v5 v6: html, tiny first nudge toward html5 (v5 v6 differ)
authorRalph Amissah <ralph@amissah.com>
Fri, 3 Oct 2014 23:28:27 +0000 (19:28 -0400)
committerRalph Amissah <ralph@amissah.com>
Fri, 3 Oct 2014 23:31:48 +0000 (19:31 -0400)
* document headers, other minor

27 files changed:
data/doc/sisu/CHANGELOG_v5
data/doc/sisu/CHANGELOG_v6
lib/sisu/v5/cgi_sql_common.rb
lib/sisu/v5/harvest_authors.rb
lib/sisu/v5/harvest_topics.rb
lib/sisu/v5/html_concordance.rb
lib/sisu/v5/html_format.rb
lib/sisu/v5/html_manifest.rb
lib/sisu/v5/html_segments.rb
lib/sisu/v5/se_css.rb
lib/sisu/v5/shared_metadata.rb
lib/sisu/v6/cgi_sql_common.rb
lib/sisu/v6/defaults.rb
lib/sisu/v6/harvest_authors.rb
lib/sisu/v6/harvest_topics.rb
lib/sisu/v6/html.rb
lib/sisu/v6/html_concordance.rb
lib/sisu/v6/html_format.rb
lib/sisu/v6/html_lite_shared.rb
lib/sisu/v6/html_manifest.rb
lib/sisu/v6/html_promo.rb
lib/sisu/v6/html_scroll.rb
lib/sisu/v6/html_segments.rb
lib/sisu/v6/html_tune.rb
lib/sisu/v6/se_css.rb
lib/sisu/v6/shared_metadata.rb
lib/sisu/v6/xhtml_epub2.rb

index cd26fe030a75f618d7ca21062634232cbf6b80b2..e3d65afb14f19ead1c13478471a55738cc420b1d 100644 (file)
@@ -41,6 +41,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.6.9.orig.tar.xz
 * --act provides info on current --act0 to --act9 settings (makes it easier to
   make use of acts 0 to 9)
 
+* html, tiny first nudge toward html5 (document headers and minor)
+
 %% 5.6.8.orig.tar.xz (2014-09-28:38/7)
 http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.8
 http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.6.8-1
index 04c1f218e7e4988a808dc6fc93e44195f99c05ea..89e20477777582d7ee003af7b6191be4054d90ab 100644 (file)
@@ -31,6 +31,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.2.10.orig.tar.xz
 * --act provides info on current --act0 to --act9 settings (makes it easier to
   make use of acts 0 to 9)
 
+* html, tiny first nudge toward html5 (document headers and minor)
+
 %% 6.2.9.orig.tar.xz (2014-09-28:38/7)
 http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.9
 http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.2.9-1
index 187859ec67a55f8313a69400ec06d8df7e526a07..a16ca0db67e40f413c789b7e6c83485f4424a78a 100644 (file)
@@ -144,18 +144,17 @@ module SiSU_CGI_SQL
     end
     def header_desc
       <<-WOK_SQL
-    <!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>
-    <title>
-    SiSU search form (sample): SiSU information Structuring Universe
-    </title>
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-    <meta name="sourcefile" content="SiSU._sst" />
-    <link rel="generator" href="http://www.jus.uio.no/sisu" />
-    <link rel="shortcut icon" href="#{@image_src}/rb7.ico" />
-    <link rel="stylesheet" href="../_sisu/css/html.css" type="text/css" />
+      <title>
+      <meta charset="utf-8">
+      <meta name="sourcefile" content="SiSU._sst" />
+      SiSU search form (sample): SiSU information Structuring Universe
+      </title>
+      <link rel="generator" href="http://www.jus.uio.no/sisu" />
+      <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">
     <table summary="band" border="0" cellpadding="3" cellspacing="0">
