From 0bd17c97aa19fb4a03c27e07d9e0a631b560b9f6 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 3 Oct 2014 19:15:10 -0400 Subject: v5 v6: cleaning, minor --- lib/sisu/v5/hub_options.rb | 51 ---------------------------------------------- lib/sisu/v6/hub_options.rb | 51 ---------------------------------------------- 2 files changed, 102 deletions(-) (limited to 'lib') diff --git a/lib/sisu/v5/hub_options.rb b/lib/sisu/v5/hub_options.rb index ceeebe78..0854b9c6 100644 --- a/lib/sisu/v5/hub_options.rb +++ b/lib/sisu/v5/hub_options.rb @@ -505,57 +505,6 @@ module SiSU_Commandline end s.strip! end - def expand_numeric_shortcuts_(a) - shortcut=SiSU_Env::InfoProcessingFlag.new - s='' - a.each do |x| - y=case x - when /0/ - (x=~/^-0\S+/) \ - ? x.gsub(/^-0(\S+)/,shortcut.act_0.str + ' -\1') - : x.gsub(/^-0/,shortcut.act_0.str + ' ') - when /1/ - (x=~/^-1\S+/) \ - ? x.gsub(/^-1(\S+)/,shortcut.act_1.str + ' -\1') - : x.gsub(/^-1/,shortcut.act_1.str + ' ') - when /2/ - (x=~/^-2\S+/) \ - ? x.gsub(/^-2(\S+)/,shortcut.act_2.str + ' -\1') - : x.gsub(/^-2/,shortcut.act_2.str + ' ') - when /3/ - (x=~/^-3\S+/) \ - ? x.gsub(/^-3(\S+)/,shortcut.act_3.str + ' -\1') - : x.gsub(/^-3/,shortcut.act_3.str + ' ') - when /4/ - (x=~/^-4\S+/) \ - ? x.gsub(/^-4(\S+)/,shortcut.act_4.str + ' -\1') - : x.gsub(/^-4/,shortcut.act_4.str + ' ') - when /5/ - (x=~/^-5\S+/) \ - ? x.gsub(/^-5(\S+)/,shortcut.act_5.str + ' -\1') - : x.gsub(/^-5/,shortcut.act_5.str + ' ') - when /6/ - (x=~/^-6\S+/) \ - ? x.gsub(/^-6(\S+)/,shortcut.act_6.str + ' -\1') - : x.gsub(/^-6/,shortcut.act_6.str + ' ') - when /7/ - (x=~/^-7\S+/) \ - ? x.gsub(/^-7(\S+)/,shortcut.act_7.str + ' -\1') - : x.gsub(/^-7/,shortcut.act_7.str + ' ') - when /8/ - (x=~/^-8\S+/) \ - ? x.gsub(/^-8(\S+)/,shortcut.act_8.str + ' -\1') - : x.gsub(/^-8/,shortcut.act_8.str + ' ') - when /9/ - (x=~/^-9\S+/) \ - ? x.gsub(/^-9(\S+)/,shortcut.act_9.str + ' -\1') - : x.gsub(/^-9/,shortcut.act_9.str + ' ') - else x - end - s << " #{y}" unless y.empty? - end - s.strip! - end def opt_cmd_and_mod_adjust(ch,select_arr,files) select_arr=select_arr.flatten sel_init=select_arr.flatten diff --git a/lib/sisu/v6/hub_options.rb b/lib/sisu/v6/hub_options.rb index 0cb0d336..7ed7645f 100644 --- a/lib/sisu/v6/hub_options.rb +++ b/lib/sisu/v6/hub_options.rb @@ -505,57 +505,6 @@ module SiSU_Commandline end s.strip! end - def expand_numeric_shortcuts_(a) - shortcut=SiSU_Env::InfoProcessingFlag.new - s='' - a.each do |x| - y=case x - when /0/ - (x=~/^-0\S+/) \ - ? x.gsub(/^-0(\S+)/,shortcut.act_0.str + ' -\1') - : x.gsub(/^-0/,shortcut.act_0.str + ' ') - when /1/ - (x=~/^-1\S+/) \ - ? x.gsub(/^-1(\S+)/,shortcut.act_1.str + ' -\1') - : x.gsub(/^-1/,shortcut.act_1.str + ' ') - when /2/ - (x=~/^-2\S+/) \ - ? x.gsub(/^-2(\S+)/,shortcut.act_2.str + ' -\1') - : x.gsub(/^-2/,shortcut.act_2.str + ' ') - when /3/ - (x=~/^-3\S+/) \ - ? x.gsub(/^-3(\S+)/,shortcut.act_3.str + ' -\1') - : x.gsub(/^-3/,shortcut.act_3.str + ' ') - when /4/ - (x=~/^-4\S+/) \ - ? x.gsub(/^-4(\S+)/,shortcut.act_4.str + ' -\1') - : x.gsub(/^-4/,shortcut.act_4.str + ' ') - when /5/ - (x=~/^-5\S+/) \ - ? x.gsub(/^-5(\S+)/,shortcut.act_5.str + ' -\1') - : x.gsub(/^-5/,shortcut.act_5.str + ' ') - when /6/ - (x=~/^-6\S+/) \ - ? x.gsub(/^-6(\S+)/,shortcut.act_6.str + ' -\1') - : x.gsub(/^-6/,shortcut.act_6.str + ' ') - when /7/ - (x=~/^-7\S+/) \ - ? x.gsub(/^-7(\S+)/,shortcut.act_7.str + ' -\1') - : x.gsub(/^-7/,shortcut.act_7.str + ' ') - when /8/ - (x=~/^-8\S+/) \ - ? x.gsub(/^-8(\S+)/,shortcut.act_8.str + ' -\1') - : x.gsub(/^-8/,shortcut.act_8.str + ' ') - when /9/ - (x=~/^-9\S+/) \ - ? x.gsub(/^-9(\S+)/,shortcut.act_9.str + ' -\1') - : x.gsub(/^-9/,shortcut.act_9.str + ' ') - else x - end - s << " #{y}" unless y.empty? - end - s.strip! - end def opt_cmd_and_mod_adjust(ch,select_arr,files) select_arr=select_arr.flatten sel_init=select_arr.flatten -- cgit v1.2.3 From 97864e99d0819efdd3916f11f16cca058438ffc4 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 3 Oct 2014 19:20:08 -0400 Subject: v5 v6: --act provides info on current --act0 to --act9 settings * makes it easier to make use of acts 0 to 9 --- lib/sisu/v5/hub_options.rb | 8 +++++- lib/sisu/v5/se_processing.rb | 68 +++++++++++++++++++++++++++++++------------- lib/sisu/v6/hub_options.rb | 8 +++++- lib/sisu/v6/se_processing.rb | 68 +++++++++++++++++++++++++++++++------------- 4 files changed, 110 insertions(+), 42 deletions(-) (limited to 'lib') diff --git a/lib/sisu/v5/hub_options.rb b/lib/sisu/v5/hub_options.rb index 0854b9c6..9e35cc36 100644 --- a/lib/sisu/v5/hub_options.rb +++ b/lib/sisu/v5/hub_options.rb @@ -511,7 +511,7 @@ module SiSU_Commandline shortcut=SiSU_Env::InfoProcessingFlag.new if files ==:true if not sel_init.empty? \ - and sel_init.inspect =~/"--act[0-9]/ + and sel_init.inspect =~/"--act[s0-9]?/ sel_init.each do |s| select_arr <<=case s when /--act0/ then shortcut.act_0.arr @@ -524,6 +524,7 @@ module SiSU_Commandline when /--act7/ then shortcut.act_7.arr when /--act8/ then shortcut.act_8.arr when /--act9/ then shortcut.act_9.arr + when /--act/ then shortcut.act_info end end end @@ -688,6 +689,11 @@ module SiSU_Commandline end end else + if not sel_init.empty? \ + and sel_init.inspect =~/"--acts?/ + shortcut.act_info + exit + end if ch =~/c/ then select_arr << '--color-toggle' ch=ch.gsub(/[c]/,'') end diff --git a/lib/sisu/v5/se_processing.rb b/lib/sisu/v5/se_processing.rb index 88b0b7df..8646b5e0 100644 --- a/lib/sisu/v5/se_processing.rb +++ b/lib/sisu/v5/se_processing.rb @@ -472,6 +472,9 @@ module SiSU_Info_Processing_Flag : false end def act_0 #configurable processing flag shortcuts + def default + '--manifest --digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --verbose' + end def str if defined? @rc['flag']['act0'] \ and @rc['flag']['act0'].is_a?(String) @@ -479,8 +482,7 @@ module SiSU_Info_Processing_Flag elsif defined? @rc['flag']['default'] \ and @rc['flag']['default'].is_a?(String) @rc['flag']['default'] - else - '--manifest --digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --verbose' + else default end end def arr @@ -489,6 +491,9 @@ module SiSU_Info_Processing_Flag self end def act_1 #configurable processing flag shortcuts + def default + '--manifest --text --html' + end def str if defined? @rc['flag']['act1'] \ and @rc['flag']['act1'].is_a?(String) @@ -496,8 +501,7 @@ module SiSU_Info_Processing_Flag elsif defined? @rc['flag']['i'] \ and @rc['flag']['i'].is_a?(String) @rc['flag']['i'] - else - '--manifest --text --html' + else default end end def arr @@ -506,6 +510,9 @@ module SiSU_Info_Processing_Flag self end def act_2 #configurable processing flag shortcuts + def default + '--manifest --text --html --epub --pdf' + end def str if defined? @rc['flag']['act2'] \ and @rc['flag']['act2'].is_a?(String) @@ -513,8 +520,7 @@ module SiSU_Info_Processing_Flag elsif defined? @rc['flag']['ii'] \ and @rc['flag']['ii'].is_a?(String) @rc['flag']['ii'] - else - '--manifest --text --html --epub --pdf' + else default end end def arr @@ -523,6 +529,9 @@ module SiSU_Info_Processing_Flag self end def act_3 #configurable processing flag shortcuts + def default + '--manifest --text --html --epub --pdf --concordance --qrcode' + end def str if defined? @rc['flag']['act3'] \ and @rc['flag']['act3'].is_a?(String) @@ -530,8 +539,7 @@ module SiSU_Info_Processing_Flag elsif defined? @rc['flag']['iii'] \ and @rc['flag']['iii'].is_a?(String) @rc['flag']['iii'] - else - '--manifest --text --html --epub --pdf --concordance --qrcode' + else default end end def arr @@ -540,6 +548,9 @@ module SiSU_Info_Processing_Flag self end def act_4 #configurable processing flag shortcuts + def default + '--manifest --text --html --epub --pdf --concordance --qrcode --digest --odf --docbook' + end def str if defined? @rc['flag']['act4'] \ and @rc['flag']['act4'].is_a?(String) @@ -547,8 +558,7 @@ module SiSU_Info_Processing_Flag elsif defined? @rc['flag']['iv'] \ and @rc['flag']['iv'].is_a?(String) @rc['flag']['iv'] - else - '--manifest --text --html --epub --pdf --concordance --qrcode --digest --odf --docbook' + else default end end def arr @@ -557,6 +567,9 @@ module SiSU_Info_Processing_Flag self end def act_5 #configurable processing flag shortcuts + def default + '--manifest --text --html --epub --pdf --concordance --qrcode --digest --odf --docbook --sqlite' + end def str if defined? @rc['flag']['act5'] \ and @rc['flag']['act5'].is_a?(String) @@ -564,8 +577,7 @@ module SiSU_Info_Processing_Flag elsif defined? @rc['flag']['v'] \ and @rc['flag']['v'].is_a?(String) @rc['flag']['v'] - else - '--manifest --text --html --epub --pdf --concordance --qrcode --digest --odf --docbook --sqlite' + else default end end def arr @@ -574,12 +586,14 @@ module SiSU_Info_Processing_Flag self end def act_6 #configurable processing flag shortcuts + def default + '--manifest --text --html --epub --pdf --concordance --qrcode --digest --odf --docbook --sqlite --xhtml --xml-sax --xml-dom' + end def str if defined? @rc['flag']['act6'] \ and @rc['flag']['act6'].is_a?(String) @rc['flag']['act6'] - else - '--manifest --text --html --epub --pdf --concordance --qrcode --digest --odf --docbook --sqlite --xhtml --xml-sax --xml-dom' + else default end end def arr @@ -588,12 +602,14 @@ module SiSU_Info_Processing_Flag self end def act_7 #configurable processing flag shortcuts + def default + '--manifest --text --html --epub --pdf --concordance --qrcode --digest --odf --docbook --sqlite --xhtml --xml-sax --xml-dom --source --sisupod' + end def str if defined? @rc['flag']['act7'] \ and @rc['flag']['act7'].is_a?(String) @rc['flag']['act7'] - else - '--manifest --text --html --epub --pdf --concordance --qrcode --digest --odf --docbook --sqlite --xhtml --xml-sax --xml-dom --source --sisupod' + else default end end def arr @@ -602,12 +618,14 @@ module SiSU_Info_Processing_Flag self end def act_8 #configurable processing flag shortcuts + def default + '--manifest --text --html --epub --pdf --concordance --qrcode --digest --odf --docbook --xhtml --xml-sax --xml-dom --pg --update' + end def str if defined? @rc['flag']['act8'] \ and @rc['flag']['act8'].is_a?(String) @rc['flag']['act8'] - else - '--manifest --text --html --epub --pdf --concordance --qrcode --digest --odf --docbook --xhtml --xml-sax --xml-dom --pg --update' + else default end end def arr @@ -616,12 +634,14 @@ module SiSU_Info_Processing_Flag self end def act_9 #configurable processing flag shortcuts + def default + '--manifest --text --html --epub --pdf --concordance --qrcode --digest --odf --docbook --xhtml --xml-sax --xml-dom --pg --update --source --sisupod' + end def str if defined? @rc['flag']['act9'] \ and @rc['flag']['act9'].is_a?(String) @rc['flag']['act9'] - else - '--manifest --text --html --epub --pdf --concordance --qrcode --digest --odf --docbook --xhtml --xml-sax --xml-dom --pg --update --source --sisupod' + else default end end def arr @@ -629,6 +649,14 @@ module SiSU_Info_Processing_Flag end self end + def act_info + puts 'current "act" settings:' + acts=%w[ act_0 act_1 act_2 act_3 act_4 act_5 act_6 act_7 act_8 act_9 ] + acts.each_with_index do |m,i| + puts '--act-' + i.to_s + ' == ' \ + + send(m).str + end + end end end __END__ diff --git a/lib/sisu/v6/hub_options.rb b/lib/sisu/v6/hub_options.rb index 7ed7645f..f8085c6c 100644 --- a/lib/sisu/v6/hub_options.rb +++ b/lib/sisu/v6/hub_options.rb @@ -511,7 +511,7 @@ module SiSU_Commandline shortcut=SiSU_Env::InfoProcessingFlag.new if files ==:true if not sel_init.empty? \ - and sel_init.inspect =~/"--act[0-9]/ + and sel_init.inspect =~/"--act[s0-9]?/ sel_init.each do |s| select_arr <<=case s when /--act0/ then shortcut.act_0.arr @@ -524,6 +524,7 @@ module SiSU_Commandline when /--act7/ then shortcut.act_7.arr when /--act8/ then shortcut.act_8.arr when /--act9/ then shortcut.act_9.arr + when /--act/ then shortcut.act_info end end end @@ -688,6 +689,11 @@ module SiSU_Commandline end end else + if not sel_init.empty? \ + and sel_init.inspect =~/"--acts?/ + shortcut.act_info + exit + end if ch =~/c/ then select_arr << '--color-toggle' ch=ch.gsub(/[c]/,'') end diff --git a/lib/sisu/v6/se_processing.rb b/lib/sisu/v6/se_processing.rb index e437bd0f..2f41bb17 100644 --- a/lib/sisu/v6/se_processing.rb +++ b/lib/sisu/v6/se_processing.rb @@ -472,6 +472,9 @@ module SiSU_Info_Processing_Flag : false end def act_0 #configurable processing flag shortcuts + def default + '--manifest --digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --verbose' + end def str if defined? @rc['flag']['act0'] \ and @rc['flag']['act0'].is_a?(String) @@ -479,8 +482,7 @@ module SiSU_Info_Processing_Flag elsif defined? @rc['flag']['default'] \ and @rc['flag']['default'].is_a?(String) @rc['flag']['default'] - else - '--manifest --digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --verbose' + else default end end def arr @@ -489,6 +491,9 @@ module SiSU_Info_Processing_Flag self end def act_1 #configurable processing flag shortcuts + def default + '--manifest --text --html' + end def str if defined? @rc['flag']['act1'] \ and @rc['flag']['act1'].is_a?(String) @@ -496,8 +501,7 @@ module SiSU_Info_Processing_Flag elsif defined? @rc['flag']['i'] \ and @rc['flag']['i'].is_a?(String) @rc['flag']['i'] - else - '--manifest --text --html' + else default end end def arr @@ -506,6 +510,9 @@ module SiSU_Info_Processing_Flag self end def act_2 #configurable processing flag shortcuts + def default + '--manifest --text --html --epub --pdf' + end def str if defined? @rc['flag']['act2'] \ and @rc['flag']['act2'].is_a?(String) @@ -513,8 +520,7 @@ module SiSU_Info_Processing_Flag elsif defined? @rc['flag']['ii'] \ and @rc['flag']['ii'].is_a?(String) @rc['flag']['ii'] - else - '--manifest --text --html --epub --pdf' + else default end end def arr @@ -523,6 +529,9 @@ module SiSU_Info_Processing_Flag self end def act_3 #configurable processing flag shortcuts + def default + '--manifest --text --html --epub --pdf --concordance --qrcode' + end def str if defined? @rc['flag']['act3'] \ and @rc['flag']['act3'].is_a?(String) @@ -530,8 +539,7 @@ module SiSU_Info_Processing_Flag elsif defined? @rc['flag']['iii'] \ and @rc['flag']['iii'].is_a?(String) @rc['flag']['iii'] - else - '--manifest --text --html --epub --pdf --concordance --qrcode' + else default end end def arr @@ -540,6 +548,9 @@ module SiSU_Info_Processing_Flag self end def act_4 #configurable processing flag shortcuts + def default + '--manifest --text --html --epub --pdf --concordance --qrcode --digest --odf --docbook' + end def str if defined? @rc['flag']['act4'] \ and @rc['flag']['act4'].is_a?(String) @@ -547,8 +558,7 @@ module SiSU_Info_Processing_Flag elsif defined? @rc['flag']['iv'] \ and @rc['flag']['iv'].is_a?(String) @rc['flag']['iv'] - else - '--manifest --text --html --epub --pdf --concordance --qrcode --digest --odf --docbook' + else default end end def arr @@ -557,6 +567,9 @@ module SiSU_Info_Processing_Flag self end def act_5 #configurable processing flag shortcuts + def default + '--manifest --text --html --epub --pdf --concordance --qrcode --digest --odf --docbook --sqlite' + end def str if defined? @rc['flag']['act5'] \ and @rc['flag']['act5'].is_a?(String) @@ -564,8 +577,7 @@ module SiSU_Info_Processing_Flag elsif defined? @rc['flag']['v'] \ and @rc['flag']['v'].is_a?(String) @rc['flag']['v'] - else - '--manifest --text --html --epub --pdf --concordance --qrcode --digest --odf --docbook --sqlite' + else default end end def arr @@ -574,12 +586,14 @@ module SiSU_Info_Processing_Flag self end def act_6 #configurable processing flag shortcuts + def default + '--manifest --text --html --epub --pdf --concordance --qrcode --digest --odf --docbook --sqlite --xhtml --xml-sax --xml-dom' + end def str if defined? @rc['flag']['act6'] \ and @rc['flag']['act6'].is_a?(String) @rc['flag']['act6'] - else - '--manifest --text --html --epub --pdf --concordance --qrcode --digest --odf --docbook --sqlite --xhtml --xml-sax --xml-dom' + else default end end def arr @@ -588,12 +602,14 @@ module SiSU_Info_Processing_Flag self end def act_7 #configurable processing flag shortcuts + def default + '--manifest --text --html --epub --pdf --concordance --qrcode --digest --odf --docbook --sqlite --xhtml --xml-sax --xml-dom --source --sisupod' + end def str if defined? @rc['flag']['act7'] \ and @rc['flag']['act7'].is_a?(String) @rc['flag']['act7'] - else - '--manifest --text --html --epub --pdf --concordance --qrcode --digest --odf --docbook --sqlite --xhtml --xml-sax --xml-dom --source --sisupod' + else default end end def arr @@ -602,12 +618,14 @@ module SiSU_Info_Processing_Flag self end def act_8 #configurable processing flag shortcuts + def default + '--manifest --text --html --epub --pdf --concordance --qrcode --digest --odf --docbook --xhtml --xml-sax --xml-dom --pg --update' + end def str if defined? @rc['flag']['act8'] \ and @rc['flag']['act8'].is_a?(String) @rc['flag']['act8'] - else - '--manifest --text --html --epub --pdf --concordance --qrcode --digest --odf --docbook --xhtml --xml-sax --xml-dom --pg --update' + else default end end def arr @@ -616,12 +634,14 @@ module SiSU_Info_Processing_Flag self end def act_9 #configurable processing flag shortcuts + def default + '--manifest --text --html --epub --pdf --concordance --qrcode --digest --odf --docbook --xhtml --xml-sax --xml-dom --pg --update --source --sisupod' + end def str if defined? @rc['flag']['act9'] \ and @rc['flag']['act9'].is_a?(String) @rc['flag']['act9'] - else - '--manifest --text --html --epub --pdf --concordance --qrcode --digest --odf --docbook --xhtml --xml-sax --xml-dom --pg --update --source --sisupod' + else default end end def arr @@ -629,6 +649,14 @@ module SiSU_Info_Processing_Flag end self end + def act_info + puts 'current "act" settings:' + acts=%w[ act_0 act_1 act_2 act_3 act_4 act_5 act_6 act_7 act_8 act_9 ] + acts.each_with_index do |m,i| + puts '--act-' + i.to_s + ' == ' \ + + send(m).str + end + end end end __END__ -- cgit v1.2.3 From 14b5f96494f79b75e3e77844561678c793d0caa6 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 3 Oct 2014 19:28:27 -0400 Subject: v5 v6: html, tiny first nudge toward html5 (v5 v6 differ) * document headers, other minor --- lib/sisu/v5/cgi_sql_common.rb | 21 ++++++------- lib/sisu/v5/harvest_authors.rb | 10 +++--- lib/sisu/v5/harvest_topics.rb | 10 +++--- lib/sisu/v5/html_concordance.rb | 3 +- lib/sisu/v5/html_format.rb | 29 ++++------------- lib/sisu/v5/html_manifest.rb | 8 ++--- lib/sisu/v5/html_segments.rb | 2 +- lib/sisu/v5/se_css.rb | 6 ++-- lib/sisu/v5/shared_metadata.rb | 14 +++++++++ lib/sisu/v6/cgi_sql_common.rb | 29 +++++++++-------- lib/sisu/v6/defaults.rb | 34 ++++++++++---------- lib/sisu/v6/harvest_authors.rb | 10 +++--- lib/sisu/v6/harvest_topics.rb | 10 +++--- lib/sisu/v6/html.rb | 14 ++++----- lib/sisu/v6/html_concordance.rb | 9 +++--- lib/sisu/v6/html_format.rb | 69 ++++++++++++----------------------------- lib/sisu/v6/html_lite_shared.rb | 4 +-- lib/sisu/v6/html_manifest.rb | 26 ++++++++-------- lib/sisu/v6/html_promo.rb | 16 +++++----- lib/sisu/v6/html_scroll.rb | 2 +- lib/sisu/v6/html_segments.rb | 6 ++-- lib/sisu/v6/html_tune.rb | 8 ++--- lib/sisu/v6/se_css.rb | 6 ++-- lib/sisu/v6/shared_metadata.rb | 14 +++++++++ lib/sisu/v6/xhtml_epub2.rb | 2 +- 25 files changed, 172 insertions(+), 190 deletions(-) (limited to 'lib') diff --git a/lib/sisu/v5/cgi_sql_common.rb b/lib/sisu/v5/cgi_sql_common.rb index 187859ec..a16ca0db 100644 --- a/lib/sisu/v5/cgi_sql_common.rb +++ b/lib/sisu/v5/cgi_sql_common.rb @@ -144,18 +144,17 @@ module SiSU_CGI_SQL end def header_desc <<-WOK_SQL - - + + - - SiSU search form (sample): SiSU information Structuring Universe - - - - - - + + <meta charset="utf-8"> + <meta name="sourcefile" content="SiSU._sst" /> + SiSU search form (sample): SiSU information Structuring Universe + + + + diff --git a/lib/sisu/v5/harvest_authors.rb b/lib/sisu/v5/harvest_authors.rb index 1ea2167a..8db14eee 100644 --- a/lib/sisu/v5/harvest_authors.rb +++ b/lib/sisu/v5/harvest_authors.rb @@ -318,20 +318,20 @@ module SiSU_HarvestAuthors output_structure_by='(output organised by ?)' end < - + + + SiSU Metadata Harvest - Authors - + - + diff --git a/lib/sisu/v5/harvest_topics.rb b/lib/sisu/v5/harvest_topics.rb index bb0bbe22..b2e83683 100644 --- a/lib/sisu/v5/harvest_topics.rb +++ b/lib/sisu/v5/harvest_topics.rb @@ -688,20 +688,20 @@ module SiSU_HarvestTopics output_structure_by='(output organised by ?)' end < - + + + SiSU Metadata Harvest - Topics - + - + diff --git a/lib/sisu/v5/html_concordance.rb b/lib/sisu/v5/html_concordance.rb index 44a6cd69..51acabef 100644 --- a/lib/sisu/v5/html_concordance.rb +++ b/lib/sisu/v5/html_concordance.rb @@ -156,9 +156,10 @@ WOK else '' end < + + SiSU created WordIndex for: #{@md.title.full} diff --git a/lib/sisu/v5/html_format.rb b/lib/sisu/v5/html_format.rb index b8db9445..c34759cf 100644 --- a/lib/sisu/v5/html_format.rb +++ b/lib/sisu/v5/html_format.rb @@ -89,7 +89,7 @@ module SiSU_HTML_Format end end def id #w3c? "tidy" complains about numbers as identifiers ! annoying - (@ocn==nil || @ocn.empty?) ? '' : %{id="o#{@ocn}"} + (@ocn==nil || @ocn.empty?) ? '' : %{id="#{Mx[:ocn_id_char]}#{@ocn}"} end def goto (@ocn==nil || @ocn.empty?) ? '' : %{} @@ -173,9 +173,8 @@ module SiSU_HTML_Format SiSU_XML_Tags::RDF.new(md) end def doc_type - %{ -\n} + %{ +\n} end def table_close %{ @@ -414,6 +413,7 @@ WOK rdf=SiSU_XML_Tags::RDF.new(@md) %{#{doc_type} + #{@md.html_title} @@ -597,11 +597,7 @@ WOK #{@vz.credits_splash} #{@vz.credits_sisu} - - - - @@ -615,11 +611,7 @@ WOK #{@vz.credits_splash} #{@vz.credits_sisu} - - - - } end @@ -630,11 +622,7 @@ WOK #{@vz.credits_splash} #{@vz.credits_sisu} - - - - @@ -775,11 +763,7 @@ WOK #{@vz.credits_splash} #{@vz.credits_sisu} - - - - } end @@ -832,6 +816,7 @@ WOK rdf=SiSU_XML_Tags::RDF.new(@md) %{#{doc_type} + #{@seg_name_html[@seg_name_html_tracker]} - #{@md.html_title} @@ -841,9 +826,7 @@ WOK #{@stylesheet.css_head_seg} </head> #{@vz.color_body} -<a name="top" id="top"></a> -<a name="up" id="up"></a> -<a name="start" id="start"></a>} +<a name="top" id="top"></a>} end def title_banner(title,subtitle,creator) %{ diff --git a/lib/sisu/v5/html_manifest.rb b/lib/sisu/v5/html_manifest.rb index a31420ac..45ee2aae 100644 --- a/lib/sisu/v5/html_manifest.rb +++ b/lib/sisu/v5/html_manifest.rb @@ -888,10 +888,10 @@ WOK vz=SiSU_Viz::Defaults.new format_head_toc=SiSU_HTML_Format::HeadToc.new(@md) @manifest[:html] <<<<WOK -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> +<!DOCTYPE html> +<html> <head> +<meta charset="utf-8"> <title> SiSU manifest: #{@md.title.full} @@ -901,7 +901,7 @@ SiSU manifest: #{@md.title.full} #{@stylesheet.css_head} - + #{format_head_toc.seg_head_navigation_band(:manifest)} WOK if make.build.manifest_minitoc? diff --git a/lib/sisu/v5/html_segments.rb b/lib/sisu/v5/html_segments.rb index 0467a128..555b75bb 100644 --- a/lib/sisu/v5/html_segments.rb +++ b/lib/sisu/v5/html_segments.rb @@ -120,7 +120,7 @@ module SiSU_HTML_Seg << @seg[:idx] \ << '' # << '' elsif @type=='metadata' - metadata=SiSU_Metadata::Summary.new(@md).xhtml_display.metadata + metadata=SiSU_Metadata::Summary.new(@md).html_display.metadata @seg[:headings]=[] format_head_seg=SiSU_HTML_Format::HeadSeg.new(@md) if @title_banner_ diff --git a/lib/sisu/v5/se_css.rb b/lib/sisu/v5/se_css.rb index 378fece8..4d4713e1 100644 --- a/lib/sisu/v5/se_css.rb +++ b/lib/sisu/v5/se_css.rb @@ -169,21 +169,21 @@ module SiSU_CSS @file.path_rel_links.html_scroll_css \ + @env.path.style + '/' \ + @css.html - %{ } + %{ } end def html_seg stylesheet= @file.path_rel_links.html_seg_css \ + @env.path.style + '/' \ + @css.html - %{ } + %{ } end def html_tables stylesheet= @file.path_rel_links.html_seg_css \ + @env.path.style + '/' \ + @css.html - %{ } + %{ } end def xhtml_epub %{ } diff --git a/lib/sisu/v5/shared_metadata.rb b/lib/sisu/v5/shared_metadata.rb index 3a83d674..9f4f4362 100644 --- a/lib/sisu/v5/shared_metadata.rb +++ b/lib/sisu/v5/shared_metadata.rb @@ -829,6 +829,20 @@ WOK end self end + def html_display + def meta_para + inf_xml=char_enc(@inf).amp + inf_xml=char_enc(inf_xml).utf8 + inf_xml=char_enc(inf_xml).br + %{

