metanorma-iso 1.10.4 → 1.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abbf367b7ec988ab0de353fe50309648657bc86b3d7a1495c4ac6722b4653b5b
-  data.tar.gz: 365546239553eb27bb0dcdc1e4920234922b93dcb235027f42f7f1a682f3fd18
+  metadata.gz: 7a8f44a84f1173e2b495a6ccb50683b6b17454ec8408b740a1adb56b3c05e4a2
+  data.tar.gz: 6efb198dffa92685545a865310668345cbc20f6b6a08e79d1b63cbda0961aa27
 SHA512:
-  metadata.gz: bbbdb1ad0d1b86c34f437af1ad664c2c6d19d706a28fa01a25cb5b677d1fddaec5d2eec0fdc4eb5846e5254777b3ea0d868ae31ee5c9e59c58f40f67bd17b339
-  data.tar.gz: eb62b3b9ab796aba24059a9c45c8432a7fc5a7ee0a3b30c6893fda63bbce62452270ee13f93c66d3f16b054dd9cf92887cca868a849f42c248b5f8c37efbfdfa
+  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/lib/asciidoctor/iso/front.rb

@@ -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

@@ -1973,7 +1973,11 @@
       </optional>
       <element name="name">
         <zeroOrMore>
-          <ref name="PureTextElement"/>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+            <ref name="index"/>
+          </choice>
         </zeroOrMore>
       </element>
       <optional>
@@ -1987,7 +1991,7 @@
         </element>
       </optional>
       <optional>
-        <element name="grammar-info">
+        <element name="grammar">
           <ref name="Grammar"/>
         </element>
       </optional>

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/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/style-human.css

@@ -75,6 +75,12 @@ code *, pre *, tt *, kbd *, samp * {
   font-family: {{monospacefont}} !important;
   font-variant-ligatures: none; }
 
+p code, dt code, li code, label code, legend code, caption code, th code, td code,
+p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
+p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
+p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
+  font-size: {{monospacefontsize}}; }
+
 article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
   display: block; }
