metanorma-iso 2.9.0 → 2.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0941432979465638a050af9a47a277a037c98bcf7ac8fd8dc6f5cdf55fe0f92b'
-  data.tar.gz: 628a80940efddab2c8659dae8aa140839f1b7eb2e4c662a9757410e0048c3e23
+  metadata.gz: d8cce2da59aa8b9dc9110813d8705c46804317af51f1d1ac3c7c9feeaefce0ee
+  data.tar.gz: 421cc96a3f66326d521a543a8e42e62b7e5b1db5180aceb0bd45ff94eceea917
 SHA512:
-  metadata.gz: 322cbf882d1fb24c13c8263ce74d2d1d851763df54a2e27dc864657dbce0d47adf08537420aabb89eb3632ed1e476463e583fd9e52117072e0cf88a95fe666e2
-  data.tar.gz: 9eaa31b78ccfa61cb66a3352493dfcf38e36584a3ef960f7782dab497f77bccfdd750bddf2fbe96f23ac34907c530eced9ec30cd8a999eba08e5f07e964acf34
+  metadata.gz: 7323f3b08a9de3a3d27dc57847c09baa2e2c418a3db00d36ad232ab9235b5e0cae6a9fffb4663d36c497c1677ee0f455cd718516c195c45cd54da81ca3407ffd
+  data.tar.gz: eca0875e427fc33eb671a59a659f544c2af89699024c622192f8250b7197026c33c7fc696f16ed7e59753abe844a82ddb7cae9b08e056bdc28634d9ae4404442

data/lib/isodoc/iso/base_convert.rb

@@ -29,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..].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)
@@ -88,6 +87,7 @@ module IsoDoc
         admonition_name_in_first_para(node, div)
       end
 
+      # TODO: To Presentation XML
       def admonition_name_para_delim(para)
         para << " "
       end
@@ -114,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
@@ -149,9 +149,9 @@ module IsoDoc
         out.div **figure_attrs(node) do |div|
           node.children.each do |n|
             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
 
@@ -178,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;