Presentation XML refactor, terms: metanorma/isodoc#630

metanorma · Jan 8, 2025 · a183679 · a183679
1 parent 9978287
commit a183679
Show file tree

Hide file tree

Showing 8 changed files with 371 additions and 129 deletions.
diff --git a/Gemfile.devel b/Gemfile.devel
@@ -0,0 +1,3 @@
+gem "isodoc", git: "https://github.com/metanorma/isodoc", branch: "feature/presentation-terms"
+gem "metanorma-iso", git: "https://github.com/metanorma/metanorma-iso", branch: "feature/presentation-terms"
+gem "mn-requirements", git: "https://github.com/metanorma/mn-requirements", branch: "main"
diff --git a/lib/isodoc/jis/base_convert.rb b/lib/isodoc/jis/base_convert.rb
@@ -4,22 +4,6 @@
 module IsoDoc
   module Jis
     module BaseConvert
-      # KILL
-      def termnote_parsex(node, out)
-        name = node.at(ns("./name"))&.remove
-        out.div **note_attrs(node) do |div|
-          div.p do |p|
-            if name
-              p.span class: "note_label" do |s|
-                name.children.each { |n| parse(n, s) }
-              end
-              p << " "
-            end
-            para_then_remainder(node.first_element_child, node, p, div)
-          end
-        end
-      end
-
       def make_tr_attr(cell, row, totalrows, header, bordered)
         cell["border"] == "0" and bordered = false
         super

diff --git a/lib/isodoc/jis/presentation_xml_convert.rb b/lib/isodoc/jis/presentation_xml_convert.rb
@@ -42,7 +42,10 @@ def ol_depth(node)
       end
 
       def admits(elem)
-        elem.children.first.previous = @i18n.l10n("#{@i18n.admitted}: ")
+        #elem.children.first.previous = @i18n.l10n("#{@i18n.admitted}: ")
+        elem.xpath(ns(".//semx[@element = 'admitted']")).each do |t|
+        t.previous = @i18n.l10n("#{@i18n.admitted}: ")
+      end
       end
 
       def dl(docxml)
@@ -127,13 +130,28 @@ def full_row(cols, elem)
         "<tr><td border='0' colspan='#{cols}'>#{elem}</td></tr>"
       end
 
+      # KILL
       def tablesource(elem)
         while elem&.next_element&.name == "source"
           elem << "; #{to_xml(elem.next_element.remove.children)}"
         end
         elem.children = l10n("#{@i18n.source}: #{to_xml(elem.children).strip}")
       end
 
+      # TODO preserve original Semantic XML source
+      def tablesource(elem)
+      ret = [semx_fmt_dup(elem)]
+      while elem&.next_element&.name == "source"
+        ret << semx_fmt_dup(elem.next_element.remove)
+      end
+      s = ret.map { |x| to_xml(x) }.map(&:strip).join("; ")
+      tablesource_label(elem, s)
+    end
+
+    def tablesource_label(elem, sources)
+      elem.children = l10n("#{@i18n.source}: #{sources}")
+    end
+
       def table_fn1(_table, fnote, _idx)
         fnote["reference"] += ")"
       end

diff --git a/spec/isodoc/blocks_spec.rb b/spec/isodoc/blocks_spec.rb
@@ -112,7 +112,7 @@
              <source status="generalisation">
                 [SOURCE:
                 <xref type="inline" target="ISO712">ISO 712, Section 1</xref>
-                — with adjustments]
+                — <semx element="modification" source="_">with adjustments</semx>]
              </source>
              <note id="note1" autonum="">
                 <fmt-name>

diff --git a/spec/isodoc/i18n_spec.rb b/spec/isodoc/i18n_spec.rb
@@ -242,9 +242,18 @@
                          <span class="fmt-autonum-delim">.</span>
                          <semx element="autonum" source="J">1</semx>
                       </fmt-xref-label>
-                      <preferred>
-                         <strong>Term2</strong>
+                      <preferred id="_">
+                         <expression>
+                            <name>Term2</name>
+                         </expression>
                       </preferred>
+                      <fmt-preferred>
+                         <p>
+                            <semx element="preferred" source="_">
+                               <strong>Term2</strong>
+                            </semx>
+                         </p>
+                      </fmt-preferred>
                    </term>
                 </terms>
                 <definitions id="K">
@@ -963,9 +972,18 @@
                          <span class="fmt-autonum-delim">・</span>
                          <semx element="autonum" source="J">一</semx>
                       </fmt-xref-label>
