aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2014-10-12 10:34:20 -0400
committerRalph Amissah <ralph@amissah.com>2014-10-12 10:34:20 -0400
commit46485232482fdcb385f8dda5f01cad57f7add189 (patch)
tree47a8c7b064b1bde461587e0722bacd953012e7c1
parentv5: html, reduce difference with v6 (removal of some trailing slashes <p> <br>) (diff)
v5: html, reduce difference with v6 (mostly removal of bgcolor)
* note: html_format.rb has differences, else same
Diffstat
-rw-r--r--data/doc/sisu/CHANGELOG_v51
-rw-r--r--lib/sisu/v5/cgi_sql_common.rb8
-rw-r--r--lib/sisu/v5/defaults.rb34
-rw-r--r--lib/sisu/v5/html_concordance.rb2
-rw-r--r--lib/sisu/v5/html_lite_shared.rb2
-rw-r--r--lib/sisu/v5/html_manifest.rb12
-rw-r--r--lib/sisu/v5/html_tune.rb2
-rw-r--r--lib/sisu/v5/xhtml_epub2.rb2
8 files changed, 32 insertions, 31 deletions
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 52d6c7ea..d978b5b6 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -40,6 +40,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.7.0.orig.tar.xz
* html, reduce difference with v6
* removal of some trailing slashes <p> <br>
+ * mostly removal of bgcolor
* moved files: harvest* to html_harvest*
diff --git a/lib/sisu/v5/cgi_sql_common.rb b/lib/sisu/v5/cgi_sql_common.rb
index a16ca0db..d6f99342 100644
--- a/lib/sisu/v5/cgi_sql_common.rb
+++ b/lib/sisu/v5/cgi_sql_common.rb
@@ -156,11 +156,11 @@ module SiSU_CGI_SQL
<link rel="shortcut icon" href="#{@image_src}/rb7.ico" />
<link href="../_sisu/css/html.css" rel="stylesheet">
</head>
- <body bgcolor="#ffffff" text="#000000" link="#003090" lang="en" xml:lang="en">
+ <body lang="en" xml:lang="en">
<table summary="band" border="0" cellpadding="3" cellspacing="0">
<tr><td width="20%">
<table summary="home button / home information" border="0" cellpadding="3" cellspacing="0">
- <tr><td align="left" bgcolor="#ffffff">
+ <tr><td align="left">
<br /><a href="http://sisudoc.org/" target="_top">
<b>SiSU</b>
</a>
@@ -543,11 +543,11 @@ module SiSU_CGI_SQL
def tail
<<-'WOK'
<br /><hr /><br />
-<table summary="SiSU summary" bgcolor="#ffffff" cellpadding="2" border="0">
+<table summary="SiSU summary" cellpadding="2" border="0">
<!-- widget sisu -->
<tr><td valign="top" width="10%">
<table summary="home button / home information" border="0" cellpadding="3" cellspacing="0">
- <tr><td align="left" bgcolor="#ffffff">
+ <tr><td align="left">
<br /><a href="http://sisudoc.org/" target="_top">
<b>SiSU</b>
</a>
diff --git a/lib/sisu/v5/defaults.rb b/lib/sisu/v5/defaults.rb
index 0ea154b2..da8b13a2 100644
--- a/lib/sisu/v5/defaults.rb
+++ b/lib/sisu/v5/defaults.rb
@@ -268,7 +268,7 @@ module SiSU_Viz
end
#% path
def path_stylesheet_home
- %{ <link rel="stylesheet" href="./#{@dir.path.style}/homepage.css" type="text/css" />}
+ %{ <link href="./#{@dir.path.style}/homepage.css" rel="stylesheet">}
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
- %{<body bgcolor="#ffffff" text="#000000" link="#003090" lang="en" xml:lang="en">}
+ %{<body lang="en" xml:lang="en">}
end
def color_white
'"#ffffff"'
@@ -450,7 +450,7 @@ module SiSU_Viz
%{"#{color_white}"}
end
def color_body
- %{<body bgcolor="#ffffff" text="#000000" link="#003090" lang="en" xml:lang="en">}
+ %{<body lang="en" xml:lang="en">}
end
def color_font_face #was font WATCH
"#{color_black}"
@@ -663,38 +663,38 @@ module SiSU_Viz
<td width="2%" align="right" valign="top"> '
end
def margin_txt_w1
- %{<table summary="" width=#{table_width_txt_r} border="0" bgcolor="white" cellpadding="2" align="center">
+ %{<table summary="" width=#{table_width_txt_r} border="0" cellpadding="2" align="center">
<tr><td width="6%" align="right">&nbsp;</td>
<td width="90%" valign="top" align="justify">}
end
def margin_txt_w2
- %{<table summary="" width=#{table_width_txt_r} border="0" bgcolor="white" cellpadding="2" align="center">
+ %{<table summary="" width=#{table_width_txt_r} border="0" cellpadding="2" align="center">
<tr><td width="10%" align="right">&nbsp;</td>
<td width="86%" valign="top" align="justify">}
end
def margin_txt_0
- %{<table summary="" width=#{table_width_txt} border="0" bgcolor="white" cellpadding="2" align="center">
+ %{<table summary="" width=#{table_width_txt} border="0" cellpadding="2" align="center">
<tr><td width=#{indent_level_0} align="right">
</td><td valign="top" align="justify">}
end
def margin_txt_1
- %{<table summary="" width=#{table_width_txt} border="0" bgcolor="white" cellpadding="2" align="center">
+ %{<table summary="" width=#{table_width_txt} border="0" cellpadding="2" align="center">
<tr><td width=#{indent_level_1} align="right"></td><td valign="top" align="justify">}
end
def margin_txt_2
- %{<table summary="" width=#{table_width_txt} border="0" bgcolor="white" cellpadding="2" align="center">
+ %{<table summary="" width=#{table_width_txt} border="0" cellpadding="2" align="center">
<tr><td width=#{indent_level_2} align="right">
</td>
<td valign="top" align="justify">}
end
def margin_txt_3
- %{<table summary="" width=#{table_width_txt} border="0" bgcolor="white" cellpadding="2" align="center">
+ %{<table summary="" width=#{table_width_txt} border="0" cellpadding="2" align="center">
<tr><td width=#{indent_level_3} align="right">
</td>
<td valign="top" align="justify">}
end
def margin_css
- '<table summary="normal text css" width="100%" border="0" bgcolor="white" cellpadding="2" align="center">
+ '<table summary="normal text css" width="100%" border="0" cellpadding="2" align="center">
<tr><td valign="top" align="justify"> '
end
#% png
@@ -790,8 +790,8 @@ module SiSU_Viz
</a>}
end
def banner_band #yellow_dark now white
- %{<table summary="home button" width="100%" border="0" cellpadding="3" bgcolor= "#ffffff" align="center">
-<tr><td align="left" valign="middle" bgcolor="#{color_white}">
+ %{<table summary="home button" width="100%" border="0" cellpadding="3" align="center">
+<tr><td align="left" valign="middle">
<a href="#{url_site}/" target="_top">
#{png_home}
</a>
@@ -800,11 +800,11 @@ module SiSU_Viz
#{table_close}}
end
def banner_instrument_cover_band_scr
- '<table summary="scroll instrument cover band" width="100%" border="0" cellpadding="8" bgcolor="#ffffff" align="center">
+ '<table summary="scroll instrument cover band" width="100%" border="0" cellpadding="8" align="center">
<tr><td align="center">'
end
def banner_instrument_cover_band_seg
- '<table summary="segment instrument cover band, title, author, location" width="100%" border="0" cellpadding="8" bgcolor="#ffffff" align="center">
+ '<table summary="segment instrument cover band, title, author, location" width="100%" border="0" cellpadding="8" align="center">
<tr><td align="center">'
end
#% widget
@@ -813,7 +813,7 @@ module SiSU_Viz
end
def widgets_open
<<WOK
-<table summary="SiSU summary" bgcolor="#ffffff" cellpadding="4" border="0">
+<table summary="SiSU summary" cellpadding="4" border="0">
WOK
end
def widget_sisu_text
@@ -941,7 +941,7 @@ WOK
end
def credits_sisu
%{<div class="substance">
-<table summary="SiSU summary" bgcolor="#ffffff" cellpadding="4" border="0">
+<table summary="SiSU summary" cellpadding="4" border="0">
<tr><td>
#{widget_sisu}
</table></div>}
@@ -993,7 +993,7 @@ WOK
<link rel="shortcut icon" href="./_sisu/image/rb7.ico" />
</head>
-<body bgcolor="#ffffff" text="#000000" link="#003090" lang="en" xml:lang="en">
+<body lang="en" xml:lang="en">
<a name="top" id="top"></a>
<a name="up" id="up"></a>
<a name="start" id="start"></a>
diff --git a/lib/sisu/v5/html_concordance.rb b/lib/sisu/v5/html_concordance.rb
index 32a2ea35..6053bd61 100644
--- a/lib/sisu/v5/html_concordance.rb
+++ b/lib/sisu/v5/html_concordance.rb
@@ -136,7 +136,7 @@ module SiSU_Concordance
@fnb=@md.fnb
@lex_button=%{<a href="http://www.jus.uio.no/sisu/" target="_top"><img border="0" height="44" width="144" valign="center" src="#{@file.path_rel_links.html_seg_2}_sisu/image/sisu.png" alt="SiSU home --&gt;"></a>}
@doc_details =<<WOK
-<table summary="links to text related to this rudimentary index" width="96%" border="0" bgcolor="white" cellpadding="0" align="center"><tr><td width="2%" align="right">&nbsp;</td><td width="94%" valign="top" align="justify"><h1 class="small"><a href="#{@md.file.base_filename.html_segtoc}"><b>#{@md.title.full}</b></a></h1><p class="bold">#{@md.author}</p></td></tr></table>
+<table summary="links to text related to this rudimentary index" width="96%" border="0" cellpadding="0" align="center"><tr><td width="2%" align="right">&nbsp;</td><td width="94%" valign="top" align="justify"><h1 class="small"><a href="#{@md.file.base_filename.html_segtoc}"><b>#{@md.title.full}</b></a></h1><p class="bold">#{@md.author}</p></td></tr></table>
WOK
@make=SiSU_Env::ProcessingSettings.new(@md)
end
diff --git a/lib/sisu/v5/html_lite_shared.rb b/lib/sisu/v5/html_lite_shared.rb
index d766b54c..35eb130e 100644
--- a/lib/sisu/v5/html_lite_shared.rb
+++ b/lib/sisu/v5/html_lite_shared.rb
@@ -265,7 +265,7 @@ GSUB
parablock=parablock.gsub(/<!f.+?!>/,'')
@@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]}/,
- %{<table summary="normal text css" width="100%" border="0" bgcolor="white" cellpadding="2" align="center">})
+ %{<table summary="normal text css" width="100%" border="0" cellpadding="2" align="center">})
if parablock =~/#{Mx[:gr_o]}TZ#{Mx[:gr_c]}/
tablefoot=[]
@@tablefoot.each {|x| tablefoot << %{<p align="center"><font size=2><i>#{x}</i></font></p>\n}}
diff --git a/lib/sisu/v5/html_manifest.rb b/lib/sisu/v5/html_manifest.rb
index d3e5871c..d2c1360f 100644
--- a/lib/sisu/v5/html_manifest.rb
+++ b/lib/sisu/v5/html_manifest.rb
@@ -963,26 +963,26 @@ WOK
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="#links">metadata suggested links (if any)</a>
</p>
</div>
-<table summary="normal text css" width="100%" border="0" bgcolor="white" cellpadding="2" align="center">
+<table summary="normal text css" width="100%" border="0" cellpadding="2" align="center">
WOK
published_versions
@manifest[:html] << '</table>'
@manifest[:html] <<<<WOK
<h2 class="small"><a name="output">#{@translate.manifest_description_output}</a></h2>
-<table summary="available output/filetypes" width="100%" border="0" bgcolor="white" cellpadding="2" align="center">
+<table summary="available output/filetypes" width="100%" border="0" cellpadding="2" align="center">
<tr> <th class="left"><p class="bold">#{@translate.filetype_description}</p></th><th class="left"><p class="bold">#{@translate.filename}</p></th><th class="right"><p class="right"><b>#{@translate.file_size}</b></p><p class="tiny_right">(kB)</p></th></tr>
WOK
output_tests
@manifest[:html] << '</table>'
@manifest[:html] <<<<WOK
-<table summary="normal text css" width="100%" border="0" bgcolor="white" cellpadding="2" align="center">
+<table summary="normal text css" width="100%" border="0" cellpadding="2" align="center">
WOK
source_tests
@manifest[:html] << '</table>'
@manifest[:html] <<<<WOK
<h2 class="small"><a name="metadata">#{@translate.manifest_description_metadata}</a></h2>
-<table summary="document metadata" width="100%" border="0" bgcolor="white" cellpadding="2" align="center">
+<table summary="document metadata" width="100%" border="0" cellpadding="2" align="center">
<tr> <th class="left"><p class="bold">#{@translate.metadata}</p></th><th class="left"><p class="bold">#{@translate.description}</p></th></tr>
WOK
metadata_tests
@@ -991,7 +991,7 @@ WOK
WOK
@manifest[:html] <<<<WOK
<p class="bold"><a name="links">#{@translate.suggested_links}:</a></p>
-<table summary="suggested links" width="100%" border="0" bgcolor="white" cellpadding="2" align="center">
+<table summary="suggested links" width="100%" border="0" cellpadding="2" align="center">
WOK
links_tests
@manifest[:html] <<<<WOK
@@ -999,7 +999,7 @@ WOK
WOK
@manifest[:html] <<<<WOK
<h2 class="small"><a name="languages">#{@translate.language_version_list}</a></h2>
-<table summary="language versions" width="100%" border="0" bgcolor="white" cellpadding="2" align="center">
+<table summary="language versions" width="100%" border="0" cellpadding="2" align="center">
<tr> <th class="left"><p class="bold">#{@translate.filename}</p></th><th class="left"><p class="bold">#{@translate.description}</p></th><th class="right"><p class="right">&nbsp;</p></th></tr>
WOK
diff --git a/lib/sisu/v5/html_tune.rb b/lib/sisu/v5/html_tune.rb
index bd934ecc..292087e5 100644
--- a/lib/sisu/v5/html_tune.rb
+++ b/lib/sisu/v5/html_tune.rb
@@ -65,7 +65,7 @@ module SiSU_HTML_Tune
@@line_mode=''
@@endnote_array=[]
@@endnote_call_counter=1
- @@table_align='<table summary='' width="96%" border="0" bgcolor="white" cellpadding="0" col="3">
+ @@table_align='<table summary='' width="96%" border="0" cellpadding="0" col="3">
<tr ...><td width="2%" align="right">
&nbsp\;</td>
<td width="94%" valign="top" align="justify">'
diff --git a/lib/sisu/v5/xhtml_epub2.rb b/lib/sisu/v5/xhtml_epub2.rb
index 2d89bc68..794c9024 100644
--- a/lib/sisu/v5/xhtml_epub2.rb
+++ b/lib/sisu/v5/xhtml_epub2.rb
@@ -850,7 +850,7 @@ module SiSU_XHTML_EPUB2
<link rel="stylesheet" href="css/xhtml.css" type="text/css" />
<style type="text/css"> img { max-width: 100%; } </style>
</head>
- <body bgcolor="#ffffff" text="#000000" link="#003090" lang="en" xml:lang="en">
+ <body xml:lang="en">
<div class="svg_outer">
<div class="svg_inner">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xl="http://www.w3.org/1999/xlink" width="100%" height="100%" viewBox="0 0 #{@md.make.cover_image[:w]} #{@md.make.cover_image[:h]}" preserveAspectRatio="xMidYMid meet">
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 14:20:07 +0000