metanorma-iso 1.9.0 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fc50a5631e4815038d720b3f8b01551c824df300760d7d5c01e0fa57adf37a0
-  data.tar.gz: 7f2b4cad47277b4b1b0ab49d12f873e9a008b511fbd5db2a3925b96c9f504875
+  metadata.gz: ac1798683a3c7ca060a86feb2617005c4e642740a8d65c6221a65c1920799590
+  data.tar.gz: 6e3935f47c7d2b9458c0c0768c336477a32ff263e1f6cba0d57cdaad47151e60
 SHA512:
-  metadata.gz: cfb9d4ca6d29cdd964118d3d7810cd71acfbe4b6d9c5c1edb3b14bfbadddbc004e73755e5495ebf91fa51670a373dc02d6b37ea4e1bac8df5d097bb3214adb44
-  data.tar.gz: 28b0407e858ff7ea5b8a7911b9c7bf2b82c7a9d45e9035029bd510a78a7e16016175fdfa03dbf04599d4254e2eabce2178f36b671141e833587f02d3298b008a
+  metadata.gz: c9619fe733adeddd4064d3531a6cdca00f1c841234729c24db198c88f24e7cce87ae9b4e847c7df5f52f0414b8392c3c581c88cb19f0a2ad2affc2f1693508f5
+  data.tar.gz: c745a76c0834e67c582649c7676d8fa140e1c5a89f20d67fea317e1fb37251a339155a17e980250e96f54d2da0b0e6d05bcd382743bd91b8979571ba030cec6b

data/lib/asciidoctor/iso/cleanup.rb

@@ -137,10 +137,9 @@ module Asciidoctor
         xmldoc.xpath("//bibitem/note[@type = 'Unpublished-Status']").each do |n|
           id = n.parent["id"]
           e = xmldoc.at("//eref[@bibitemid = '#{id}']") or next
-          e.next = n.dup
-          e.next.name = "fn"
-          e.next.delete("format")
-          e.next.delete("type")
+          fn = n.children.to_xml
+          n&.elements&.first&.name == "p" or fn = "<p>#{fn}</p>"
+          e.next = "<fn>#{fn}</fn>"
         end
       end
 

data/lib/asciidoctor/iso/front_id.rb

@@ -193,12 +193,17 @@ module Asciidoctor
       end
 
       def get_stage(node)
-        node.attr("status") || node.attr("docstage") || "60"
+        a = node.attr("status")
+        a = node.attr("docstage") if a.nil? || a.empty?
+        a = "60" if a.nil? || a.empty?
+        a
       end
 
       def get_substage(node)
         stage = get_stage(node)
-        node.attr("docsubstage") || (stage == "60" ? "60" : "00")
+        ret = node.attr("docsubstage")
+        ret = (stage == "60" ? "60" : "00") if ret.nil? || ret.empty?
+        ret
       end
 
       def get_typeabbr(node, amd = false)

data/lib/asciidoctor/iso/isodoc.rng

@@ -32,6 +32,18 @@
         <ref name="DocumentType"/>
       </element>
     </define>
+    <define name="section-title">
+      <element name="title">
+        <zeroOrMore>
+          <ref name="TextElement"/>
+        </zeroOrMore>
+      </element>
+      <zeroOrMore>
+        <element name="variant-title">
+          <ref name="TypedTitleString"/>
+        </element>
+      </zeroOrMore>
+    </define>
     <define name="hyperlink">
       <element name="link">
         <attribute name="target">
@@ -158,15 +170,17 @@
             <data type="boolean"/>
           </attribute>
         </optional>
-        <attribute name="type">
-          <choice>
-            <value>roman</value>
-            <value>alphabet</value>
-            <value>arabic</value>
-            <value>roman_upper</value>
-            <value>alphabet_upper</value>
-          </choice>
-        </attribute>
+        <optional>
+          <attribute name="type">
+            <choice>
+              <value>roman</value>
+              <value>alphabet</value>
+              <value>arabic</value>
+              <value>roman_upper</value>
+              <value>alphabet_upper</value>
+            </choice>
+          </attribute>
+        </optional>
         <oneOrMore>
           <ref name="li"/>
         </oneOrMore>