+ #{@tag}: #{inf_xml} +

} + end + def metadata + SiSU_Metadata::Summary.new(@md,true).metadata_base + end + self + end def xml_sax def meta_para inf_xml=char_enc(@inf).utf8 diff --git a/lib/sisu/v6/cgi_sql_common.rb b/lib/sisu/v6/cgi_sql_common.rb index c6758685..a05f8f53 100644 --- a/lib/sisu/v6/cgi_sql_common.rb +++ b/lib/sisu/v6/cgi_sql_common.rb @@ -144,24 +144,23 @@ module SiSU_CGI_SQL end def header_desc <<-WOK_SQL - - + + - - SiSU search form (sample): SiSU information Structuring Universe - - - - - - + + <meta charset="utf-8"> + <meta name="sourcefile" content="SiSU._sst" /> + SiSU search form (sample): SiSU information Structuring Universe + + + + - +
-
+

SiSU @@ -544,11 +543,11 @@ module SiSU_CGI_SQL def tail <<-'WOK'

- +
-
+

SiSU diff --git a/lib/sisu/v6/defaults.rb b/lib/sisu/v6/defaults.rb index fb56a6d4..185e28e7 100644 --- a/lib/sisu/v6/defaults.rb +++ b/lib/sisu/v6/defaults.rb @@ -268,7 +268,7 @@ module SiSU_Viz end #% path def path_stylesheet_home - %{ } + %{ } end #% text #changed from txt to avoid naming conflicts #FOLLOW def txt_generator @@ -372,7 +372,7 @@ module SiSU_Viz end #% color def color_body - %{} + %{} end def color_white '"#ffffff"' @@ -450,7 +450,7 @@ module SiSU_Viz %{"#{color_white}"} end def color_body - %{} + %{} end def color_font_face #was font WATCH "#{color_black}" @@ -663,38 +663,38 @@ module SiSU_Viz 		' end def margin_txt_w1 - %{ + %{
  } end def margin_txt_w2 - %{ + %{
  } end def margin_txt_0 - %{ + %{
} end def margin_txt_1 - %{ + %{
} end def margin_txt_2 - %{ + %{
} end def margin_txt_3 - %{ + %{
} end def margin_css - ' + '
' end #% png @@ -790,8 +790,8 @@ module SiSU_Viz } end def banner_band #yellow_dark now white - %{ -
+ %{ +
#{png_home} @@ -800,11 +800,11 @@ module SiSU_Viz #{table_close}} end def banner_instrument_cover_band_scr - ' + '
' end def banner_instrument_cover_band_seg - ' + '
' end #% widget @@ -813,7 +813,7 @@ module SiSU_Viz end def widgets_open < + WOK end def widget_sisu_text @@ -941,7 +941,7 @@ WOK end def credits_sisu %{
-
+
#{widget_sisu}
} @@ -993,7 +993,7 @@ WOK - + diff --git a/lib/sisu/v6/harvest_authors.rb b/lib/sisu/v6/harvest_authors.rb index 0f375c00..e48c4f78 100644 --- a/lib/sisu/v6/harvest_authors.rb +++ b/lib/sisu/v6/harvest_authors.rb @@ -318,20 +318,20 @@ module SiSU_HarvestAuthors output_structure_by='(output organised by ?)' end < - + + + SiSU Metadata Harvest - Authors - + - + diff --git a/lib/sisu/v6/harvest_topics.rb b/lib/sisu/v6/harvest_topics.rb index aafc3755..2b80565e 100644 --- a/lib/sisu/v6/harvest_topics.rb +++ b/lib/sisu/v6/harvest_topics.rb @@ -688,20 +688,20 @@ module SiSU_HarvestTopics output_structure_by='(output organised by ?)' end < - + + + SiSU Metadata Harvest - Topics - + - + diff --git a/lib/sisu/v6/html.rb b/lib/sisu/v6/html.rb index 199770e7..014a81c5 100644 --- a/lib/sisu/v6/html.rb +++ b/lib/sisu/v6/html.rb @@ -335,10 +335,10 @@ module SiSU_HTML

-(relatively static) RSS feeds for DOCUMENTS:
-RSS feed http://www.jus.uio.no/lm/rssfeed/documents.xml
-RSS feed http://www.jus.uio.no/lm/rssfeed/tradelaw.xml
-RSS feed http://www.jus.uio.no/lm/rssfeed/environmental.xml
+(relatively static) RSS feeds for DOCUMENTS:
+RSS feed http://www.jus.uio.no/lm/rssfeed/documents.xml
+RSS feed http://www.jus.uio.no/lm/rssfeed/tradelaw.xml
+RSS feed http://www.jus.uio.no/lm/rssfeed/environmental.xml

info@address.com

@@ -383,7 +383,7 @@ WOK toc[:seg_mini]=format_toc.mini_lev0 title=if dob.ocn ==0 then linkname else - @@toc[:scr] << '
' + @@toc[:scr] << '
' %{#{linkname}} end txt_obj={ txt: title } @@ -425,7 +425,7 @@ WOK else linkname end else - @@toc[:scr] << '
' + @@toc[:scr] << '
' %{#{linkname}} end txt_obj={ txt: title } @@ -666,7 +666,7 @@ WOK @segtoc << "#{@vz.table_close*1}\n" tmp_head=nil if @md.prefix_a - tmp_head ||= %{

#{@md.prefix_a}\n} + tmp_head ||= %{

#{@md.prefix_a}\n} toc_shared << tmp_head.dup @segtoc << tmp_head.dup end diff --git a/lib/sisu/v6/html_concordance.rb b/lib/sisu/v6/html_concordance.rb index ce284e3f..54560aa2 100644 --- a/lib/sisu/v6/html_concordance.rb +++ b/lib/sisu/v6/html_concordance.rb @@ -136,7 +136,7 @@ module SiSU_Concordance @fnb=@md.fnb @lex_button=%{SiSU home -->} @doc_details =<

 

#{@md.title.full}

#{@md.author}

+
 

#{@md.title.full}

#{@md.author}

WOK @make=SiSU_Env::ProcessingSettings.new(@md) end @@ -156,9 +156,10 @@ WOK else '' end < + + SiSU created WordIndex for: #{@md.title.full} @@ -175,10 +176,10 @@ WOK #{toc}
#{@doc_details} -

Word index links are to html versions of the text the segmented version followed by the scroll (single document) version.
[For segmented text references [T1], [T2] or [T3] appearing without a link, indicates that the word appears in a title (or subtitle) of the text (that is identifiable by the appended object citation number).]

+

Word index links are to html versions of the text the segmented version followed by the scroll (single document) version.
[For segmented text references [T1], [T2] or [T3] appearing without a link, indicates that the word appears in a title (or subtitle) of the text (that is identifiable by the appended object citation number).]

(The word listing/index is Case sensitive: Capitalized words appear before lower case)

- word (number of occurences)
linked references to word within document
+ word (number of occurences)
linked references to word within document
[if number of occurences exceed number of references - word occurs more than once in at least one reference. Footnote/endnotes are either assigned to the paragraph from which they are referenced or ignored, so it is relevant to check the footnotes referenced from within a paragraph as well.]

diff --git a/lib/sisu/v6/html_format.rb b/lib/sisu/v6/html_format.rb index eb0745da..abefdf2f 100644 --- a/lib/sisu/v6/html_format.rb +++ b/lib/sisu/v6/html_format.rb @@ -74,7 +74,7 @@ module SiSU_HTML_Format else name=(@make.build.html_strict?) ? '' : %{ name="#{@ocn}"} @ocn.gsub(/^(\d+|)$/, - %{}) + %{}) end else '' @@ -89,7 +89,7 @@ module SiSU_HTML_Format end end def id #w3c? "tidy" complains about numbers as identifiers ! annoying - (@ocn==nil || @ocn.empty?) ? '' : %{id="o#{@ocn}"} + (@ocn==nil || @ocn.empty?) ? '' : %{id="#{Mx[:ocn_id_char]}#{@ocn}"} end def goto (@ocn==nil || @ocn.empty?) ? '' : %{} @@ -173,9 +173,8 @@ module SiSU_HTML_Format SiSU_XML_Tags::RDF.new(md) end def doc_type - %{ -\n} + %{ +\n} end def table_close %{ @@ -302,7 +301,7 @@ WOK

  #{@vz.table_close} -

} +

} else '' end end @@ -325,7 +324,7 @@ WOK #{doc_types} #{up_button} #{@vz.table_close} -

} +

} else '' end end @@ -355,7 +354,7 @@ WOK

 #{firstseg}  #{@vz.table_close} -

} +

} else '' end end @@ -411,20 +410,17 @@ WOK

} end def head - rdf=SiSU_XML_Tags::RDF.new(@md) %{#{doc_type} + #{@md.html_title} -#{rdf.metatag_html} #{@stylesheet.css_head} #{@vz.color_body} - - -} +} end def concordance if @md.concord_make @@ -513,7 +509,7 @@ WOK rights=SiSU_HTML_Tune::CleanHTML.new(@md.rights.all).clean_for_html rights=rights.gsub(/^\s*Copyright\s+\(C\)/,'Copyright © ') %{

Rights: #{rights}

-

} +

} end self end @@ -597,11 +593,7 @@ WOK #{@vz.credits_splash} #{@vz.credits_sisu} - - - - @@ -615,11 +607,7 @@ WOK #{@vz.credits_splash} #{@vz.credits_sisu} - - - - } end @@ -630,11 +618,7 @@ WOK #{@vz.credits_splash} #{@vz.credits_sisu} - - - - @@ -775,11 +759,7 @@ WOK #{@vz.credits_splash} #{@vz.credits_sisu} - - - - } end @@ -829,21 +809,18 @@ WOK } #revisit end def head_seg - rdf=SiSU_XML_Tags::RDF.new(@md) %{#{doc_type} + #{@seg_name_html[@seg_name_html_tracker]} - #{@md.html_title} - -#{rdf.metatag_html} + #{@stylesheet.css_head_seg} #{@vz.color_body} - - -} +} end def title_banner(title,subtitle,creator) %{ @@ -937,15 +914,9 @@ WOK and dob.tags.length > 0 # insert tags "hypertargets" dob.tags.each do |t| t=t.gsub(/[^a-z0-9._-]/,'') #use for all html tags? consider limiting to strict? or implementing earlier - if @make.build.html_strict? - tags=(t =~/^[#{Mx[:ocn_id_char]}]?[0-9.]+$/) \ - ? tags #check what can be sorted in ao - : (tags << %{}) - else - tags=(t =~/^[#{Mx[:ocn_id_char]}][0-9.]+$/) \ - ? tags #check what can be sorted in ao - : (tags << %{}) - end + tags=(t =~/^[0-9.]+$/) \ + ? tags #check what can be sorted in ao + : (tags << %{}) end end tags @@ -1038,7 +1009,7 @@ WOK end def heading_normal(tag,attrib) section_break=(tag=~/h[1-5]/) \ - ? '


