diff options
| -rw-r--r-- | CHANGELOG_v2 | 25 | ||||
| -rw-r--r-- | data/doc/sisu/v2/CHANGELOG | 25 | ||||
| -rw-r--r-- | data/sisu/v2/v/version.yml | 2 | ||||
| -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 |
6 files changed, 49 insertions, 19 deletions
diff --git a/CHANGELOG_v2 b/CHANGELOG_v2 index 71e5dc75..8045f065 100644 --- a/CHANGELOG_v2 +++ b/CHANGELOG_v2 @@ -12,17 +12,32 @@ Reverse Chronological: %% Development branch UNSTABLE +%% 2.7.2.orig.tar.gz (2010-10-01:39/5) +http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.2.orig.tar.gz + sisu_2.7.2.orig.tar.gz + sisu_2.7.2-1.dsc + sisu_2.7.2-1.diff.gz + + [debian freeze, fix] + + * hub, test whether user name set, fix + (requested fix) + + * epub, fix breakage where angle brackets used in used metadata header + + * texpdf_format, remove a few commented out lines + %% 2.7.1.orig.tar.gz (2010-10-01:39/5) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.1.orig.tar.gz - sisu_2.7.1.orig.tar.gz - sisu_2.7.1-1.dsc - sisu_2.7.1-1.diff.gz + 48383fa9a8e26261b93a8bfc054d328b967557a9fb12b5afb559d40ac8bd1391 2742168 sisu_2.7.1.orig.tar.gz + 620b4664f3c52e70821f6c23e0c215aaef0a75ea55bf1ca0bdb261b8747768d8 1196 sisu_2.7.1-1.dsc + 11dc1a9aad442486592e9311e3d1b561b796593bdedb959435c8be0c81dbb8dc 288127 sisu_2.7.1-1.diff.gz [debian freeze, fix] * texinfo - * texinfo_format, texinfo output broken, fix (Closes #598063) - * ocn decoration use a hash (instead of angle braces + * texinfo_format, texinfo output broken, fix (Closes: #598063) + * ocn decoration use a hash (instead of angle braces) * urls cleaned and with angle bracket decoration * texpdf diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG index adefc68d..154b287c 100644 --- a/data/doc/sisu/v2/CHANGELOG +++ b/data/doc/sisu/v2/CHANGELOG @@ -12,17 +12,32 @@ Reverse Chronological: %% Development branch UNSTABLE +%% 2.7.2.orig.tar.gz (2010-10-01:39/5) +http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.2.orig.tar.gz + sisu_2.7.2.orig.tar.gz + sisu_2.7.2-1.dsc + sisu_2.7.2-1.diff.gz + + [debian freeze, fix] + + * hub, test whether user name set, fix + (requested fix) + + * epub, fix breakage where angle brackets used in used metadata header + + * texpdf_format, remove a few commented out lines + %% 2.7.1.orig.tar.gz (2010-10-01:39/5) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.1.orig.tar.gz - sisu_2.7.1.orig.tar.gz - sisu_2.7.1-1.dsc - sisu_2.7.1-1.diff.gz + 48383fa9a8e26261b93a8bfc054d328b967557a9fb12b5afb559d40ac8bd1391 2742168 sisu_2.7.1.orig.tar.gz + 620b4664f3c52e70821f6c23e0c215aaef0a75ea55bf1ca0bdb261b8747768d8 1196 sisu_2.7.1-1.dsc + 11dc1a9aad442486592e9311e3d1b561b796593bdedb959435c8be0c81dbb8dc 288127 sisu_2.7.1-1.diff.gz [debian freeze, fix] * texinfo - * texinfo_format, texinfo output broken, fix (Closes #598063) - * ocn decoration use a hash (instead of angle braces + * texinfo_format, texinfo output broken, fix (Closes: #598063) + * ocn decoration use a hash (instead of angle braces) * urls cleaned and with angle bracket decoration * texpdf diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml index db6d5a8c..f8d1f833 100644 --- a/data/sisu/v2/v/version.yml +++ b/data/sisu/v2/v/version.yml @@ -1,5 +1,5 @@ --- -:version: 2.7.1 +:version: 2.7.2 :date_stamp: 2010w39/5 :date: "2010-10-01" :project: SiSU 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>') |