diff options
| author | Ralph Amissah <ralph@amissah.com> | 2011-03-24 20:24:15 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2011-03-24 20:24:15 -0400 |
| commit | e158c914b4f353c4d3aaf682cbe0d52d87e7f8ee (patch) | |
| tree | feb1754689976a2cb83530864c53060a2f49e9e3 /lib | |
| parent | debian/changelog (3.0.4-1) (diff) | |
| parent | v2, v3: texpdf bugfix, where map_nametags not found, drop tag, rather than crash (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sisu/v2/texpdf_format.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/v3/texpdf_format.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/sisu/v2/texpdf_format.rb b/lib/sisu/v2/texpdf_format.rb index dbf0d095..b2dd0e32 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 a91095e8..b235e1fc 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}}")) \ |