diff options
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v5 | 2 | ||||
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v6 | 2 | ||||
| -rw-r--r-- | lib/sisu/v5/html_format.rb | 20 | ||||
| -rw-r--r-- | lib/sisu/v6/html_format.rb | 11 |
4 files changed, 19 insertions, 16 deletions
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index 4cf5fdc5..986932b9 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -38,6 +38,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.7.0.orig.tar.xz sisu_5.7.0.orig.tar.xz sisu_5.7.0-1.dsc +* html_format, label, re: object number object names + * constants, remove ocn html leader (resulting hashtag #1 instead of #o1) * html, reduce difference with v6 diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index 6998064e..50f3c72e 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -28,6 +28,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.3.0.orig.tar.xz sisu_6.3.0.orig.tar.xz sisu_6.3.0-1.dsc +* html_format, label, re: object number object names + * constants, remove ocn html leader (resulting hashtag #1 instead of #o1) * moved files: harvest* to html_harvest* diff --git a/lib/sisu/v5/html_format.rb b/lib/sisu/v5/html_format.rb index e99f1b5f..3cfa9268 100644 --- a/lib/sisu/v5/html_format.rb +++ b/lib/sisu/v5/html_format.rb @@ -71,10 +71,10 @@ module SiSU_HTML_Format if @ocn.to_i==0 \ or @ocn.empty? '' + elsif @make.build.html_strict? + %{<label class="ocn">#{@ocn}</label>} 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"><a name="#{@ocn}" class="lnkocn">#{@ocn}</a></label>} end else '' @@ -819,7 +819,7 @@ WOK #{@seg_name_html[@seg_name_html_tracker]} - #{@md.html_title} </title> -<meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> +<meta http-equiv="Content-Type" content="text/html;charset=utf-8"> #{rdf.metatag_html} #{@stylesheet.css_head_seg} </head> @@ -918,15 +918,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 diff --git a/lib/sisu/v6/html_format.rb b/lib/sisu/v6/html_format.rb index abefdf2f..61fedba1 100644 --- a/lib/sisu/v6/html_format.rb +++ b/lib/sisu/v6/html_format.rb @@ -71,10 +71,11 @@ module SiSU_HTML_Format if @ocn.to_i==0 \ or @ocn.empty? '' + elsif @make.build.html_strict? + %{<label class="ocn">#{@ocn}</label>} else - name=(@make.build.html_strict?) ? '' : %{ name="#{@ocn}"} - @ocn.gsub(/^(\d+|)$/, - %{<label class="ocn" id="#{@ocn}">\\1</label>}) + %{<label class="ocn"><a name="#{@ocn}" class="lnkocn">#{@ocn}</a></label>} + #%{<label class="ocn" id="#{@ocn}">#{@ocn}</label>} end else '' @@ -410,6 +411,7 @@ WOK </tr></table>} end def head + rdf=SiSU_XML_Tags::RDF.new(@md) %{#{doc_type} <head> <meta charset="utf-8"> @@ -417,6 +419,7 @@ WOK #{@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} @@ -809,6 +812,7 @@ WOK } #revisit end def head_seg + rdf=SiSU_XML_Tags::RDF.new(@md) %{#{doc_type} <head> <meta charset="utf-8"> @@ -817,6 +821,7 @@ WOK #{@md.html_title} </title> <meta http-equiv="Content-Type" content="text/html;charset=utf-8"> +#{rdf.metatag_html} #{@stylesheet.css_head_seg} </head> #{@vz.color_body} |