semantically annotate hierarchically formed labels of bloocks: #617

metanorma · Nov 24, 2024 · 7d4c8d6 · 7d4c8d6
1 parent 98b9937
commit 7d4c8d6
Show file tree

Hide file tree

Showing 6 changed files with 321 additions and 261 deletions.
diff --git a/lib/isodoc/xref/xref_anchor.rb b/lib/isodoc/xref/xref_anchor.rb
@@ -44,7 +44,6 @@ def anchor_struct_label(lbl, node, elem)
       def anchor_struct_xref(lbl, node, elem)
         unless lbl.blank?
           lbl = semx(node, lbl)
-          #lbl = "<semx element='autonum' source='#{node['id'] || node[:id]}'>#{lbl}</semx>"
           s = " #{anchor_struct_value(lbl, elem)}"
         end
         l10n("<span class='fmt-element-name'>#{elem}</span>#{s}")

diff --git a/lib/isodoc/xref/xref_util.rb b/lib/isodoc/xref/xref_util.rb
@@ -48,9 +48,12 @@ def child_sections
         CHILD_SECTIONS
       end
 
+      # if hierarchically marked up node in label already,
+      # leave alone, else wrap in semx
       def semx(node, label, element = "autonum")
-        l = stripsemx(label)
         id = node["id"] || node[:id]
+        /<semx element='[^']+' source='#{id}'/.match?(label) and return label
+        l = stripsemx(label)
         %(<semx element='#{element}' source='#{id}'>#{l}</semx>)
       end
 

diff --git a/spec/isodoc/blocks_spec.rb b/spec/isodoc/blocks_spec.rb
@@ -625,7 +625,9 @@
          <fmt-xref-label>
             <span class="fmt-element-name">Formula</span>
             <span class="fmt-autonum-delim">(</span>
-            <semx element="autonum" source="AnnexFormula">A.1</semx>
+            <semx element="autonum" source="Annex">A</semx>
+            <span class="fmt-autonum-delim">.</span>
+            <semx element="autonum" source="AnnexFormula">1</semx>
             <span class="fmt-autonum-delim">)</span>
          </fmt-xref-label>
          <stem type="AsciiMath">r = 1 %</stem>
@@ -1075,7 +1077,9 @@
          </fmt-name>
          <fmt-xref-label>
             <span class="fmt-element-name">Permission</span>
-            <semx element="autonum" source="AnnexPermission">A.1</semx>
+            <semx element="autonum" source="Annex">A</semx>
+            <span class="fmt-autonum-delim">.</span>
+            <semx element="autonum" source="AnnexPermission">1</semx>
          </fmt-xref-label>
          <div type="requirement-description">
             <p id="_">As for the measurement targets,</p>

diff --git a/spec/isodoc/figures_spec.rb b/spec/isodoc/figures_spec.rb
@@ -232,7 +232,9 @@
          </fmt-name>
          <fmt-xref-label>
             <span class="fmt-element-name">Figure</span>
-            <semx element="autonum" source="AnnexFigure">A.1</semx>
+            <semx element="autonum" source="Annex">A</semx>
+            <span class="fmt-autonum-delim">.</span>
+            <semx element="autonum" source="AnnexFigure">1</semx>
          </fmt-xref-label>
          <pre>A &lt;
   B</pre>

diff --git a/spec/isodoc/table_spec.rb b/spec/isodoc/table_spec.rb
@@ -301,7 +301,9 @@
          </fmt-name>
          <fmt-xref-label>
             <span class="fmt-element-name">Table</span>
-            <semx element="autonum" source="AnnexTable">A.1</semx>
+            <semx element="autonum" source="Annex1">A</semx>
+            <span class="fmt-autonum-delim">.</span>
+            <semx element="autonum" source="AnnexTable">1</semx>
          </fmt-xref-label>
          <tbody>
             <tr>