metanorma-iso 1.10.1 → 1.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24633dfc813afd54d496d125ac4cc7ffdb4e11b9a2958437033c0cfe57ea7873
-  data.tar.gz: b3995300f75025e162a31b28aa2aea9ebfdb3fd791928d622ee9fea264948a63
+  metadata.gz: 7a8f44a84f1173e2b495a6ccb50683b6b17454ec8408b740a1adb56b3c05e4a2
+  data.tar.gz: 6efb198dffa92685545a865310668345cbc20f6b6a08e79d1b63cbda0961aa27
 SHA512:
-  metadata.gz: 1d495eb4e4758f85053f888027b8776048ed4e1c2f1c0ee5f87a5dda4214fcfe85d2d490947633a8889cf9aa8db48dcd42eb319e1ae63abb5cf3901fec9cb789
-  data.tar.gz: c4472ab5da3868ccf1331e6ff1879218a5e5e515128f3733d1ef32dcc8b4fec5b5855d5712c03ac950c67b4a7e0ccdf452da1b4fba9c6f61907b9ed40b0867e3
+  metadata.gz: c848159c457326d7cd76a3000721b063d16febbd3f7db96a673a666c0fe8abddcc0c0ef6bc330a4d0be85a09b101e22dda9d954e9b7ae4c331cd698168c827a6
+  data.tar.gz: d1b9dd77f0e81ec1aa9e0415d83026bab80a59dd205fd0d0cd2349e0e41b5a22078928120f9e373f220391a50d17b10320577d18796a7973792f503f63eca89f

data/.github/workflows/ubuntu.yml

@@ -36,6 +36,6 @@ jobs:
 
     - uses: actions/download-artifact@master
       with:
-        name: xsd_doc-ubuntu
+        name: xsd_doc
         path: xsd_doc
 

data/Gemfile

@@ -4,7 +4,7 @@ Encoding.default_internal = Encoding::UTF_8
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}" }
 
-# gem "asciimath", git: "https://github.com/asciidoctor/asciimath"
+gem "relaton", git: "https://github.com/relaton/relaton"
 
 gemspec
 

data/lib/asciidoctor/iso/base.rb

@@ -28,7 +28,7 @@ module Asciidoctor
       def pdf_converter(node)
         return nil if node.attr("no-pdf")
 
-        IsoDoc::Iso::PdfConvert.new(doc_extract_attributes(node))
+        IsoDoc::Iso::PdfConvert.new(pdf_extract_attributes(node))
       end
 
       def sts_converter(node)

data/lib/asciidoctor/iso/basicdoc.rng

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar xmlns="http://relaxng.org/ns/structure/1.0" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="biblio.rng">
     <start>
       <ref name="document"/>
@@ -19,7 +19,6 @@
   </define>
   <define name="bibdata">
     <element name="bibdata">
-      <a:documentation>Document attributes</a:documentation>
       <ref name="BibData"/>
     </element>
   </define>
@@ -105,12 +104,10 @@
   </define>
   <define name="paragraph">
     <element name="p">
-      <a:documentation>Paragraph</a:documentation>
       <ref name="ParagraphType"/>
     </element>
   </define>
   <define name="Alignments">
-    <a:documentation>Text alignment</a:documentation>
     <choice>
       <value>left</value>
       <value>right</value>
@@ -218,7 +215,6 @@
   </define>
   <define name="quote">
     <element name="quote">
-      <a:documentation>Block quotes</a:documentation>
       <attribute name="id">
         <data type="ID"/>
       </attribute>
@@ -253,7 +249,6 @@
   </define>
   <define name="sourcecode">
     <element name="sourcecode">
-      <a:documentation>Source code, a pre-formatted source snippet to be rendered in monospace font, and with spaces preserved</a:documentation>
       <attribute name="id">
         <data type="ID"/>
       </attribute>
@@ -1052,7 +1047,6 @@
   </define>
   <define name="ul">
     <element name="ul">
-      <a:documentation>Unordered list</a:documentation>
       <attribute name="id">
         <data type="ID"/>
       </attribute>
@@ -1066,7 +1060,6 @@
   </define>
   <define name="li">
     <element name="li">