' + ? '

' : '' %{#{section_break}
@@ -1196,13 +1167,13 @@ WOK
#{@txt} #{@two} -

} +

} end def navigation_toc_lev1 %{#{@banner.nav_toc}} end def navigation_toc_lev2 #change bold use css - %{

+ %{

@@ -1214,7 +1185,7 @@ WOK #{@vz.table_close}} end def navigation_toc_lev3 #change bold use css - %{

+ %{

diff --git a/lib/sisu/v6/html_lite_shared.rb b/lib/sisu/v6/html_lite_shared.rb index 7249ba31..dc54fdb9 100644 --- a/lib/sisu/v6/html_lite_shared.rb +++ b/lib/sisu/v6/html_lite_shared.rb @@ -104,7 +104,7 @@ module SiSU_FormatShared w=%{width="#{w}"} if w h=%{height="#{h}"} if h c=m[/"(.+?)"/m,1] - caption=%{

#{c}

} if c + caption=%{

#{c}

} if c png=m.scan(/\S+/)[0] ins=if u \ and u.strip !~/^image$/ @@ -265,7 +265,7 @@ GSUB parablock=parablock.gsub(//,'') @@tablehead=1 if parablock =~/#{Mx[:gr_o]}Th#{Mx[:tc_p]}/u parablock=parablock.gsub(/#{Mx[:gr_o]}Th?#{Mx[:tc_p]}.+?#{Mx[:tc_p]}~(\d+)#{Mx[:gr_c]}/, - %{
}) + %{
}) if parablock =~/#{Mx[:gr_o]}TZ#{Mx[:gr_c]}/ tablefoot=[] @@tablefoot.each {|x| tablefoot << %{

#{x}

\n}} diff --git a/lib/sisu/v6/html_manifest.rb b/lib/sisu/v6/html_manifest.rb index 036713e9..1ac7f4d4 100644 --- a/lib/sisu/v6/html_manifest.rb +++ b/lib/sisu/v6/html_manifest.rb @@ -158,7 +158,7 @@ module SiSU_Manifest if @o_str.dump_or_redirect? '' elsif src==:src #check - %{
#{@brace_url.xml_open}#{url}/#{file}#{@brace_url.xml_close}} + %{
#{@brace_url.xml_open}#{url}/#{file}#{@brace_url.xml_close}} else %{

