aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2007-08-19 02:42:08 +0100
committerRalph Amissah <ralph@amissah.com>2007-08-19 02:42:08 +0100
commitc82a1eecd727e72d9123756719c74a88c4e4a8ae (patch)
tree7df18e8f83a0a6131b168173cf279e70e69476c2
parentUpdated sisu-0.56.2 (diff)
parentsisu-0.56.3 minor update, small fixes (diff)
Merge branch 'upstream' into debian/sid
-rw-r--r--CHANGELOG27
-rw-r--r--lib/sisu/v0/conf.rb3
-rw-r--r--lib/sisu/v0/dal.rb2
-rw-r--r--lib/sisu/v0/defaults.rb4
-rw-r--r--lib/sisu/v0/html.rb1
-rw-r--r--lib/sisu/v0/html_format.rb6
-rw-r--r--lib/sisu/v0/html_segments.rb2
-rw-r--r--lib/sisu/v0/html_tune.rb4
-rw-r--r--lib/sisu/v0/manifest.rb67
-rw-r--r--lib/sisu/v0/param.rb17
-rw-r--r--lib/sisu/v0/texpdf.rb11
-rw-r--r--lib/sisu/v0/texpdf_format.rb29
12 files changed, 101 insertions, 72 deletions
diff --git a/CHANGELOG b/CHANGELOG
index d8d5e4ff..14e97fdf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,11 +6,32 @@ Reverse Chronological:
%% STABLE MANIFEST
+%% sisu_0.56.3.orig.tar.gz (2007-08-19:33/7)
+http://www.jus.uio.no/sisu/pkg/src/sisu_0.56.3.orig.tar.gz
+ sisu_0.56.3.orig.tar.gz
+ sisu_0.56.3-1.dsc
+ sisu_0.56.3-1.diff.gz
+
+ * manifest make file-type descriptions simpler to understand
+
+ * copyright restricted to rights tag, unless none, in which case rights tag
+ gets creator information
+ * copyright mark picked up in rights if 'Copyright (C)' is used
+
+ * tex/pdf url matching semi-colon following url
+
+ * endnote heading, apply tag to exclude numbering and segment heading where
+ there is no segment
+
+ * html scroll endnote text minor fix
+
+ * initialize site structure, make copy site images default (sisu -CC)
+
%% sisu_0.56.2.orig.tar.gz (2007-07-31:31/2)
http://www.jus.uio.no/sisu/pkg/src/sisu_0.56.2.orig.tar.gz
- sisu_0.56.2.orig.tar.gz
- sisu_0.56.2-1.dsc
- sisu_0.56.2-1.diff.gz
+ f9f1091e846cdaf9df4c53eb537dcf85 1272237 sisu_0.56.2.orig.tar.gz
+ 5c440179db51bbf2d061233fdc16c5e6 606 sisu_0.56.2-1.dsc
+ 8cfc0d4d0c2cdeb72ace91cf80a5430e 142387 sisu_0.56.2-1.diff.gz
* odf, a few regex matches, a new fix (url), and an old one (grouped text
with change to fontface)
diff --git a/lib/sisu/v0/conf.rb b/lib/sisu/v0/conf.rb
index 108639df..92632e79 100644
--- a/lib/sisu/v0/conf.rb
+++ b/lib/sisu/v0/conf.rb
@@ -72,7 +72,7 @@ module SiSU_Initialize
SiSU_Config.new(@opt).dtd
SiSU_Config.new(@opt).cp_local_images
SiSU_Config.new(@opt).cp_external_images
- SiSU_Config.new(@opt).cp_webserver_images if @opt.mod.inspect =~/--init(?:ialize)?=site/
+ SiSU_Config.new(@opt).cp_webserver_images #if @opt.mod.inspect =~/--init(?:ialize)?=site/
end
end
class SiSU_Config #config files such as css are not updated if they already exist unless forced using the --init=site modifier
@@ -113,6 +113,7 @@ module SiSU_Initialize
tell=SiSU_Screen::Ansi.new(@opt.cmd,'invert','Copy webserver/output file images','')
tell.colorize unless @opt.cmd =~/q/
SiSU_Env::Create_site.new(@opt.cmd).cp_webserver_images
+ SiSU_Env::Create_system_link.new.images
end
def css
tell=SiSU_Screen::Ansi.new(@opt.cmd,'invert','Configuring CSSs','')
diff --git a/lib/sisu/v0/dal.rb b/lib/sisu/v0/dal.rb
index 8880ca9d..a4e512f2 100644
--- a/lib/sisu/v0/dal.rb
+++ b/lib/sisu/v0/dal.rb
@@ -502,7 +502,7 @@ module SiSU_DAL
end
# debug 2003w46 adding revision control info
if @md.flag_auto_endnotes and @md.flag_separate_endnotes_make
- @tuned_file << "\n4~endnotes Endnotes <~0;0:0;u0>" #prob numbering, revisit
+ @tuned_file << "\n4~endnotes Endnotes <-#> <~0;0:0;u0>"
end
@tuned_file << "\n<ENDNOTES>"
@tuned_file=@tuned_file.flatten
diff --git a/lib/sisu/v0/defaults.rb b/lib/sisu/v0/defaults.rb
index a3a19988..3d5a7c40 100644
--- a/lib/sisu/v0/defaults.rb
+++ b/lib/sisu/v0/defaults.rb
@@ -1327,7 +1327,7 @@ WOK
<a href="#{url_sisu}" #{js_sisu}>
<b>#{v[:project]}</b>
</a>
- <sup>&copy;</sup> Ralph Amissah.
+ Copyright <sup>&copy;</sup> Ralph Amissah
1997, current #{@date.year_static}.
All Rights Reserved.
<br />
@@ -1356,7 +1356,7 @@ WOK
<br />Standard SiSU meta-markup syntax, and the
<br />Standard SiSU <u>object citation numbering</u> and system, (object/text positioning system)
<br />
- <sup>&copy;</sup> Ralph Amissah 1997, current #{@date.year_static}.
+ Copyright <sup>&copy;</sup> Ralph Amissah 1997, current #{@date.year_static}.
All Rights Reserved.
</font></p>
</td></tr>
diff --git a/lib/sisu/v0/html.rb b/lib/sisu/v0/html.rb
index 62d0a44a..5bec99bc 100644
--- a/lib/sisu/v0/html.rb
+++ b/lib/sisu/v0/html.rb
@@ -598,7 +598,6 @@ WOK
end
if @md.dc_creator
creator_endnote=@md.dc_creator.gsub(/(\*+)/,%{&nbsp;<sup><a href="#notes">\\1</a></sup>})
- creator_endnote=%{<sup>&copy;</sup> #{creator_endnote}} if creator_endnote =~/\S/
tmp_head=creator_endnote + "\n"
format_txt_obj=SiSU_HTML_Format_type::Format_text_object.new(@md,tmp_head)
toc_shared << format_txt_obj.center_bold
diff --git a/lib/sisu/v0/html_format.rb b/lib/sisu/v0/html_format.rb
index cbbcadb4..b78017fd 100644
--- a/lib/sisu/v0/html_format.rb
+++ b/lib/sisu/v0/html_format.rb
@@ -436,7 +436,7 @@ WOK
def prefix_a
end
def rights
- rights=@md.dc_rights.gsub(/^\s*Copyright\s+/,'<sup>&copy;</sup>&nbsp;')
+ rights=@md.dc_rights.gsub(/^\s*Copyright\s+\(C\)/,'Copyright <sup>&copy;</sup>&nbsp;')
%{<p class="left">#{rights}</p>
<p />}
end
@@ -609,9 +609,7 @@ WOK
def title_endnote
%{#{@vz.margin_txt_0}
#{@vz.paragraph_txt}
- <br />
- <a name="endnotes" id="endnotes"></a>
- <b>Endnotes</b>
+ <a name="endnotes" id="endnotes"><hr></a>
#{@vz.margin_num}
&nbsp;
#{@vz.table_close}}
diff --git a/lib/sisu/v0/html_segments.rb b/lib/sisu/v0/html_segments.rb
index 96eb0bee..44ab9033 100644
--- a/lib/sisu/v0/html_segments.rb
+++ b/lib/sisu/v0/html_segments.rb
@@ -208,7 +208,7 @@ module SiSU_HTML_seg
end
@p_num ||= ''
if @@is1 == 1
- @dc_creator=%{<b><sup>&copy;</sup>&nbsp;#{@md.dc_creator}</b>\n} if @md.dc_creator.to_s =~/\S/
+ @dc_creator=%{<b>#{@md.dc_creator}</b>\n} if @md.dc_creator.to_s =~/\S/
@@seg[:tocband] << format_head_seg.navigation_band(@@segtocband,@@seg[:dot_nav])
@@seg[:headers] << format_head_seg.seg_head_escript if SiSU_HTML_Format_type::Head_seg.method_defined? :seg_head_escript #debug PHP move up in text #bug
@@seg[:headers] << format_head_seg.title_banner(@md.title,@md.subtitle,@dc_creator).gsub(clean,'')
diff --git a/lib/sisu/v0/html_tune.rb b/lib/sisu/v0/html_tune.rb
index cca41056..7f91641e 100644
--- a/lib/sisu/v0/html_tune.rb
+++ b/lib/sisu/v0/html_tune.rb
@@ -245,8 +245,8 @@ module SiSU_Tune
@words=[]
data.each do |word|
@words << if word=~/\{(.+?)\}((?:https?|ftp)\S+|image)/
- if word =~/\{(.+?)\}((?:https?|ftp)\S+|image)([;.,](?:\s|$))/
- m,u,d=/\{(.+?)\}((?:https?|ftp)\S+|image)([;.,](?:\s|$))/.match(word).captures
+ if word =~/\{(.+?)\}((?:https?|ftp)\S+|image)([;.,]?(?:\s|$))/
+ m,u,d=/\{(.+?)\}((?:https?|ftp)\S+|image)([;.,]?(?:\s|$))/.match(word).captures
else m,u=/\{(.+?)\}((?:https?|ftp)\S+|image)/.match(word).captures
d=''
end
diff --git a/lib/sisu/v0/manifest.rb b/lib/sisu/v0/manifest.rb
index 998d3c59..bca5cd92 100644
--- a/lib/sisu/v0/manifest.rb
+++ b/lib/sisu/v0/manifest.rb
@@ -107,11 +107,11 @@ module SiSU_Manifest
manifest << x
end
end
- def summarize(id,file)
+ def summarize(id,file,img='')
size=(File.size("#{@base_path}/#{file}")/1024.00).to_s
kb=/([0-9]+\.[0-9]{0,1})/m.match(size)[1]
@manifest[:txt] << "#{file} #{id} #{kb}\n"
- @manifest[:html] << %{<tr><th class="left"><p class="bold"><a href="#{file}">#{file}</a></p></th><td><p class="norm">#{id}</p><p class="tiny"><a href="#@base_url/#{file}">#@base_url/#{file}</a></p></td><td class="right"><p class="right">#{kb}</p></td></tr>\n}
+ @manifest[:html] << %{<tr><th class="left"><p class="norm"><a href="#@base_url/#{file}">#{img}#{id}</a></p></th><td><p class="small"><a href="#{file}">#{file}</a></p><p class="tiny">&lt;<a href="#@base_url/#{file}">#@base_url/#{file}</a>&gt;</p></td><td class="right"><p class="right">#{kb}</p></td></tr>\n}
end
def summarize_source(id,file)
sys=SiSU_Env::System_call.new
@@ -123,7 +123,9 @@ module SiSU_Manifest
size=(File.size("#{@base_path}/#{file}")/1024.00).to_s
kb=/([0-9]+\.[0-9]{0,1})/m.match(size)[1]
@manifest[:txt] << "#{file} #{id} #{kb}\n"
- @manifest[:html] << %{<tr><th class="left"><p class="tiny">#{id}:</p> <p class="norm"><a href="#{file}">#{file}</a></p><p class="tiny"><a href="#@base_url/#{file}">#@base_url/#{file}</a></p></th><td class="right"><p class="tiny">#{dgst[1]}</p></td><td class="right"><p class="right">#{kb}</p></td></tr>\n}
+ @manifest[:html] << %{<tr><th class="left"><p class="norm"><a href="#{file}">#{id}</a></p></th><td class="right"><p class="tiny"><a href="#{file}">#{file}</a> &nbsp;&nbsp;#{dgst[1]}<br />&lt;<a href="#@base_url/#{file}">#@base_url/#{file}</a>&gt;</p></td><td class="right"><p class="right">#{kb}</p>
+ </td></tr>\n} if kb and kb =~/\d+/
+ #@manifest[:html] << %{<tr><th class="left"><p class="tiny">#{id}:</p> <p class="norm"><a href="#{file}">#{file}</a></p><p class="tiny">&nbsp;&nbsp;&lt;<a href="#@base_url/#{file}">#@base_url/#{file}</a>&gt;</p></th><td class="right"><p class="tiny">#{dgst[1]}</p></td><td class="right"><p class="right">#{kb}</p></td></tr>\n} if kb and kb =~/\d+/
end
def languages(id,file)
flv=@env.published_manifests?(@base_path)
@@ -151,52 +153,57 @@ module SiSU_Manifest
elsif url =~/^\.\.\//; url.gsub(/^\.(\.)?/,@env.url.root)
else url
end
- @manifest[:html] << %{<tr><th class="left"><p class="norm"><a href="#{url}">#{lnk}</a></p><p class="tiny"><a href="#{static}">#{static}</a></p></th></tr>\n}
+ @manifest[:html] << %{<tr><th class="left"><p class="norm"><a href="#{url}">#{lnk}</a></p><p class="tiny">&nbsp;&nbsp;&lt;<a href="#{static}">#{static}</a>&gt;</p></th></tr>\n}
end
def output_tests
if FileTest.file?("#@base_path/#{@md.fn[:toc]}")==true
- id,file='HTML table of contents (linked to segmented text)',@md.fn[:toc]
- summarize(id,file)
+ img='<img border="0" height="18" width="15" src="../_sisu/image/b_toc.png" alt="TOC linked" /> '
+ id,file='table of contents (for segmented HTML text)',@md.fn[:toc]
+ summarize(id,file,img)
end
if FileTest.file?("#@base_path/#{@md.fn[:doc]}")==true
- id,file='HTML document (scroll)',@md.fn[:doc]
- summarize(id,file)
- end
- if FileTest.file?("#@base_path/#{@md.fn[:xhtml]}")==true
- id,file='XHTML',@md.fn[:xhtml]
- summarize(id,file)
+ img='<img border="0" height="15" width="15" src="../_sisu/image/b_doc.png" alt="Full Text" /> '
+ id,file='full length document (HTML)',@md.fn[:doc]
+ summarize(id,file,img)
end
- if FileTest.file?("#@base_path/#{@md.fn[:sax]}")==true
- id,file='XML (SAX)',@md.fn[:sax]
- summarize(id,file)
+ if FileTest.file?("#@base_path/#{@md.fn[:pdf_p]}")==true
+ img='<img border="0" height="18" width="15" src="../_sisu/image/b_pdf.png" alt="PDF portrait" /> '
+ id,file='full length document (PDF portrait&nbsp;/ vertical - recommended for printing)',@md.fn[:pdf_p]
+ summarize(id,file,img)
end
- if FileTest.file?("#@base_path/#{@md.fn[:dom]}")==true
- id,file='XML (DOM)',@md.fn[:dom]
- summarize(id,file)
+ if FileTest.file?("#@base_path/#{@md.fn[:pdf_l]}")==true
+ img='<img border="0" height="15" width="18" src="../_sisu/image/b_pdf.png" alt="PDF landscape" /> '
+ id,file='full length document (PDF landscape&nbsp;/ horizontal - recommended for screen viewing)',@md.fn[:pdf_l]
+ summarize(id,file,img)
end
if FileTest.file?("#@base_path/#{@md.fn[:odf]}")==true
- id,file='ODF:ODT (Open Document Format)',@md.fn[:odf]
+ img='<img border="0" height="18" width="18" src="../_sisu/image/b_odf.png" alt="ODF/ODT" /> '
+ id,file='full length document (ODF:ODT - Open Document Format)',@md.fn[:odf]
+ summarize(id,file,img)
+ end
+ if FileTest.file?("#@base_path/#{@md.fn[:xhtml]}")==true
+ id,file='full length document (XHTML)',@md.fn[:xhtml]
summarize(id,file)
end
- if FileTest.file?("#@base_path/#{@md.fn[:pdf_p]}")==true
- id,file='PDF (portrait) - print bias',@md.fn[:pdf_p]
+ if FileTest.file?("#@base_path/#{@md.fn[:sax]}")==true
+ id,file='full length document (XML SAX)',@md.fn[:sax]
summarize(id,file)
end
- if FileTest.file?("#@base_path/#{@md.fn[:pdf_l]}")==true
- id,file='PDF (landscape) - screen view bias (colored links)',@md.fn[:pdf_l]
+ if FileTest.file?("#@base_path/#{@md.fn[:dom]}")==true
+ id,file='full length document (XML DOM)',@md.fn[:dom]
summarize(id,file)
end
if FileTest.file?("#@base_path/#{@md.fn[:plain]}")==true
- if @md.cmd =~/a/; id,file='plaintext Unix (UTF-8) (footnotes)',@md.fn[:plain]
- elsif @md.cmd =~/e/; id,file='plaintext Unix (UTF-8) (endnotes)',@md.fn[:plain]
- elsif @md.cmd =~/A/; id,file='plaintext dos (UTF-8) (footnotes)',@md.fn[:plain]
- elsif @md.cmd =~/E/; id,file='plaintext dos (UTF-8) (endnotes)',@md.fn[:plain]
- else id,file='plaintext (UTF-8)',@md.fn[:plain]
+ if @md.cmd =~/a/; id,file='full length document (plaintext Unix (UTF-8) with footnotes)',@md.fn[:plain]
+ elsif @md.cmd =~/e/; id,file='full length document (plaintext Unix (UTF-8) with endnotes)',@md.fn[:plain]
+ elsif @md.cmd =~/A/; id,file='full length document (plaintext dos (UTF-8) with footnotes)',@md.fn[:plain]
+ elsif @md.cmd =~/E/; id,file='full length document (plaintext dos (UTF-8) with endnotes)',@md.fn[:plain]
+ else id,file='full length document (plaintext (UTF-8))',@md.fn[:plain]
end
summarize(id,file)
end
if FileTest.file?("#@base_path/#{@md.fn[:concordance]}")==true
- id,file='Concordance (wordmap)',@md.fn[:concordance]
+ id,file='Concordance file (HTML - wordmap, alphabetical wordlist)',@md.fn[:concordance]
summarize(id,file)
end
if FileTest.file?("#@base_path/#{@md.fns}.tex")==true
@@ -483,7 +490,7 @@ WOK
@manifest[:html] <<<<WOK
<h2 class="small"><a name="output">#{@translate.manifest_description_output}</a></h2>
<table summary="normal text css" width="100%" border="0" bgcolor="white" cellpadding="2" align="center">
-<tr> <th class="left"><p class="bold">#{@translate.filename}</p></th><th class="left"><p class="bold">#{@translate.description}</p></th><th class="right"><p class="right"><b>#{@translate.file_size}</b></p><p class="tiny_right">(kB)</p></th></tr>
+<tr> <th class="left"><p class="bold">#{@translate.description}</p></th><th class="left"><p class="bold">#{@translate.filename}</p></th><th class="right"><p class="right"><b>#{@translate.file_size}</b></p><p class="tiny_right">(kB)</p></th></tr>
WOK
output_tests
diff --git a/lib/sisu/v0/param.rb b/lib/sisu/v0/param.rb
index 211516ad..186901a1 100644
--- a/lib/sisu/v0/param.rb
+++ b/lib/sisu/v0/param.rb
@@ -262,9 +262,6 @@ module SiSU_Param
@creator_home, @dc_creator=$1,$2
else @dc_creator=/(?:0~|@)(?:creator|author)-?:?\s+(.+?)$/m.match(para)[1]
end
- @creator_copymark=if para=~/(?:0~|@)(?:creator|author)-:?/; false
- else true
- end
@dc_creator.strip!
when /^(?:0~(?:translator|translated_by)|@(?:translator|translated_by):)\s+(.+?)$/m #% metainfo
@translator=$1
@@ -516,12 +513,6 @@ module SiSU_Param
@lv4 ||=/^4~/
@lv5 ||=/^5~/
@lv6 ||=/^6~/
- if @dc_creator
- @dc_rights ||=if @dc_date =~/([12][890]\d{2})/ #matches years 1800 through 20\d\d 2004w19
- ('Copyright ' + @dc_creator) + ' ' + $1
- else 'Copyright ' + @dc_creator
- end
- end
else #%
if para =~ /^(?:1|:?A)~/ #% processing
if para=~/^:?A~/
@@ -585,6 +576,14 @@ module SiSU_Param
end
end
end #% here endeth the document loop
+ unless @dc_rights
+ if @dc_creator
+ @dc_rights ||=if @dc_date =~/([12][890]\d{2})/ #matches years 1800 through 20\d\d 2004w19
+ "Copyright (C) #{$1} #@dc_creator"
+ else 'Copyright (C)' + @dc_creator
+ end
+ end
+ end
if @markup_version.to_f >= 0.38 #convert values in headers to internal representation
translated=[]
translate_list=[@pagenew,@pagebreak,@num_top,@toc_lev_limit]
diff --git a/lib/sisu/v0/texpdf.rb b/lib/sisu/v0/texpdf.rb
index 6ac87240..22c2681d 100644
--- a/lib/sisu/v0/texpdf.rb
+++ b/lib/sisu/v0/texpdf.rb
@@ -258,7 +258,8 @@ module SiSU_TeX
copymark=if @md.creator_copymark; '{\\begin{small}\\raisebox{1ex}{\\copyright}\\end{small}} '
else ''
end
- copyright=do_mono.special_characters_safe.gsub(/^\s*Copyright/, copymark)
+ copymark='Copyright {\\begin{small}\\raisebox{1ex}{\\copyright}\\end{small}} '
+ copyright=do_mono.special_characters_safe.gsub(/^\s*Copyright \(C\)/, copymark)
@@rights||="\n #{@@tex_backslash*2}[3]\\ \\linebreak #{copyright}"
end
if @md.prefix_b
@@ -308,7 +309,6 @@ module SiSU_TeX
def footnote(data)
@tex_file=[]
data.each do |para|
- para2=para.dup
# EMBEDDED FOOTNOTES / ENDNOTES should be straightforward but not quite a synch.
footnote=[]
if para =~/~\\\{[\d*+]+\s|\\\~\[([*+]\d+)\s/ # note escape not necessary in front of ~ has implications for many other matches #debug note
@@ -366,9 +366,10 @@ WOK
sisu_rc_footnote=if @md.sc_info; @tex.doc_sc_info_footnote_full
else @tex.doc_sc_info_footnote_brief
end
- @copymark=if @md.creator_copymark; '^\copyright'
- else ''
- end
+ #@copymark=if @md.creator_copymark; '^\copyright'
+ #else ''
+ #end
+ @copymark='' #check and remove as now is superflous
if @orientation =~/landscape/ # using longtable latex package
@tex_file << SiSU_TeX_Pdf::Format_text_object.new(@md,@md.title,@md.subtitle).title_landscape
if @md.dc_creator
diff --git a/lib/sisu/v0/texpdf_format.rb b/lib/sisu/v0/texpdf_format.rb
index 92333d28..0880a9c7 100644
--- a/lib/sisu/v0/texpdf_format.rb
+++ b/lib/sisu/v0/texpdf_format.rb
@@ -66,7 +66,7 @@ module SiSU_TeX_Pdf
@vz=SiSU_Env::Get_init.instance.skin
@date=SiSU_Env::Info_date.new # #{@date.year}
@copymark='{\\begin{footnotesize}\\raisebox{1ex}{\\copyright}\\end{footnotesize}}'
- #@url_brace=SiSU_Viz::Skin.new.url_decoration
+ @url_brace=SiSU_Viz::Skin.new.url_decoration
end
def skip
"\n\\vspace*{\\smallskipamount} \n"
@@ -144,9 +144,9 @@ WOK
\\\\ ~
{\\begin{footnotesize}#{base_prog_txt}
\\\\ Generated by \\href{http://www.jus.uio.no/sisu}{SiSU} \\begin{tiny}[ #{v[:project]} #{v[:version]} of #{v[:date_stamp]} ]\\end{tiny} \\href{http://www.jus.uio.no/sisu}{www.jus.uio.no/sisu}
-\\\\ #@copymark Ralph Amissah 1997, current #{@date.year_static}, All Rights Reserved.
+\\\\ Copyright #@copymark 1997, current #{@date.year_static} Ralph Amissah, All Rights Reserved.
\\\\ SiSU is software for document structuring, publishing and search (with object citation numbering), \\href{http://www.sisudoc.org}{www.sisudoc.org}
-\\\\ SiSU is released under \\href{http://www.fsf.org/licenses/gpl.html}{GPL 3 } or later, \\href{http://www.fsf.org/licenses/gpl.html}{http://www.fsf.org/licenses/gpl.html}.
+\\\\ SiSU is released under \\href{http://www.fsf.org/licenses/gpl.html}{GPL 3 } or later, #{@url_brace.tex_open}\\href{http://www.fsf.org/licenses/gpl.html}{http://www.fsf.org/licenses/gpl.html}#{@url_brace.tex_close}.
{\\end{footnotesize}
\\\\
WOK
@@ -190,7 +190,7 @@ WOK
<<WOK
{\\begin{footnotesize}
\\\\ For alternative output formats of this document check:
-\\\\ \\begin{scriptsize}\\href{#{@vz.url_root_http}/#{url}/#{fn}}{#{@vz.url_root_http}/#{url}/#{fn}}\\end{scriptsize}
+\\\\ #{@url_brace.tex_open}\\begin{scriptsize}\\href{#{@vz.url_root_http}/#{url}/#{fn}}{#{@vz.url_root_http}/#{url}/#{fn}}\\end{scriptsize}#{@url_brace.tex_close}
\\end{footnotesize}}&
WOK
end
@@ -221,7 +221,7 @@ WOK
\"Support Open Standards and Software Libre for the Information Technology Infrastructure\" RA\\subsubsection*{Information on this document copy #{site}}
\\addcontentsline{toc}{subsection}{Information on this document copy}
{\\begin{footnotesize}
-\\\\ 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) #@copymark Ralph Amissah 1997, current #{@date.year_static}, All Rights Reserved.
+\\\\ 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} \\textbf{pdf} versions can be found at: \\\\
@@ -253,7 +253,7 @@ Mail from: ralph@amissah.com\\\\
\\\\
\"Support Open Standards and Open Sources for the Information Technology Infrastructure\" RA
\\subsubsection*{Information on this document copy #{site}\\copyright}
-Presentations' look and feel generated by \\href{http://www.jus.uio.no/sisu/}{SiSU Scribe} \\href{http://www.jus.uio.no/sisu/}{http://www.jus.uio.no/sisu/} programmed in Ruby on Debian/Gnu/Linux by \\copyright Ralph Amissah, W3 since October 3 1993 \\href{http://www.jus.uio.no/sisu/}{\\includegraphics*[width=35pt]{#{dir.path.image_source_tex}/sisu.png}}for #{sitename}. SiSU Scribe (sisu information structuring unit) produces Electronic Documents, i.e. it generates structured output for use in a number of file formats, including the pdf file produced here.
+Presentations' look and feel generated by \\href{http://www.jus.uio.no/sisu/}{SiSU Scribe} \\href{http://www.jus.uio.no/sisu/}{http://www.jus.uio.no/sisu/} programmed in Ruby on Debian/Gnu/Linux by Copyright \\copyright Ralph Amissah, W3 since October 3 1993 \\href{http://www.jus.uio.no/sisu/}{\\includegraphics*[width=35pt]{#{dir.path.image_source_tex}/sisu.png}}for #{sitename}. SiSU Scribe (sisu information structuring unit) produces Electronic Documents, i.e. it generates structured output for use in a number of file formats, including the pdf file produced here.
WOK
end
end
@@ -499,9 +499,9 @@ WOK
@string.gsub!(/<a href=".+?">/,' ')
@string.gsub!(/<\/a>/,' ')
@string.gsub!(/[^\}>_]((?:https?|ftp):\/\/\S+?)(<\/\S>)/,' \begin{scriptsize}\href{\1}{\1} \end{scriptsize}\2') #special case
- @string.gsub!(/((?:^|\s)[}])((?:https?|ftp):\/\/\S+?\.[^'"><\s]+?)([.,]?(?:\s|$))/,'\1\begin{scriptsize}\\href{\2}{\2}\end{scriptsize}\3') #special case \{ e.g. \}http://url
- @string.gsub!(/\B(?:\\_|\\)((?:https?|ftp):\/\/\S+?\.[^'"><\s]+?)([.,]?(?:\s|$))/,'\begin{scriptsize}\\href{\1}{\1}\end{scriptsize}\2') #specially escaped url no decoration
- @string.gsub!(/(^|\s)((?:https?|ftp):\/\/\S+?\.[^'"><\s]+?)([.,]?(?=\s|$))/,"\\1#{@url_brace.tex_open}\\begin{scriptsize}\\href{\\2}{\\2}\\end{scriptsize}#{@url_brace.tex_close}\\3") #url matching with decoration <url> positive lookahead, sequence issue with { linked }http://url cannot use \b at start
+ @string.gsub!(/((?:^|\s)[}])((?:https?|ftp):\/\/\S+?\.[^'"><\s]+?)([;.,]?(?:\s|$))/,'\1\begin{scriptsize}\\href{\2}{\2}\end{scriptsize}\3') #special case \{ e.g. \}http://url
+ @string.gsub!(/\B(?:\\_|\\)((?:https?|ftp):\/\/\S+?\.[^'"><\s]+?)([;.,]?(?:\s|$))/,'\begin{scriptsize}\\href{\1}{\1}\end{scriptsize}\2') #specially escaped url no decoration
+ @string.gsub!(/(^|\s)((?:https?|ftp):\/\/\S+?\.[^'"><\s]+?)([;.,]?(?=\s|$))/,"\\1#{@url_brace.tex_open}\\begin{scriptsize}\\href{\\2}{\\2}\\end{scriptsize}#{@url_brace.tex_close}\\3") #url matching with decoration <url> positive lookahead, sequence issue with { linked }http://url cannot use \b at start
@string.gsub!(/<:ee>/,'')
@string.gsub!(/<!>/,' ')
#proposed change, insert, but may be redundant
@@ -789,10 +789,13 @@ WOK
dir=SiSU_Env::Info_env.new(@md.fns)
@words=[]
@string.each do |word|
- @words << if word=~/\{.+?\}(?:https?|ftp):\S+/
- if word =~/\\\{(.+?)\\\}((?:https?|ftp)\S+?)([;.,](?:\s|$))/
- r=%r/\\\{(.+?)\\?\}((?:https?|ftp):\S+?)(?:[;.,](?:\s|$)|(?:\s|$))/
- d=/\\\{.+?\\?\}(?:https?|ftp):\S+([;.,](?:\s|$))/.match(word).captures.to_s
+ @words << if word=~/\\\{.+?\\\}(?:https?|ftp):\S+/
+ if word =~/\\\{(.+?)\\\}((?:https?|ftp):\/\/\S+?\.[^'"><\s]+?)([;.,]?(?:\s|$))/
+ r=%r/\\\{(.+?)\\?\}((?:https?|ftp):\/\/\S+?\.[^'"><\s]+?)(?:[;.,]?(?:\s|$)|(?:\s|$))/
+ d=/\\\{.+?\\?\}(?:https?|ftp):\/\/\S+?\.[^'"><\s]+?([;.,]?(?:\s|$))/.match(word).captures.to_s
+# if word =~/\\\{(.+?)\\\}((?:https?|ftp)\S+?)([;.,]?(?:\s|$))/
+# r=%r/\\\{(.+?)\\?\}((?:https?|ftp):\S+?)(?:[;.,]?(?:\s|$)|(?:\s|$))/
+# d=/\\\{.+?\\?\}(?:https?|ftp):\S+?([;.,]?(?:\s|$))/.match(word).captures.to_s
else
r=%r/\\\{(.+?)\\?\}((?:https?|ftp):\S+)/
d=''