-      <a:documentation>List item</a:documentation>
       <optional>
         <attribute name="id">
           <data type="ID"/>
@@ -1104,7 +1097,6 @@
   </define>
   <define name="dl">
     <element name="dl">
-      <a:documentation>Definition list</a:documentation>
       <attribute name="id">
         <data type="ID"/>
       </attribute>
@@ -1119,7 +1111,6 @@
   </define>
   <define name="dt">
     <element name="dt">
-      <a:documentation>Definition term</a:documentation>
       <zeroOrMore>
         <ref name="TextElement"/>
       </zeroOrMore>
@@ -1127,7 +1118,6 @@
   </define>
   <define name="dd">
     <element name="dd">
-      <a:documentation>Definition description</a:documentation>
       <zeroOrMore>
         <ref name="paragraph-with-footnote"/>
       </zeroOrMore>

data/lib/asciidoctor/iso/biblio.rng

@@ -76,14 +76,12 @@
   <define name="script">
     <a:documentation>ISO-639</a:documentation>
     <element name="script">
-        <a:documentation>ISO-639</a:documentation>
       <text/>
     </element>
   </define>
   <define name="edition">
     <a:documentation>ISO-15924: Latn</a:documentation>
     <element name="edition">
-      <a:documentation>ISO-15924: Latn</a:documentation>
       <optional>
         <attribute name="number"/>
       </optional>

data/lib/asciidoctor/iso/front.rb

@@ -18,8 +18,8 @@ module Asciidoctor
           xml.updates_document_type a
       end
 
-      def metadata_doctype(node, xml)
-        xml.doctype doctype(node)
+      def metadata_subdoctype(node, xml)
+        super
         a = node.attr("horizontal") and xml.horizontal a
       end
 
@@ -146,11 +146,24 @@ module Asciidoctor
       end
 
       def relaton_relations
-        super + %w(obsoletes)
+        super + %w(obsoletes successor-of manifestation-of related annotation-of)
       end
 
       def relaton_relation_descriptions
-        super.merge("amends" => "updates")
+        super.merge(
+          "amends" => "updates", "revises" => "updates",
+          "replaces" => "obsoletes",
+          "supersedes" => "obsoletes",
+          "corrects" => "updates",
+          "informatively-cited-in" => "isCitedIn",
+          "informatively-cites" => "cites",
+          "normatively-cited in" => "isCitedIn",
+          "normatively-cites" => "cites",
+          "identical-adopted-from" => "adoptedFrom",
+          "modified-adopted-from" => "adoptedFrom",
+          "related-directive" => "related",
+          "related-mandate" => "related",
+        )
       end
     end
   end

data/lib/asciidoctor/iso/front_id.rb

@@ -48,7 +48,7 @@ module Asciidoctor
         ret
       end
 
-      def stage_name(stage, substage, doctype, iteration = nil)
+      def stage_name(stage, substage, _doctype, iteration = nil)
         return "Proof" if stage == "60" && substage == "00"
 
         ret = STAGE_NAMES[stage.to_sym]
@@ -69,7 +69,7 @@ module Asciidoctor
       end
 
       def iso_id(node, xml)
-        !@amd && node.attr("docnumber") || @amd && node.attr("updates") or
+        (!@amd && node.attr("docnumber")) || (@amd && node.attr("updates")) or
           return
 
         dn = iso_id1(node)
@@ -133,28 +133,33 @@ module Asciidoctor
       end
 
       def id_stage_abbr(stage, substage, node, bare = false)
-        ret = if bare
-                IsoDoc::Iso::Metadata.new("en", "Latn", @i18n)
-                  .status_abbrev(stage_abbr(stage, substage, doctype(node)),
-                substage, nil, nil, doctype(node))
-              else
-                IsoDoc::Iso::Metadata.new("en", "Latn", @i18n)
-                  .status_abbrev(stage_abbr(stage, substage, doctype(node)),
-                substage, node.attr("iteration"),
-                node.attr("draft"), doctype(node))
-              end
+        ret = id_stage_abbr1(stage, substage, node, bare)
         if %w(amendment technical-corrigendum technical-report
-              technical-specification).include?(doctype(node))
-          ret = "#{ret} " unless %w(D FD).include?(ret)
+              technical-specification).include?(doctype(node)) &&
+            !%w(D FD).include?(ret)
+          ret = "#{ret} "
         end
         ret
       end
 