index 1ea2167ab1e2bada4c7c096d2e3754cd3cbd95db..8db14eee954e8bf57c025fdfbf491e3d1e9a60a0 100644 (file)
@@ -318,20 +318,20 @@ module SiSU_HarvestAuthors
           output_structure_by='(output organised by ?)'
         end
         <<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 Metadata Harvest - Authors</title>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="dc.title" content= "SiSU metadata harvest, Authors - SiSU information Structuring Universe, Structured information Serialised Units" />
 <meta name="dc.subject" content= "document structuring, ebook, publishing, PDF, LaTeX, XML, ODF, SQL, postgresql, sqlite, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, granular search, digital library" />
 <meta name="generator" content="#{sv[:project]} #{sv[:version]} of #{sv[:date_stamp]} (n*x and Ruby!)" />
 <link rel="generator" href="http://www.jus.uio.no/sisu/SiSU" />
-<link rel="stylesheet" href="#{css_path}" type="text/css" />
+<link href="#{css_path}" rel="stylesheet" >
 <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>
index bb0bbe2233d37620ec992691b15d797634dfa590..b2e836833bb8c6ef958cfb806f14d75f3083b580 100644 (file)
@@ -688,20 +688,20 @@ module SiSU_HarvestTopics
           output_structure_by='(output organised by ?)'
         end
         <<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 Metadata Harvest - Topics</title>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="dc.title" content= "SiSU metadata harvest, Topics - SiSU information Structuring Universe, Structured information Serialised Units" />
 <meta name="dc.subject" content= "document structuring, ebook, publishing, PDF, LaTeX, XML, ODF, SQL, postgresql, sqlite, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, granular search, digital library" />
 <meta name="generator" content="#{sv[:project]} #{sv[:version]} of #{sv[:date_stamp]} (n*x and Ruby!)" />
 <link rel="generator" href="http://www.jus.uio.no/sisu/SiSU" />
-<link rel="stylesheet" href="#{css_path}" type="text/css" />
+<link href="#{css_path}" rel="stylesheet">
 <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>
index 44a6cd699a2d3f0ca415650085a63d4c924315d4..51acabef73cb187a75213a67d3cb884214e9a766 100644 (file)
@@ -156,9 +156,10 @@ WOK
         else ''
         end
         <<WOK
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html>
 <html>
 <head>
+  <meta charset="utf-8">
   <title>
     SiSU created WordIndex for: #{@md.title.full}
   </title>
index b8db94454a06a93c69ee24f212f638ad45269caa..c34759cf0f2b27d56864bd6f239c914bd9f8de7a 100644 (file)
@@ -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?) ? '' : %{<a href="##{@ocn_html_identifier}#{@ocn}">}
@@ -173,9 +173,8 @@ module SiSU_HTML_Format
       SiSU_XML_Tags::RDF.new(md)
     end
     def doc_type
