aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--data/doc/sisu/CHANGELOG_v319
-rw-r--r--data/sisu/v3/v/version.yml6
-rw-r--r--lib/sisu/v3/odf.rb6
-rw-r--r--lib/sisu/v3/sysenv.rb6
4 files changed, 25 insertions, 12 deletions
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 8f9c2cea..3dec3c02 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -13,13 +13,26 @@ Reverse Chronological:
%% Development branch UNSTABLE
v3 branch once stable will supersede & replace current stable v2 branch
+%% 3.1.8.orig.tar.xz (2011-12-13:50/2)
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.8
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.8-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.8.orig.tar.xz
+ sisu_3.1.8.orig.tar.xz
+ sisu_3.1.8-1.dsc
+ sisu_3.1.8-1.debian.tar.gz
+
+ * texpdf, output by filetype, fix, produce pdf files with language code as
+ part of filename (previously written over)
+
+ * odf:odt, codeblocks, a match fix, affects e.g. "<<"
+
%% 3.1.7.orig.tar.xz (2011-12-08:49/4)
http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.7
http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.7-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.7.orig.tar.xz
- sisu_3.1.7.orig.tar.xz
- sisu_3.1.7-1.dsc
- sisu_3.1.7-1.debian.tar.gz
+ 26d1159304c0874240e2244842f671555b67d7db07dc0122ee81a44f4b05e8e4 1649336 sisu_3.1.7.orig.tar.xz
+ 9f500794d809bc0f69dc0d0a06f610a652d67a678980fa22337af4b7f14b1284 1382 sisu_3.1.7-1.dsc
+ 3a862f6993b2dd7aa970d654684d3ffe907b83b27b86455aec9f5ca077f8a7d5 290465 sisu_3.1.7-1.debian.tar.gz
* dal, codeblocks
* internal document identifier tags removed, consider
diff --git a/data/sisu/v3/v/version.yml b/data/sisu/v3/v/version.yml
index c6f6a029..e2186fc9 100644
--- a/data/sisu/v3/v/version.yml
+++ b/data/sisu/v3/v/version.yml
@@ -1,5 +1,5 @@
---
-:version: 3.1.7
-:date_stamp: 2011w49/4
-:date: "2011-12-08"
+:version: 3.1.8
+:date_stamp: 2011w50/2
+:date: "2011-12-13"
:project: SiSU
diff --git a/lib/sisu/v3/odf.rb b/lib/sisu/v3/odf.rb
index b7b747ee..7d4fa309 100644
--- a/lib/sisu/v3/odf.rb
+++ b/lib/sisu/v3/odf.rb
@@ -535,10 +535,12 @@ module SiSU_ODF
unless dob =~/^(?:#{Rx[:meta]}|%+ )/m
w.gsub!(/&#(?:126|152);/,'~') #126 usual
w.gsub!(/&nbsp;/,'&#160;')
- if w !~/&\S{2,7}?;/
+ if w !~/(?:&\S{2,7}?;)+/
w.gsub!(/&/,'&amp;')
end
- w.gsub!(/(&\S{1,7};)+&/,'\1&amp;') #could break things
+ if w !~/&\S{1,7}?;(?:&\S{1,7}?;)+/ #imperfect
+ w.gsub!(/(&\S{1,7};)+&/,'\1&amp;')
+ end
end
para_array << w
end
diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb
index 953c8eec..98a58f72 100644
--- a/lib/sisu/v3/sysenv.rb
+++ b/lib/sisu/v3/sysenv.rb
@@ -3818,15 +3818,13 @@ WOK
end
end
def pdf_p
- if @env.output_dir_structure.by_language_code? \
- or @env.output_dir_structure.by_filetype?
+ if @env.output_dir_structure.by_language_code?
@md.fnb + '.portrait.'
else 'portrait' + @md.lang_code_insert + '.'
end
end
def pdf_l
- if @env.output_dir_structure.by_language_code? \
- or @env.output_dir_structure.by_filetype?
+ if @env.output_dir_structure.by_language_code?
@md.fnb + '.landscape.'
else 'landscape' + @md.lang_code_insert + '.'
end