#{@brace_url.xml_open}#{url}/#{file}#{@brace_url.xml_close}

} end @@ -265,7 +265,7 @@ module SiSU_Manifest end end def metadata(id,info) - info=info.to_s.gsub(/(?:#{Mx[:br_line]}|\\)+/,'
') + info=info.to_s.gsub(/(?:#{Mx[:br_line]}|\\)+/,'
') @manifest[:html] << %{\n} end def links(url,lnk,target) @@ -888,10 +888,10 @@ WOK vz=SiSU_Viz::Defaults.new format_head_toc=SiSU_HTML_Format::HeadToc.new(@md) @manifest[:html] <<< - + + + SiSU manifest: #{@md.title.full} @@ -901,7 +901,7 @@ SiSU manifest: #{@md.title.full} #{@stylesheet.css_head} - + #{format_head_toc.seg_head_navigation_band(:manifest)} WOK if make.build.manifest_minitoc? @@ -963,26 +963,26 @@ WOK       metadata suggested links (if any)

-

#{id}:

#{info}

+
WOK published_versions @manifest[:html] << '
' @manifest[:html] <<<#{@translate.manifest_description_output} - +
WOK output_tests @manifest[:html] << '

#{@translate.filetype_description}

#{@translate.filename}

#{@translate.file_size}

(kB)

' @manifest[:html] <<< + WOK source_tests @manifest[:html] << '
' @manifest[:html] <<<#{@translate.manifest_description_metadata} - +
WOK metadata_tests @@ -991,7 +991,7 @@ WOK WOK @manifest[:html] <<<#{@translate.suggested_links}:

-

#{@translate.metadata}

#{@translate.description}

+
WOK links_tests @manifest[:html] <<<#{@translate.language_version_list} -
+
WOK @@ -1009,7 +1009,7 @@ WOK

#{@translate.filename}

#{@translate.description}

 

-
+
#{vz.credits_sisu_manifest}
diff --git a/lib/sisu/v6/html_promo.rb b/lib/sisu/v6/html_promo.rb index a6f456ae..750add5c 100644 --- a/lib/sisu/v6/html_promo.rb +++ b/lib/sisu/v6/html_promo.rb @@ -145,7 +145,7 @@ module SiSU_HTML_Promo @prod['form'] ? %{

#{@prod['form']}

} : '' end def nick - @prod['nick'] ? %{(#{@prod['nick']})
} : '' + @prod['nick'] ? %{(#{@prod['nick']})
} : '' end def update @prod['update'] ? %{

Updated: #{@prod['update']}

} : '' @@ -186,7 +186,7 @@ module SiSU_HTML_Promo else nil end form=if action - '
' + @env.widget.search_form('hyperestraier',action,'',table) + '
' + @env.widget.search_form('hyperestraier',action,'',table) else '' end form @@ -208,7 +208,7 @@ module SiSU_HTML_Promo end end def image - @prod['image'] ? %{
} : '' + @prod['image'] ? %{
} : '' end def url_link @url_=if @prod['url'] =~/https?:/ @@ -296,7 +296,7 @@ module SiSU_HTML_Promo def output_form_sponsor(type,id) cell=cell(@ad[:promo][type][id],prod_id) <<-WOK -
+
#{cell.site_link} #{cell.blurb} #{cell.links} @@ -306,7 +306,7 @@ module SiSU_HTML_Promo prod_id=id.gsub(/id_/,'') cell=cell(@ad[:promo][type][id],prod_id) < +
#{cell.site_link} #{cell.author} #{cell.year} @@ -330,7 +330,7 @@ WOK prod_type=((id=~/id_(?:[0-9x]){10,13}/i) ? 'isbn' : 'id') id_detail=%{

#{prod_type}: #{prod_id}

} < +
#{cell.site_link} #{cell.author} #{cell.year} @@ -346,7 +346,7 @@ WOK prod_id=id.gsub(/id_/,'') cell=cell(@ad[:promo][type][id],prod_id) < +
#{cell.site_link} #{cell.editor} #{cell.issn} @@ -363,7 +363,7 @@ WOK cell=cell(@ad[:promo][type][id],prod_id) #translate date (dd month yyyy) from 2007-03-04 and ruby conversion < +
#{cell.site_link} #{cell.date} #{cell.location} diff --git a/lib/sisu/v6/html_scroll.rb b/lib/sisu/v6/html_scroll.rb index 1415c585..f6a1115c 100644 --- a/lib/sisu/v6/html_scroll.rb +++ b/lib/sisu/v6/html_scroll.rb @@ -134,7 +134,7 @@ module SiSU_HTML_Scroll end elsif dob.is==:break \ and dob.from==:markup - '

' + '

' elsif dob.is==:heading_insert x=if dob.ln==0 unless dob.obj.empty? diff --git a/lib/sisu/v6/html_segments.rb b/lib/sisu/v6/html_segments.rb index 47fe9d14..54b0b124 100644 --- a/lib/sisu/v6/html_segments.rb +++ b/lib/sisu/v6/html_segments.rb @@ -120,7 +120,7 @@ module SiSU_HTML_Seg << @seg[:idx] \ << '' # << '' elsif @type=='metadata' - metadata=SiSU_Metadata::Summary.new(@md).xhtml_display.metadata + metadata=SiSU_Metadata::Summary.new(@md).html_display.metadata @seg[:headings]=[] format_head_seg=SiSU_HTML_Format::HeadSeg.new(@md) if @title_banner_ @@ -443,7 +443,7 @@ module SiSU_HTML_Seg @@seg[:tocband_banner] \ << format_head_seg.navigation_band(@@segtocband,@@seg[:dot_nav]) @@seg[:tocband_bannerless] \ - << '
' \ + << '
' \ << format_head_seg.navigation_band_bottom(@@segtocband,@@seg[:dot_nav]) if @title_banner_ @@seg[:headings] \ @@ -570,7 +570,7 @@ module SiSU_HTML_Seg sto.table elsif dob.is==:break \ and dob.from==:markup - '

' + '

' end if @md.flag_separate_endnotes dob.obj=dob.obj.gsub(/"\s+href="#(#{Mx[:note]}\d+)">/,%{" href=\"endnotes#{Sfx[:html]}#\\1">}) #endnote- twice #removed file type diff --git a/lib/sisu/v6/html_tune.rb b/lib/sisu/v6/html_tune.rb index 7ce62bfc..b655b7d1 100644 --- a/lib/sisu/v6/html_tune.rb +++ b/lib/sisu/v6/html_tune.rb @@ -65,7 +65,7 @@ module SiSU_HTML_Tune @@line_mode='' @@endnote_array=[] @@endnote_call_counter=1 - @@table_align=' + @@table_align='
 \; ' @@ -119,7 +119,7 @@ module SiSU_HTML_Tune end str=str.gsub(/#{Mx[:gl_o]}(#[0-9]{3})#{Mx[:gl_c]}/u,'&\1;'). gsub(/#{Mx[:gl_o]}#([a-z]{2,4})#{Mx[:gl_c]}/u,'&\1;'). - gsub(/[\\]{2}/m,'
') + gsub(/[\\]{2}/m,'
') end end class Tune @@ -187,7 +187,7 @@ module SiSU_HTML_Tune w=%{width="#{w}"} if w h=%{height="#{h}"} if h c=m[/"(.+?)"/m,1] - caption=%{

#{c}

} if c + caption=%{

#{c}

} if c png=m.scan(/\S+/)[0] image_path=@md.file.output_path.html_seg.rel_image #image_path=(@md.fns =~/\.-ss[tm]$/) \ @@ -277,7 +277,7 @@ module SiSU_HTML_Tune def markup(dob) dob.obj=dob.obj.gsub(/#{Mx[:mk_o]}#([a-zA-Z]+)#{Mx[:mk_c]}/,'&\1;'). gsub(/#{Mx[:mk_o]}(#[0-9]+)#{Mx[:mk_c]}/,'&\1;') - dob.obj=dob.obj.gsub(/#{Mx[:br_line]}|#{Mx[:br_nl]}/,'
') unless dob.is==:table + dob.obj=dob.obj.gsub(/#{Mx[:br_line]}|#{Mx[:br_nl]}/,'
') unless dob.is==:table dob.obj=dob.obj.gsub(/#{Mx[:fa_bold_o]}(.+?)#{Mx[:fa_bold_c]}/,'\1'). gsub(/#{Mx[:fa_italics_o]}(.+?)#{Mx[:fa_italics_c]}/,'\1'). gsub(/#{Mx[:fa_underscore_o]}(.+?)#{Mx[:fa_underscore_c]}/,'\1'). diff --git a/lib/sisu/v6/se_css.rb b/lib/sisu/v6/se_css.rb index fed9c571..a83d13ca 100644 --- a/lib/sisu/v6/se_css.rb +++ b/lib/sisu/v6/se_css.rb @@ -169,21 +169,21 @@ module SiSU_CSS @file.path_rel_links.html_scroll_css \ + @env.path.style + '/' \ + @css.html - %{ } + %{ } end def html_seg stylesheet= @file.path_rel_links.html_seg_css \ + @env.path.style + '/' \ + @css.html - %{ } + %{ } end def html_tables stylesheet= @file.path_rel_links.html_seg_css \ + @env.path.style + '/' \ + @css.html - %{ } + %{ } end def xhtml_epub %{ } diff --git a/lib/sisu/v6/shared_metadata.rb b/lib/sisu/v6/shared_metadata.rb index 182acde1..998c48df 100644 --- a/lib/sisu/v6/shared_metadata.rb +++ b/lib/sisu/v6/shared_metadata.rb @@ -829,6 +829,20 @@ WOK end self end + def html_display + def meta_para + inf_xml=char_enc(@inf).amp + inf_xml=char_enc(inf_xml).utf8 + inf_xml=char_enc(inf_xml).br + %{

+ #{@tag}: #{inf_xml} +

} + end + def metadata + SiSU_Metadata::Summary.new(@md,true).metadata_base + end + self + end def xml_sax def meta_para inf_xml=char_enc(@inf).utf8 diff --git a/lib/sisu/v6/xhtml_epub2.rb b/lib/sisu/v6/xhtml_epub2.rb index 245050a1..af796cbe 100644 --- a/lib/sisu/v6/xhtml_epub2.rb +++ b/lib/sisu/v6/xhtml_epub2.rb @@ -850,7 +850,7 @@ module SiSU_XHTML_EPUB2 - +
-- cgit v1.2.3