-      %{<!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">\n}
+      %{<!DOCTYPE html>
+<html>\n}
     end
     def table_close
       %{  </font>
@@ -414,6 +413,7 @@ WOK
       rdf=SiSU_XML_Tags::RDF.new(@md)
       %{#{doc_type}
 <head>
+  <meta charset="utf-8">
   <title>
     #{@md.html_title}
   </title>
@@ -597,11 +597,7 @@ WOK
 #{@vz.credits_splash}
 #{@vz.credits_sisu}
 <a name="bottom" id="bottom"></a>
-<a name="down" id="down"></a>
 <a name="end" id="end"></a>
-<a name="finish" id="finish"></a>
-<a name="stop" id="stop"></a>
-<a name="credits"></a>
 </div>
 </div>
 </div>
@@ -615,11 +611,7 @@ WOK
 #{@vz.credits_splash}
 #{@vz.credits_sisu}
 <a name="bottom" id="bottom"></a>
-<a name="down" id="down"></a>
 <a name="end" id="end"></a>
-<a name="finish" id="finish"></a>
-<a name="stop" id="stop"></a>
-<a name="credits"></a>
 </div>
 }
     end
@@ -630,11 +622,7 @@ WOK
 #{@vz.credits_splash}
 #{@vz.credits_sisu}
 <a name="bottom" id="bottom"></a>
-<a name="down" id="down"></a>
 <a name="end" id="end"></a>
-<a name="finish" id="finish"></a>
-<a name="stop" id="stop"></a>
-<a name="credits"></a>
 </div>
 </div>
 </div>
@@ -775,11 +763,7 @@ WOK
 #{@vz.credits_splash}
 #{@vz.credits_sisu}
 <a name="bottom" id="bottom"></a>
-<a name="down" id="down"></a>
 <a name="end" id="end"></a>
-<a name="finish" id="finish"></a>
-<a name="stop" id="stop"></a>
-<a name="credits" id="credits"></a>
 </div></div>
 }
     end
@@ -832,6 +816,7 @@ WOK
       rdf=SiSU_XML_Tags::RDF.new(@md)
       %{#{doc_type}
 <head>
+  <meta charset="utf-8">
   <title>
     #{@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)
       %{
index a31420ac7ec1ce6636317998d36dbc724de76497..45ee2aae5bf44061d642283d7aa5bbf7e485007e 100644 (file)
@@ -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}
 </title>
@@ -901,7 +901,7 @@ SiSU manifest: #{@md.title.full}
 <link rel="shortcut icon" href="#{@f.path_rel_links.html_scroll_css}_sisu/image_sys/rb7.ico" />
 #{@stylesheet.css_head}
 </head>
-<body bgcolor="#ffffff" text="#000000" link="#003090" lang="en" xml:lang="en">
+<body lang="en" xml:lang="en">
 #{format_head_toc.seg_head_navigation_band(:manifest)}
 WOK
           if make.build.manifest_minitoc?
index 0467a128ccba7e3b6f15ac303bf402c80fc861ed..555b75bbe26c399789cac5d9184d8f85f70b9e4c 100644 (file)
@@ -120,7 +120,7 @@ module SiSU_HTML_Seg
           << @seg[:idx] \
           << '</div>' # << '</div>'
         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_
index 378fece88ebd27e3493f902a2e251247d23c39e4..4d4713e1126829c765230697740699c9b0cb890d 100644 (file)
@@ -169,21 +169,21 @@ module SiSU_CSS
         @file.path_rel_links.html_scroll_css \
         + @env.path.style + '/' \
         + @css.html
-      %{  <link rel="stylesheet" href="#{stylesheet}" type="text/css" />}
+      %{  <link href="#{stylesheet}" rel="stylesheet">}
     end
     def html_seg
       stylesheet=
         @file.path_rel_links.html_seg_css \
         + @env.path.style + '/' \
         + @css.html
-      %{  <link rel="stylesheet" href="#{stylesheet}" type="text/css" />}
+      %{  <link href="#{stylesheet}" rel="stylesheet">}
     end
     def html_tables
       stylesheet=
         @file.path_rel_links.html_seg_css \
         + @env.path.style + '/' \
         + @css.html
-      %{  <link rel="stylesheet" href="#{stylesheet}" type="text/css" />}
+      %{  <link href="#{stylesheet}" rel="stylesheet">}
     end
     def xhtml_epub
       %{  <link rel="stylesheet" href="css/xhtml.css" type="text/css" />}
index 3a83d674117dbe011cd132bcd1cb7d26f169c0cf..9f4f43628e0a390ed042daf5d4a07a705cbf215e 100644 (file)
@@ -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
+        %{<p class="norm">
+  <b>#{@tag}</b>: #{inf_xml}
+</p>}
+      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
index c6758685c324a3cb56b040acf227320d201c5d72..a05f8f53ef7d405ee00699fe61480bdbb350da87 100644 (file)
@@ -144,24 +144,23 @@ module SiSU_CGI_SQL
     end
     def header_desc
       <<-WOK_SQL
-    <!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>
-    <title>
-    SiSU search form (sample): SiSU information Structuring Universe
-    </title>
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-    <meta name="sourcefile" content="SiSU._sst" />
-    <link rel="generator" href="http://www.jus.uio.no/sisu" />
-    <link rel="shortcut icon" href="#{@image_src}/rb7.ico" />
-    <link rel="stylesheet" href="../_sisu/css/html.css" type="text/css" />
+      <title>
+      <meta charset="utf-8">
+      <meta name="sourcefile" content="SiSU._sst" />
+      SiSU search form (sample): SiSU information Structuring Universe
+      </title>
+      <link rel="generator" href="http://www.jus.uio.no/sisu" />
+      <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>
@@ -544,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>
index fb56a6d4c7004a0250e58704e104977717f95981..185e28e701d219587ab70a01ba8ae2133411d684 100644 (file)
@@ -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>
index 0f375c00bc697d406ede23582782e618e31d36d6..e48c4f78e9c4c6d0882d47c708dc0537e3709430 100644 (file)
@@ -318,20 +318,20 @@ module SiSU_HarvestAuthors
           output_structure_by='(output organised by ?)'
         end
         <<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 Metadata Harvest - Authors</title>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="dc.title" content= "SiSU metadata harvest, Authors - SiSU information Structuring Universe, Structured information Serialised Units" />
 <meta name="dc.subject" content= "document structuring, ebook, publishing, PDF, LaTeX, XML, ODF, SQL, postgresql, sqlite, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, granular search, digital library" />
 <meta name="generator" content="#{sv[:project]} #{sv[:version]} of #{sv[:date_stamp]} (n*x and Ruby!)" />
 <link rel="generator" href="http://www.jus.uio.no/sisu/SiSU" />
-<link rel="stylesheet" href="#{css_path}" type="text/css" />
+<link href="#{css_path}" rel="stylesheet" >
 <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>
index aafc3755524ef037855db03b64e9cdf57c48f345..2b80565ecabf6c7a69f5a94bbf040a5346520271 100644 (file)
@@ -688,20 +688,20 @@ module SiSU_HarvestTopics
           output_structure_by='(output organised by ?)'
         end
         <<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 Metadata Harvest - Topics</title>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="dc.title" content= "SiSU metadata harvest, Topics - SiSU information Structuring Universe, Structured information Serialised Units" />
 <meta name="dc.subject" content= "document structuring, ebook, publishing, PDF, LaTeX, XML, ODF, SQL, postgresql, sqlite, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, granular search, digital library" />
 <meta name="generator" content="#{sv[:project]} #{sv[:version]} of #{sv[:date_stamp]} (n*x and Ruby!)" />
 <link rel="generator" href="http://www.jus.uio.no/sisu/SiSU" />
-<link rel="stylesheet" href="#{css_path}" type="text/css" />
+<link href="#{css_path}" rel="stylesheet">
 <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>
index 199770e7300eadf72908785d171569d68345ddad..014a81c596be5939f1266ccc55311a7b19844297 100644 (file)
@@ -335,10 +335,10 @@ module SiSU_HTML
 <center>
 <table><tr><td>
 <p><font color="#222222" #{@font.face} size="2">
-(relatively static) RSS feeds for DOCUMENTS:<br />
-<a href="../rssfeed/documents.xml"><img border="0" height="14" width="36" src="../_sisu/image/rss.png" alt="RSS feed"></a>&nbsp;http://www.jus.uio.no/lm/rssfeed/documents.xml<br />
-<a href="../rssfeed/tradelaw.xml"><img border="0" height="14" width="36" src="../_sisu/image/rss.png" alt="RSS feed"></a>&nbsp;http://www.jus.uio.no/lm/rssfeed/tradelaw.xml<br />
-<a href="../rssfeed/environmental.xml"><img border="0" height="14" width="36" src="../_sisu/image/rss.png" alt="RSS feed"></a>&nbsp;http://www.jus.uio.no/lm/rssfeed/environmental.xml<br />
+(relatively static) RSS feeds for DOCUMENTS:<br>
+<a href="../rssfeed/documents.xml"><img border="0" height="14" width="36" src="../_sisu/image/rss.png" alt="RSS feed"></a>&nbsp;http://www.jus.uio.no/lm/rssfeed/documents.xml<br>
+<a href="../rssfeed/tradelaw.xml"><img border="0" height="14" width="36" src="../_sisu/image/rss.png" alt="RSS feed"></a>&nbsp;http://www.jus.uio.no/lm/rssfeed/tradelaw.xml<br>
+<a href="../rssfeed/environmental.xml"><img border="0" height="14" width="36" src="../_sisu/image/rss.png" alt="RSS feed"></a>&nbsp;http://www.jus.uio.no/lm/rssfeed/environmental.xml<br>
 <center><a href="mailto:info@address.com" target="_top">info@address.com</a></center>
 </font></p>
 </td></tr></table>
@@ -383,7 +383,7 @@ WOK
         toc[:seg_mini]=format_toc.mini_lev0
         title=if dob.ocn ==0 then linkname
         else
-          @@toc[:scr] <<  '<br />'
+          @@toc[:scr] <<  '<br>'
           %{<b><a href="##{@ocn_html_identifier}#{dob.ocn}">#{linkname}</a></b>}
         end
         txt_obj={ txt: title }
@@ -425,7 +425,7 @@ WOK
           else linkname
           end
         else
-          @@toc[:scr] <<  '<br />'
+          @@toc[:scr] <<  '<br>'
           %{<b><a href="##{@ocn_html_identifier}#{dob.ocn}">#{linkname}</a></b>}
         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 ||= %{<p />#{@md.prefix_a}\n}
+          tmp_head ||= %{<p>#{@md.prefix_a}\n}
           toc_shared << tmp_head.dup
           @segtoc << tmp_head.dup
         end
index ce284e3f937ec929f62aff24f4f7df29ff23ddca..54560aa27006fdbe6ecfe991f967e2607c705811 100644 (file)
@@ -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
@@ -156,9 +156,10 @@ WOK
         else ''
         end
         <<WOK
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html>
 <html>
 <head>
+  <meta charset="utf-8">
   <title>
     SiSU created WordIndex for: #{@md.title.full}
   </title>
@@ -175,10 +176,10 @@ WOK
   #{toc}
 <div class="#{div_class}">
  #{@doc_details}
-<p>Word index links are to html versions of the text the segmented version followed by the scroll (single document) version.<br />[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).]</p>
+<p>Word index links are to html versions of the text the segmented version followed by the scroll (single document) version.<br>[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).]</p>
 <p>(The word listing/index is Case sensitive: Capitalized words appear before lower case)</p>
   <p>
-    <b>word</b> (number of occurences)<br />linked references to word within document <br />
+    <b>word</b> (number of occurences)<br>linked references to word within document <br>
     [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.]
   </p>
   <p>
index eb0745dac223bd537c5fd3e6772aa708a13092d5..abefdf2f7b102f3dbb6f31f74dcccb5f987eba1f 100644 (file)
@@ -74,7 +74,7 @@ module SiSU_HTML_Format
         else
           name=(@make.build.html_strict?) ? '' :  %{ name="#{@ocn}"}
           @ocn.gsub(/^(\d+|)$/,
-            %{<label class="ocn"><a#{name} href="##{@ocn_html_identifier}#{@ocn}" class="lnkocn">\\1</a></label>})
+            %{<label class="ocn" id="#{@ocn}">\\1</label>})
         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?) ? '' : %{<a href="##{@ocn_html_identifier}#{@ocn}">}
@@ -173,9 +173,8 @@ module SiSU_HTML_Format
       SiSU_XML_Tags::RDF.new(md)
     end
     def doc_type
-      %{<!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">\n}
+      %{<!DOCTYPE html>
+<html>\n}
     end
     def table_close
       %{  </font>
@@ -302,7 +301,7 @@ WOK
 <td width="20%">
   &nbsp;
 #{@vz.table_close}
-<p />}
+<p>}
       else ''
       end
     end
@@ -325,7 +324,7 @@ WOK
   #{doc_types}
 #{up_button}
 #{@vz.table_close}
-<p />}
+<p>}
       else ''
       end
     end
@@ -355,7 +354,7 @@ WOK
 <td width="5%" align="right">
   &nbsp;#{firstseg}&nbsp;
 #{@vz.table_close}
-<p />}
+<p>}
       else ''
       end
     end
