summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2011-03-25 00:07:41 +0000
committerRalph Amissah <ralph@amissah.com>2011-03-25 00:08:20 +0000
commite5d3440be5a3925ec932df1a32c6b6e48f6e9b5b (patch)
tree0e332a7b7d535089b5dbfc994c4f4dd623c07036
parentv3, v2: bin/sisu*: v3 development ruby >=1.9.2p180; v2 maintenance ruby >=1.8.7 (diff)
downloadsisu-e5d3440be5a3925ec932df1a32c6b6e48f6e9b5b.zip
sisu-e5d3440be5a3925ec932df1a32c6b6e48f6e9b5b.tar.xz
v2, v3: texpdf bugfix, where map_nametags not found, drop tag, rather than crashsisu_3.0.5
* Debian-live, live-manual (Ben Armstrong, chals?, reported new bug in a number of translations (that crashed the pdf generator). It turns out where map_nametags is not found the document crashes. Fix.
-rw-r--r--data/doc/sisu/CHANGELOG_v28
-rw-r--r--data/doc/sisu/CHANGELOG_v38
-rw-r--r--data/sisu/v2/v/version.yml4
-rw-r--r--data/sisu/v3/v/version.yml4
-rw-r--r--lib/sisu/v2/texpdf_format.rb2
-rw-r--r--lib/sisu/v3/texpdf_format.rb2
6 files changed, 20 insertions, 8 deletions
diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2
index 92868dc..5cf3d98 100644
--- a/data/doc/sisu/CHANGELOG_v2
+++ b/data/doc/sisu/CHANGELOG_v2
@@ -12,7 +12,7 @@ Reverse Chronological:
%% STABLE Branch
-%% 2.9.0.orig.tar.gz (2011-03-23:12/3) [see 3.0.5]
+%% 2.9.0.orig.tar.gz (2011-03-24:12/4) [see 3.0.5]
http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.5-1
* move to ruby >=1.9.2p180: simplify development of v3 and maintenance of v2
@@ -22,6 +22,12 @@ http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.5-1
least be v1.9.2p180, when issues in earlier versions of ruby-1.9.2 were
first observed to be gone]
+ * texpdf bugfix, where map_nametags not found, drop nametag (rather than
+ crash)
+ [Debian-live, live-manual (Ben Armstrong, chals?, reported new bug in a
+ number of translations (that crashed the pdf generator). It turns out where
+ map_nametags is not found the document crashes.]
+
* vim syntax highlighting, fix typo
%% 2.8.2.orig.tar.gz (2011-03-11:10/5) [see 3.0.3]
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 192a830..5727b98 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -13,7 +13,7 @@ Reverse Chronological:
%% Development branch UNSTABLE
v3 branch once stable will supersede & replace current stable v2 branch
-%% 3.0.5.orig.tar.gz (2011-03-23:12/3)
+%% 3.0.5.orig.tar.gz (2011-03-24:12/4)
http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.5-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.5.orig.tar.gz
sisu_3.0.5.orig.tar.gz
@@ -26,6 +26,12 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.5.orig.tar.gz
[note should at least be v1.9.2p180, when issues in earlier versions of
ruby-1.9.2 were first observed to be gone]
+ * texpdf bugfix, where map_nametags not found, drop nametag (rather than
+ crash)
+ [Debian-live, live-manual (Ben Armstrong, chals?, reported new bug in a
+ number of translations (that crashed the pdf generator). It turns out where
+ map_nametags is not found the document crashes.]
+
* vim syntax highlighting, fix typo
%% 3.0.4.orig.tar.gz (2011-03-11:10/5)
diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml
index be98c78..765b05a 100644
--- a/data/sisu/v2/v/version.yml
+++ b/data/sisu/v2/v/version.yml
@@ -1,5 +1,5 @@
---
:version: 2.9.0
-:date_stamp: 2011w12/3
-:date: "2011-03-23"
+:date_stamp: 2011w12/4
+:date: "2011-03-24"
:project: SiSU
diff --git a/data/sisu/v3/v/version.yml b/data/sisu/v3/v/version.yml
index 4baf491..bca535e 100644
--- a/data/sisu/v3/v/version.yml
+++ b/data/sisu/v3/v/version.yml
@@ -1,5 +1,5 @@
---
:version: 3.0.5-beta-rb1.9.2p180
-:date_stamp: 2011w12/3
-:date: "2011-03-23"
+:date_stamp: 2011w12/4
+:date: "2011-03-24"
:project: SiSU
diff --git a/lib/sisu/v2/texpdf_format.rb b/lib/sisu/v2/texpdf_format.rb
index dbf0d09..b2dd0e3 100644
--- a/lib/sisu/v2/texpdf_format.rb
+++ b/lib/sisu/v2/texpdf_format.rb
@@ -419,7 +419,7 @@ module SiSU_TeX_Pdf
map_nametags[url][:ocn]
else nil
end
- ocn_lnk=(url=~/^\d+$/ ? url : (map_nametags[url][:ocn]))
+ ocn_lnk=(url=~/^\d+$/ ? url : ocn_lnk)
if ocn_lnk and not ocn_lnk.empty?
idx \
? (str.sub!(rgx_url_internal,"\\hyperlink{#{ocn_lnk}}{#{link}}")) \
diff --git a/lib/sisu/v3/texpdf_format.rb b/lib/sisu/v3/texpdf_format.rb
index a91095e..b235e1f 100644
--- a/lib/sisu/v3/texpdf_format.rb
+++ b/lib/sisu/v3/texpdf_format.rb
@@ -421,7 +421,7 @@ module SiSU_TeX_Pdf
map_nametags[url][:ocn]
else nil
end
- ocn_lnk=(url=~/^\d+$/ ? url : (map_nametags[url][:ocn]))
+ ocn_lnk=(url=~/^\d+$/ ? url : ocn_lnk)
if ocn_lnk and not ocn_lnk.empty?
idx \
? (str.sub!(rgx_url_internal,"\\hyperlink{#{ocn_lnk}}{#{link}}")) \