@@ -1011,8 +1025,14 @@
       <ref name="imagemap"/>
       <ref name="svgmap"/>
       <ref name="inputform"/>
+      <ref name="toc"/>
     </choice>
   </define>
+  <define name="toc">
+    <element name="toc">
+      <ref name="ul"/>
+    </element>
+  </define>
   <define name="inputform">
     <element name="form">
       <attribute name="id">
@@ -1254,6 +1274,12 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="identifier"/>
+    </optional>
+    <optional>
+      <attribute name="prefix"/>
+    </optional>
     <text/>
   </define>
   <define name="ics">

data/lib/asciidoctor/iso/isostandard.rng

@@ -184,6 +184,9 @@
         <zeroOrMore>
           <ref name="termsource"/>
         </zeroOrMore>
+        <zeroOrMore>
+          <ref name="term"/>
+        </zeroOrMore>
       </element>
     </define>
     <define name="annex">

data/lib/asciidoctor/iso/reqt.rng

@@ -64,9 +64,9 @@
     <optional>
       <ref name="label"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="subject"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="reqinherit"/>
     </zeroOrMore>
@@ -80,6 +80,7 @@
         <ref name="verification"/>
         <ref name="import"/>
         <ref name="description"/>
+        <ref name="component"/>
       </choice>
     </zeroOrMore>
     <optional>
@@ -105,12 +106,16 @@
   </define>
   <define name="subject">
     <element name="subject">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="reqinherit">
     <element name="inherit">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="measurementtarget">
@@ -138,6 +143,12 @@
       <ref name="RequirementSubpart"/>
     </element>
   </define>
+  <define name="component">
+    <element name="component">
+      <attribute name="class"/>
+      <ref name="RequirementSubpart"/>
+    </element>
+  </define>
   <define name="reqt_references">
     <element name="references">
       <oneOrMore>

data/lib/asciidoctor/iso/section.rb

@@ -15,7 +15,7 @@ module Asciidoctor
       end
 
       def appendix_parse(attrs, xml, node)
-        attrs["inline-header".to_sym] = node.option? "inline-header"
+        attrs[:"inline-header"] = node.option? "inline-header"
         set_obligation(attrs, node)
         xml.appendix **attr_code(attrs) do |xml_section|
           xml_section.title { |name| name << node.title }
@@ -38,6 +38,12 @@ module Asciidoctor
 
         super
       end
+
+      def term_def_subclause_parse(attrs, xml, node)
+        node.role == "term" and
+          return term_def_subclause_parse1(attrs, xml, node)
+        super
+      end
     end
   end
 end

data/lib/asciidoctor/iso/validate_section.rb

@@ -32,10 +32,10 @@ module Asciidoctor
       end
 
       ONE_SYMBOLS_WARNING = "Only one Symbols and Abbreviated "\
-        "Terms section in the standard".freeze
+                            "Terms section in the standard".freeze
 
       NON_DL_SYMBOLS_WARNING = "Symbols and Abbreviated Terms can "\
-        "only contain a definition list".freeze
+                               "only contain a definition list".freeze
 
       def symbols_validate(root)
         f = root.xpath("//definitions")
@@ -87,7 +87,7 @@ module Asciidoctor
           },
           {
             msg: "Normative References must be followed by "\
-            "Terms and Definitions",
+                 "Terms and Definitions",
             val: ["./self::terms | .//terms"],
           },
         ].freeze
@@ -127,17 +127,20 @@ module Asciidoctor
         end
         elem&.at("./self::clause") ||
           @log.add("Style", elem, "Document must contain clause after "\
-                   "Terms and Definitions")
+                                  "Terms and Definitions")
         elem&.at("./self::clause[@type = 'scope']") &&
-          @log.add("Style", elem, "Scope must occur before Terms and Definitions")
+          @log.add("Style", elem,
+                   "Scope must occur before Terms and Definitions")
         elem = names.shift
         while elem&.name == "clause"
           elem&.at("./self::clause[@type = 'scope']")