+      def id_stage_abbr1(stage, substage, node, bare)
+        if bare
+          IsoDoc::Iso::Metadata.new("en", "Latn", @i18n)
+            .status_abbrev(stage_abbr(stage, substage, doctype(node)),
+                           substage, nil, nil, doctype(node))
+        else
+          IsoDoc::Iso::Metadata.new("en", "Latn", @i18n)
+            .status_abbrev(stage_abbr(stage, substage, doctype(node)),
+                           substage, node.attr("iteration"),
+                           node.attr("draft"), doctype(node))
+        end
+      end
+
       def cover_stage_abbr(node)
         stage = get_stage(node)
         abbr = id_stage_abbr(get_stage(node), get_substage(node), node, true)
         typeabbr = get_typeabbr(node, true)
-        if stage.to_i > 50 || stage.to_i == 60 && get_substage(node).to_i < 60
+        if stage.to_i > 50 || (stage.to_i == 60 && get_substage(node).to_i < 60)
           typeabbr = ""
         end
         "#{abbr}#{typeabbr}".strip
@@ -213,8 +218,6 @@ module Asciidoctor
         when "technical-specification" then "TS "
         when "amendment" then (amd ? "Amd " : "")
         when "technical-corrigendum" then (amd ? "Cor " : "")
-        else
-          nil
         end
       end
     end

data/lib/asciidoctor/iso/isodoc.rng

@@ -58,7 +58,7 @@
           <attribute name="alt"/>
         </optional>
         <optional>
-          <attribute name="updatetype">
+          <attribute name="update-type">
             <data type="boolean"/>
           </attribute>
         </optional>
@@ -194,7 +194,6 @@
         </optional>
         <optional>
           <attribute name="type">
-            <a:documentation>allow specifying labels of an ordered list</a:documentation>
             <choice>
               <value>roman</value>
               <value>alphabet</value>
@@ -1797,6 +1796,20 @@
           <data type="ID"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="tag"/>
+      </optional>
+      <optional>
+        <attribute name="multilingual-rendering">
+          <ref name="MultilingualRenderingType"/>
+        </attribute>
+      </optional>
       <oneOrMore>
         <ref name="preferred"/>
       </oneOrMore>
@@ -1815,9 +1828,6 @@
       <optional>
         <ref name="termsubject"/>
       </optional>
-      <optional>
-        <ref name="termusage"/>
-      </optional>
       <oneOrMore>
         <ref name="termdefinition"/>
       </oneOrMore>
@@ -1881,17 +1891,37 @@
       </attribute>
     </optional>
     <optional>
-      <attribute name="geographicArea"/>
+      <attribute name="geographic-area"/>
     </optional>
     <choice>
       <ref name="expression_designation"/>
       <ref name="letter_symbol_designation"/>
       <ref name="graphical_symbol_designation"/>
     </choice>
+    <optional>
+      <ref name="fieldofapplication"/>
+    </optional>
+    <optional>
+      <ref name="usageinfo"/>
+    </optional>
     <zeroOrMore>
       <ref name="termsource"/>
     </zeroOrMore>
   </define>
+  <define name="fieldofapplication">
+    <element name="field-of-application">
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="usageinfo">
+    <element name="usage-info">
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="letter_symbol_designation">
     <element name="letter-symbol">
       <optional>
@@ -1943,11 +1973,15 @@
       </optional>
       <element name="name">
         <zeroOrMore>
-          <ref name="PureTextElement"/>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+            <ref name="index"/>
+          </choice>
         </zeroOrMore>
       </element>
       <optional>
-        <element name="abbreviationType">
+        <element name="abbreviation-type">
           <ref name="AbbreviationType"/>
         </element>
       </optional>
@@ -1957,7 +1991,7 @@
         </element>
       </optional>
       <optional>
-        <element name="grammarInfo">
+        <element name="grammar">
           <ref name="Grammar"/>
         </element>
       </optional>
