diff options
| -rw-r--r-- | CHANGELOG_v2 | 5 | ||||
| -rw-r--r-- | data/doc/sisu/v2/CHANGELOG | 5 | ||||
| -rw-r--r-- | data/sisu/v2/v/version.yml | 4 | ||||
| -rw-r--r-- | lib/sisu/v2/defaults.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/v2/html_format.rb | 117 |
5 files changed, 21 insertions, 112 deletions
diff --git a/CHANGELOG_v2 b/CHANGELOG_v2 index 6beafd0c..ad6734a7 100644 --- a/CHANGELOG_v2 +++ b/CHANGELOG_v2 @@ -12,7 +12,7 @@ Reverse Chronological: %% Development branch UNSTABLE -%% 2.7.9.orig.tar.gz (2010-11-29:48/1) +%% 2.7.9.orig.tar.gz (2010-12-03:48/5) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz sisu_2.7.9.orig.tar.gz sisu_2.7.9-1.dsc @@ -38,6 +38,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz * epub, ocn (object numbers) now link to themselves, clicking on one places that object at the top of the viewer + * html, link to "document manifest" remains (links to other individual + outputs removed) + %% 2.7.8.orig.tar.gz (2010-10-25:43/1) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz af9dac02064ea03c61d6eecd0882a9f1be6f83d37fdddcf8e45832b9def52140 2750397 sisu_2.7.8.orig.tar.gz diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG index 984fe865..87c6cfb8 100644 --- a/data/doc/sisu/v2/CHANGELOG +++ b/data/doc/sisu/v2/CHANGELOG @@ -12,7 +12,7 @@ Reverse Chronological: %% Development branch UNSTABLE -%% 2.7.9.orig.tar.gz (2010-11-29:48/1) +%% 2.7.9.orig.tar.gz (2010-12-03:48/5) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz sisu_2.7.9.orig.tar.gz sisu_2.7.9-1.dsc @@ -38,6 +38,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz * epub, ocn (object numbers) now link to themselves, clicking on one places that object at the top of the viewer + * html, link to "document manifest" remains (links to other individual + outputs removed) + %% 2.7.8.orig.tar.gz (2010-10-25:43/1) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz af9dac02064ea03c61d6eecd0882a9f1be6f83d37fdddcf8e45832b9def52140 2750397 sisu_2.7.8.orig.tar.gz diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml index 601713a3..339fa8ec 100644 --- a/data/sisu/v2/v/version.yml +++ b/data/sisu/v2/v/version.yml @@ -1,5 +1,5 @@ --- :version: 2.7.9 -:date_stamp: 2010w48/1 -:date: "2010-11-29" +:date_stamp: 2010w48/5 +:date: "2010-12-03" :project: SiSU diff --git a/lib/sisu/v2/defaults.rb b/lib/sisu/v2/defaults.rb index 362b67e5..a5305e4d 100644 --- a/lib/sisu/v2/defaults.rb +++ b/lib/sisu/v2/defaults.rb @@ -1134,7 +1134,7 @@ module SiSU_Viz end def nav_txt_manifest %{ <font face="#{font_fonts}" size="2"> - #{png_manifest} + [ document manifest ] </font> } end def nav_txt_concordance diff --git a/lib/sisu/v2/html_format.rb b/lib/sisu/v2/html_format.rb index 89ee812f..66f9bc05 100644 --- a/lib/sisu/v2/html_format.rb +++ b/lib/sisu/v2/html_format.rb @@ -145,29 +145,13 @@ module SiSU_HTML_Format @cf_defaults=SiSU_Env::Info_processing_flag.new end def home - %{<td align="center" bgcolor=#{@vz.color_band2}> - <a href="../index.html" target="_top"> - #{@vz.nav_txt_homepage}</a> -</td> -} + '' end def scroll(text) - if @md.fns =~ /\.(?:-|ssm\.)?sst$/ - scroll=%{<td align="center" bgcolor=#{@vz.color_band2}> - <a href="#{@md.fn[:doc]}" target="_top" #{@vz.js_doc}> - #{text} - </a> -</td> -} - end + '' end def seg(text) - %{<td align="center" bgcolor="#99CC66"> - <a href="#{@md.fn[:toc]}" target="_top" #{@vz.js_doc}> - #{text} - </a> -</td> -} + '' end def search env=SiSU_Env::Info_env.new(@md.fns,@md) @@ -181,66 +165,19 @@ module SiSU_HTML_Format </td>} end def pdf - pdf=if @md.programs[:pdf] \ - and @cf_defaults.cf_0 =~/p/ - %{ -<td align="center" bgcolor=#{@vz.color_band2}> - <a href="#{@md.fn[:pdf_p]}" target="_top" #{@vz.js_portrait}> - #{@vz.nav_txt_pdf_portrait} - </a> -</td> -<td align="center" bgcolor=#{@vz.color_band2}> - <a href="#{@md.fn[:pdf_l]}" target="_top" #{@vz.js_landscape}> - #{@vz.nav_txt_pdf_landscape} - </a> -</td> -} - 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/ - %{ -<td align="center" bgcolor=#{@vz.color_band2}> - <a href="../epub/#{@md.fn[:epub]}" target="_top" #{@vz.js_epub}> - #{@vz.nav_txt_epub} - </a> -</td>} - else '' - end + '' end def odf - odf=if @cf_defaults.cf_0 =~/o/ - %{ -<td align="center" bgcolor=#{@vz.color_band2}> - <a href="#{@md.fn[:odf]}" target="_top" #{@vz.js_odf}> - #{@vz.nav_txt_odf} - </a> -</td>} - else '' - end + '' end def concordance(text) - if @md.concord_make \ - and @md.wc_words < 300000 #max word count for display of concordance here as would now be a large file - %{<td align="center" bgcolor=#{@vz.color_band2}> - <a href="#{@md.fn[:concordance]}" target="_top" #{@vz.js_concordance}> - #{text} - </a> - </td>} - else '' - end + '' end end class XML @@ -307,23 +244,7 @@ WOK <p />} end def seg_head_navigation_band_bottom(type='') - if type=~/pdf/ - @tocband_segtoc=make_scroll_seg_pdf - end - firstseg=%{<a href="#{@md.fnl[:pre]}#{@md.firstseg}#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}" target="_top" alt="->"> - #{@vz.png_nav_nxt} - </a>} if @md.firstseg =~/\S+/ - %{<table summary="table of contents segment navigation band" id="toc" width="100%" bgcolor=#{@vz.color_band1}> -<tr><td width="20%"> - -</td> -<td width="75%" align="center"> - #{@tocband_segtoc} -</td> -<td width="5%" align="right"> - #{firstseg} -#{@vz.table_close} -<p />} + '' end def manifest_link(text) %{<font size=2> @@ -331,14 +252,7 @@ WOK </font>} end def concordance_link(text) - if @md.concord_make - %{<font size=2> - <a href="#{@md.fn[:concordance]}" target="_top" #{@vz.js_concordance}> - #{text} - </a> - </font>} - else '' - end + '' end def make_seg_scroll_pdf wgt=Widget.new(@md) @@ -348,12 +262,8 @@ 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.txt}#{wgt.epub}#{wgt.pdf}#{wgt.odf} - #{wgt.concordance(@vz.nav_txt_concordance)} #{wgt.manifest} #{wgt.search} - #{wgt.home} </tr></table>} end def make_scroll_seg_pdf @@ -365,13 +275,9 @@ 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.txt}#{wgt.epub}#{wgt.pdf}#{wgt.odf} <td align="center" bgcolor=#{@vz.color_band2}> - #{wgt.concordance(@vz.nav_txt_concordance)} #{wgt.manifest} #{wgt.search} - #{wgt.home} </tr></table>} end def make_concordance @@ -379,12 +285,9 @@ WOK wgt=Widget.new(@md) %{<table summary="toc scroll and segment with pdf" border="0" cellpadding="3" cellspacing="0"> <tr> - #{wgt.seg(@vz.nav_txt_toc_link)}#{wgt.scroll(@vz.nav_txt_doc_link)}#{wgt.pdf}#{wgt.odf} <td align="center" bgcolor=#{@vz.color_band2}> - #{wgt.concordance(@vz.nav_txt_concordance)} #{wgt.manifest} #{wgt.search} - #{wgt.home} </tr></table>} end def head |