-          @log.add("Style", elem, "Scope must occur before Terms and Definitions")
+          @log.add("Style", elem,
+                   "Scope must occur before Terms and Definitions")
           elem = names.shift
         end
         %w(annex references).include? elem&.name or
-          @log.add("Style", elem, "Only annexes and references can follow clauses")
+          @log.add("Style", elem,
+                   "Only annexes and references can follow clauses")
         [names, elem]
       end
 
@@ -146,7 +149,8 @@ module Asciidoctor
           elem = names.shift
         end
         %w(annex references).include? elem&.name or
-          @log.add("Style", elem, "Only annexes and references can follow terms and clauses")
+          @log.add("Style", elem,
+                   "Only annexes and references can follow terms and clauses")
         [names, elem]
       end
 
@@ -155,25 +159,19 @@ module Asciidoctor
           elem = names.shift
           if elem.nil?
             @log.add("Style", nil, "Document must include (references) "\
-                     "Normative References")
+                                   "Normative References")
           end
         end
         elem&.at("./self::references[@normative = 'true']") ||
           @log.add("Style", nil, "Document must include (references) "\
-                   "Normative References")
+                                 "Normative References")
         elem = names&.shift
         elem&.at("./self::references[@normative = 'false']") ||
-          @log.add("Style", elem, "Final section must be (references) Bibliography")
+          @log.add("Style", elem,
+                   "Final section must be (references) Bibliography")
         names.empty? ||
-          @log.add("Style", elem, "There are sections after the final Bibliography")
-      end
-
-      def style_warning(node, msg, text = nil)
-        return if @novalid
-
-        w = msg
-        w += ": #{text}" if text
-        @log.add("Style", node, w)
+          @log.add("Style", elem,
+                   "There are sections after the final Bibliography")
       end
 
       NORM_ISO_WARN = "non-ISO/IEC reference not expected as normative".freeze

data/lib/asciidoctor/iso/validate_style.rb

@@ -70,18 +70,18 @@ module Asciidoctor
         style(node, extract_text(node))
       end
 
-      def style_regex(re, warning, n, text)
-        (m = re.match(text)) && style_warning(n, warning, m[:num])
+      def style_regex(regex, warning, n, text)
+        (m = regex.match(text)) && style_warning(n, warning, m[:num])
       end
 
       # style check with a regex on a token
       # and a negative match on its preceding token
-      def style_two_regex_not_prev(n, text, re, re_prev, warning)
+      def style_two_regex_not_prev(n, text, regex, re_prev, warning)
         return if text.nil?
 
         arr = Tokenizer::WhitespaceTokenizer.new.tokenize(text)
         arr.each_index do |i|
-          m = re.match arr[i]
+          m = regex.match arr[i]
           m_prev = i.zero? ? nil : re_prev.match(arr[i - 1])
           if !m.nil? && m_prev.nil?
             style_warning(n, warning, m[:num])
@@ -132,22 +132,22 @@ module Asciidoctor
 
       # leaving out as problematic: N J K C S T H h d B o E
       SI_UNIT = "(m|cm|mm|km|μm|nm|g|kg|mgmol|cd|rad|sr|Hz|Hz|MHz|Pa|hPa|kJ|"\
-        "V|kV|W|MW|kW|F|μF|Ω|Wb|°C|lm|lx|Bq|Gy|Sv|kat|l|t|eV|u|Np|Bd|"\
-        "bit|kB|MB|Hart|nat|Sh|var)".freeze
+                "V|kV|W|MW|kW|F|μF|Ω|Wb|°C|lm|lx|Bq|Gy|Sv|kat|l|t|eV|u|Np|Bd|"\
+                "bit|kB|MB|Hart|nat|Sh|var)".freeze
 
       # ISO/IEC DIR 2, 9.3
       def style_units(node, text)
         style_regex(/\b(?<num>[0-9][0-9,]*\s+[\u00b0\u2032\u2033])/,
                     "space between number and degrees/minutes/seconds",
                     node, text)
