From f0f647e331cf162d86bfe064e8710f3e29b8408e Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 3 Dec 2010 23:47:08 -0500 Subject: html, link to "document manifest" remains (individual output links removed) --- CHANGELOG_v2 | 5 +- data/doc/sisu/v2/CHANGELOG | 5 +- data/sisu/v2/v/version.yml | 4 +- lib/sisu/v2/defaults.rb | 2 +- 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 %{ - #{png_manifest}  + [ document manifest ] } 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 - %{ - - #{@vz.nav_txt_homepage} - -} + '' end def scroll(text) - if @md.fns =~ /\.(?:-|ssm\.)?sst$/ - scroll=%{ - - #{text} - - -} - end + '' end def seg(text) - %{ - - #{text} - - -} + '' end def search env=SiSU_Env::Info_env.new(@md.fns,@md) @@ -181,66 +165,19 @@ module SiSU_HTML_Format } end def pdf - pdf=if @md.programs[:pdf] \ - and @cf_defaults.cf_0 =~/p/ - %{ - - - #{@vz.nav_txt_pdf_portrait} - - - - - #{@vz.nav_txt_pdf_landscape} - - -} - 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/ - %{ - - - #{@vz.nav_txt_epub} - -} - else '' - end + '' end def odf - odf=if @cf_defaults.cf_0 =~/o/ - %{ - - - #{@vz.nav_txt_odf} - -} - 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 - %{ - - #{text} - - } - else '' - end + '' end end class XML @@ -307,23 +244,7 @@ WOK

} end def seg_head_navigation_band_bottom(type='') - if type=~/pdf/ - @tocband_segtoc=make_scroll_seg_pdf - end - firstseg=%{ - #{@vz.png_nav_nxt} - } if @md.firstseg =~/\S+/ - %{ - - -
-   - - #{@tocband_segtoc} - -  #{firstseg}  -#{@vz.table_close} -

} + '' end def manifest_link(text) %{ @@ -331,14 +252,7 @@ WOK } end def concordance_link(text) - if @md.concord_make - %{ - - #{text} - - } - else '' - end + '' end def make_seg_scroll_pdf wgt=Widget.new(@md) @@ -348,12 +262,8 @@ WOK } %{ - #{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}
} end def make_scroll_seg_pdf @@ -365,13 +275,9 @@ WOK } %{ - #{seg} - #{wgt.scroll(@vz.nav_txt_doc_link)}#{wgt.txt}#{wgt.epub}#{wgt.pdf}#{wgt.odf}
- #{wgt.concordance(@vz.nav_txt_concordance)} #{wgt.manifest} #{wgt.search} - #{wgt.home}
} end def make_concordance @@ -379,12 +285,9 @@ WOK wgt=Widget.new(@md) %{ - #{wgt.seg(@vz.nav_txt_toc_link)}#{wgt.scroll(@vz.nav_txt_doc_link)}#{wgt.pdf}#{wgt.odf}
- #{wgt.concordance(@vz.nav_txt_concordance)} #{wgt.manifest} #{wgt.search} - #{wgt.home}
} end def head -- cgit v1.2.3