From a6aadc4d2c1ceb764192be5e18dec5a27c860a40 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Thu, 8 Dec 2011 21:40:38 -0500
Subject: sha256 (3.1.7)
---
data/doc/sisu/CHANGELOG_v3 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 8f9c2cea..242840aa 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -17,9 +17,9 @@ v3 branch once stable will supersede & replace current stable v2 branch
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
--
cgit v1.2.3
From 59a52e3db7963e116b5108ea39f16cda590e6bfc Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 13 Dec 2011 22:02:27 -0500
Subject: v3: 3.1.8 version & changelog "opened"
---
data/doc/sisu/CHANGELOG_v3 | 8 ++++++++
data/sisu/v3/v/version.yml | 6 +++---
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 242840aa..146d7786 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -13,6 +13,14 @@ 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
+
%% 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
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
--
cgit v1.2.3
From 0607a1bd8727ed7c482fcfb0e4c4002cd24eca72 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 13 Dec 2011 22:05:41 -0500
Subject: v3: odf:odt, codeblocks, a match fix, affects e.g. "<<"
---
data/doc/sisu/CHANGELOG_v3 | 2 ++
lib/sisu/v3/odf.rb | 6 ++++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 146d7786..427561d1 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -21,6 +21,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.8.orig.tar.xz
sisu_3.1.8-1.dsc
sisu_3.1.8-1.debian.tar.gz
+ * 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
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!(/ /,' ')
- if w !~/&\S{2,7}?;/
+ if w !~/(?:&\S{2,7}?;)+/
w.gsub!(/&/,'&')
end
- w.gsub!(/(&\S{1,7};)+&/,'\1&') #could break things
+ if w !~/&\S{1,7}?;(?:&\S{1,7}?;)+/ #imperfect
+ w.gsub!(/(&\S{1,7};)+&/,'\1&')
+ end
end
para_array << w
end
--
cgit v1.2.3
From b77338f9a9cc17af78819cb19e6e5e1b89f5e734 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 13 Dec 2011 22:08:17 -0500
Subject: v3: texpdf, output_by: filetype, fix, language code part of filename,
fix
* files previously given same name and written over
* [reported by chals (live-manual) on irc oftc #sisu]
* [output_by language and filename ok]
---
data/doc/sisu/CHANGELOG_v3 | 3 +++
lib/sisu/v3/sysenv.rb | 6 ++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 427561d1..3dec3c02 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -21,6 +21,9 @@ http://www.jus.uio.no/sisu/pkg/src/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)
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
--
cgit v1.2.3