From f577abb16836786378d578cb6aab95224869e7fd Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 11 Mar 2011 17:17:37 -0500 Subject: sha256 (3.0.4) --- 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 246cf38a..3970ca1c 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -16,9 +16,9 @@ v3 branch once stable will supersede & replace current stable v2 branch %% 3.0.4.orig.tar.gz (2011-03-11:10/5) http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.4-1 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.4.orig.tar.gz - sisu_3.0.4.orig.tar.gz - sisu_3.0.4-1.dsc - sisu_3.0.4-1.debian.tar.gz + 145c409526b26cb0a14b43f4c46219fb828dc41c8211d8f77bad486a98300678 1920526 sisu_3.0.4.orig.tar.gz + 4886196e536e3ad48b29d27b1f0664f77b58ee4b4b21e41c0351c6b3a33dd156 1216 sisu_3.0.4-1.dsc + b41f225c61600a084a729b4d749b30eeebbdbfffc775e227a05159410b4c2a00 281648 sisu_3.0.4-1.debian.tar.gz * sisu_manual, sisu_download, remove references to versions of sisu -- cgit v1.2.3 From 21cadb83ff945d105e87a664fc5c843002542ec7 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 20 Mar 2011 22:46:24 -0400 Subject: v3: changelog & version 3.0.5 --- data/doc/sisu/CHANGELOG_v3 | 7 +++++++ data/sisu/v3/v/version.yml | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 3970ca1c..289bb661 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -13,6 +13,13 @@ Reverse Chronological: %% Development branch UNSTABLE v3 branch once stable will supersede & replace current stable v2 branch +%% 3.0.5.orig.tar.gz (2011-03-20:11/7) +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 + sisu_3.0.5-1.dsc + sisu_3.0.5-1.debian.tar.gz + %% 3.0.4.orig.tar.gz (2011-03-11:10/5) http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.4-1 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.4.orig.tar.gz diff --git a/data/sisu/v3/v/version.yml b/data/sisu/v3/v/version.yml index 8084e1f1..ef6be262 100644 --- a/data/sisu/v3/v/version.yml +++ b/data/sisu/v3/v/version.yml @@ -1,5 +1,5 @@ --- -:version: 3.0.4-beta-rb1.9.2p180 -:date_stamp: 2011w10/5 -:date: "2011-03-11" +:version: 3.0.5-beta-rb1.9.2p180 +:date_stamp: 2011w11/7 +:date: "2011-03-20" :project: SiSU -- cgit v1.2.3 From 18eefb233aeb2ae9b9a5a45ad4540590f8be7504 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 20 Mar 2011 22:49:57 -0400 Subject: v2, v3: vim syntax highlighting, fix typo --- data/doc/sisu/CHANGELOG_v2 | 5 +++++ data/doc/sisu/CHANGELOG_v3 | 2 ++ data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim | 4 ++-- data/sisu/v2/v/version.yml | 6 +++--- data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim | 4 ++-- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2 index 21ce50c5..313a9893 100644 --- a/data/doc/sisu/CHANGELOG_v2 +++ b/data/doc/sisu/CHANGELOG_v2 @@ -12,6 +12,11 @@ Reverse Chronological: %% STABLE Branch +%% 2.8.3.orig.tar.gz (2011-03-20:11/7) [see 3.0.5] +http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.5-1 + + * vim syntax highlighting, fix typo + %% 2.8.2.orig.tar.gz (2011-03-11:10/5) [see 3.0.3] http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.3-1 diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 289bb661..6ae16842 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -20,6 +20,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.5.orig.tar.gz sisu_3.0.5-1.dsc sisu_3.0.5-1.debian.tar.gz + * vim syntax highlighting, fix typo + %% 3.0.4.orig.tar.gz (2011-03-11:10/5) http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.4-1 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.4.orig.tar.gz diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim index e1077034..751202cc 100644 --- a/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim +++ b/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim @@ -1,6 +1,6 @@ "SiSU Vim syntax file "SiSU Maintainer: Ralph Amissah -"SiSU Markup: SiSU (sisu-2.8.2, 2011-03-11) +"SiSU Markup: SiSU (sisu-2.8.3, 2011-03-20) "(originally looked at Ruby Vim by Mirko Nasato) if version < 600 @@ -36,7 +36,7 @@ if !exists("sisu_no_identifiers") syn match sisu_sub_header_date "^\s\+:\(added_to_site\|available\|created\|issued\|modified\|published\|valid\|translated\|original_publication\):\s" syn match sisu_sub_header_original "^\s\+:\(publisher\|date\|language\|lang_char\|institution\|nationality\|source\):\s" syn match sisu_sub_header_make "^\s\+:\(headings\|num_top\|breaks\|language\|italics\|bold\|emphasis\|plaintext_wrap\|texpdf_font\|skin\|stamp\|promo\|ad\|manpage\):\s" - syn match sisu_sub_header_notes "^\s\+:\(abstract\comment\|description\|history\|prefix\|prefix_[ab]\|suffix\):\s" + syn match sisu_sub_header_notes "^\s\+:\(abstract\|comment\|description\|history\|prefix\|prefix_[ab]\|suffix\):\s" syn match sisu_sem_marker ";{\|};[a-z._]*[a-z]" syn match sisu_sem_marker_block "\([a-z][a-z._]*\|\):{\|}:[a-z._]*[a-z]" syn match sisu_sem_ex_marker ";\[\|\];[a-z._]*[a-z]" diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml index db91e9eb..bb6a21b0 100644 --- a/data/sisu/v2/v/version.yml +++ b/data/sisu/v2/v/version.yml @@ -1,5 +1,5 @@ --- -:version: 2.8.2 -:date_stamp: 2011w10/5 -:date: "2011-03-11" +:version: 2.8.3 +:date_stamp: 2011w11/7 +:date: "2011-03-20" :project: SiSU diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim index aa24113d..00cdbea4 100644 --- a/data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim +++ b/data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim @@ -1,6 +1,6 @@ "SiSU Vim syntax file "SiSU Maintainer: Ralph Amissah -"SiSU Markup: SiSU (sisu-3.0.3, 2011-03-11) +"SiSU Markup: SiSU (sisu-3.0.5, 2011-03-20) "(originally looked at Ruby Vim by Mirko Nasato) if version < 600 @@ -40,7 +40,7 @@ if !exists("sisu_no_identifiers") syn match sisu_sub_header_date "^\s\+:\(added_to_site\|available\|created\|issued\|modified\|published\|valid\|translated\|original_publication\):\s" syn match sisu_sub_header_original "^\s\+:\(publisher\|date\|language\|lang_char\|institution\|nationality\|source\):\s" syn match sisu_sub_header_make "^\s\+:\(headings\|num_top\|breaks\|language\|italics\|bold\|emphasis\|plaintext_wrap\|texpdf_font\|skin\|stamp\|promo\|ad\|manpage\):\s" - syn match sisu_sub_header_notes "^\s\+:\(abstract\comment\|description\|history\|prefix\|prefix_[ab]\|suffix\):\s" + syn match sisu_sub_header_notes "^\s\+:\(abstract\|comment\|description\|history\|prefix\|prefix_[ab]\|suffix\):\s" syn match sisu_sem_marker ";{\|};[a-z._]*[a-z]" syn match sisu_sem_marker_block "\([a-z][a-z._]*\|\):{\|}:[a-z._]*[a-z]" syn match sisu_sem_ex_marker ";\[\|\];[a-z._]*[a-z]" -- cgit v1.2.3 From 9e82ccef5eeb3228c7c958b049de4cbbf6b0d8a2 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 23 Mar 2011 21:49:33 -0400 Subject: v3, v2: bin/sisu*: v3 development ruby >=1.9.2p180; v2 maintenance ruby >=1.8.7 * bin/sisu* version checks --- bin/sisu | 92 +++++++++++++++++++++++++++++++-------------- bin/sisu3 | 93 +++++++++++++++++++++++++++++++--------------- bin/sisu_termsheet | 80 +++++++++++++++++++++++++++++++-------- bin/sisu_webrick | 80 +++++++++++++++++++++++++++++++-------- data/doc/sisu/CHANGELOG_v2 | 9 ++++- data/doc/sisu/CHANGELOG_v3 | 8 +++- data/sisu/v2/v/version.yml | 6 +-- data/sisu/v3/v/version.yml | 4 +- 8 files changed, 278 insertions(+), 94 deletions(-) diff --git a/bin/sisu b/bin/sisu index 5da17513..ceeebd6c 100644 --- a/bin/sisu +++ b/bin/sisu @@ -1,37 +1,73 @@ #!/usr/bin/env ruby # encoding: utf-8 #SiSU: copyright (C) 1997 - 2011 Ralph Amissah; License GPL, see appended program information -#raise "Please, use Ruby1.8 (1.8.4 or later), current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4' or RUBY_VERSION > '1.9' -def check_sisu_stable_ruby_version? - rbv_sisu_stable='1.8.7' - if RUBY_VERSION < rbv_sisu_stable - raise "Please, use Ruby#{rbv_sisu_stable} or later, current Ruby #{RUBY_VERSION}" +begin + def check_sisu_stable_ruby_version? + rbv_sisu_stable='1.8.7' + if RUBY_VERSION < rbv_sisu_stable + raise "Please, use Ruby#{rbv_sisu_stable} or later, current Ruby #{RUBY_VERSION}" + else check_incompatible_ruby_build? + end end -end -def check_sisu_dev_ruby_version? - rbv_sisu_dev='1.9.2' - if RUBY_VERSION < rbv_sisu_dev - raise "Please, use Ruby#{rbv_sisu_dev} or later, current Ruby #{RUBY_VERSION}" + def check_sisu_dev_ruby_version? + rbv_sisu_dev='1.9.2' + if RUBY_VERSION < rbv_sisu_dev + raise "Please, use Ruby#{rbv_sisu_dev} or later, current Ruby #{RUBY_VERSION}" + else check_incompatible_ruby_build? + end end + def check_incompatible_ruby_build? + require 'rbconfig' + e=Config::CONFIG + if RUBY_VERSION == '1.9.2' \ + and e['PATCHLEVEL'].to_i < 180 + raise < '1.9' -def check_sisu_stable_ruby_version? - rbv_sisu_stable='1.8.7' - if RUBY_VERSION < rbv_sisu_stable - raise "Please, use Ruby#{rbv_sisu_stable} or later, current Ruby #{RUBY_VERSION}" +begin + def check_sisu_stable_ruby_version? + rbv_sisu_stable='1.8.7' + if RUBY_VERSION < rbv_sisu_stable + raise "Please, use Ruby#{rbv_sisu_stable} or later, current Ruby #{RUBY_VERSION}" + else check_incompatible_ruby_build? + end end -end -def check_sisu_dev_ruby_version? - rbv_sisu_dev='1.9.2' - if RUBY_VERSION < rbv_sisu_dev - raise "Please, use Ruby#{rbv_sisu_dev} or later, current Ruby #{RUBY_VERSION}" + def check_sisu_dev_ruby_version? + rbv_sisu_dev='1.9.2' + if RUBY_VERSION < rbv_sisu_dev + raise "Please, use Ruby#{rbv_sisu_dev} or later, current Ruby #{RUBY_VERSION}" + else check_incompatible_ruby_build? + end end + def check_incompatible_ruby_build? + require 'rbconfig' + e=Config::CONFIG + if RUBY_VERSION == '1.9.2' \ + and e['PATCHLEVEL'].to_i < 180 + raise < '1.9' -#raise "Please, use Ruby1.8.4 or later, current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4' -$VERBOSE=nil -argv=$* -SiSU_version_dir=case argv.inspect -when /--v2/ - 'v2' -when /--v3/ - 'v3' -when /--dev/ - 'v3' -else - 'v2' +begin + def check_sisu_stable_ruby_version? + rbv_sisu_stable='1.8.7' + if RUBY_VERSION < rbv_sisu_stable + raise "Please, use Ruby#{rbv_sisu_stable} or later, current Ruby #{RUBY_VERSION}" + else check_incompatible_ruby_build? + end + end + def check_sisu_dev_ruby_version? + rbv_sisu_dev='1.9.2' + if RUBY_VERSION < rbv_sisu_dev + raise "Please, use Ruby#{rbv_sisu_dev} or later, current Ruby #{RUBY_VERSION}" + else check_incompatible_ruby_build? + end + end + def check_incompatible_ruby_build? + require 'rbconfig' + e=Config::CONFIG + if RUBY_VERSION == '1.9.2' \ + and e['PATCHLEVEL'].to_i < 180 + raise < '1.9' -#raise "Please, use Ruby1.8.4 or later, current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4' -$VERBOSE=nil -argv=$* -SiSU_version_dir=case argv.inspect -when /--v2/ - 'v2' -when /--v3/ - 'v3' -when /--dev/ - 'v3' -else - 'v2' +begin + def check_sisu_stable_ruby_version? + rbv_sisu_stable='1.8.7' + if RUBY_VERSION < rbv_sisu_stable + raise "Please, use Ruby#{rbv_sisu_stable} or later, current Ruby #{RUBY_VERSION}" + else check_incompatible_ruby_build? + end + end + def check_sisu_dev_ruby_version? + rbv_sisu_dev='1.9.2' + if RUBY_VERSION < rbv_sisu_dev + raise "Please, use Ruby#{rbv_sisu_dev} or later, current Ruby #{RUBY_VERSION}" + else check_incompatible_ruby_build? + end + end + def check_incompatible_ruby_build? + require 'rbconfig' + e=Config::CONFIG + if RUBY_VERSION == '1.9.2' \ + and e['PATCHLEVEL'].to_i < 180 + raise <=1.9.2p180: simplify development of v3 and maintenance of v2 + * bin/sisu demand ruby >=1.9.2p180 (version checks) + * debian/control, dependencies + [enforcing use of ruby >= 1.9.2 reason for version bump, note should at + least be v1.9.2p180, when issues in earlier versions of ruby-1.9.2 were + first observed to be gone] + * 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 6ae16842..192a830f 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -13,13 +13,19 @@ Reverse Chronological: %% Development branch UNSTABLE v3 branch once stable will supersede & replace current stable v2 branch -%% 3.0.5.orig.tar.gz (2011-03-20:11/7) +%% 3.0.5.orig.tar.gz (2011-03-23:12/3) 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 sisu_3.0.5-1.dsc sisu_3.0.5-1.debian.tar.gz + * move to ruby >=1.9.2p180: simplify development of v3 and maintenance of v2 + * bin/sisu demand ruby >=1.9.2p180 (version checks) + * debian/control, dependencies + [note should at least be v1.9.2p180, when issues in earlier versions of + ruby-1.9.2 were first observed to be gone] + * 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 bb6a21b0..be98c78f 100644 --- a/data/sisu/v2/v/version.yml +++ b/data/sisu/v2/v/version.yml @@ -1,5 +1,5 @@ --- -:version: 2.8.3 -:date_stamp: 2011w11/7 -:date: "2011-03-20" +:version: 2.9.0 +:date_stamp: 2011w12/3 +:date: "2011-03-23" :project: SiSU diff --git a/data/sisu/v3/v/version.yml b/data/sisu/v3/v/version.yml index ef6be262..4baf4911 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: 2011w11/7 -:date: "2011-03-20" +:date_stamp: 2011w12/3 +:date: "2011-03-23" :project: SiSU -- cgit v1.2.3 From e5d3440be5a3925ec932df1a32c6b6e48f6e9b5b Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 24 Mar 2011 20:07:41 -0400 Subject: v2, v3: texpdf bugfix, where map_nametags not found, drop tag, 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. Fix. --- data/doc/sisu/CHANGELOG_v2 | 8 +++++++- data/doc/sisu/CHANGELOG_v3 | 8 +++++++- data/sisu/v2/v/version.yml | 4 ++-- data/sisu/v3/v/version.yml | 4 ++-- lib/sisu/v2/texpdf_format.rb | 2 +- lib/sisu/v3/texpdf_format.rb | 2 +- 6 files changed, 20 insertions(+), 8 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2 index 92868dc8..5cf3d984 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 192a830f..5727b980 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 be98c78f..765b05a3 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 4baf4911..bca535e0 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 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}}")) \ -- cgit v1.2.3