@@ -1984,6 +2018,11 @@
         <ref name="GrammarGender"/>
       </element>
     </zeroOrMore>
+    <zeroOrMore>
+      <element name="number">
+        <ref name="GrammarNumber"/>
+      </element>
+    </zeroOrMore>
     <optional>
       <element name="isPreposition">
         <data type="boolean"/>
@@ -2015,7 +2054,7 @@
       </element>
     </optional>
     <zeroOrMore>
-      <element name="grammarvalue">
+      <element name="grammar-value">
         <text/>
       </element>
     </zeroOrMore>
@@ -2028,6 +2067,13 @@
       <value>common</value>
     </choice>
   </define>
+  <define name="GrammarNumber">
+    <choice>
+      <value>singular</value>
+      <value>dual</value>
+      <value>plural</value>
+    </choice>
+  </define>
   <define name="termdomain">
     <element name="domain">
       <oneOrMore>
@@ -2042,13 +2088,6 @@
       </oneOrMore>
     </element>
   </define>
-  <define name="termusage">
-    <element name="usageinfo">
-      <oneOrMore>
-        <ref name="BasicBlock"/>
-      </oneOrMore>
-    </element>
-  </define>
   <define name="termdefinition">
     <element name="definition">
       <choice>
@@ -2062,13 +2101,16 @@
     </element>
   </define>
   <define name="verbaldefinition">
-    <element name="verbaldefinition">
+    <element name="verbal-definition">
       <oneOrMore>
         <choice>
           <ref name="paragraph"/>
           <ref name="dl"/>
           <ref name="ol"/>
           <ref name="ul"/>
+          <ref name="table"/>
+          <ref name="figure"/>
+          <ref name="formula"/>
         </choice>
       </oneOrMore>
       <zeroOrMore>
@@ -2077,7 +2119,7 @@
     </element>
   </define>
   <define name="nonverbalrep">
-    <element name="nonverbalrepresentation">
+    <element name="non-verbal-representation">
       <oneOrMore>
         <choice>
           <ref name="table"/>

data/lib/asciidoctor/iso/isostandard-amd.rng

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar ns="https://www.metanorma.org/ns/iso" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+<grammar ns="https://www.metanorma.org/ns/iso" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <!-- default namespace isostandard = "https://www.metanorma.com/ns/iso" -->
   <include href="isostandard.rng">
     <start>

data/lib/asciidoctor/iso/isostandard.rng

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar ns="https://www.metanorma.org/ns/iso" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"  datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+<grammar ns="https://www.metanorma.org/ns/iso" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <!-- default namespace isostandard = "https://www.metanorma.com/ns/iso" -->
   <include href="isodoc.rng">
     <start>
@@ -159,6 +159,20 @@
             <data type="ID"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="language"/>
+        </optional>
+        <optional>
+          <attribute name="script"/>
+        </optional>
+        <optional>
+          <attribute name="tag"/>
+        </optional>
+        <optional>
+          <attribute name="multilingual-rendering">
+            <ref name="MultilingualRenderingType"/>
+          </attribute>
+        </optional>
         <ref name="preferred"/>
         <zeroOrMore>
           <ref name="admitted"/>
@@ -359,7 +373,6 @@
   -->
   <define name="iso-standard">
     <element name="iso-standard">
-      <a:documentation>Root element for xml document</a:documentation>
       <attribute name="version"/>
       <attribute name="type">
         <choice>
@@ -470,7 +483,6 @@
   </define>
   <define name="annex-appendix">
     <element name="appendix">
-      <a:documentation>Appendix</a:documentation>
       <ref name="Clause-Section"/>
     </element>
   </define>

data/lib/asciidoctor/iso/reqt.rng

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar xmlns="http://relaxng.org/ns/structure/1.0" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <!--
     Presupposes isodoc.rnc, is included in it
     include "isodoc.rnc" { }

data/lib/asciidoctor/iso/section.rb

@@ -1,5 +1,5 @@
 require "htmlentities"
-require "uri"
+require "uri" if /^2\./.match?(RUBY_VERSION)
 
 module Asciidoctor
   module ISO

