v5 v6: html_format, label, re: object number object names

1 files changed, 7 insertions, 13 deletions

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