@@ -411,20 +410,17 @@ WOK
 </tr></table>}
     end
     def head
-      rdf=SiSU_XML_Tags::RDF.new(@md)
       %{#{doc_type}
 <head>
+  <meta charset="utf-8">
   <title>
     #{@md.html_title}
   </title>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-#{rdf.metatag_html}
 #{@stylesheet.css_head}
 </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 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 <sup>&copy;</sup>&nbsp;')
         %{<p class="small_left">Rights: #{rights}</p>
-<p />}
+<p>}
       end
       self
     end
@@ -597,11 +593,7 @@ WOK
 #{@vz.credits_splash}
 #{@vz.credits_sisu}
 <a name="bottom" id="bottom"></a>
-<a name="down" id="down"></a>
 <a name="end" id="end"></a>
-<a name="finish" id="finish"></a>
-<a name="stop" id="stop"></a>
-<a name="credits"></a>
 </div>
 </div>
 </div>
@@ -615,11 +607,7 @@ WOK
 #{@vz.credits_splash}
 #{@vz.credits_sisu}
 <a name="bottom" id="bottom"></a>
-<a name="down" id="down"></a>
 <a name="end" id="end"></a>
-<a name="finish" id="finish"></a>
-<a name="stop" id="stop"></a>
-<a name="credits"></a>
 </div>
 }
     end