data/lib/asciidoctor/iso/validate.rb

@@ -78,7 +78,7 @@ module Asciidoctor
       # ISO/IEC DIR 2, 16.5.6
       def termdef_style(xmldoc)
         xmldoc.xpath("//term").each do |t|
-          para = t.at("./definition/verbaldefinition") || return
+          para = t.at("./definition/verbal-definition") || return
           term = t.at("./preferred//name").text
           termdef_warn(para.text, /\A(the|a)\b/i, t, term,
                        "term definition starts with article")

data/lib/asciidoctor/iso/validate_image.rb

@@ -31,7 +31,7 @@ module Asciidoctor
         when "ru" then "_r"
         when "es" then "_s"
         when "ar" then "_a"
-        when "en" then "_e"
+        # when "en" then "_e"
         else
           "_e"
         end

data/lib/asciidoctor/iso/validate_section.rb

@@ -216,7 +216,7 @@ module Asciidoctor
 
       def asset_style(root)
         root.xpath("//example | //termexample").each { |e| example_style(e) }
-        root.xpath("//definition/verbaldefinition").each { |e| definition_style(e) }
+        root.xpath("//definition/verbal-definition").each { |e| definition_style(e) }
         root.xpath("//note").each { |e| note_style(e) }
         root.xpath("//fn").each { |e| footnote_style(e) }
         root.xpath(ASSETS_TO_STYLE).each { |e| style(e, extract_text(e)) }

data/lib/isodoc/iso/base_convert.rb

@@ -74,29 +74,6 @@ module IsoDoc
         end
       end
 
-      def insertall_after_here(node, insert, name)
-        node.children.each do |n|
-          next unless n.name == name
-
-          insert.next = n.remove
-          insert = n
-        end
-        insert
-      end
-
-      def termexamples_before_termnotes(node)
-        return unless node.at(ns("./termnote")) && node.at(ns("./termexample"))
-        return unless insert = node.at(ns("./definition"))
-
-        insert = insertall_after_here(node, insert, "termexample")
-        insertall_after_here(node, insert, "termnote")
-      end
-
-      def termdef_parse(node, out)
-        termexamples_before_termnotes(node)
-        super
-      end
-
       def cleanup(docxml)
         super
         table_th_center(docxml)
@@ -177,14 +154,20 @@ module IsoDoc
 
       def clause_etc(isoxml, out, num)
         isoxml.xpath(ns("//sections/clause[not(@type = 'scope')] | "\
-                        "//sections/terms | //sections/definitions")).each do |f|
-          out.div **attr_code(id: f["id"],
-                              class: f.name == "definitions" ? "Symbols" : nil) do |div|
-            num = num + 1
-            clause_name(num, f&.at(ns("./title")), div, nil)
-            f.elements.each do |e|
-              parse(e, div) unless %w{title source}.include? e.name
-            end
+                        "//sections/terms | //sections/definitions"))
+          .each do |f|
+            clause_etc1(f, out, num)
+          end
+      end
+
+      def clause_etc1(clause, out, num)
+        out.div **attr_code(
+          id: clause["id"],
+          class: clause.name == "definitions" ? "Symbols" : nil) do |div|
+          num = num + 1
+          clause_name(num, clause&.at(ns("./title")), div, nil)
+          clause.elements.each do |e|
+            parse(e, div) unless %w{title source}.include? e.name
           end
         end
       end

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

@@ -689,7 +689,6 @@ p.Terms, li.Terms, div.Terms {
   mso-fareast-font-family: "SimHei",serif;
   mso-bidi-font-family: {{headerfont}};
   mso-ansi-language: EN-GB;
-  font-weight: bold;
   mso-bidi-font-weight: normal; }
 
 p.AltTerms, li.AltTerms, div.AltTerms {

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

@@ -658,7 +658,6 @@ p.Terms, li.Terms, div.Terms
 	mso-fareast-font-family:"SimHei",serif;
 	mso-bidi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
-	font-weight:bold;
 	mso-bidi-font-weight:normal;}
 p.AltTerms, li.AltTerms, div.AltTerms
 	{mso-style-name:"AltTerm\(s\)";