diff options
| author | Ralph Amissah <ralph@amissah.com> | 2010-10-01 23:44:42 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2010-10-01 23:44:42 -0400 |
| commit | 27020c9bb0e449e1af86d4f1756e3a1582b4ad00 (patch) | |
| tree | a9bf1e1b93d5983d96be8dce2eccbcca412490e6 /lib | |
| parent | debian/changelog 2.7.1-1 (diff) | |
| parent | version & changelog 2.7.2 (squeeze freeze, fixes) (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sisu/v2/epub_format.rb | 10 | ||||
| -rw-r--r-- | lib/sisu/v2/hub.rb | 1 | ||||
| -rw-r--r-- | lib/sisu/v2/texpdf_format.rb | 5 |
3 files changed, 8 insertions, 8 deletions
diff --git a/lib/sisu/v2/epub_format.rb b/lib/sisu/v2/epub_format.rb index 28fe7357..761d771e 100644 --- a/lib/sisu/v2/epub_format.rb +++ b/lib/sisu/v2/epub_format.rb @@ -1031,12 +1031,16 @@ WOK def metadata #metadata dc author=if defined? @md.creator.author \ and @md.creator.author =~/\S+/ - %{\n <dc:creator opf:file-as="#{@md.creator.author}" opf:role="aut">#{@md.creator.author}</dc:creator>} + x=@md.creator.author.gsub!(/</,'<'); @md.creator.author.gsub!(/>/,'>') + @md.creator.author.gsub!(/<br(?: \/)?>/,'<br />') + %{\n <dc:creator opf:file-as="#{x}" opf:role="aut">#{x}</dc:creator>} else '' end illustrator=if defined? @md.creator.illustrator \ and @md.creator.illustrator =~/\S+/ - %{\n <dc:creator opf:file-as="#{@md.creator.illustrator}" opf:role="ill">#{@md.creator.illustrator}</dc:creator>} + x=@md.creator.illustrator.gsub!(/</,'<'); @md.creator.illustrator.gsub!(/>/,'>') + @md.creator.illustrator.gsub!(/<br(?: \/)?>/,'<br />') + %{\n <dc:creator opf:file-as="#{x}" opf:role="ill">#{x}</dc:creator>} else '' end rights=if defined? @md.rights.all \ @@ -1588,7 +1592,7 @@ WOK #{@vz.js_top}} end def toc_metadata - @metalink=%{./#{@md.fn[:meatadata]}} + @metalink=%{./#{@md.fn[:metadata]}} toc_metadata end def title_banner(title,subtitle,creator) diff --git a/lib/sisu/v2/hub.rb b/lib/sisu/v2/hub.rb index 85009d75..4b06a45c 100644 --- a/lib/sisu/v2/hub.rb +++ b/lib/sisu/v2/hub.rb @@ -490,6 +490,7 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/ @msg,@msgs="\tsisu -W [to start ruby web-server on output directory]\n",nil unless @opt.cmd =~/q/ @tell.call.print_brown if @opt.cmd =~/[uUvVM]/ unless @opt.files.join.empty? if defined? @@env.path.processing \ + and @@env.user \ and FileTest.directory?(@@env.path.processing) \ and @@env.path.processing =~/#{@@env.user}$/ #clean temporary processing directory of content as is located in public area cd(@@env.path.processing_base_tmp) do diff --git a/lib/sisu/v2/texpdf_format.rb b/lib/sisu/v2/texpdf_format.rb index ea34a390..8eff07b9 100644 --- a/lib/sisu/v2/texpdf_format.rb +++ b/lib/sisu/v2/texpdf_format.rb @@ -967,11 +967,6 @@ WOK and w=~/\/\S+?\// \ and w.length > 6 w.gsub!(/([_.\/])/,'\1\-') - #elsif w !~/http:/ \ - #and w=~/([_,.;:\/|=])/ \ - #and w.length > 10 - # w.gsub!(/([_,.;:\/|=])/,'\1\-') - # w.gsub!(/(--)(\S{4,})/,'\1\-\2') end w.gsub!(/#{Mx[:gl_o]}#lt#{Mx[:gl_c]}/,'<'); w.gsub!(/#{Mx[:gl_o]}#gt#{Mx[:gl_c]}/,'>') w.gsub!(/[\\]?~/,'<=tilde>') |