-                      <preferred>
-                         <strong>Term2</strong>
+                      <preferred id="_">
+                         <expression>
+                            <name>Term2</name>
+                         </expression>
                       </preferred>
+                      <fmt-preferred>
+                         <p>
+                            <semx element="preferred" source="_">
+                               <strong>Term2</strong>
+                            </semx>
+                         </p>
+                      </fmt-preferred>
                    </term>
                 </terms>
                 <definitions id="K">
@@ -1422,7 +1440,6 @@
                 <doctype language="en">International standard</doctype>
              </ext>
           </bibdata>
-          
           <preface>
              <foreword obligation="informative" displayorder="1">
                 <title id="_">Foreword</title>
@@ -1543,9 +1560,18 @@
                          <span class="fmt-autonum-delim">.</span>
                          <semx element="autonum" source="J">1</semx>
                       </fmt-xref-label>
-                      <preferred>
-                         <strong>Term2</strong>
+                      <preferred id="_">
+                         <expression>
+                            <name>Term2</name>
+                         </expression>
                       </preferred>
+                      <fmt-preferred>
+                         <p>
+                            <semx element="preferred" source="_">
+                               <strong>Term2</strong>
+                            </semx>
+                         </p>
+                      </fmt-preferred>
                    </term>
                 </terms>
                 <definitions id="K">

diff --git a/spec/isodoc/table_spec.rb b/spec/isodoc/table_spec.rb
@@ -198,26 +198,33 @@
                       <semx element="name" source="_">Key</semx>
                    </p>
                    <p class="dl">Drago: A type of rice</p>
-                   <source status="generalisation">
+                   <source status="generalisation" id="_">
                       SOURCE:
-                      <origin bibitemid="ISO712" type="inline" citeas="">
-                         <localityStack>
-                            <locality type="section">
-                               <referenceFrom>1</referenceFrom>
-                            </locality>
-                         </localityStack>
-                         , Section 1
-                      </origin>
-                      — with adjustments ;
-                      <origin bibitemid="ISO713" type="inline" citeas="">
-                         <localityStack>
-                            <locality type="section">
-                               <referenceFrom>3</referenceFrom>
-                            </locality>
-                         </localityStack>
-                         , Section 3
-                      </origin>
-                      — with alterations
+               <semx element="source" source="_">
+                  <origin bibitemid="ISO712" type="inline" citeas="">
+                     <localityStack>
+                        <locality type="section">
+                           <referenceFrom>1</referenceFrom>
+                        </locality>
+                     </localityStack>
+                     , Section 1
+                  </origin>
+                  —
+                  <semx element="modification" source="_">with adjustments</semx>
+               </semx>
+               ;
+               <semx element="source" source="_">
+                  <origin bibitemid="ISO713" type="inline" citeas="">
+                     <localityStack>
+                        <locality type="section">
+                           <referenceFrom>3</referenceFrom>
+                        </locality>
+                     </localityStack>
+                     , Section 3
+                  </origin>
+                  —
+                  <semx element="modification" source="_">with alterations</semx>
+               </semx>
                    </source>
                    <note>
                       <fmt-name>
@@ -381,14 +388,7 @@
                          <p class="ListTitle">Key</p>
                          <p class="dl">Drago: A type of rice</p>
                          <div class="BlockSource">
-                            <p>SOURCE: , Section 1
-          —
-           with adjustments
-
-       ;
-         , Section 3
-          —
-           with alterations</p>
+                            <p>SOURCE: , Section 1 — with adjustments; , Section 3 — with alterations</p>
                          </div>
                          <div class="Note">
                             <p>
@@ -525,18 +525,7 @@
                 <tr>
                    <td colspan="5" style="border-top:0pt;mso-border-top-alt:0pt;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;border-left:solid windowtext 1.5pt;mso-border-left-alt:solid windowtext 1.5pt;border-right:solid windowtext 1.5pt;mso-border-right-alt:solid windowtext 1.5pt;">
                       <div class="BlockSource">
-                         <p class="MsoNormal">SOURCE:
-     
-     
-                    , Section 1
-     
-                    — with adjustments ;
-     
-     
-             , Section 3
-     
-           — with alterations
-                </p>
+                         <p class="MsoNormal">SOURCE: , Section 1 — with adjustments; , Section 3 — with alterations</p>
                       </div>
                       <div>
                          <p class="Note">