diff options
| -rw-r--r-- | CHANGELOG_v2 | 32 | ||||
| -rw-r--r-- | conf/sisu/v2/sisurc.yml | 2 | ||||
| -rw-r--r-- | data/doc/sisu/v2/CHANGELOG | 32 | ||||
| -rw-r--r-- | data/sisu/v2/v/version.yml | 6 | ||||
| -rw-r--r-- | lib/sisu/v2/defaults.rb | 77 | ||||
| -rw-r--r-- | lib/sisu/v2/epub.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/v2/epub_format.rb | 28 | ||||
| -rw-r--r-- | lib/sisu/v2/epub_segments.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/v2/epub_tune.rb | 1 | ||||
| -rw-r--r-- | lib/sisu/v2/git.rb | 12 | ||||
| -rw-r--r-- | lib/sisu/v2/html_format.rb | 27 | ||||
| -rw-r--r-- | lib/sisu/v2/hub.rb | 22 | ||||
| -rw-r--r-- | lib/sisu/v2/manifest.rb | 28 | ||||
| -rw-r--r-- | lib/sisu/v2/odf.rb | 16 | ||||
| -rw-r--r-- | lib/sisu/v2/param.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/v2/sysenv.rb | 56 |
16 files changed, 235 insertions, 110 deletions
diff --git a/CHANGELOG_v2 b/CHANGELOG_v2 index 642fda83..724bf9c4 100644 --- a/CHANGELOG_v2 +++ b/CHANGELOG_v2 @@ -12,6 +12,38 @@ Reverse Chronological: %% Development branch UNSTABLE +%% 2.6.3.orig.tar.gz (2010-07-28:30/3) +http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.3.orig.tar.gz + sisu_2.6.3.orig.tar.gz + sisu_2.6.3-1.dsc + sisu_2.6.3-1.diff.gz + + * odf, footnotes, asterisk series (**) fix + + * html_format, epub_format: subtoc, footnote content bug (fix) + + * odf: lt (<), gt (>) fix for codeblocks; & fix, messy + + * epub_format, removed some title & author info, check + + * epub_tune, <br /> (from <br>) + + * epub_format, within head, title & author + + * epub, toc copyat link removed + + * manifest, defaults, minimal sisu footer + + * hub, add metaverse run for git (composite files) + + * git, param, refine filename regex for composite files + + * git sisu directory structure, lang dir beneath txt + + * html, links to output formats, remove icons + + * minitoc sisurc configurable (true/false) + %% 2.6.2.orig.tar.gz (2010-07-15:28/4) http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.2.orig.tar.gz 63ffa027e66ed18d5d56d8e82e79a437bcec362e7c16d6d4ae26fa0d029f80ae 2730609 sisu_2.6.2.orig.tar.gz diff --git a/conf/sisu/v2/sisurc.yml b/conf/sisu/v2/sisurc.yml index 8b1c71e6..cb57891d 100644 --- a/conf/sisu/v2/sisurc.yml +++ b/conf/sisu/v2/sisurc.yml @@ -124,3 +124,5 @@ program_set: # hyperestraier: # flag: true # action: http://search.sisudoc.org/cgi-bin/estseek.cgi? +#manifest: +# minitoc: true diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG index 7cbe91a6..a81c772b 100644 --- a/data/doc/sisu/v2/CHANGELOG +++ b/data/doc/sisu/v2/CHANGELOG @@ -12,6 +12,38 @@ Reverse Chronological: %% Development branch UNSTABLE +%% 2.6.3.orig.tar.gz (2010-07-28:30/3) +http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.3.orig.tar.gz + sisu_2.6.3.orig.tar.gz + sisu_2.6.3-1.dsc + sisu_2.6.3-1.diff.gz + + * odf, footnotes, asterisk series (**) fix + + * html_format, epub_format: subtoc, footnote content bug (fix) + + * odf: lt (<), gt (>) fix for codeblocks; & fix, messy + + * epub_format, removed some title & author info, check + + * epub_tune, <br /> (from <br>) + + * epub_format, within head, title & author + + * epub, toc copyat link removed + + * manifest, defaults, minimal sisu footer + + * hub, add metaverse run for git (composite files) + + * git, param, refine filename regex for composite files + + * git sisu directory structure, lang dir beneath txt + + * html, links to output formats, remove icons + + * minitoc sisurc configurable (true/false) + %% 2.6.2.orig.tar.gz (2010-07-15:28/4) http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.2.orig.tar.gz 63ffa027e66ed18d5d56d8e82e79a437bcec362e7c16d6d4ae26fa0d029f80ae 2730609 sisu_2.6.2.orig.tar.gz diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml index e7f60c76..08bbe3bb 100644 --- a/data/sisu/v2/v/version.yml +++ b/data/sisu/v2/v/version.yml @@ -1,5 +1,5 @@ --- -:version: 2.6.2 -:date_stamp: 2010w28/4 -:date: "2010-07-15" +:version: 2.6.3 +:date_stamp: 2010w30/3 +:date: "2010-07-28" :project: SiSU diff --git a/lib/sisu/v2/defaults.rb b/lib/sisu/v2/defaults.rb index 020563e3..188b1869 100644 --- a/lib/sisu/v2/defaults.rb +++ b/lib/sisu/v2/defaults.rb @@ -124,6 +124,8 @@ module SiSU_Viz end def js_prev end + def js_plaintext + end def js_portrait end def js_landscape @@ -337,10 +339,10 @@ module SiSU_Viz #% text #changed from txt to avoid naming conflicts #FOLLOW def txt_generator %{ <meta name="generator" content="#{@v[:project]} #{@v[:version]} of #{@v[:date_stamp]} (#{@v[:date]}) (n*x and Ruby!)" /> - <link rel="generator" href="http://www.sisudoc.org/sisu" />} + <link rel="generator" href="http://www.sisudoc.org/" />} end def txt_generator_comment - %{ <!- #{@v[:project]} #{@v[:version]} of #{@v[:date_stamp]} (#{@v[:date]}) (n*x and Ruby!)" http://www.sisudoc.org/sisu ->} + %{ <!- #{@v[:project]} #{@v[:version]} of #{@v[:date_stamp]} (#{@v[:date]}) (n*x and Ruby!)" http://www.sisudoc.org/ ->} end def txt_hp ' SiSU' @@ -359,29 +361,29 @@ module SiSU_Viz URI.parse(uri) end def url_sisu - 'http://www.sisudoc.org/sisu' + 'http://www.sisudoc.org/' end def url_sisudoc 'http://www.sisudoc.org' end def url_footer_signature - 'http://www.sisudoc.org/sisu' + 'http://www.sisudoc.org/' end def url_root '/sisu' #watch end def url_root_http - 'http://www.sisudoc.org/sisu' #watch + 'http://www.sisudoc.org/' #watch end def url_home - 'http://www.sisudoc.org/sisu' # used in pdf header + 'http://www.sisudoc.org/' # used in pdf header end def url_site #used as stub... where there are subdirectories and is different from home url_home - #'http://www.sisudoc.org/sisu' # used in pdf header + #'http://www.sisudoc.org/' # used in pdf header end def url_txt - 'www.sisudoc.org/sisu' + 'www.sisudoc.org/' end def url_path_image_base #used for html image display '../_sisu/image' @@ -1112,12 +1114,12 @@ module SiSU_Viz end def nav_txt_homepage %{ <font face="#{font_fonts}" size="2"> - #{png_site} homepage + home </font> } end def nav_txt_toc_link %{ <font face="#{font_fonts}" size="2"> - #{png_toc} toc + toc </font> } end def nav_txt_toc_link_verbose @@ -1127,7 +1129,7 @@ module SiSU_Viz end def nav_txt_doc_link %{ <font face="#{font_fonts}" size="2"> - #{png_doc} scroll + scroll </font> } end def nav_txt_manifest @@ -1151,9 +1153,14 @@ module SiSU_Viz Next <b>>></b> </font> } end + def nav_txt_plaintext + %{ <font face="#{font_fonts}" size="2"> + txt + </font> } + end def nav_txt_odf %{ <font face="#{font_fonts}" size="2"> - #{png_odf} odt + odt </font> } end def nav_txt_pdfs @@ -1163,17 +1170,17 @@ module SiSU_Viz end def nav_txt_epub %{ <font face="#{font_fonts}" size="2"> - #{png_epub} epub + epub </font> } end def nav_txt_pdf_portrait %{ <font face="#{font_fonts}" size="2"> - #{png_pdf_portrait} pdf + pdf </font> } end def nav_txt_pdf_landscape %{ <font face="#{font_fonts}" size="2"> - #{png_pdf_landscape} pdf + pdf </font> } end #% banner @@ -1529,9 +1536,29 @@ WOK </td></tr> WOK end + def widget_sisu_text +<<WOK + <p class="tiny"><font color="#666666" size="2"> + Output generated by + <a href="#{url_sisu}" #{js_sisu}> + #{@v[:project]} + </a> + #{@v[:version]} #{@v[:date]} (#{@v[:date_stamp]}) + </font></p> +WOK + end def widget_sisu <<WOK <!-- widget sisu --> +<tr><td valign="top" width="100%"> +<!-- SiSU Rights --> +#{widget_sisu_text} +</td></tr> +WOK + end + def widget_sisu_verbose +<<WOK +<!-- widget sisu --> <tr><td valign="top" width="10%"> <p class="tiny_left"><font color="#666666" size="2"> <a href="#{url_sisu}" #{js_sisu}> @@ -1560,7 +1587,7 @@ WOK is software for document structuring, publishing and search, <br /> <a href="#{url_sisu}" #{js_sisu}> - www.sisudoc.org/sisu + www.sisudoc.org/ </a> and <a href="#{url_sisudoc}" #{js_sisu}> @@ -1621,16 +1648,13 @@ WOK [not to mention flexibility & choice] use of and adherence to open standards (where practical and fair) and it is software libré. <br /> Get With the Future - <a href="http://www.sisudoc.org/sisu/"> + <a href="http://www.sisudoc.org/"> Way Better! </a> </font></p> </td></tr> WOK end - def widget_wayBetter - widget_way_better - end #% credits def credits_itl_cover_band %{<table summary="itl cover band" width="88%" border="0" cellpadding="0" bgcolor="blue"> @@ -1653,12 +1677,7 @@ WOK #{table_close*4}} end def credits_sisu_manifest - %{<div class="substance"> -<table summary="SiSU summary" bgcolor="#ffffff" cellpadding="4" border="0"> -<tr><td> - #{widget_sisu} - #{widget_way_better} -</table></div>} + widget_sisu_text end def credits_sisu x=%{<div class="substance"> @@ -1964,13 +1983,13 @@ outputs include: plaintext, html, XHTML, XML, ODF (OpenDocument), EPUB, LaTeX, P SiSU Short Description </p> <p> -SiSU is a comprehensive future-proofing electronic document management system. Built-in search capabilities allow you to search across multiple documents and highlight matches in an easy-to-follow format. Paragraph numbering system allows you to cite your electronic documents in a consistent manner across multiple file formats. Multiple format outputs allow you to display your documents in plain text, PDF (portrait and horizontal), OpenDocument format, HTML, or e-book reading format (EPUB). Word mapping allows you to easily create word indexes for your documents. Future-proofing flexibility allows you to quickly adapt your documents to newer output formats as needed. All these features are achieved with little or no additional work on your documents - by marking up the documents with a super simplistic markup language, leaving the SiSU engine to handle the heavy-lifting processing. +SiSU is a comprehensive future-proofing electronic document management system. Built-in search capabilities allow you to search across multiple documents and highlight matches in an easy-to-follow format. Paragraph numbering system allows you to cite your electronic documents in a consistent manner across multiple file formats. Multiple format outputs allow you to display your documents in plain text, PDF (portrait and horizontal), OpenDocument format, HTML, or e-book reading format (EPUB). Word mapping allows you to easily create word indexes for your documents. Future-proofing flexibility allows you to quickly adapt your documents to newer output formats as needed. All these and many other features are achieved with little or no additional work on your documents - by marking up the documents with a super simplistic markup language, leaving the SiSU engine to handle the heavy-lifting processing. </p> <p> -Potential users of SiSU include individual authors who want to publish their books or articles electronically to reach a broad audience or any organizations with a medium or large set of electronic documents to centrally manage, especially governmental organizations which may prefer to keep their documents in easily accessible yet non-proprietary formats. +Potential users of SiSU include individual authors who want to publish their books or articles electronically to reach a broad audience, web publishers who want to provide multiple channels of access to their electronic documents, or any organizations which centrally manage a medium or large set of electronic documents, especially governmental organizations which may prefer to keep their documents in easily accessible yet non-proprietary formats. </p> <p> -SiSU is an Open Source project led by Ralph Amissah (<a href="mailto://ralph.amissah@gmail.com">ralph.amissah@gmail.com</a>) and can be contacted at <a href="mailto://sisu@lists.sisudoc.org">sisu@lists.sisudoc.org</a>. SiSU is licensed under the GNU General Public License. +SiSU is an Open Source project initiated and led by Ralph Amissah (<a href="mailto://ralph.amissah@gmail.com">ralph.amissah@gmail.com</a>) and can be contacted at <a href="mailto://sisu@lists.sisudoc.org">sisu@lists.sisudoc.org</a>. SiSU is licensed under the GNU General Public License. </p> <p class="bold"> For less markup than the most elementary HTML you can have more. diff --git a/lib/sisu/v2/epub.rb b/lib/sisu/v2/epub.rb index fa8b61ab..6f4ab25b 100644 --- a/lib/sisu/v2/epub.rb +++ b/lib/sisu/v2/epub.rb @@ -531,8 +531,6 @@ module SiSU_EPUB toc_shared << format_txt_obj.center_bold segtoc << format_txt_obj.center_bold end - toc_shared << format_head_toc.copyat - segtoc << format_head_toc.copyat segtoc << seg_toc_band tmp_head=nil if defined? @md.prefix_a \ diff --git a/lib/sisu/v2/epub_format.rb b/lib/sisu/v2/epub_format.rb index 6bbbd668..350e6f2c 100644 --- a/lib/sisu/v2/epub_format.rb +++ b/lib/sisu/v2/epub_format.rb @@ -1281,9 +1281,6 @@ WOK def head %{#{doc_type} <head> - <title> - #{@md.html_title} - </title> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> #{@css.xhtml_epub} </head> @@ -1593,25 +1590,6 @@ WOK toc_metadata end def title_banner(title,subtitle,creator) - %{ -<div class="summary"> - <p class="tiny"> - #{title} - </p> - <p class="tiny"> - #{subtitle} - </p> - <p class="tiny"> - #{creator} - </p> - <p class="tiny"> - copy @ - <a href="#{@vz.url_home}"> - #{@vz.txt_home} - </a> - </p> -</div> -} end end class Head_scroll < Head_toc @@ -1925,7 +1903,13 @@ WOK </p> } end + def clean(txt) + txt.gsub!(/#{Mx[:en_a_o]}.+?#{Mx[:en_a_c]}/,'') + txt.gsub!(/#{Mx[:en_b_o]}.+?#{Mx[:en_b_c]}/,'') + txt + end def subtoc_lev(tag,attrib) + @txt=clean(@txt) txt=if @txt \ and @txt =~/<\/?i>|<a\s+name="\S+?">/mi @txt.gsub(/<\/?i>|<a\s+name="\S+?">/mi,'') #removes name markers from subtoc, go directly to substantive text diff --git a/lib/sisu/v2/epub_segments.rb b/lib/sisu/v2/epub_segments.rb index 66d73f4f..4edcc93b 100644 --- a/lib/sisu/v2/epub_segments.rb +++ b/lib/sisu/v2/epub_segments.rb @@ -301,7 +301,7 @@ WOK format_head_seg=SiSU_EPUB_Format::Head_seg.new(@md) if @@tracker < @@seg_total-1 if @@tracker==0; @@segtocband=format_head_seg.toc_next2 #if format_head_seg.toc_next2 - else @@segtocband=format_head_seg.toc_pre_next2 #if format_head_seg.toc_pre_next2 + else @@segtocband=format_head_seg.toc_pre_next2 #if format_head_seg.toc_pre_next2 end else @@segtocband=format_head_seg.toc_pre2 #if format_head_seg.toc_pre2 end diff --git a/lib/sisu/v2/epub_tune.rb b/lib/sisu/v2/epub_tune.rb index 5da82392..83e718aa 100644 --- a/lib/sisu/v2/epub_tune.rb +++ b/lib/sisu/v2/epub_tune.rb @@ -192,6 +192,7 @@ module SiSU_EPUB_Tune str.gsub!(/þ/u,'þ') # þ str.gsub!(/ÿ/u,'ÿ') # ÿ str.gsub!(/ý/u,'ý') + str.gsub!(/<br>/u,'<br />') str.gsub(/#{Mx[:nbsp]}/u,' ') str end diff --git a/lib/sisu/v2/git.rb b/lib/sisu/v2/git.rb index 2d7629fd..b5dc403e 100644 --- a/lib/sisu/v2/git.rb +++ b/lib/sisu/v2/git.rb @@ -65,9 +65,17 @@ module SiSU_Git def initialize(opt) @opt=opt @env=SiSU_Env::Info_env.new + l=SiSU_Env::Standardise_language.new.file_to_language(@opt.fns) @git_path={} - @git_path[:fnb]=@env.path.processing_path_git + '/' + @opt.fnb - @git_path[:src]=@git_path[:fnb] + '/' + Gt[:txt] + if @env.i18n.multilingual + m=/((.+?)(?:\~\w{2,3})?)\.((?:-|ssm\.)?sst|ssm)$/ #watch added match for sss + fnn,fnb,fnt=@opt.fns[m,1],@opt.fns[m,2],@opt.fns[m,3] + else m=/(.+?)\.((?:-|ssm\.)?sst|ssm)$/ + fnb=@fnn=@opt.fns[m,1] + fnt=@opt.fns[m,2] + end + @git_path[:fnb]=@env.path.processing_path_git + '/' + fnb # + @opt.fnb + @git_path[:src]=@git_path[:fnb] + '/' + Gt[:txt] + '/' + l[:c] @git_path[:image]=@git_path[:fnb] + '/' + Gt[:image] @git_path[:conf]=@git_path[:fnb] + '/' + Gt[:conf] @md=SiSU_Param::Parameters.new(@opt).get diff --git a/lib/sisu/v2/html_format.rb b/lib/sisu/v2/html_format.rb index b3712690..47472406 100644 --- a/lib/sisu/v2/html_format.rb +++ b/lib/sisu/v2/html_format.rb @@ -147,7 +147,7 @@ module SiSU_HTML_Format def home %{<td align="center" bgcolor=#{@vz.color_band2}> <a href="../index.html" target="_top"> - #{@vz.png_homepage}</a> + #{@vz.nav_txt_homepage}</a> </td> } end @@ -198,6 +198,17 @@ module SiSU_HTML_Format else '' end end + def txt + txt=if @cf_defaults.cf_0 =~/[at]/ + %{ +<td valign=bottom bgcolor=#{@vz.color_band2}> + <a href="#{@md.fn[:plain]}" target="_top" #{@vz.js_plaintext}> + #{@vz.nav_txt_plaintext} + </a> +</td>} + else '' + end + end def epub epub=if @cf_defaults.cf_0 =~/e/ %{ @@ -338,7 +349,7 @@ WOK %{<table summary="toc segment and scroll with pdf" border="0" cellpadding="3" cellspacing="0"> <tr> #{scroll} - #{wgt.seg(@vz.nav_txt_toc_link)}#{wgt.epub}#{wgt.pdf}#{wgt.odf} + #{wgt.seg(@vz.nav_txt_toc_link)}#{wgt.txt}#{wgt.epub}#{wgt.pdf}#{wgt.odf} #{wgt.concordance(@vz.nav_txt_concordance)} #{wgt.manifest} #{wgt.search} @@ -355,7 +366,7 @@ WOK %{<table summary="toc scroll and segment with pdf" border="0" cellpadding="3" cellspacing="0"> <tr> #{seg} - #{wgt.scroll(@vz.nav_txt_doc_link)}#{wgt.epub}#{wgt.pdf}#{wgt.odf} + #{wgt.scroll(@vz.nav_txt_doc_link)}#{wgt.txt}#{wgt.epub}#{wgt.pdf}#{wgt.odf} <td align="center" bgcolor=#{@vz.color_band2}> #{wgt.concordance(@vz.nav_txt_concordance)} #{wgt.manifest} @@ -736,7 +747,7 @@ WOK <tr> #{wgt.seg(@vz.nav_txt_toc_link)} #{wgt.scroll(@vz.nav_txt_doc_link)} - #{wgt.epub}#{wgt.pdf}#{wgt.odf} + #{wgt.txt}#{wgt.epub}#{wgt.pdf}#{wgt.odf} <td align="center" bgcolor=#{@vz.color_band2}> #{wgt.concordance(@vz.nav_txt_concordance)} #{wgt.manifest} @@ -749,7 +760,7 @@ WOK <tr> #{wgt.seg(@vz.nav_txt_toc_link)} #{wgt.scroll(@vz.nav_txt_doc_link)} - #{wgt.epub}#{wgt.pdf}#{wgt.odf} + #{wgt.txt}#{wgt.epub}#{wgt.pdf}#{wgt.odf} <td align="center" bgcolor=#{@vz.color_band2}> #{wgt.manifest} #{wgt.search} @@ -1263,7 +1274,13 @@ WOK </p> } end + def clean(txt) + txt.gsub!(/#{Mx[:en_a_o]}.+?#{Mx[:en_a_c]}/,'') + txt.gsub!(/#{Mx[:en_b_o]}.+?#{Mx[:en_b_c]}/,'') + txt + end def subtoc_lev(tag,attrib) + @txt=clean(@txt) txt=if @txt \ and @txt =~/<\/?i>|<a\s+name="\S+?">/mi @txt.gsub(/<\/?i>|<a\s+name="\S+?">/mi,'') #removes name markers from subtoc, go directly to substantive text diff --git a/lib/sisu/v2/hub.rb b/lib/sisu/v2/hub.rb index db167571..68ff6fcb 100644 --- a/lib/sisu/v2/hub.rb +++ b/lib/sisu/v2/hub.rb @@ -179,8 +179,8 @@ module SiSU end end end - elsif @req =~/^dbi$/; SiSU_DBI::SiSU_SQL.new(@opt).connect # -D -d - elsif @req=~/^sisupod_make$/; SiSU_Doc::Source.new(@opt).read # -S + elsif @req =~/^dbi$/; SiSU_DBI::SiSU_SQL.new(@opt).connect # -D -d + elsif @req=~/^sisupod_make$/; SiSU_Doc::Source.new(@opt).read # -S end Operations.new.counter end @@ -194,40 +194,40 @@ module SiSU def counter @@n_do=0 end - def remote_put_base_site_rsync # -CR + def remote_put_base_site_rsync # -CR p "here #{__FILE__} #{__LINE__}" if @opt =~/M/ require "#{SiSU_lib}/remote" # remote.rb SiSU_Remote::Put.new(@opt).rsync_base end - def remote_put_base_site_rsync_match # -CCRZ + def remote_put_base_site_rsync_match # -CCRZ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/ require "#{SiSU_lib}/remote" # remote.rb SiSU_Remote::Put.new(@opt).rsync_base_sync end - def remote_put_base_site # -Cr + def remote_put_base_site # -Cr p "here #{__FILE__} #{__LINE__}" if @opt =~/M/ require "#{SiSU_lib}/remote" # remote.rb SiSU_Remote::Put.new(@opt).scp_base end - def remote_put_base_site_all # -CCr + def remote_put_base_site_all # -CCr p "here #{__FILE__} #{__LINE__}" if @opt =~/M/ require "#{SiSU_lib}/remote" # remote.rb SiSU_Remote::Put.new(@opt).scp_base_all end - def cgi # -F + def cgi # -F require "#{SiSU_lib}/cgi" # cgi.rb SiSU_CGI::SiSU_search.new(@opt).read end - def encoding # -K build character encoding db (uses KirbyBase) + def encoding # -K build character encoding db (uses KirbyBase) require "#{SiSU_lib}/character_encoding" # character_encoding.rb SiSU_character_encode::Create.new.db end - def termsheet # -t + def termsheet # -t system("sisu_termsheet #{@opt.cmd} #{@opt.fns}\n") @@n_do=@@n_do+1 SiSU_Screen::Ansi.new(@opt.cmd,@@n_do,'Termsheet(s) processed').term_sheet_title unless @opt.cmd =~/q/ end - def webrick # -W + def webrick # -W port=prt=@fns prt=if prt !~/\d+/ 'webrick default (sysenv)' @@ -292,7 +292,7 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/ flag=SiSU_Env::Info_processing_flag.new extra='' if @opt.cmd !~/[mn]/ - extra+=if @opt.cmd =~/[abehHhIiJjNOoptTwXxz]/ \ + extra+=if @opt.cmd =~/[abeghHhIiJjNOoptTwXxz]/ \ and @opt.cmd !~/[mn]/ 'm' #% add dal elsif ((@opt.cmd =~/[Dd]/ \ diff --git a/lib/sisu/v2/manifest.rb b/lib/sisu/v2/manifest.rb index 7be18b19..6954fc6a 100644 --- a/lib/sisu/v2/manifest.rb +++ b/lib/sisu/v2/manifest.rb @@ -589,14 +589,23 @@ module SiSU_Manifest banner_table=if vz.banner_home_button_only !~ /http:\/\/www\.jus\.uio\.no\/sisu/ \ and vz.banner_home_button_only !~ /sisu\.home\.png/ <<WOK -<table summary="band" width="100%" border="0" cellpadding="3" cellspacing="0"> -<tr><td align="left" bgcolor="#ffffff">#{vz.banner_band}</td><td width="60%"><p class="tiny">#{@brace_url.xml_open}<a href="#{@base_url}/#{file}">#{@base_url}/#{file}</a>#{@brace_url.xml_close}</p></td><td width="20%">#{@env.widget_static.search_form}</td><td><a href="http://www.jus.uio.no/sisu/" target="_top"><img border="0" src="#{vz.url_path_image_sys}/sisu.png" alt="SiSU -->" /></a></td></tr> +<table summary="band" border="0" cellpadding="3" cellspacing="0"> +<tr><td align="left" width="15%" bgcolor="#ffffff">#{vz.banner_band}</td> +<td width="70%"><p class="tiny">#{@brace_url.xml_open}<a href="#{@base_url}/#{file}">#{@base_url}/#{file}</a>#{@brace_url.xml_close}</p></td> +<td>#{@env.widget_static.search_form}</td></tr> </table> WOK +#<<WOK +#<table summary="band" width="100%" border="0" cellpadding="3" cellspacing="0"> +#<tr><td align="left" bgcolor="#ffffff">#{vz.banner_band}</td><td width="60%"><p class="tiny">#{@brace_url.xml_open}<a href="#{@base_url}/#{file}">#{@base_url}/#{file}</a>#{@brace_url.xml_close}</p></td><td width="20%">#{@env.widget_static.search_form}</td><td><a href="http://www.jus.uio.no/sisu/" target="_top"><img border="0" src="#{vz.url_path_image_sys}/sisu.png" alt="SiSU -->" /></a></td></tr> +#</table> +#WOK else <<WOK <table summary="band" border="0" cellpadding="3" cellspacing="0"> -<tr><td align="left" bgcolor="#ffffff"><a href="http://www.jus.uio.no/sisu/" target="_top"><img border="0" src="#{vz.url_path_image_sys}/sisu.png" alt="SiSU -->" /></a></td><td><p class="tiny">#{@brace_url.xml_open}<a href="#{@base_url}/#{file}">#{@base_url}/#{file}</a>#{@brace_url.xml_close}</p></td><td>#{@env.widget_static.search_form}</td></tr> +<tr><td align="left" bgcolor="#ffffff"><a href="http://www.jus.uio.no/sisu/" target="_top"><img border="0" src="#{vz.url_path_image_sys}/sisu.png" alt="SiSU -->" /></a></td> +<td><p class="tiny">#{@brace_url.xml_open}<a href="#{@base_url}/#{file}">#{@base_url}/#{file}</a>#{@brace_url.xml_close}</p></td> +<td>#{@env.widget_static.search_form}</td></tr> </table> WOK end @@ -616,10 +625,20 @@ SiSU manifest: #{@md.title.full} </head> <body bgcolor="#ffffff" text="#000000" link="#003090" lang="en" xml:lang="en"> #{banner_table} +WOK + if @env.manifest_minitoc? + @manifest[:html] <<<<WOK <div class="toc"> #{minitoc.to_s} </div> <div class="content"> +WOK + else + @manifest[:html] <<<<WOK +<div> +WOK + end + @manifest[:html] <<<<WOK <h1 class="small">#{@translate.manifest_description}</h1> <h2 class="small">#{@md.title.full}</h2> <p class="bold">#{@md.author}</p> @@ -676,7 +695,8 @@ WOK @manifest[:html] <<<<WOK </table> </div> -<div class="main_column"> +<div> +<br /> #{vz.credits_sisu_manifest} </div> </body> diff --git a/lib/sisu/v2/odf.rb b/lib/sisu/v2/odf.rb index 2c0e206b..bb071683 100644 --- a/lib/sisu/v2/odf.rb +++ b/lib/sisu/v2/odf.rb @@ -113,9 +113,8 @@ module SiSU_ODF @vz=SiSU_Env::Get_init.instance.skin @tab="\t" @brace_url=SiSU_Viz::Skin.new.url_decoration - @br=if @md.cmd =~/M/; "\n" - else '' - end + @br=(@md.cmd =~/M/) ? '' : '' + #@br=(@md.cmd =~/M/) ? "\n" : '' end def songsheet pre @@ -316,9 +315,15 @@ module SiSU_ODF end if str @astx||=10000 + @astxs||=20000 if str =~/#{Mx[:en_a_o]}\d+\s+/ str.gsub!(/#{Mx[:en_a_o]}(\d+)\s+(.+?)#{Mx[:en_a_c]}/,'<text:note text:id="ftn\1" text:note-class="footnote"><text:note-citation>\1</text:note-citation><text:note-body><text:p text:style-name="Footnote"> \2</text:p><text:p text:style-name="Footnote"/></text:note-body></text:note>') end + if str =~/#{Mx[:en_a_o]}([*]+)\s+/ + a=$1.gsub(/([*])/,"\\\\\\1") + str.gsub!(/#{Mx[:en_a_o]}([*]+)\s+(.+?)#{Mx[:en_a_c]}/,%{<text:note text:id="ftn#{@astx.to_s}" text:note-class="footnote"><text:note-citation text:label="\\1">\\1</text:note-citation><text:note-body><text:p text:style-name="Footnote"> \\2</text:p><text:p text:style-name="Footnote"/></text:note-body></text:note>}) + @astxs+=1 + end if str=~/#{Mx[:en_a_o]}[*+]+\s/ asterisk=str.scan(/#{Mx[:en_a_o]}([*+]+)\s+(.+?)#{Mx[:en_a_c]}/) asterisk.each do |x| @@ -459,6 +464,7 @@ module SiSU_ODF or w =~/ / w.gsub!(/&/,'&') #watch end + w.gsub!(/(&\S{1,7};)+&/,'\1&') #could break things end para_array << w end @@ -466,8 +472,8 @@ module SiSU_ODF dob.obj=dob.obj.strip end if dob.is=='code' #{Mx[:gr_o]}code#{Mx[:gr_c]}/ #fix #code-block: angle brackets special characters #fix - dob.obj.gsub!(/(^|[^}])_</m,'\1<'); dob.obj.gsub!(/(^|[^}])_>/m,'\1>') - dob.obj.gsub!(/(^|[^}])_</m,'\1<'); dob.obj.gsub!(/(^|[^}])_>/m,'\1>') + dob.obj.gsub!(/(^|[^}])_(?:<|<)/m,'\1<'); dob.obj.gsub!(/(^|[^}])_(?:>|>)/m,'\1>') + dob.obj.gsub!(/(^|[^}])_(?:<|<)/m,'\1<'); dob.obj.gsub!(/(^|[^}])_(?:>|>)/m,'\1>') end if dob.of=='group' dob.obj.gsub!(/#{Mx[:gl_bullet]}/,'● ') diff --git a/lib/sisu/v2/param.rb b/lib/sisu/v2/param.rb index 89eaced3..674a0a08 100644 --- a/lib/sisu/v2/param.rb +++ b/lib/sisu/v2/param.rb @@ -841,7 +841,7 @@ module SiSU_Param # programs set here for things that affect output appearance only @programs[:pdf]=SiSU_Env::System_call.new.program_found?('pdflatex') if @env.i18n.multilingual - m=/((.+?)(?:\~\w{2,3})?)\.((?:-|ssm\.)?sst)$/ #watch added match for sss + m=/((.+?)(?:\~\w{2,3})?)\.((?:-|ssm\.)?sst|ssm)$/ #watch added match for sss @fnn,@fnb,@fnt=@fns[m,1],@fns[m,2],@fns[m,3] @flv=@env.document_language_versions_found[:f] @fnz=(@fns =~/\.(?:ssm\.sst|ssm)$/) ? (@fnn + '.ssm.zip') : (@fnn + '.sst.zip') diff --git a/lib/sisu/v2/sysenv.rb b/lib/sisu/v2/sysenv.rb index 8f330343..12348dc3 100644 --- a/lib/sisu/v2/sysenv.rb +++ b/lib/sisu/v2/sysenv.rb @@ -614,7 +614,7 @@ module SiSU_Env false end end - def psql #psql + def psql #psql program='psql' program_ref="\n\t\tpsql requested" if program_found?(program); true @@ -680,7 +680,7 @@ module SiSU_Env end @texpdf end - def latex2pdf(md,papersize='a4') #convert from latex to pdf + def latex2pdf(md,papersize='a4') #convert from latex to pdf tell=((@cmd =~/[MVv]/) ? '' : '> /dev/null' ) mode='batchmode' #mode='nonstopmode' @@ -900,7 +900,7 @@ module SiSU_Env @@current_document||=Dir.pwd @@current_document end - def stub_pwd #200412 + def stub_pwd #200412 @stub_pwd end def stub_md_harvest @@ -935,6 +935,13 @@ module SiSU_Env def defaults #multiple default directories @default_dir ||=@sys.default_dir #DEFAULT_DIR end + def manifest_minitoc? + flag=if defined? @rc['manifest']['minitoc'] \ + and not @rc['manifest']['minitoc'].nil? + @rc['manifest']['minitoc'] + else false + end + end def widget #needs (md) #move @rc=SiSU_Env::Get_init.instance.yamlrc @ad=SiSU_Env::Get_init.instance.ads @@ -955,8 +962,7 @@ module SiSU_Env and @rc['promo'].length > 0 @flag[:rc]=true true - else - false + else false end @flag end @@ -1308,13 +1314,13 @@ WOK def bin @sys.dir_bin end - def share #shared data repository source directory + def share #shared data repository source directory defaults[:sisu_share] end def style defaults[:stylesheet_stub] end - def sample_data #sample data repository source directory + def sample_data #sample data repository source directory defaults[:sample_data_path] end def rc @@ -1345,7 +1351,7 @@ WOK def webserv_path #testing, check need, remove webserv end - def webserv #separation required for webrick which cannot use path.output (different requirements as no file is passed) + def webserv #separation required for webrick which cannot use path.output (different requirements as no file is passed) man_path=if @@man_path.nil? man_path=if defined? @rc['webserv']['path'] \ and @rc['webserv']['path'] =~/\S\S+/ @@ -1378,17 +1384,17 @@ WOK def webserv_map_pwd #dir "#{path.webserv}/#{stub_pwd}" end - def webserv_dir #fixed/hard path to /www web/presentation directory, on Debian /var/www subdirectories are created within it, depending on markup directory stub-name (last segment of markup directory name) + def webserv_dir #fixed/hard path to /www web/presentation directory, on Debian /var/www subdirectories are created within it, depending on markup directory stub-name (last segment of markup directory name) defaults[:webserv_dir] end - def webserv_image #web/presentation directory, subdirectories are created within it, depending on markup directory stub-name (last segment of markup directory name) + def webserv_image #web/presentation directory, subdirectories are created within it, depending on markup directory stub-name (last segment of markup directory name) images=if defined? @rc['webserv']['images'] @rc['webserv']['images'] else defaults[:images] end "#{path.webserv}/#{images}" end - def output #web/webserv output directory... subdirectory into which further subdirectories are made based on file names + def output #web/webserv output directory... subdirectory into which further subdirectories are made based on file names "#{path.webserv}/#{@stub_pwd}" end def output_src @@ -1754,7 +1760,7 @@ WOK end end end - def webserv_cgi #web url for local webserv (localhost, or hostname) + def webserv_cgi #web url for local webserv (localhost, or hostname) if defined? @rc['webserv_cgi']['host'] \ and not @rc['webserv_cgi']['host'].nil? http=((@rc['webserv_cgi']['host'] =~ /https?:\/\//) ? '' : 'http://') #check https? missing @@ -1770,7 +1776,7 @@ WOK end end end - def webserv_base_cgi #web url for local webserv (localhost, or hostname) + def webserv_base_cgi #web url for local webserv (localhost, or hostname) if defined? @rc['webserv_cgi']['host'] \ and not @rc['webserv_cgi']['host'].nil? http=((@rc['webserv_cgi']['host'] =~ /https?:\/\//) ? '' : 'http://') @@ -1801,7 +1807,7 @@ WOK "#{http}#{webserv_host_base}" else "#{http}localhost" end end - def webserv #web url for local webserv (localhost, or hostname) + def webserv #web url for local webserv (localhost, or hostname) if path.webserv_dir \ and path.webserv =~ /#{path.webserv_dir}/ #revisit "#{path.webserv}/#{@stub_pwd}".gsub(/#{path.webserv_dir}/,"#{url.hostname}/#{@stub_pwd}") @@ -1813,7 +1819,7 @@ WOK else "#{url.hostname}/#{@stub_pwd}" end end - def webserv_base #web url for local webserv (localhost, or hostname) + def webserv_base #web url for local webserv (localhost, or hostname) if path.webserv_dir \ and path.webserv =~ /#{path.webserv_dir}/ #revisit "#{path.webserv}/#{@stub_pwd}".gsub(/#{path.webserv_dir}/,"#{url.hostname}") @@ -2040,7 +2046,7 @@ WOK self end def i18n - def language # language settings + def language # language settings m=/.+\/\S+?\~(\S+)/ pwd=Dir.pwd conf=(defined? @rc['default']['language']) ? @rc['default']['language'] : nil @@ -2172,10 +2178,10 @@ WOK end end class Info_settings < Info_env - def permission?(prog) #program defaults + def permission?(prog) #program defaults (defined? @rc['permission_set'][prog]) ? @rc['permission_set'][prog] : false end - def program?(prog) #program defaults + def program?(prog) #program defaults (defined? @rc['program_set'][prog]) ? @rc['program_set'][prog] : false end end @@ -2204,7 +2210,7 @@ WOK and @md.cmd !~ /[hH]/ ft << @md.fn[:manifest] end - if @md.cmd =~ /a/; ft << @md.fn[:plain] + if @md.cmd =~ /[at]/; ft << @md.fn[:plain] end if @md.cmd =~ /b/; ft << @md.fn[:xhtml] end @@ -2546,7 +2552,7 @@ WOK end end end - def scp_base #base site + def scp_base #base site self.remote_host_base.each do |remote_conn| local=@source_path remote="#{remote_conn[:name]}/#{@env.path.stub_pwd}/." @@ -2564,7 +2570,7 @@ WOK end end end - def scp_base_all #base site + def scp_base_all #base site self.remote_host_base.each do |remote_conn| local=@source_path remote="#{remote_conn[:name]}/#{@env.path.stub_pwd}/." @@ -2586,7 +2592,7 @@ WOK end end end - def rsync_base #base site + def rsync_base #base site ldest="#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu" image_sys="#{@env.path.webserv}/_sisu/image_sys" images="#{@env.path.webserv}/_sisu/image" @@ -2610,7 +2616,7 @@ WOK end end end - def rsync_base_sync #base site + def rsync_base_sync #base site self.remote_host_base.each do |remote_conn| local=@source_path remote="#{remote_conn[:name]}/#{@env.path.stub_pwd}/." @@ -2633,7 +2639,7 @@ WOK end end end - def rsync_sitemaps #sitemap directory + def rsync_sitemaps #sitemap directory self.remote_host_base.each do |remote_conn| local="#{@source_path}/sitemapindex.xml" remote="#{remote_conn[:name]}/#{@env.path.stub_pwd}/." @@ -2832,7 +2838,7 @@ WOK @env.url.webrick_port end end - class Info_program < Info_env #revisit + class Info_program < Info_env #revisit attr_accessor :editor,:wc,:tidy,:rexml,:pdflatex,:postgresql,:sqlite def initialize prog=SiSU_Env::Info_env.new.program |