metanorma-iso 2.8.9 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cddf2aa3ff6244b6b2c71735ff0d0fadf3c09781f175a911acdd329fb0a1d8a4
-  data.tar.gz: c8349e9a17b898ec039710f1db1129f771e138fd3f2d1aabd10831fb37a88c31
+  metadata.gz: 6b7b6883da4ce6bbf015239527a21673238975a1793459c2dde2ea18ca65cf8d
+  data.tar.gz: 56c0603011e5c16b2fc05e226661b6cbf361bef6b7099a7f3a7e750df12c5da1
 SHA512:
-  metadata.gz: 044e820c2a45d6e90e0d56edbf546ee3edf9413ae4430abbcd142f56d0b4b1e0f08245b3873565aa4700b9d18f12259f4583208483cbf0377e9d3a94b0724f19
-  data.tar.gz: f14bfec47073d66be2b55a84c19be102c24797c4bbbc878bc41253d99f2f6bc6be9cd39a50f47ec341c5232f29f370dc158655974710feab7e1032de2139da34
+  metadata.gz: 6e2f189df9167a3dfca2749a356faec5d7d0ab5d19530fde0752caba459ae6b36f3a18ce184ba801de5085dd4f98efd84f7c6ed8997d020884b257183687d909
+  data.tar.gz: e83e5d3eecc9951236bc3c21c6d812bbaac0bce2f6a148edaf41bb55a7fefbaadc83c35d7988fe38b12d59e707cdba4188ff306e1ef079a552b7b7a6ddea379c

data/lib/isodoc/iso/base_convert.rb

@@ -13,11 +13,6 @@ module IsoDoc
         super
       end
 
-      def implicit_reference(bib)
-        bib.at(ns("./docidentifier"))&.text == "IEV" and return true
-        super
-      end
-
       # terms not defined in standoc
       def error_parse(node, out)
         case node.name
@@ -34,35 +29,34 @@ module IsoDoc
         end
       end
 
+      def example_p_class
+        nil
+      end
+
       def example_p_parse(node, div)
-        div.p do |p|
-          example_span_label(node, p, node&.at(ns("./name"))&.remove)
-          insert_tab(p, 1)
-          node.first_element_child.children.each { |n| parse(n, p) }
+        name = node.at(ns("./fmt-name"))
+        para = node.at(ns("./p"))
+        div.p **attr_code(class: example_p_class) do |p|
+          name and p.span class: "example_label" do |s|
+            name.children.each { |n| parse(n, s) }
+          end
+          insert_tab(p, 1) # TODO to Presentation XML
+          children_parse(para, p)
         end
-        node.element_children[1..-1].each { |n| parse(n, div) }
+        para.xpath("./following-sibling::*").each { |n| parse(n, div) }
       end
 
       def example_parse1(node, div)
         div.p do |p|
-          example_span_label(node, p, node.at(ns("./name")))
+          example_span_label(node, p, node.at(ns("./fmt-name")))
           insert_tab(p, 1)
         end
-        node.children.each { |n| parse(n, div) unless n.name == "name" }
-      end
-
-      def node_begins_with_para(node)
-        node.elements.each do |e|
-          e.name == "name" and next
-          e.name == "p" and return true
-          return false
-        end
-        false
+        node.children.each { |n| parse(n, div) unless n.name == "fmt-name" }
       end
 
       def example_parse(node, out)
         out.div id: node["id"], class: "example" do |div|
-          if node_begins_with_para(node)
+          if starts_with_para?(node)
             example_p_parse(node, div)
           else
             example_parse1(node, div)
@@ -83,42 +77,19 @@ module IsoDoc
         end
       end
 
-      def admonition_parse(node, out)
-        type = node["type"]
-        name = admonition_name(node, type)
-        out.div id: node["id"], class: admonition_class(node) do |div|
-          if node.first_element_child.name == "p"
-            admonition_p_parse(node, div, name)
-          else
-            admonition_parse1(node, div, name)
-          end
-        end
-      end
-
       def admonition_class(node)
         if node["type"] == "editorial" then "zzHelp"
         else super
         end
       end
 
