From 5e1bcfbb6cdde447298d10115d1d2f9de0bb99a2 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 1 Oct 2012 15:45:00 -0400 Subject: v3: cosmetic code, remove javascript holders js_ (not used) --- data/doc/sisu/CHANGELOG_v3 | 1 + lib/sisu/v3/concordance.rb | 4 +- lib/sisu/v3/defaults.rb | 105 +++++++--------------------------------- lib/sisu/v3/epub_concordance.rb | 2 +- lib/sisu/v3/epub_format.rb | 13 +++-- lib/sisu/v3/html_format.rb | 52 ++++++++++---------- lib/sisu/v3/xml_format.rb | 25 +++++----- 7 files changed, 63 insertions(+), 139 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index b2c5b02b..751247a1 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -36,6 +36,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.3.orig.tar.xz * if, else, remove some semicolons (;) replace with newlines * if true ; x, remove semicolons replace with "then" * .is_a?(X) replaces .class==X (& for some defined? and nil? tests) + * remove javascript holders js_ (not used) * v3: sisu -v, provide version information, fix diff --git a/lib/sisu/v3/concordance.rb b/lib/sisu/v3/concordance.rb index 2a3b585a..a7581112 100644 --- a/lib/sisu/v3/concordance.rb +++ b/lib/sisu/v3/concordance.rb @@ -118,7 +118,7 @@ module SiSU_Concordance @fnb=@md.fnb @lex_button=%{SiSU home -->} @doc_details =< 

#{@md.title.full}

#{@md.author}

+
 

#{@md.title.full}

#{@md.author}