-        style_regex(/\b(?<num>[0-9][0-9,]*#{SI_UNIT})\b/,
+        style_regex(/\b(?<num>[0-9][0-9,]*#{SI_UNIT})\b/o,
                     "no space between number and SI unit", node, text)
         style_non_std_units(node, text)
       end
 
       NONSTD_UNITS = {
-        "sec": "s", "mins": "min", "hrs": "h", "hr": "h", "cc": "cm^3",
-        "lit": "l", "amp": "A", "amps": "A", "rpm": "r/min"
+        sec: "s", mins: "min", hrs: "h", hr: "h", cc: "cm^3",
+        lit: "l", amp: "A", amps: "A", rpm: "r/min"
       }.freeze
 
       # ISO/IEC DIR 2, 9.3
@@ -157,6 +157,14 @@ module Asciidoctor
                       "non-standard unit (should be #{v})", node, text)
         end
       end
+
+      def style_warning(node, msg, text = nil)
+        return if @novalid
+
+        w = msg
+        w += ": #{text}" if text
+        @log.add("Style", node, w)
+      end
     end
   end
 end

data/lib/isodoc/iso/index.rb

@@ -7,12 +7,13 @@ module IsoDoc
 
       def index(docxml)
         unless docxml.at(ns("//index"))
-          docxml.xpath(ns("//indexsect")).each { |i| i.remove }
+          docxml.xpath(ns("//indexsect")).each(&:remove)
           return
         end
         i = docxml.at(ns("//indexsect")) ||
           docxml.root.add_child("<indexsect #{add_id}><title>#{@i18n.index}</title></indexsect>").first
-        index = sort_indexterms(docxml.xpath(ns("//index")), docxml.xpath(ns("//index-xref[@also = 'false']")),
+        index = sort_indexterms(docxml.xpath(ns("//index")),
+                                docxml.xpath(ns("//index-xref[@also = 'false']")),
                                 docxml.xpath(ns("//index-xref[@also = 'true']")))
         index1(docxml, i, index)
       end
@@ -20,10 +21,12 @@ module IsoDoc
       def index1(docxml, i, index)
         c = i.add_child("<ul></ul>").first
         index.keys.sort.each do |k|
-          #c = i.add_child "<clause #{add_id}><title>#{k}</title><ul></ul></clause>"
-          words = index[k].keys.each_with_object({}) { |w, v| v[sortable(w).downcase] = w }
+          # c = i.add_child "<clause #{add_id}><title>#{k}</title><ul></ul></clause>"
+          words = index[k].keys.each_with_object({}) do |w, v|
+            v[sortable(w).downcase] = w
+          end
           words.keys.localize(@lang.to_sym).sort.to_a.each do |w|
-            #c.first.at(ns("./ul")).add_child index_entries(words, index[k], w)
+            # c.first.at(ns("./ul")).add_child index_entries(words, index[k], w)
             c.add_child index_entries(words, index[k], w)
           end
         end
@@ -31,8 +34,8 @@ module IsoDoc
         @xrefs.bookmark_anchor_names(docxml)
       end
 
-      def sortable(s)
-        HTMLEntities.new.decode(Nokogiri::XML.fragment(s).text)
+      def sortable(str)
+        HTMLEntities.new.decode(Nokogiri::XML.fragment(str).text)
       end
 
       def index_entries_opt
@@ -40,8 +43,12 @@ module IsoDoc
       end
 
       def index_entries(words, index, primary)
-        ret = index_entries_head(words[primary], index.dig(words[primary], nil, nil), index_entries_opt)
-        words2 = index[words[primary]]&.keys&.reject { |k| k.nil?}&.each_with_object({}) { |w, v| v[w.downcase] = w }
+        ret = index_entries_head(words[primary],
+                                 index.dig(words[primary], nil, nil),
+                                 index_entries_opt)
+        words2 = index[words[primary]]&.keys&.reject do |k|
+                   k.nil?
+                 end&.each_with_object({}) { |w, v| v[w.downcase] = w }
         unless words2.empty?
           ret += "<ul>"
           words2.keys.localize(@lang.to_sym).sort.to_a.each do |w|
@@ -53,12 +60,18 @@ module IsoDoc
       end
 
       def index_entries2(words, index, secondary)
-        ret = index_entries_head(words[secondary], index.dig(words[secondary], nil), index_entries_opt)
-        words3 = index[words[secondary]]&.keys&.reject { |k| k.nil?}&.each_with_object({}) { |w, v| v[w.downcase] = w }
+        ret = index_entries_head(words[secondary],
+                                 index.dig(words[secondary], nil),
+                                 index_entries_opt)
+        words3 = index[words[secondary]]&.keys&.reject do |k|
+                   k.nil?
+                 end&.each_with_object({}) { |w, v| v[w.downcase] = w }
         unless words3.empty?
           ret += "<ul>"
           words3.keys.localize(@lang.to_sym).sort.to_a.each do |w|
-            ret += (index_entries_head(words3[w], index[words[secondary]][words3[w]], index_entries_opt) + "</li>")
+            ret += (index_entries_head(words3[w],
+                                       index[words[secondary]][words3[w]],
+                                       index_entries_opt) + "</li>")
           end
           ret += "</ul>"
         end
@@ -68,10 +81,18 @@ module IsoDoc
       def index_entries_head(head, entries, opt)
         ret = "<li>#{head}"
         xref = entries&.dig(:xref)&.join(", ")
-        see_sort = entries&.dig(:see)&.each_with_object({}) { |w, v| v[sortable(w).downcase] = w }
-        see = see_sort&.keys&.localize(@lang.to_sym)&.sort&.to_a&.map { |k| see_sort[k] }&.join(", ")
-        also_sort = entries&.dig(:also)&.each_with_object({}) { |w, v| v[sortable(w).downcase] = w }
-        also = also_sort&.keys&.localize(@lang.to_sym)&.sort&.to_a&.map { |k| also_sort[k] }&.join(", ")
+        see_sort = entries&.dig(:see)&.each_with_object({}) do |w, v|
+          v[sortable(w).downcase] = w
+        end
+        see = see_sort&.keys&.localize(@lang.to_sym)&.sort&.to_a&.map do |k|
+                see_sort[k]
+              end&.join(", ")
+        also_sort = entries&.dig(:also)&.each_with_object({}) do |w, v|
+          v[sortable(w).downcase] = w
+        end
+        also = also_sort&.keys&.localize(@lang.to_sym)&.sort&.to_a&.map do |k|
+                 also_sort[k]
+               end&.join(", ")
         ret += "#{opt[:xref_lbl]} #{xref}" if xref
         ret += "#{opt[:see_lbl]} #{see}" if see
         ret += "#{opt[:also_lbl]} #{also}" if also
@@ -96,8 +117,8 @@ module IsoDoc
         end
       end
 
-      def extract_indexsee(v, terms, label)
-        terms.each_with_object(v) do |t, v|
+      def extract_indexsee(val, terms, label)
+        terms.each_with_object(val) do |t, v|
           term = t&.at(ns("./primary"))&.children&.to_xml
           term2 = t&.at(ns("./secondary"))&.children&.to_xml
           term3 = t&.at(ns("./tertiary"))&.children&.to_xml
@@ -110,8 +131,11 @@ module IsoDoc
         end
       end
 
-      def xml_encode_attr(s)
-        HTMLEntities.new.encode(s, :basic, :hexadecimal).gsub(/\&#x([^;]+);/) { |x| "&#x#{$1.upcase};" }
+      def xml_encode_attr(str)
+        HTMLEntities.new.encode(str, :basic, :hexadecimal)
+          .gsub(/&#x([^;]+);/) do |_x|
+          "&#x#{$1.upcase};"
+        end
       end
 
       # attributes are decoded into UTF-8, elements in extract_indexsee are still in entities
@@ -130,10 +154,10 @@ module IsoDoc
         end
       end
 
-      def index2bookmark(t)
-        t.name = "bookmark"
-        t.children.each { |x| x.remove }
-        t["id"] = "_#{UUIDTools::UUID.random_create}"
+      def index2bookmark(node)
+        node.name = "bookmark"
+        node.children.each(&:remove)
+        node["id"] = "_#{UUIDTools::UUID.random_create}"
       end
     end
   end