@@ -86,6 +92,9 @@ table {
 h1, h2, h3, h4, h5, h6 {
   font-family: {{headerfont}}; }
 
+.h1, .h2, .h3, .h4, .h5, .h6 {
+  font-family: {{headerfont}}; }
+
 blockquote, q {
   quotes: none; }
   blockquote:before, blockquote:after, q:before, q:after {
@@ -338,23 +347,24 @@ span.title {
   font-size: 0.9em; }
 
 /* TYPOGRAPHY */
-h1 {
+h1, .h1 {
   font-weight: 900; }
 
 h2,
 h3,
 h4,
 h5,
-h6 {
+h6,
+.h2, .h3, .h4, .h5, .h6 {
   font-weight: 700; }
 
-h1 {
+h1, .h1 {
   font-size: 1.5em;
   line-height: 2em;
   margin-top: 2em;
   margin-bottom: 1em; }
 
-h2 {
+h2, .h2 {
   font-size: 1.2em;
   line-height: 1.5em;
   margin-top: 2em;
@@ -365,12 +375,13 @@ h2,
 h3,
 h4,
 h5,
-h6 {
+h6,
+.h1, .h2, .h3, .h4, .h5, .h6 {
   line-height: 1.2; }
 
 /* override for amendments */
 {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
   font-weight: normal;
   font-size: initial;
   font-style: italic;
@@ -379,7 +390,7 @@ h1, h2, h3, h4, h5, h6 {
   margin-bottom: 1em; }
 
 {% endif %}
-h2 p {
+h2 p, .h2 p {
   display: inline; }
 
 p {
@@ -401,7 +412,7 @@ a {
   color: black;
   text-decoration-color: black; }
 
-h2 p {
+h2 p, .h2 p {
   display: inline; }
 
 ul > li {

data/lib/isodoc/iso/html/style-human.scss

@@ -140,7 +140,7 @@ span.title {
 
 /* TYPOGRAPHY */
 
-h1 {
+h1, .h1 {
     font-weight: 900;
 }
 
@@ -148,18 +148,19 @@ h2,
 h3,
 h4,
 h5,
-h6 {
+h6, 
+.h2, .h3, .h4, .h5, .h6{
     font-weight: 700;
 }
 
-h1 {
+h1, .h1 {
     font-size: 1.5em;
     line-height: 2em;
     margin-top: 2em;
     margin-bottom: 1em;
 }
 
-h2 {
+h2, .h2 {
     font-size: 1.2em;
     line-height: 1.5em;
     margin-top: 2em;
@@ -171,7 +172,8 @@ h2,
 h3,
 h4,
 h5,
-h6 {
+h6, 
+.h1, .h2, .h3, .h4, .h5, .h6 {
     line-height: 1.2;
 }
 
@@ -179,7 +181,7 @@ h6 {
 
 {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
 
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
     font-weight: normal;
     font-size: initial;
     font-style: italic;
@@ -190,7 +192,7 @@ h1, h2, h3, h4, h5, h6 {
 
 {% endif %}
 
-h2 p {
+h2 p, .h2 p {
     display: inline;
 }
 
@@ -218,7 +220,7 @@ a {
     text-decoration-color: black;
 }
 
-h2 p {
+h2 p, .h2 p {
     display: inline;
 }
 

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

@@ -75,6 +75,12 @@ code *, pre *, tt *, kbd *, samp * {
   font-family: {{monospacefont}} !important;
   font-variant-ligatures: none; }
 
+p code, dt code, li code, label code, legend code, caption code, th code, td code,
+p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
+p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
+p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
+  font-size: {{monospacefontsize}}; }
+
 article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
   display: block; }
@@ -86,6 +92,9 @@ table {
 h1, h2, h3, h4, h5, h6 {
   font-family: {{headerfont}}; }
 
+.h1, .h2, .h3, .h4, .h5, .h6 {
+  font-family: {{headerfont}}; }
+
 blockquote, q {
   quotes: none; }
   blockquote:before, blockquote:after, q:before, q:after {
@@ -315,23 +324,23 @@ span.partlabel {
   font-size: 0.9em; }
 
 /* TYPOGRAPHY */
-h1 {
+h1, .h1 {
   font-size: 1.5em;
   line-height: 2em;
   margin-top: 2em;
   margin-bottom: 1em; }
 
-h2 {
+h2, .h2 {
   font-size: 1.2em;
   line-height: 1.5em;
   margin-top: 2em;
   margin-bottom: 1em; }
 
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
   line-height: 1.2; }
 
 {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
   font-weight: normal;
   font-size: initial;
   font-style: italic; }
@@ -355,7 +364,7 @@ a {
   color: black;
   text-decoration-color: black; }
 
-h2 p {
+h2 p, .h2 p {
   display: inline; }
 
 ul > li {

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

@@ -112,27 +112,27 @@ span.partlabel {
 
 /* TYPOGRAPHY */
 
-h1 {
+h1, .h1 {
     font-size: 1.5em;
     line-height: 2em;
     margin-top: 2em;
     margin-bottom: 1em;
 }
 
-h2 {
+h2, .h2 {
     font-size: 1.2em;
     line-height: 1.5em;
     margin-top: 2em;
     margin-bottom: 1em;
 }
 
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
     line-height: 1.2;
 }
 
 {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
 
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
     font-weight: normal;
     font-size: initial;
     font-style: italic;
@@ -164,7 +164,7 @@ a {
     text-decoration-color: black;
 }
 
-h2 p {
+h2 p, .h2 p {
     display: inline;
 }
 

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

@@ -289,7 +289,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
 div.figure, p.figure {
   text-align: center; }
 
-h1 {
+h1, .h1 {
   mso-style-priority: 1;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -304,8 +304,6 @@ h1 {
   line-height: 13.5pt;
   mso-pagination: widow-orphan;
   page-break-after: avoid;
-  mso-outline-level: 1;
-  mso-list: l1 level1 lfo6;
   mso-hyphenate: none;
   tab-stops: 20.0pt list 21.6pt left 28.0pt;
   {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
@@ -324,6 +322,10 @@ h1 {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
+h1 {
+  mso-outline-level: 1;
+  mso-list: l1 level1 lfo6; }
+
 h1.ForewordTitle {
   font-size: 13.0pt;
   font-style: normal;
@@ -358,7 +360,7 @@ h1.Annex {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
-.h2Annex, h2 {
+.h2Annex, h2, .h2 {
   mso-style-priority: 2;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -395,7 +397,7 @@ h2 {
   mso-list: l1 level2 lfo6;
   mso-outline-level: 2; }
 
-.h3Annex, h3 {
+.h3Annex, h3, .h3 {
   mso-style-priority: 3;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -432,7 +434,7 @@ h3 {
   mso-list: l1 level3 lfo6;
   mso-outline-level: 3; }
 
-.h4Annex, h4 {
+.h4Annex, h4, .h4 {
   mso-style-priority: 4;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -467,7 +469,7 @@ h4 {
   mso-list: l1 level4 lfo6;
   mso-outline-level: 4; }
 
-.h5Annex, h5 {
+.h5Annex, h5, .h5 {
   mso-style-priority: 5;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -502,7 +504,7 @@ h5 {
   mso-list: l1 level5 lfo6;
   mso-outline-level: 5; }
 
-h6 {
+h6, .h6 {
   mso-style-priority: 6;
   mso-style-unhide: no;
   mso-style-qformat: yes;

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

@@ -269,7 +269,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
 div.figure, p.figure
         {text-align: center;}
 
-h1
+h1, .h1
 	{mso-style-priority:1;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
@@ -284,8 +284,6 @@ h1
 	line-height:13.5pt;
 	mso-pagination:widow-orphan;
 	page-break-after:avoid;
-	mso-outline-level:1;
-	mso-list:l1 level1 lfo6;
 	mso-hyphenate:none;
 	tab-stops:20.0pt list 21.6pt left 28.0pt;
 {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
@@ -303,6 +301,10 @@ h1
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
+h1 {
+	mso-outline-level:1;
+	mso-list:l1 level1 lfo6;
+}
 h1.ForewordTitle {
         font-size:13.0pt;
         font-style: normal ;
@@ -336,7 +338,7 @@ h1.Annex
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
-.h2Annex, h2
+.h2Annex, h2, .h2
         {mso-style-priority:2;
         mso-style-unhide:no;
         mso-style-qformat:yes;
@@ -372,7 +374,7 @@ h2
 	{ mso-list:l1 level2 lfo6;
         mso-outline-level:2;
         }
-.h3Annex, h3
+.h3Annex, h3, .h3
 	{mso-style-priority:3;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
@@ -407,7 +409,7 @@ h2
 h3      {mso-list:l1 level3 lfo6;
 	mso-outline-level:3;
         }
-.h4Annex, h4
+.h4Annex, h4, .h4
 	{mso-style-priority:4;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
@@ -440,7 +442,7 @@ h3      {mso-list:l1 level3 lfo6;
 h4      {mso-list:l1 level4 lfo6;
 	mso-outline-level:4;
         }
-.h5Annex, h5
+.h5Annex, h5, .h5
 	{mso-style-priority:5;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
@@ -473,7 +475,7 @@ h4      {mso-list:l1 level4 lfo6;
 h5      {mso-list:l1 level5 lfo6;
 	mso-outline-level:5;
         }
-h6
+h6, .h6
 	{mso-style-priority:6;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;