WOK end def create @@ -151,10 +151,8 @@ WOK #{stylesheet.css_head_seg} - #{@vz.js_head} - #{@vz.js_top} #{top_band} #{toc}
diff --git a/lib/sisu/v3/defaults.rb b/lib/sisu/v3/defaults.rb index 47e3c970..6a082813 100644 --- a/lib/sisu/v3/defaults.rb +++ b/lib/sisu/v3/defaults.rb @@ -80,75 +80,6 @@ module SiSU_Viz #% php def php_persist end - #% javascript #kxjs knxjs - def js_home - end - def js_infobox - end - def js_knxjs - end - def js_head - end - def js_top - end - def js_sisu - end - def js_home - end - def js_sponsor - end - def js_books - end - def js_journals - end - def js_conferences - end - def js_services - end - def js_catalogue - end - def js_doc - end - def js_toc - end - def js_seg - end - def js_mail - end - def js_manifest - end - def js_status - end - def js_next - end - def js_prev - end - def js_plaintext - end - def js_portrait - end - def js_landscape - end - def js_pdf - end - def js_epub - end - def js_odf - end - def js_concordance - end - def js_instruments - end - def js_external - end - def js_gopher - end - def js_ftp - end - def js_law - end - def js_disclaimer - end def semantic_tags def default { @@ -1187,7 +1118,7 @@ module SiSU_Viz #% banner def banner_home %{
- + #{png_site}
@@ -1202,23 +1133,23 @@ module SiSU_Viz end def banner_home_guide %{
- + #{png_doc} LM toc - + #{png_doc} LM 20**
} end def banner_home_button_only - %{ + %{ #{png_home_button} } end def banner_home_button #yellow_dark now white %{ @@ -1230,7 +1161,7 @@ module SiSU_Viz
- + #{png_home_button}
@@ -1240,7 +1171,7 @@ module SiSU_Viz
- + #{png_home}
@@ -222,7 +222,7 @@ module SiSU_HTML_Format end def seg(text) %{ @@ -244,7 +244,7 @@ module SiSU_HTML_Format else @file.base_filename.manifest end %{} @@ -256,12 +256,12 @@ module SiSU_HTML_Format and @cf_defaults.cf_0 =~/p/ %{ @@ -331,13 +331,13 @@ WOK def manifest_link(text) # @file=SiSU_Env::FileOp.new(@md) if @md %{ - #{text} + #{text} } end def concordance_link(text) if @md.concord_make %{ - + #{text} } @@ -394,14 +394,13 @@ WOK #{@vz.color_body} - -#{@vz.js_top}} +} end def concordance if @md.concord_make %{#{@vz.margin_css}

- + Concordance

@@ -418,7 +417,7 @@ WOK
- +  This text's sub- 
 Table of Contents  @@ -1254,12 +1185,12 @@ module SiSU_Viz #{table_close}} end def banner_url_txt_sisu - %{SiSU} + %{SiSU} end def banner_band #yellow_dark now white %{ @@ -1541,7 +1472,7 @@ WOK < Output generated by - + #{@v[:project]} #{@v[:version]} #{@v[:date]} (#{@v[:date_stamp]}) @@ -1562,7 +1493,7 @@ WOK
- + #{png_home}

- + SiSU

@@ -1570,33 +1501,33 @@ WOK

Output generated by - + #{@v[:project]} #{@v[:version]} #{@v[:date]} (#{@v[:date_stamp]})
- + #{@v[:project]} Copyright © Ralph Amissah 1997, current #{@date.year_static}. All Rights Reserved.
- + #{@v[:project]} is software for document structuring, publishing and search,
- + www.sisudoc.org/ and - + www.sisudoc.org
w3 since October 3 1993 - + ralph@amissah.com

@@ -1624,7 +1555,7 @@ WOK

- + #{@v[:project]} is released under diff --git a/lib/sisu/v3/epub_concordance.rb b/lib/sisu/v3/epub_concordance.rb index 224578b6..b8db317d 100644 --- a/lib/sisu/v3/epub_concordance.rb +++ b/lib/sisu/v3/epub_concordance.rb @@ -105,7 +105,7 @@ module SiSU_EPUB_Concordance @fnb=@md.fnb @lex_button=%{SiSU home -->} @doc_details =<

 

#{@md.title.full}

#{@md.creator.author}

+
 

#{@md.title.full}

#{@md.creator.author}

WOK end def create diff --git a/lib/sisu/v3/epub_format.rb b/lib/sisu/v3/epub_format.rb index cc98219c..ab6f34c7 100644 --- a/lib/sisu/v3/epub_format.rb +++ b/lib/sisu/v3/epub_format.rb @@ -1673,7 +1673,7 @@ WOK end def copyat %{

copy @ - + #{@vz.txt_home}

} end @@ -1706,11 +1706,11 @@ WOK : %{

#{firstseg}

} end def manifest_link(text) - %{ #{text}} + %{ #{text}} end def concordance_link(text) if @md.concord_make - %{ + %{ #{text} } else '' @@ -1722,14 +1722,13 @@ WOK #{@css.xhtml_epub} -#{@vz.color_body} -#{@vz.js_top}} +#{@vz.color_body}} end def concordance if @md.concord_make %{#{@vz.margin_css}

- + Concordance

@@ -1787,7 +1786,7 @@ WOK def metadata %{#{@vz.margin_css}

- + MetaData

diff --git a/lib/sisu/v3/html_format.rb b/lib/sisu/v3/html_format.rb index e16cbc5d..433652e0 100644 --- a/lib/sisu/v3/html_format.rb +++ b/lib/sisu/v3/html_format.rb @@ -184,7 +184,7 @@ module SiSU_HTML_Format end def copyat %{#{@vz.paragraph_font_tiny}copy @ - + #{@vz.txt_home} } end @@ -213,7 +213,7 @@ module SiSU_HTML_Format def scroll(text) if @md.fns =~ /\.(?:-|ssm\.)?sst$/ scroll=%{		 - + #{text} - + #{text} - + #{@vz.nav_txt_manifest} - + #{@vz.nav_txt_pdf_portrait} - + #{@vz.nav_txt_pdf_landscape}
- + #{png_nav.dot_pre} - + #{png_nav.dot_toc} - + #{png_nav.dot_nxt} #{@vz.table_close}} @@ -655,17 +654,17 @@ WOK nxt="#{@md.file.base_filename.html_segtoc}" %{} pre=%{} if f_pre==true nxt=%{} if f_nxt==true @@ -714,7 +713,7 @@ WOK end def manifest_link(text) %{ - + #{text} } @@ -722,7 +721,7 @@ WOK def concordance_link(text) if @md.concord_make %{ - + #{text} } @@ -856,8 +855,7 @@ WOK #{@vz.color_body} - -#{@vz.js_top}} +} end def title_banner(title,subtitle,creator) %{ diff --git a/lib/sisu/v3/xml_format.rb b/lib/sisu/v3/xml_format.rb index 54d889cd..1c6aa67d 100644 --- a/lib/sisu/v3/xml_format.rb +++ b/lib/sisu/v3/xml_format.rb @@ -389,7 +389,7 @@ WOK end def copyat %{#{@vz.paragraph_font_tiny}copy @ - + #{@vz.txt_home} } end @@ -541,8 +541,7 @@ WOK #{@vz.color_body} - -#{@vz.js_top}} +} end def links_guide_open(type='horizontal') if type=='vertical'; links_guide_vertical_open @@ -629,7 +628,7 @@ WOK def metadata %{#{@vz.margin_css}

- + MetaData

@@ -719,25 +718,24 @@ WOK #{@vz.color_body} - -#{@vz.js_top}} +} end def title_banner(title,subtitle,creator) end def dot_control_pre_next %{
- + #{png_nav.dot_pre} - + #{png_nav.dot_toc} - + #{png_nav.dot_nxt} #{@vz.table_close}} @@ -673,17 +672,17 @@ WOK def toc_nav(f_pre=false,f_nxt=false,use=1) pre=nxt='' toc=%{ - + #{png_nav.toc} - + #{png_nav.pre} - + #{png_nav.nxt}
} pre=%{} if f_pre==true nxt=%{} if f_nxt==true @@ -935,8 +933,7 @@ WOK #{@vz.color_body} - -#{@vz.js_top}} +} end def title_banner(title,subtitle,creator) %{ -- cgit v1.2.3
- + #{@vz.png_nav_dot_pre} - + #{@vz.png_nav_dot_toc} - + #{@vz.png_nav_dot_nxt} #{@vz.table_close}} @@ -745,17 +743,17 @@ WOK def toc_nav(f_pre=false,f_nxt=false,use=1) pre=nxt='' toc=%{ - + #{@vz.png_nav_toc} - + #{@vz.png_nav_pre} - + #{@vz.png_nav_nxt}