- #{@md.html_title} + #{@md.title.full}

+WOK + else + @manifest[:html] <<< +WOK + end + @manifest[:html] <<<#{@translate.manifest_description}

#{@md.title.full}

#{@md.author}

diff --git a/lib/sisu/v2/sysenv.rb b/lib/sisu/v2/sysenv.rb index 8f330343..f45ccdee 100644 --- a/lib/sisu/v2/sysenv.rb +++ b/lib/sisu/v2/sysenv.rb @@ -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 -- cgit v1.2.3 From e4e85022c6fec0009c0e64f62f3cb7f781039e90 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 26 Jul 2010 18:37:17 -0400 Subject: html, links to output formats, remove icons --- lib/sisu/v2/defaults.rb | 21 ++++++++++++++------- lib/sisu/v2/html_format.rb | 21 ++++++++++++++++----- lib/sisu/v2/sysenv.rb | 2 +- 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/lib/sisu/v2/defaults.rb b/lib/sisu/v2/defaults.rb index f53ca7ce..5c10c020 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 @@ -1112,12 +1114,12 @@ module SiSU_Viz end def nav_txt_homepage %{ - #{png_site} homepage + home } end def nav_txt_toc_link %{ - #{png_toc} toc + toc } end def nav_txt_toc_link_verbose @@ -1127,7 +1129,7 @@ module SiSU_Viz end def nav_txt_doc_link %{ - #{png_doc} scroll + scroll } end def nav_txt_manifest @@ -1149,11 +1151,16 @@ module SiSU_Viz def nav_txt_next %{ Next >> + } + end + def nav_txt_plaintext + %{ + txt } end def nav_txt_odf %{ - #{png_odf} odt + odt } end def nav_txt_pdfs @@ -1163,17 +1170,17 @@ module SiSU_Viz end def nav_txt_epub %{ - #{png_epub} epub + epub } end def nav_txt_pdf_portrait %{ - #{png_pdf_portrait} pdf + pdf } end def nav_txt_pdf_landscape %{ - #{png_pdf_landscape} pdf + pdf } end #% banner diff --git a/lib/sisu/v2/html_format.rb b/lib/sisu/v2/html_format.rb index b3712690..1cd5104f 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 %{ - #{@vz.png_homepage} + #{@vz.nav_txt_homepage} } end @@ -198,6 +198,17 @@ module SiSU_HTML_Format else '' end end + def txt + txt=if @cf_defaults.cf_0 =~/[at]/ + %{ + + + #{@vz.nav_txt_plaintext} + +} + else '' + end + end def epub epub=if @cf_defaults.cf_0 =~/e/ %{ @@ -338,7 +349,7 @@ WOK %{ #{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 %{

#{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} #{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} #{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} +WOK + end + def widget_sisu_text +< + Output generated by + + #{@v[:project]} + + #{@v[:version]} #{@v[:date]} (#{@v[:date_stamp]}) +

WOK end def widget_sisu < + +WOK + end + def widget_sisu_verbose +<

#{wgt.concordance(@vz.nav_txt_concordance)} #{wgt.manifest} @@ -736,7 +747,7 @@ WOK

#{wgt.concordance(@vz.nav_txt_concordance)} #{wgt.manifest} @@ -749,7 +760,7 @@ WOK

#{wgt.manifest} #{wgt.search} diff --git a/lib/sisu/v2/sysenv.rb b/lib/sisu/v2/sysenv.rb index f45ccdee..5b16a673 100644 --- a/lib/sisu/v2/sysenv.rb +++ b/lib/sisu/v2/sysenv.rb @@ -2210,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 -- cgit v1.2.3 From de4b7d3ebae90c136fe1d571e78f9d20cafc2c25 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 26 Jul 2010 18:38:57 -0400 Subject: git sisu directory structure, lang dir beneath txt * git sisu directory structure becomes more complicated --- lib/sisu/v2/git.rb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/sisu/v2/git.rb b/lib/sisu/v2/git.rb index 2d7629fd..b910c723 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)$/ #watch added match for sss + fnn,fnb,fnt=@opt.fns[m,1],@opt.fns[m,2],@opt.fns[m,3] + else m=/(.+?)\.((?:-|ssm\.)?sst)$/ + 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 -- cgit v1.2.3 From d80c096eac436552bde6cdf771fe692e870d25fc Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 27 Jul 2010 10:45:21 -0400 Subject: sysenv, cosmetic --- lib/sisu/v2/sysenv.rb | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/lib/sisu/v2/sysenv.rb b/lib/sisu/v2/sysenv.rb index 5b16a673..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 @@ -1314,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 @@ -1351,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+/ @@ -1384,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 @@ -1760,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 @@ -1776,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://') @@ -1807,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}") @@ -1819,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}") @@ -2046,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 @@ -2178,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 @@ -2552,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}/." @@ -2570,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}/." @@ -2592,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" @@ -2616,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}/." @@ -2639,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}/." @@ -2838,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 -- cgit v1.2.3 From 738c59b641e19aca6c2a5c6eb32c4b62bca0f0ff Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 27 Jul 2010 10:50:08 -0400 Subject: git, param, refine filename regex for composite files --- lib/sisu/v2/git.rb | 4 ++-- lib/sisu/v2/param.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/sisu/v2/git.rb b/lib/sisu/v2/git.rb index b910c723..b5dc403e 100644 --- a/lib/sisu/v2/git.rb +++ b/lib/sisu/v2/git.rb @@ -68,9 +68,9 @@ module SiSU_Git l=SiSU_Env::Standardise_language.new.file_to_language(@opt.fns) @git_path={} 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=@opt.fns[m,1],@opt.fns[m,2],@opt.fns[m,3] - else m=/(.+?)\.((?:-|ssm\.)?sst)$/ + else m=/(.+?)\.((?:-|ssm\.)?sst|ssm)$/ fnb=@fnn=@opt.fns[m,1] fnt=@opt.fns[m,2] end 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') -- cgit v1.2.3 From c5734e635470e37dc94b3ebfb8d9d8ffee5c8311 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 27 Jul 2010 10:52:44 -0400 Subject: hub, add metaverse run for git (composite files) --- lib/sisu/v2/hub.rb | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) 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]/ \ -- cgit v1.2.3 From 9cc6657bcdbad0b481ae61632887f56e5d0958d0 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 27 Jul 2010 11:32:22 -0400 Subject: manifest, defaults, minimal sisu footer --- lib/sisu/v2/defaults.rb | 26 +++++++++++++++++++++----- lib/sisu/v2/manifest.rb | 3 ++- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/lib/sisu/v2/defaults.rb b/lib/sisu/v2/defaults.rb index 5c10c020..188b1869 100644 --- a/lib/sisu/v2/defaults.rb +++ b/lib/sisu/v2/defaults.rb @@ -1534,11 +1534,31 @@ WOK

+ +#{widget_sisu_text} +

@@ -1657,11 +1677,7 @@ WOK #{table_close*4}} end def credits_sisu_manifest - %{

- -

- #{widget_sisu} -

} + widget_sisu_text end def credits_sisu x=%{

diff --git a/lib/sisu/v2/manifest.rb b/lib/sisu/v2/manifest.rb index aca64e40..6954fc6a 100644 --- a/lib/sisu/v2/manifest.rb +++ b/lib/sisu/v2/manifest.rb @@ -695,7 +695,8 @@ WOK @manifest[:html] <<<

+
#{vz.credits_sisu_manifest}

- #{title} -

- #{subtitle} -

- #{creator} -

- copy @ - - #{@vz.txt_home} - -

-} end end class Head_scroll < Head_toc 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 -- cgit v1.2.3 From f5d98e3fdebd32abb5b3d9b428a8cc2ad66cef0c Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 27 Jul 2010 16:59:56 -0400 Subject: odf: lt (<), gt (>) fix for codeblocks; & fix, messy --- lib/sisu/v2/odf.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/sisu/v2/odf.rb b/lib/sisu/v2/odf.rb index 2c0e206b..de010f3b 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 @@ -459,6 +458,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 +466,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>') end if dob.of=='group' dob.obj.gsub!(/#{Mx[:gl_bullet]}/,'● ') -- cgit v1.2.3 From 248be7a781c1e9aa13e3637e2fd6afad634c484d Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 27 Jul 2010 23:54:19 -0400 Subject: html_format, epub_format: subtoc, footnote content bug (fix) --- lib/sisu/v2/epub_format.rb | 6 ++++++ lib/sisu/v2/html_format.rb | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/lib/sisu/v2/epub_format.rb b/lib/sisu/v2/epub_format.rb index a10493ca..350e6f2c 100644 --- a/lib/sisu/v2/epub_format.rb +++ b/lib/sisu/v2/epub_format.rb @@ -1903,7 +1903,13 @@ WOK

} 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>|/mi @txt.gsub(/<\/?i>|/mi,'') #removes name markers from subtoc, go directly to substantive text -- cgit v1.2.3 From 3d092a1c809e87c9f220954cd78c82c29f1bd899 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 28 Jul 2010 13:30:14 -0400 Subject: odf, footnotes, asterisk series (**) fix --- lib/sisu/v2/odf.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/sisu/v2/odf.rb b/lib/sisu/v2/odf.rb index de010f3b..bb071683 100644 --- a/lib/sisu/v2/odf.rb +++ b/lib/sisu/v2/odf.rb @@ -315,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]}/,'

') end + if str =~/#{Mx[:en_a_o]}([*]+)\s+/ + a=$1.gsub(/([*])/,"\\\\\\1") + str.gsub!(/#{Mx[:en_a_o]}([*]+)\s+(.+?)#{Mx[:en_a_c]}/,%{

\\1

\\2

}) + @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| -- cgit v1.2.3 From 0cf9b6b16d02ad6ee2614b2115abfce66b69bf78 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 28 Jul 2010 14:41:56 -0400 Subject: sisu-2.6.3 changelog, date, version --- CHANGELOG_v2 | 32 ++++++++++++++++++++++++++++++++ data/doc/sisu/v2/CHANGELOG | 32 ++++++++++++++++++++++++++++++++ data/sisu/v2/v/version.yml | 6 +++--- 3 files changed, 67 insertions(+), 3 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,
(from
) + + * 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/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,
(from
) + + * 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 -- cgit v1.2.3