@@ -630,11 +618,7 @@ WOK
 #{@vz.credits_splash}
 #{@vz.credits_sisu}
 <a name="bottom" id="bottom"></a>
-<a name="down" id="down"></a>
 <a name="end" id="end"></a>
-<a name="finish" id="finish"></a>
-<a name="stop" id="stop"></a>
-<a name="credits"></a>
 </div>
 </div>
 </div>
@@ -775,11 +759,7 @@ WOK
 #{@vz.credits_splash}
 #{@vz.credits_sisu}
 <a name="bottom" id="bottom"></a>
-<a name="down" id="down"></a>
 <a name="end" id="end"></a>
-<a name="finish" id="finish"></a>
-<a name="stop" id="stop"></a>
-<a name="credits" id="credits"></a>
 </div></div>
 }
     end
@@ -829,21 +809,18 @@ WOK
 } #revisit
     end
     def head_seg
-      rdf=SiSU_XML_Tags::RDF.new(@md)
       %{#{doc_type}
 <head>
+  <meta charset="utf-8">
   <title>
     #{@seg_name_html[@seg_name_html_tracker]} -
     #{@md.html_title}
   </title>
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-#{rdf.metatag_html}
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
 #{@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)
       %{
@@ -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 << %{<a name="#{t}" ></a>})
-          else
-            tags=(t =~/^[#{Mx[:ocn_id_char]}][0-9.]+$/) \
-            ? tags             #check what can be sorted in ao
-            : (tags << %{<a name="#{t}" ></a>})
-          end
+          tags=(t =~/^[0-9.]+$/) \
+          ? tags             #check what can be sorted in ao
+          : (tags << %{<a name="#{t}" ></a>})
         end
       end
       tags
@@ -1038,7 +1009,7 @@ WOK
     end
     def heading_normal(tag,attrib)
       section_break=(tag=~/h[1-5]/) \
-      ? '<br /><hr width=90% /><br />'
+      ? '<br><hr width=90% /><br>'
       : ''
       %{#{section_break}
 <div class="substance">
@@ -1196,13 +1167,13 @@ WOK
 <center>
 #{@txt}
 #{@two}
-</a></center><p />}
+</a></center><p>}
     end
     def navigation_toc_lev1
       %{#{@banner.nav_toc}}
     end
     def navigation_toc_lev2                                                      #change bold use css
-      %{<p />
+      %{<p>
 <table summary="navigation segment level 2">
 <tr><td width ="20">
 </td>
@@ -1214,7 +1185,7 @@ WOK
 #{@vz.table_close}}
     end
     def navigation_toc_lev3                                                      #change bold use css
-      %{<p />
+      %{<p>
 <table summary="navigation segment level 3">
 <tr><td width ="20">
 </td>
index 7249ba318c0e1f6e1320a66dca5a68faba245f72..dc54fdb9ce887efdda184d69654c731c164a40e7 100644 (file)
@@ -104,7 +104,7 @@ module SiSU_FormatShared
             w=%{width="#{w}"} if w
             h=%{height="#{h}"} if h
             c=m[/"(.+?)"/m,1]
-            caption=%{<br /><p class="caption">#{c}</p>} if c
+            caption=%{<br><p class="caption">#{c}</p>} if c
             png=m.scan(/\S+/)[0]
             ins=if u \
             and u.strip !~/^image$/
@@ -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}}
index 036713e987619641ef15116688136b6de6bb791e..1ac7f4d4d4b35e938cd825b0074bc7ee5837cf90 100644 (file)
@@ -158,7 +158,7 @@ module SiSU_Manifest
         if @o_str.dump_or_redirect?
           ''
         elsif src==:src #check
-          %{<br />#{@brace_url.xml_open}<a href="#{url}/#{file}">#{url}/#{file}</a>#{@brace_url.xml_close}}
+          %{<br>#{@brace_url.xml_open}<a href="#{url}/#{file}">#{url}/#{file}</a>#{@brace_url.xml_close}}
         else
           %{<p class="tiny">#{@brace_url.xml_open}<a href="#{url}/#{file}">#{url}/#{file}</a>#{@brace_url.xml_close}</p>}
         end
@@ -265,7 +265,7 @@ module SiSU_Manifest
         end
       end
       def metadata(id,info)
-        info=info.to_s.gsub(/(?:#{Mx[:br_line]}|\\)+/,'<br />')
+        info=info.to_s.gsub(/(?:#{Mx[:br_line]}|\\)+/,'<br>')
         @manifest[:html] << %{<tr><th class="left"><p class="bold_left">#{id}:</p></th><td><p class="left">#{info}</p></td></tr>\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] <<<<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}
 </title>
@@ -901,7 +901,7 @@ SiSU manifest: #{@md.title.full}
 <link rel="shortcut icon" href="#{@f.path_rel_links.html_scroll_css}_sisu/image_sys/rb7.ico" />
 #{@stylesheet.css_head}
 </head>
-<body bgcolor="#ffffff" text="#000000" link="#003090" lang="en" xml:lang="en">
+<body lang="en" xml:lang="en">
 #{format_head_toc.seg_head_navigation_band(:manifest)}
 WOK
           if make.build.manifest_minitoc?
@@ -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
@@ -1009,7 +1009,7 @@ WOK
 </table>
 </div>
 <div>
-<br />
+<br>
 #{vz.credits_sisu_manifest}
 </div>
 </body>
index a6f456ae5f6a69c72f45d759ce594002d3de43fb..750add5cbd00b297bfee60d99c20e7fbbd90b054 100644 (file)
@@ -145,7 +145,7 @@ module SiSU_HTML_Promo
         @prod['form'] ? %{<p class="pane">#{@prod['form']}</p>} : ''
       end
       def nick
-        @prod['nick'] ? %{(#{@prod['nick']})<br />} : ''
+        @prod['nick'] ? %{(#{@prod['nick']})<br>} : ''
       end
       def update
         @prod['update'] ? %{<p class="pane">Updated: #{@prod['update']}</p>} : ''
@@ -186,7 +186,7 @@ module SiSU_HTML_Promo
         else nil
         end
         form=if action
-          '<br />' + @env.widget.search_form('hyperestraier',action,'',table)
+          '<br>' + @env.widget.search_form('hyperestraier',action,'',table)
         else ''
         end
         form
@@ -208,7 +208,7 @@ module SiSU_HTML_Promo
         end
       end
       def image
-        @prod['image'] ? %{<img border="0" src="../_sisu/image/#{@prod['image']}" /><br />} : ''
+        @prod['image'] ? %{<img border="0" src="../_sisu/image/#{@prod['image']}" /><br>} : ''
       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
-<br />
+<br>
 #{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)
        <<WOK
-<br />
+<br>
 #{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=%{<p class="pane">#{prod_type}: #{prod_id}</p>}
        <<WOK
-<br />
+<br>
 #{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)
        <<WOK
-<br />
+<br>
 #{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
        <<WOK
-<br />
+<br>
 #{cell.site_link}
 #{cell.date}
 #{cell.location}
index 1415c585bda2582bcdc11498378af67a8b636423..f6a1115c904c3fc299c5521b5e7aa2de0da8df1b 100644 (file)
@@ -134,7 +134,7 @@ module SiSU_HTML_Scroll
             end
           elsif dob.is==:break \
           and dob.from==:markup
-            '<br /><hr width=90% /><br />'
+            '<br><hr width=90% /><br>'
           elsif dob.is==:heading_insert
             x=if dob.ln==0
               unless dob.obj.empty?
index 47fe9d148e8285abe53b6750d24bc127eec6e399..54b0b1249547d8631ceec4019f2d495b6b9e525d 100644 (file)
@@ -120,7 +120,7 @@ module SiSU_HTML_Seg
           << @seg[:idx] \
           << '</div>' # << '</div>'
         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] \
-        << '<br />' \
+        << '<br>' \
         << 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
-          '<br /><hr width=90% /><br />'
+          '<br><hr width=90% /><br>'
         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
index 7ce62bfca25f5b147746494c4dffd790c94cf2ef..b655b7d1f2e5b8172aba04d9445d1a8dfef1643b 100644 (file)
@@ -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">'
@@ -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,'<br />')
+        gsub(/[\\]{2}/m,'<br>')
     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=%{<br /><p class="caption">#{c}</p>} if c
+            caption=%{<br><p class="caption">#{c}</p>} 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]}/,'<br />') unless dob.is==:table
+      dob.obj=dob.obj.gsub(/#{Mx[:br_line]}|#{Mx[:br_nl]}/,'<br>') unless dob.is==:table
       dob.obj=dob.obj.gsub(/#{Mx[:fa_bold_o]}(.+?)#{Mx[:fa_bold_c]}/,'<b>\1</b>').
         gsub(/#{Mx[:fa_italics_o]}(.+?)#{Mx[:fa_italics_c]}/,'<i>\1</i>').
         gsub(/#{Mx[:fa_underscore_o]}(.+?)#{Mx[:fa_underscore_c]}/,'<u>\1</u>').
index fed9c571ea80c640897c3213de1790470e2e124f..a83d13ca544b52d569e6c6e8762df9e4407a2367 100644 (file)
@@ -169,21 +169,21 @@ module SiSU_CSS
         @file.path_rel_links.html_scroll_css \
         + @env.path.style + '/' \
         + @css.html
-      %{  <link rel="stylesheet" href="#{stylesheet}" type="text/css" />}
+      %{  <link href="#{stylesheet}" rel="stylesheet">}
     end
     def html_seg
       stylesheet=
         @file.path_rel_links.html_seg_css \
         + @env.path.style + '/' \
         + @css.html
-      %{  <link rel="stylesheet" href="#{stylesheet}" type="text/css" />}
+      %{  <link href="#{stylesheet}" rel="stylesheet">}
     end
     def html_tables
       stylesheet=
         @file.path_rel_links.html_seg_css \
         + @env.path.style + '/' \
         + @css.html
-      %{  <link rel="stylesheet" href="#{stylesheet}" type="text/css" />}
+      %{  <link href="#{stylesheet}" rel="stylesheet">}
     end
     def xhtml_epub
       %{  <link rel="stylesheet" href="css/xhtml.css" type="text/css" />}
index 182acde1d1b78409d67a528cc617a0b8bbb98087..998c48df3a8ab84bcb5cb45459f3df04f435ec6c 100644 (file)
@@ -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
+        %{<p class="norm">
+  <b>#{@tag}</b>: #{inf_xml}
+</p>}
+      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
index 245050a168577797c159254b911d0dea206aaa65..af796cbe2e264deca1e2931d3d25f61f8989a938 100644 (file)
@@ -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">