Merge branch 'upstream' into debian/sid

12 files changed, 103 insertions, 51 deletions

diff --git a/CHANGELOG_v2 b/CHANGELOG_v2
index f4e29be3..28eb16fb 100644
--- a/CHANGELOG_v2
+++ b/CHANGELOG_v2
@@ -12,11 +12,25 @@ Reverse Chronological:
 
 %% Development branch UNSTABLE
 
+%% 2.3.3.orig.tar.gz (2010-05-05:18/3)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.3.orig.tar.gz
+  sisu_2.3.3.orig.tar.gz
+  sisu_2.3.3-1.dsc
+  sisu_2.3.3-1.diff.gz
+
+  * texpdf, special word and number optional break points, (also, reduce text
+    display size of digests, reduce image size, add some url braces)
+
+  * sysenv, sisurc.yml, default shortform command flags, removal of verbose
+    flag from default, add -v when needed, e.g. sisu -3v filename.sst
+
+  * screen output (ansi), control
+
 %% 2.3.2.orig.tar.gz (2010-05-03:18/1)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.2.orig.tar.gz
-  sisu_2.3.2.orig.tar.gz
-  sisu_2.3.2-1.dsc
-  sisu_2.3.2-1.diff.gz
+  6f9b95e70dfbd80c793ef6dd7a64cc16f1073b6261a466f388b98ea364daab29 2752926 sisu_2.3.2.orig.tar.gz
+  5719841cbacf87088a9e34c868b6e2e9b0e9ac17221b4a02bddbe2a055b019c2 1145 sisu_2.3.2-1.dsc
+  cf8af2c7587af61ca07481819ae20376e60efc979cbe8e2b0245f4862e986748 276091 sisu_2.3.2-1.diff.gz
 
   * dal, markup, In cases where the line is interpreted as level 1~ (either by
     explicit 1~ tag or @make: :heading:) a hash (#) [octothorpe] will be
@@ -28,7 +42,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.2.orig.tar.gz
     or the markup source document header @make: :emphasis: 'bold' [requested]
 
   * plaintext, wrap width configurable between 20 to 200 characters, the
-    default width being 78, configuration eithe rin sisurc.yml (default: text_wrap:
+    default width being 78, configuration either in sisurc.yml (default: text_wrap:
     78), or the markup source document header (@make: :plaintext_wrap: 78)
 
   * param_identify_markup, identify version 2 markup
diff --git a/conf/sisu/v2/sisurc.yml b/conf/sisu/v2/sisurc.yml
index a5c13293..0703e0f4 100644
--- a/conf/sisu/v2/sisurc.yml
+++ b/conf/sisu/v2/sisurc.yml
@@ -54,13 +54,13 @@ show_output_on: 'filesystem_url'
 #  concord_max:  400000
 #% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default)
 flag:
-  color:        true                       # making colour default -c is toggle, and will now toggle colour off
-  default:      '-NhwpoabxXyYv'            # includes verbose; -m would in any event be run by default
-  i:            '-hwpoyv'                  # includes verbose; -m run by default
-  ii:           '-NhwepoabxXyv'             # includes verbose; -m run by default
-  iii:          '-NhwepoabxXyYv'            # includes verbose; -m run by default
-  iv:           '-NhwepoabxXYDyv --import'  # includes verbose; -m run by default
-  v:            '-NhwepoabxXYDyv --update'  # includes verbose; -m run by default
+  color:        true                        # making colour default -c is toggle, and will now toggle colour off
+  default:      '-NhwepoabxXyYv'            # -m run by default; includes verbose
+  i:            '-hwpoay'                   # -m run by default
+  ii:           '-NhwepoabxXy'              # -m run by default
+  iii:          '-NhwepoabxXyY'             # -m run by default
+  iv:           '-NhwepoabxXYDy --update'   # -m run by default
+  v:            '-NhwepoabxXYDyv --update'  # -m run by default; includes verbose
 #% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
 default:
   papersize:    'A4,letter'
diff --git a/conf/sisu/v2/version.yml b/conf/sisu/v2/version.yml
index 2879bb8a..8736e8da 100644
--- a/conf/sisu/v2/version.yml
+++ b/conf/sisu/v2/version.yml
@@ -1,5 +1,5 @@
 --- 
-:version: 2.3.2
-:date_stamp: 2010w18/1
-:date: "2010-05-03"
+:version: 2.3.3
+:date_stamp: 2010w18/3
+:date: "2010-05-05"
 :project: SiSU
diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index d6c2c6ba..1e6e0843 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -12,11 +12,25 @@ Reverse Chronological:
 
 %% Development branch UNSTABLE
 
+%% 2.3.3.orig.tar.gz (2010-05-05:18/3)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.3.orig.tar.gz
+  sisu_2.3.3.orig.tar.gz
+  sisu_2.3.3-1.dsc
+  sisu_2.3.3-1.diff.gz
+
+  * texpdf, special word and number optional break points, (also, reduce text
+    display size of digests, reduce image size, add some url braces)
+
+  * sysenv, sisurc.yml, default shortform command flags, removal of verbose
+    flag from default, add -v when needed, e.g. sisu -3v filename.sst
+
+  * screen output (ansi), control
+
 %% 2.3.2.orig.tar.gz (2010-05-03:18/1)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.2.orig.tar.gz
-  sisu_2.3.2.orig.tar.gz
-  sisu_2.3.2-1.dsc
-  sisu_2.3.2-1.diff.gz
+  6f9b95e70dfbd80c793ef6dd7a64cc16f1073b6261a466f388b98ea364daab29 2752926 sisu_2.3.2.orig.tar.gz
+  5719841cbacf87088a9e34c868b6e2e9b0e9ac17221b4a02bddbe2a055b019c2 1145 sisu_2.3.2-1.dsc
+  cf8af2c7587af61ca07481819ae20376e60efc979cbe8e2b0245f4862e986748 276091 sisu_2.3.2-1.diff.gz
 
   * dal, markup, In cases where the line is interpreted as level 1~ (either by
     explicit 1~ tag or @make: :heading:) a hash (#) [octothorpe] will be
@@ -28,7 +42,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.2.orig.tar.gz
     or the markup source document header @make: :emphasis: 'bold' [requested]
 
   * plaintext, wrap width configurable between 20 to 200 characters, the
-    default width being 78, configuration eithe rin sisurc.yml (default: text_wrap:
+    default width being 78, configuration either in sisurc.yml (default: text_wrap:
     78), or the markup source document header (@make: :plaintext_wrap: 78)
 
   * param_identify_markup, identify version 2 markup
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi
index d6cbdd7d..c3c4f99a 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi
+++ b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi
@@ -16,7 +16,7 @@
  :issued: 2002-11-12
  :available: 2002-11-12
  :published: 2009-01-18
- :modified: 2010-05-03
+ :modified: 2010-05-05
 
 @make:
  :num_top: 1
@@ -55,7 +55,7 @@
 
 3~source- Source (tarball tar.gz)
 
-_* {~^ sisu_2.3.2.orig.tar.gz (2010-05-03:18/1) }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.2.orig.tar.gz
+_* {~^ sisu_2.3.3.orig.tar.gz (2010-05-05:18/3) }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.3.orig.tar.gz
 
 _* {~^ sisu-markup-samples_2.0.3.orig.tar.gz (of 2010-05-01:17/6 ) }http://www.jus.uio.no/sisu/pkg/src/sisu-markup-samples_2.0.3.orig.tar.gz *~sisu-markup-samples
 
@@ -102,11 +102,11 @@ group{
 
 *{Source}*
 
-{~^ sisu_2.3.2.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.2.orig.tar.gz
+{~^ sisu_2.3.3.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.3.orig.tar.gz
 
-{~^ sisu_2.3.2-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.2-1.diff.gz
+{~^ sisu_2.3.3-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.3-1.diff.gz
 
-{~^ sisu_2.3.2-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.2-1.dsc
+{~^ sisu_2.3.3-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.3-1.dsc
 
 }group
 
@@ -114,15 +114,15 @@ group{
 
 *{Debs}*
 
-{~^ sisu_2.3.2-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_2.3.2-1_all.deb ~{ <br>sisu, the base code, (the main package on which the others depend), without any dependencies other than ruby (and for convenience the ruby webrick web server), this generates a number of types of output on its own, other packages provide additional functionality, and have their dependencies <br>Depends: ruby (>=1.8.2), libwebrick-ruby<br>Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, vim-sisu, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl }~
+{~^ sisu_2.3.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_2.3.3-1_all.deb ~{ <br>sisu, the base code, (the main package on which the others depend), without any dependencies other than ruby (and for convenience the ruby webrick web server), this generates a number of types of output on its own, other packages provide additional functionality, and have their dependencies <br>Depends: ruby (>=1.8.2), libwebrick-ruby<br>Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, vim-sisu, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl }~
 
-{~^ sisu-complete_2.3.2-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_2.3.2-1_all.deb ~{ <br>a package that pulls in other packages to build the whole of sisu (excluding sisu-examples) <br>Depends: ruby (>=1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu<br>Recommends: sisu-examples }~
+{~^ sisu-complete_2.3.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_2.3.3-1_all.deb ~{ <br>a package that pulls in other packages to build the whole of sisu (excluding sisu-examples) <br>Depends: ruby (>=1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu<br>Recommends: sisu-examples }~
 
-{~^ sisu-pdf_2.3.2-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_2.3.2-1_all.deb ~{ <br>dependencies used by sisu to produce pdf from LaTeX generated <br>Depends: sisu, tetex-bin, tetex-extra, latex-ucs<br>Suggests: evince, xpdf }~
+{~^ sisu-pdf_2.3.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_2.3.3-1_all.deb ~{ <br>dependencies used by sisu to produce pdf from LaTeX generated <br>Depends: sisu, tetex-bin, tetex-extra, latex-ucs<br>Suggests: evince, xpdf }~
 
-{~^ sisu-postgresql_2.3.2-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_2.3.2-1_all.deb ~{ <br>dependencies used by sisu to populate postgresql database (further configuration is necessary) <br>Depends: sisu, postgresql-8.1, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby<br>Suggests: pgaccess, libdbd-pgsql, postgresql-contrib-8.1 }~
+{~^ sisu-postgresql_2.3.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_2.3.3-1_all.deb ~{ <br>dependencies used by sisu to populate postgresql database (further configuration is necessary) <br>Depends: sisu, postgresql-8.1, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby<br>Suggests: pgaccess, libdbd-pgsql, postgresql-contrib-8.1 }~
 
-{~^ sisu-sqlite_2.3.2-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_2.3.2-1_all.deb ~{ <br>dependencies used by sisu to populate sqlite database <br>Depends: sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby<br>Suggests: libdbd-sqlite }~
+{~^ sisu-sqlite_2.3.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_2.3.3-1_all.deb ~{ <br>dependencies used by sisu to populate sqlite database <br>Depends: sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby<br>Suggests: libdbd-sqlite }~
 
 }group
 
@@ -152,7 +152,7 @@ The RPM is generated from the source file using Alien.~{ http://www.kitenet.net/
 
 sudo rpm -i [package name]
 
-_* {~^ sisu-2.3.2-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-2.3.2-2.noarch.rpm ~{ <br>created using alien }~
+_* {~^ sisu-2.3.3-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-2.3.3-2.noarch.rpm ~{ <br>created using alien }~
 
 _* {~^ sisu-markup-samples_2.0.3.orig-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-markup-samples_2.0.3.orig-2.noarch.rpm ~{ <br> http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_2.0.3-1_all.deb <br> created using: alien -r sisu_0.70.5-1_all.deb }~
 
diff --git a/lib/sisu/v2/defaults.rb b/lib/sisu/v2/defaults.rb
index aa1c8e49..1f649b0a 100644
--- a/lib/sisu/v2/defaults.rb
+++ b/lib/sisu/v2/defaults.rb
@@ -2158,7 +2158,7 @@ WOK
           160
         end
         def img_px
-          348
+          300
         end
         self
       end
@@ -2185,7 +2185,7 @@ WOK
           166
         end
         def img_px
-          310
+          290
         end
         self
       end
@@ -2239,7 +2239,7 @@ WOK
           130
         end
         def img_px
-          280
+          260
         end
         self
       end
@@ -2266,7 +2266,7 @@ WOK
           100
         end
         def img_px
-          230
+          190
         end
         self
       end
diff --git a/lib/sisu/v2/param.rb b/lib/sisu/v2/param.rb
index 3db97340..285859d7 100644
--- a/lib/sisu/v2/param.rb
+++ b/lib/sisu/v2/param.rb
@@ -857,7 +857,7 @@ module SiSU_Param
         end
         @txt_path=@txt_path ||= @env.path.output
         @stmp=%{#{@fns}}[/^(.+?)\..*/m,1]
-        @fnstex=@fns.gsub(/_/,'\_')
+        @fnstex=@fns.gsub(/_/,'\_\-').gsub(/\./,'.\-')
         @flag_endnotes,@flag_auto_endnotes,@flag_separate_endnotes=false,false,false
         @flag_separate_endnotes_make=true
         regx_date=/^\d{4}(?:-(?:[0][0-9]|1[0-2])(-(?:[0-2][0-9]|3[01]))?)?$/
diff --git a/lib/sisu/v2/shared_metadata.rb b/lib/sisu/v2/shared_metadata.rb
index bd1fe73a..cd46bd1d 100644
--- a/lib/sisu/v2/shared_metadata.rb
+++ b/lib/sisu/v2/shared_metadata.rb
@@ -533,6 +533,12 @@ WOK
     def spec_char(inf)
       SiSU_TeX_Pdf::Special_characters.new(@md,inf).special_characters
     end
+    def word_break_points(inf)
+      SiSU_TeX_Pdf::Special_characters.new(@md,inf).special_word_break_points
+    end
+    def number_break_points(inf)
+      SiSU_TeX_Pdf::Special_characters.new(@md,inf).special_number_break_points
+    end
     def metadata_tex
       meta=[]
       dir=SiSU_Env::Info_env.new(@md.fns)
@@ -636,6 +642,7 @@ WOK
       if defined? @md.classify.topic_register \
       and @md.classify.topic_register=~/\S+/
         tag,inf=tr.topic_register,@md.classify.topic_register
+        inf=word_break_points(inf)
         meta << meta_para(tag,inf)
       end
       if defined? @md.classify.loc \
@@ -722,6 +729,7 @@ WOK
       if defined? @md.fns \
       and @md.fns=~/\S+/
         fn=spec_char(@md.fns)
+        fn=word_break_points(fn)
         fn="\\begin\{footnotesize\}#{fn}\\end\{footnotesize\}"
         tag,inf=tr.sourcefile,fn
         meta << meta_para(tag,inf,false)
@@ -734,13 +742,17 @@ WOK
       if defined? @md.dgst \
       and @md.dgst.class==Array
         hash_of=spec_char(@md.dgst[0])
-        tag,inf='Source Digest',"\\begin\{footnotesize\}#{hash_of}\\end\{footnotesize\} #{@br}#{@md.dgst[1]}"
+        hash_of=word_break_points(hash_of)
+        dgst=number_break_points(@md.dgst[1])
+        tag,inf='Source Digest',"\\begin\{footnotesize\}#{hash_of}\\end\{footnotesize\}\\-\\begin\{scriptsize\}#{dgst}\\end\{scriptsize\}"
         meta << meta_para(tag,inf,false)
       end
       if defined? @md.dgst_skin \
       and @md.dgst_skin.class==Array
         hash_of=spec_char(@md.dgst_skin[0])
-        tag,inf='Skin Digest',"\\begin\{footnotesize\}#{hash_of}\\end\{footnotesize\} #{@br}#{@md.dgst_skin[1]}"
+        hash_of=word_break_points(hash_of)
+        dgst=number_break_points(@md.dgst_skin[1])
+        tag,inf='Skin Digest',"\\begin\{footnotesize\}#{hash_of}\\end\{footnotesize\}\\-\\begin\{scriptsize\}#{dgst}\\end\{scriptsize\}"
         meta << meta_para(tag,inf,false)
       end
       meta << %{#{@br}\\begin\{bfseries\}Generated \\end\{bfseries\}}
diff --git a/lib/sisu/v2/sysenv.rb b/lib/sisu/v2/sysenv.rb
index f440fd3f..cc21a6c9 100644
--- a/lib/sisu/v2/sysenv.rb
+++ b/lib/sisu/v2/sysenv.rb
@@ -2113,7 +2113,7 @@ WOK
       and not (@rc['flag']['default'].nil? \
       or @rc['flag']['default'].empty?)
         @rc['flag']['default']
-      else                               '-NhwepaobxXyYv'
+      else                               '-NhwepoabxXyYv'
       end
     end
     def cf_1                                                                   #processing flag shortcuts
@@ -2121,7 +2121,7 @@ WOK
       and not (@rc['flag']['i'].nil? \
       or @rc['flag']['i'].empty?)
         @rc['flag']['i']
-      else                               '-hwepoy'
+      else                               '-hwepoay'
       end
     end
     def cf_2                                                                   #processing flag shortcuts
@@ -2129,7 +2129,7 @@ WOK
       and not (@rc['flag']['ii'].nil? \
       or @rc['flag']['ii'].empty?)
         @rc['flag']['ii']
-      else                               '-NhwepaobxXy'
+      else                               '-NhwepoabxXy'
       end
     end
     def cf_3                                                                   #processing flag shortcuts
@@ -2137,7 +2137,7 @@ WOK
       and not (@rc['flag']['iii'].nil? \
       or @rc['flag']['iii'].empty?)
         @rc['flag']['iii']
-      else                               '-NhwepaobxXyY'
+      else                               '-NhwepoabxXyY'
       end
     end
     def cf_4                                                                   #processing flag shortcuts
@@ -2145,7 +2145,7 @@ WOK
       and not (@rc['flag']['iv'].nil? \
       or @rc['flag']['iv'].empty?)
         @rc['flag']['iv']
-      else                               '-NhwepaobxXDyY --import'
+      else                               '-NhwepoabxXDyY --update'
       end
     end
     def cf_5                                                                   #processing flag shortcuts
@@ -2153,7 +2153,7 @@ WOK
       and not (@rc['flag']['v'].nil? \
       or @rc['flag']['v'].empty?)
         @rc['flag']['v']
-      else                               '-NhwepaobxXDyY --update'
+      else                               '-NhwepoabxXDyYv --update'
       end
     end
   end
diff --git a/lib/sisu/v2/texpdf.rb b/lib/sisu/v2/texpdf.rb
index a9b1df51..84347cba 100644
--- a/lib/sisu/v2/texpdf.rb
+++ b/lib/sisu/v2/texpdf.rb
@@ -277,6 +277,7 @@ module SiSU_TeX
         @tex_ml=SiSU_TeX_Pdf::Use_TeX.new(@md)
         @vz=SiSU_Env::Get_init.instance.skin
         @dp=@@dp ||=SiSU_Env::Info_env.new.digest.pattern
+        @brace_url=SiSU_Viz::Skin.new.url_decoration
         vz=SiSU_Env::Get_init.instance.skin
         @skin_no_ocn=if defined? vz.ocn_display_off \
         and vz.ocn_display_off==true
@@ -672,7 +673,7 @@ WOK
               s_lnk.gsub!(/\s*(#{Mx[:br_line]}|#{Mx[:br_nl]}|#{Mx[:br_paragraph]})\s*/,' \newline ')
               s_lnk.gsub!(/(?:\\)*([$&~%_#}{^])/,"\\\\\\1")                       #latex special chars
               if url !~/^\.(\.)?\//
-                s_lnk_url=%<\\begin{scriptsize}\\url{#{url}}\\end{scriptsize}>  # note this bit of dereferencing magic
+                s_lnk_url=%<#{@brace_url.tex_open}\\begin{scriptsize}\\url{#{url}}\\end{scriptsize}#{@brace_url.tex_close}>  # note this bit of dereferencing magic
               else
                 url.gsub!(/\.\.\//,'')
                 s_lnk_url="(#{@tex_ml.site}) \\\\\n" + ' ' +
diff --git a/lib/sisu/v2/texpdf_format.rb b/lib/sisu/v2/texpdf_format.rb
index 2d81f40c..1d2e891f 100644
--- a/lib/sisu/v2/texpdf_format.rb
+++ b/lib/sisu/v2/texpdf_format.rb
@@ -1098,6 +1098,17 @@ WOK
       str=xetex_special_characters_3(str) unless str.nil?
       @txt=str
     end
+    def special_word_break_points
+      str=@txt
+      str.gsub!(/([_,.;:\/|=])/,'\1\-')
+      str.gsub!(/(--)(\S{4,)/,'\1\-\2')
+      @txt=str
+    end
+    def special_number_break_points
+      str=@txt
+      str=str.gsub(/([0-9a-f]{8})/i,'\1\-')
+      @txt=str
+    end
     def special_characters_safe                                                #special characters - some substitutions are sequence sensitive, rearrange with care.
       str,is=@txt,@is
       str=xetex_special_characters_1(str,is) unless str.nil?
@@ -1271,20 +1282,20 @@ WOK
 \\\\ Generated by \\href{http://www.jus.uio.no/sisu/}{SiSU} found at \\href{http://www.jus.uio.no/sisu/}{www.jus.uio.no/sisu} \\begin{tiny}[ #{v[:project]} #{v[:version]} #{v[:date_stamp]} ]\\end{tiny}  \\href{http://www.sisudoc.org}{www.sisudoc.org}. SiSU is software for document structuring, publishing and search (using SiSU: object citation numbering, markup, meta-markup, and system) Copyright #{@copymark} 1997, current #{@date.year_static} Ralph Amissah, All Rights Reserved.
 \\\\ SiSU is released under \\href{http://www.fsf.org/licenses/gpl.html}{GPL 3 } or later (\\href{http://www.fsf.org/licenses/gpl.html}{www.fsf.org/licenses/gpl.html}). {\\end{footnotesize}
 {\\begin{small}
-\\\\ W3 since October 3 1993 \\href{http://www.jus.uio.no/sisu/}{#{sisu_ico}}SiSU 1997, current #{@date.year_static}. \\\\ #{sitename} presentations at \\begin{bfseries}#{site}\\end{bfseries} \\\\ \\\\ #{@md.title.full} \\textbf{pdf} versions can be found at:  \\\\
+\\\\ W3 since October 3 1993 \\href{http://www.jus.uio.no/sisu/}{#{sisu_ico}}SiSU 1997, current #{@date.year_static}. \\\\ #{sitename} presentations at \\begin{scriptsize}#{site}\\end{scriptsize} \\\\ \\\\ #{@md.title.full} \\textbf{pdf} versions can be found at:  \\\\
 {\\end{small}
-\\begin{scriptsize}\\href{#{@vz.url_root_http}/#{url}/#{@md.fn[:pdf_p]}}{#{@vz.url_root_http}/#{url}/#{@md.fn[:pdf_p]}}\\end{scriptsize}  \\\\
-\\begin{scriptsize}\\href{#{@vz.url_root_http}/#{url}/#{@md.fn[:pdf_l]}}{#{@vz.url_root_http}/#{url}/#{@md.fn[:pdf_l]}}\\end{scriptsize}  \\\\
+\\\\ #{@brace_url.tex_open}\\begin{scriptsize}\\url{#{@vz.url_root_http}/#{url}/#{@md.fn[:pdf_p]}}\\end{scriptsize}#{@brace_url.tex_close}  \\\\
+#{@brace_url.tex_open}\\begin{scriptsize}\\url{#{@vz.url_root_http}/#{url}/#{@md.fn[:pdf_l]}}\\end{scriptsize}#{@brace_url.tex_close}  \\\\
 \\\\\n#{@md.title.full} \\textbf{html} versions may be found at: \\\\
-\\begin{scriptsize}\\href{#{@vz.url_root_http}/#{url}/#{@md.fn[:toc]}}{#{@vz.url_root_http}/#{url}/#{@md.fn[:toc]}}\\end{scriptsize} or \\\\
-\\begin{scriptsize}\\href{#{@vz.url_root_http}/#{url}/#{@md.fn[:doc]}}{#{@vz.url_root_http}/#{url}/#{@md.fn[:doc]}}\\end{scriptsize}
+#{@brace_url.tex_open}\\begin{scriptsize}\\url{#{@vz.url_root_http}/#{url}/#{@md.fn[:toc]}}\\end{scriptsize}#{@brace_url.tex_close} or \\\\
+#{@brace_url.tex_open}\\begin{scriptsize}\\url{#{@vz.url_root_http}/#{url}/#{@md.fn[:doc]}}\\end{scriptsize}#{@brace_url.tex_close}
 \\\\
 \\\\
 \\href{#{@vz.url_root_http}/#{url}/#{@md.fn[:manifest]}}{SiSU Manifest} of document output and metadata may be found at: \\\\
-\\begin{scriptsize}\\href{#{@vz.url_root_http}/#{url}/#{@md.fn[:manifest]}}{#{@vz.url_root_http}/#{url}/#{@md.fnl[:pre]}sisu\\_manifest#{@md.fnl[:mid]}.html#{@md.fnl[:post]}}\\end{scriptsize}
+#{@brace_url.tex_open}\\begin{scriptsize}\\url{#{@vz.url_root_http}/#{url}/#{@md.fn[:manifest]}}\\end{scriptsize}#{@brace_url.tex_close}
 \\\\
 \\\\
- #{sitename} found at: \\begin{bfseries}#{site}\\end{bfseries}\\subsubsection*{Links that may be of interest at #{@vz.txt_home} and elsewhere:}
+ #{sitename} found at: \\begin{scriptsize}#{site}\\end{scriptsize}\\subsubsection*{Links that may be of interest at #{@vz.txt_home} and elsewhere:}
 \\addcontentsline{toc}{subsection}{Links that may be of interest}
 WOK
     end
diff --git a/lib/sisu/v2/urls.rb b/lib/sisu/v2/urls.rb
index 917b6fec..fd88f1ac 100644
--- a/lib/sisu/v2/urls.rb
+++ b/lib/sisu/v2/urls.rb
@@ -183,7 +183,7 @@ module SiSU_urls
         i="(output manifest) #{@env.url.output_tell}/#{@fnb}/sisu_manifest.html"
         @opt.cmd=~/[MVvz]/ \
         ? SiSU_Screen::Ansi.new(@opt.cmd,'URLs').grey_title_hi \
-        : SiSU_Screen::Ansi.new(@opt.cmd,'URL',i).green_title_hi
+        : SiSU_Screen::Ansi.new(@opt.cmd,'URL',i).green_hi_blue
         SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@env.path.output}/#{@fnb}").flow if @opt.cmd =~/[MVv]/
       end
       m=/.+\/(?:src\/)?(\S+)/im # m=/.+?\/(?:src\/)?([^\/]+)$/im # m=/.+\/(\S+)/m