-      def admonition_parse1(node, div, name)
-        div.p do |p|
-          admonition_name_parse(node, p, name) if name
-        end
-        node.children.each { |n| parse(n, div) unless n.name == "name" }
+      def admonition_p_parse(node, div)
+        admonition_name_in_first_para(node, div)
       end
 
-      def admonition_p_parse(node, div, name)
-        div.p do |p|
-          admonition_name_parse(node, p, name) if name
-          node.first_element_child.children.each { |n| parse(n, p) }
-        end
-        node.element_children[1..-1].each { |n| parse(n, div) }
-      end
-
-      def admonition_name_parse(_node, div, name)
-        name.children.each { |n| parse(n, div) }
-        div << " &#x2014; "
+      # TODO: To Presentation XML
+      def admonition_name_para_delim(para)
+        para << " "
       end
 
       def figure_name_parse(_node, div, name)
@@ -143,9 +114,9 @@ module IsoDoc
           class: clause.name == "definitions" ? "Symbols" : nil,
         ) do |div|
           num = num + 1
-          clause_name(clause, clause&.at(ns("./title")), div, nil)
+          clause_name(clause, clause&.at(ns("./fmt-title")), div, nil)
           clause.elements.each do |e|
-            parse(e, div) unless %w{title source}.include? e.name
+            parse(e, div) unless %w{fmt-title source}.include? e.name
           end
         end
       end
@@ -154,12 +125,6 @@ module IsoDoc
         super.merge(start: node["start"]).compact
       end
 
-      def render_identifier(ident)
-        ret = super
-        ret[:sdo] = std_docid_semantic(ret[:sdo])
-        ret
-      end
-
       def table_parse(node, out)
         @in_table = true
         table_title_parse(node, out)
@@ -183,11 +148,10 @@ module IsoDoc
         measurement_units(node, out)
         out.div **figure_attrs(node) do |div|
           node.children.each do |n|
-            figure_key(out) if n.name == "dl"
             n.name == "note" && n["type"] == "units" and next
-            parse(n, div) unless n.name == "name"
+            parse(n, div) unless n.name == "fmt-name"
           end
-          figure_name_parse(node, div, node.at(ns("./name")))
+          figure_name_parse(node, div, node.at(ns("./fmt-name")))
         end
       end
 
@@ -214,6 +178,12 @@ module IsoDoc
         super
         update_i18n(docxml)
       end
+
+      def span_parse(node, out)
+        node["class"] == "fmt-obligation" and
+          node["class"] = "obligation"
+        super
+      end
     end
   end
 end

data/lib/isodoc/iso/html/isodoc-dis.css

@@ -4489,6 +4489,6 @@ div.Note table.dl {
   font-size: {{smallerfontsize}};
   margin-left: 1.0cm; }
 
-td.example_label, td.note_label {
+td.example_label, td.note_label, td.termnote_label {
   font-size: {{smallerfontsize}};
   font-family: {{bodyfont}}; }

data/lib/isodoc/iso/html/isodoc-dis.scss

@@ -4314,7 +4314,7 @@ div.Note table.dl  {
   margin-left: 1.0cm;
 }
 
-td.example_label, td.note_label
+td.example_label, td.note_label, td.termnote_label
 {
 font-size: $smallerfontsize;
 font-family:$bodyfont;

data/lib/isodoc/iso/html/isodoc.css

@@ -1341,6 +1341,6 @@ div.Note table.dl {
   font-size: {{smallerfontsize}};
   margin-left: 1.0cm; }
 
-span.note_label, span.example_label, td.example_label, td.note_label {
+span.note_label, span.example_label, td.example_label, td.note_label, span.termnote_label, td.termnote_label {
   font-size: {{smallerfontsize}};
   font-family: {{bodyfont}}; }

data/lib/isodoc/iso/html/isodoc.scss

@@ -1307,7 +1307,7 @@ div.Note table.dl  {
   margin-left: 1.0cm;
 }
 
-span.note_label, span.example_label, td.example_label, td.note_label
+span.note_label, span.example_label, td.example_label, td.note_label, span.termnote_label, td.termnote_label
 {
 font-size: $smallerfontsize;
 font-family:$bodyfont;