fmt-caption-label update: #617

metanorma · Nov 26, 2024 · 1256474 · 1256474
1 parent 3601a8a
commit 1256474
Show file tree

Hide file tree

Showing 21 changed files with 3,131 additions and 3,528 deletions.
diff --git a/lib/isodoc/presentation_function/autonum.rb b/lib/isodoc/presentation_function/autonum.rb
@@ -48,6 +48,8 @@ def fmt_label(_label, _number, ids)
 
     # Remove ".blank?" tests if we want empty delim placeholders for manipulation
     def fmt_caption(label, elem, name, ids, delims)
+      label.blank? || %r{<span class=['"]fmt-caption-label['"]}.match?(label) or
+        label = "<span class='fmt-caption-label'>#{label}</span>"
       c = if name && !name.children.empty?
             label.blank? or
               d = "<span class='fmt-caption-delim'>#{delims[:caption]}</span>"
@@ -57,7 +59,7 @@ def fmt_caption(label, elem, name, ids, delims)
           else return end
       !delims[:label].blank? and
         f = "<span class='fmt-label-delim'>#{delims[:label]}</span>"
-      "<fmt-#{elem}><span class='fmt-caption-label'>#{c}</span>#{f}</fmt-#{elem}>"
+      "<fmt-#{elem}>#{c}#{f}</fmt-#{elem}>"
     end
   end
 end
diff --git a/lib/isodoc/xref/xref_sect_gen.rb b/lib/isodoc/xref/xref_sect_gen.rb
@@ -206,7 +206,7 @@ def annex_name_lbl(clause, num)
         title = Common::case_with_markup(@labels["annex"], "capital",
                                          @script)
         s = labelled_autonum(title, num)
-        "<strong>#{s}</strong><br/>#{obl}"
+        "<strong><span class='fmt-caption-label'>#{s}</span></strong><br/>#{obl}"
       end
 
       def annex_name_anchors(clause, num, level)

diff --git a/spec/isodoc/blocks_notes_spec.rb b/spec/isodoc/blocks_notes_spec.rb
@@ -23,9 +23,7 @@
              <foreword displayorder="2">
                 <title id="_">Foreword</title>
                 <fmt-title depth="1">
-                   <span class="fmt-caption-label">
                       <semx element="title" source="_">Foreword</semx>
-                   </span>
                 </fmt-title>
                 <note id="A" keep-with-next="true" keep-lines-together="true" autonum="1">
                    <fmt-name>
@@ -149,9 +147,7 @@
              <foreword displayorder="2">
                 <title id="_">Foreword</title>
                 <fmt-title depth="1">
-                   <span class="fmt-caption-label">
                       <semx element="title" source="_">Foreword</semx>
-                   </span>
                 </fmt-title>
                 <note id="note1" autonum="1">
                    <fmt-name>
@@ -429,9 +425,7 @@
            <foreword displayorder="2">
               <title id="_">Foreword</title>
               <fmt-title depth="1">
-                 <span class="fmt-caption-label">
                     <semx element="title" source="_">Foreword</semx>
-                 </span>
               </fmt-title>
             <note id='FB' coverpage='true' unnumbered='true'>
                         <fmt-name>
@@ -557,9 +551,7 @@
              <foreword displayorder="2">
                 <title id="_">Foreword</title>
                 <fmt-title depth="1">
-                   <span class="fmt-caption-label">
                       <semx element="title" source="_">Foreword</semx>
-                   </span>
                 </fmt-title>
                 <figure id="F" autonum="1">
                    <fmt-name>
@@ -662,9 +654,7 @@
              <foreword displayorder="2">
                 <title id="_">Foreword</title>
                 <fmt-title depth="1">
-                   <span class="fmt-caption-label">
                       <semx element="title" source="_">Foreword</semx>
-                   </span>
                 </fmt-title>
           <admonition id="_" type="caution" keep-with-next="true" keep-lines-together="true">
             <fmt-name>
@@ -724,9 +714,7 @@
              <foreword displayorder="2">
                 <title id="_">Foreword</title>
                 <fmt-title depth="1">
-                   <span class="fmt-caption-label">
                       <semx element="title" source="_">Foreword</semx>
-                   </span>
                 </fmt-title>
             <admonition id="_" type="caution">
               <fmt-name>
@@ -769,25 +757,19 @@
              <foreword displayorder="2">
                 <title id="_">Foreword</title>
                 <fmt-title depth="1">
-                   <span class="fmt-caption-label">
                       <semx element="title" source="_">Foreword</semx>
-                   </span>
                 </fmt-title>
                 <admonition id="_" type="caution">
                    <name id="_">Title</name>
                    <fmt-name>
-                      <span class="fmt-caption-label">
                          <semx element="name" source="_">Title</semx>
-                      </span>
                    </fmt-name>
                    <p id="_">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
                 </admonition>
                 <admonition id="_" type="caution" notag="true">
                    <name id="_">Title</name>
                    <fmt-name>
-                      <span class="fmt-caption-label">
                          <semx element="name" source="_">Title</semx>
-                      </span>
                    </fmt-name>
                    <p id="_">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
                 </admonition>
@@ -846,19 +828,17 @@
              <foreword displayorder="2">
                 <title id="_">Foreword</title>
                 <fmt-title depth="1">
-                   <span class="fmt-caption-label">
                       <semx element="title" source="_">Foreword</semx>
-                   </span>
                 </fmt-title>
                 <admonition id="_" type="box" autonum="1">
                    <name id="_">Title</name>
                    <fmt-name>
                       <span class="fmt-caption-label">
                          <span class="fmt-element-name">Box</span>
                          <semx element="autonum" source="_">1</semx>
+                         </span>
                          <span class="fmt-caption-delim"> — </span>
                          <semx element="name" source="_">Title</semx>
-                      </span>
                    </fmt-name>
                    <fmt-xref-label>
                       <span class="fmt-element-name">Box</span>