metanorma-iso 1.9.4 → 1.10.1

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" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+<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">
   <!-- 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" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+<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">
   <!-- default namespace isostandard = "https://www.metanorma.com/ns/iso" -->
   <include href="isodoc.rng">
     <start>
@@ -142,14 +142,9 @@
       </optional>
       <choice>
         <choice>
-          <group>
-            <oneOrMore>
-              <ref name="BasicBlock"/>
-            </oneOrMore>
-            <zeroOrMore>
-              <ref name="note"/>
-            </zeroOrMore>
-          </group>
+          <oneOrMore>
+            <ref name="BasicBlock"/>
+          </oneOrMore>
           <ref name="amend"/>
         </choice>
         <oneOrMore>
@@ -225,9 +220,6 @@
           -->
           <ref name="BasicBlock"/>
         </zeroOrMore>
-        <zeroOrMore>
-          <ref name="note"/>
-        </zeroOrMore>
         <zeroOrMore>
           <ref name="clause-hanging-paragraph-with-footnote"/>
         </zeroOrMore>
@@ -351,14 +343,9 @@
         <ref name="section-title"/>
       </optional>
       <choice>
-        <group>
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </group>
+        <zeroOrMore>
+          <ref name="BasicBlock"/>
+        </zeroOrMore>
         <oneOrMore>
           <ref name="content-subsection"/>
         </oneOrMore>
@@ -372,6 +359,7 @@
   -->
   <define name="iso-standard">
     <element name="iso-standard">
+      <a:documentation>Root element for xml document</a:documentation>
       <attribute name="version"/>
       <attribute name="type">
         <choice>
@@ -475,9 +463,6 @@
         <!-- allow hanging paragraphs in annexes: they introduce lists -->
         <ref name="BasicBlock"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="note"/>
-      </zeroOrMore>
       <zeroOrMore>
         <ref name="clause-hanging-paragraph-with-footnote"/>
       </zeroOrMore>
@@ -485,6 +470,7 @@
   </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" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+<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">
   <!--
     Presupposes isodoc.rnc, is included in it
     include "isodoc.rnc" { }
@@ -58,6 +58,14 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="tag"/>
+    </optional>
+    <optional>
+      <attribute name="multilingual-rendering">
+        <ref name="MultilingualRenderingType"/>
+      </attribute>
+    </optional>
     <optional>
       <ref name="reqtitle"/>
     </optional>
@@ -101,7 +109,9 @@
   </define>
   <define name="label">
     <element name="label">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="subject">
@@ -175,8 +185,19 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="tag"/>
+    </optional>
+    <optional>
+      <attribute name="multilingual-rendering">
+        <ref name="MultilingualRenderingType"/>
+      </attribute>
+    </optional>
     <oneOrMore>
-      <ref name="BasicBlock"/>
+      <choice>
+        <ref name="BasicBlock"/>
+        <ref name="component"/>
+      </choice>
     </oneOrMore>
   </define>
   <define name="ObligationType">

data/lib/asciidoctor/iso/validate.rb

@@ -63,7 +63,7 @@ module Asciidoctor
       def locality_erefs_validate(root)
         root.xpath("//eref[descendant::locality]").each do |t|
           if /^(ISO|IEC)/.match?(t["citeas"]) &&
-              !(/: ?(\d+{4}|–)$/.match?(t["citeas"]))
+              !/: ?(\d+{4}|–)$/.match?(t["citeas"])
             @log.add("Style", t,
                      "undated reference #{t['citeas']} should not contain "\
                      "specific elements")
@@ -78,8 +78,8 @@ module Asciidoctor
       # ISO/IEC DIR 2, 16.5.6
       def termdef_style(xmldoc)
         xmldoc.xpath("//term").each do |t|
-          para = t.at("./definition") || return
-          term = t.at("./preferred").text
+          para = t.at("./definition/verbaldefinition") || return
+          term = t.at("./preferred//name").text
           termdef_warn(para.text, /\A(the|a)\b/i, t, term,
                        "term definition starts with article")
           termdef_warn(para.text, /\.\Z/i, t, term,
@@ -90,10 +90,10 @@ module Asciidoctor
       def doctype_validate(xmldoc)
         doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
         %w(international-standard technical-specification technical-report
-        publicly-available-specification international-workshop-agreement
-        guide amendment technical-corrigendum).include? doctype or
-        @log.add("Document Attributes", nil,
-                 "#{doctype} is not a recognised document type")
+           publicly-available-specification international-workshop-agreement
+           guide amendment technical-corrigendum).include? doctype or
+          @log.add("Document Attributes", nil,
+                   "#{doctype} is not a recognised document type")
       end
 
       def script_validate(xmldoc)

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").each { |e| definition_style(e) }
+        root.xpath("//definition/verbaldefinition").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/html/isodoc.css

@@ -1,4 +1,3 @@
-@charset "UTF-8";
 p.Sourcecode, li.Sourcecode, div.Sourcecode, pre.Sourcecode {
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -208,7 +207,7 @@ p.AnnexTableTitle, li.AnnexTableTitle, div.AnnexTableTitle {
   mso-style-name: "Annex Table Title";
   mso-style-unhide: no;
   mso-style-qformat: yes;
-  mso-style-parent: "Παράγραφος λίστας";
+  mso-style-parent: "List Paragraph";
   mso-style-link: "Annex Table Title Char";
   margin-top: 0cm;
   margin-right: 0cm;

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

@@ -197,7 +197,7 @@ p.AnnexTableTitle, li.AnnexTableTitle, div.AnnexTableTitle
 	{mso-style-name:"Annex Table Title";
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
-	mso-style-parent:"Παράγραφος λίστας";
+	mso-style-parent:"List Paragraph";
 	mso-style-link:"Annex Table Title Char";
 	margin-top:0cm;
 	margin-right:0cm;

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

@@ -130,7 +130,7 @@ p.MsoBlockText, li.MsoBlockText, div.MsoBlockText {
 p.MsoList, li.MsoList, div.MsoList {
   mso-style-priority: 4;
   mso-style-unhide: no;
-  mso-style-parent: "MsoListParagraph";
+  mso-style-parent: "List Paragraph";
   margin-top: 0cm;
   margin-right: 0cm;
   margin-bottom: 6.0pt;
@@ -151,7 +151,7 @@ p.MsoList, li.MsoList, div.MsoList {
 p.MsoListCxSpFirst, li.MsoListCxSpFirst, div.MsoListCxSpFirst {
   mso-style-priority: 4;
   mso-style-unhide: no;
-  mso-style-parent: "MsoListParagraph";
+  mso-style-parent: "List Paragraph";
   mso-style-type: export-only;
   margin-top: 0cm;
   margin-right: 0cm;
@@ -173,7 +173,7 @@ p.MsoListCxSpFirst, li.MsoListCxSpFirst, div.MsoListCxSpFirst {
 p.MsoListCxSpMiddle, li.MsoListCxSpMiddle, div.MsoListCxSpMiddle {
   mso-style-priority: 4;
   mso-style-unhide: no;
-  mso-style-parent: "MsoListParagraph";
+  mso-style-parent: "List Paragraph";
   mso-style-type: export-only;
   margin-top: 0cm;
   margin-right: 0cm;
@@ -195,7 +195,7 @@ p.MsoListCxSpMiddle, li.MsoListCxSpMiddle, div.MsoListCxSpMiddle {
 p.MsoListCxSpLast, li.MsoListCxSpLast, div.MsoListCxSpLast {
   mso-style-priority: 4;
   mso-style-unhide: no;
-  mso-style-parent: "MsoListParagraph";
+  mso-style-parent: "List Paragraph";
   mso-style-type: export-only;
   margin-top: 0cm;
   margin-right: 0cm;
@@ -217,6 +217,7 @@ p.MsoListCxSpLast, li.MsoListCxSpLast, div.MsoListCxSpLast {
 p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph {
   mso-style-priority: 34;
   mso-style-unhide: no;
+  mso-style-name: "List Paragraph";
   mso-style-qformat: yes;
   margin-top: 0cm;
   margin-right: 0cm;
@@ -292,6 +293,7 @@ h1 {
   mso-style-priority: 1;
   mso-style-unhide: no;
   mso-style-qformat: yes;
+  mso-style-name: "Heading 1";
   mso-style-link: "Heading 1 Char";
   mso-style-next: Normal;
   margin-top: 13.5pt;
@@ -360,6 +362,7 @@ h1.Annex {
   mso-style-priority: 2;
   mso-style-unhide: no;
   mso-style-qformat: yes;
+  mso-style-name: "Heading 2";
   mso-style-parent: "Heading 1";
   mso-style-link: "Heading 2 Char";
   mso-style-next: Normal;
@@ -396,6 +399,7 @@ h2 {
   mso-style-priority: 3;
   mso-style-unhide: no;
   mso-style-qformat: yes;
+  mso-style-name: "Heading 3";
   mso-style-parent: "Heading 1";
   mso-style-link: "Heading 3 Char";
   mso-style-next: Normal;
@@ -432,6 +436,7 @@ h3 {
   mso-style-priority: 4;
   mso-style-unhide: no;
   mso-style-qformat: yes;
+  mso-style-name: "Heading 4";
   mso-style-parent: "Heading 3";
   mso-style-link: "Heading 4 Char";
   mso-style-next: Normal;
@@ -466,6 +471,7 @@ h4 {
   mso-style-priority: 5;
   mso-style-unhide: no;
   mso-style-qformat: yes;
+  mso-style-name: "Heading 5";
   mso-style-parent: "Heading 4";
   mso-style-link: "Heading 5 Char";
   mso-style-next: Normal;
@@ -500,6 +506,7 @@ h6 {
   mso-style-priority: 6;
   mso-style-unhide: no;
   mso-style-qformat: yes;
+  mso-style-name: "Heading 6";
   mso-style-parent: "Heading 5";
   mso-style-link: "Heading 6 Char";
   mso-style-next: Normal;
@@ -533,6 +540,7 @@ h6 {
 p.MsoToc1, li.MsoToc1, div.MsoToc1 {
   mso-style-priority: 39;
   mso-style-unhide: no;
+  mso-style-name: "TOC 1";
   mso-style-next: Normal;
   margin-top: 6.0pt;
   margin-right: 25.0pt;
@@ -555,6 +563,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2 {
   mso-style-noshow: yes;
   mso-style-priority: 39;
   mso-style-unhide: no;
+  mso-style-name: "TOC 2";
   mso-style-parent: "TOC 1";
   mso-style-next: Normal;
   margin-top: 0cm;
@@ -578,6 +587,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
   mso-style-noshow: yes;
   mso-style-priority: 39;
   mso-style-unhide: no;
+  mso-style-name: "TOC 3";
   mso-style-parent: "TOC 2";
   mso-style-next: Normal;
   margin-top: 0cm;
@@ -683,6 +693,7 @@ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape {
 
 span.MsoFootnoteReference {
   mso-style-priority: 99;
+  mso-style-name: "Footnote Reference";
   vertical-align: super; }
 
 p.MsoCaption, li.MsoCaption, div.MsoCaption {
@@ -1084,6 +1095,7 @@ span.BodyTextChar, span.Char3 {
 p.MsoCommentText, li.MsoCommentText, div.MsoCommentText {
   mso-style-noshow: yes;
   mso-style-priority: 99;
+  mso-style-name: "Comment Text";
   mso-style-link: "Comment Text Char";
   margin-top: 0cm;
   margin-right: 0cm;

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

@@ -118,7 +118,7 @@ p.MsoBlockText, li.MsoBlockText, div.MsoBlockText
 p.MsoList, li.MsoList, div.MsoList
 	{mso-style-priority:4;
 	mso-style-unhide:no;
-	mso-style-parent:"MsoListParagraph";
+	mso-style-parent:"List Paragraph";
 	margin-top:0cm;
 	margin-right:0cm;
 	margin-bottom:6.0pt;
@@ -138,7 +138,7 @@ p.MsoList, li.MsoList, div.MsoList
 p.MsoListCxSpFirst, li.MsoListCxSpFirst, div.MsoListCxSpFirst
 	{mso-style-priority:4;
 	mso-style-unhide:no;
-	mso-style-parent:"MsoListParagraph";
+	mso-style-parent:"List Paragraph";
 	mso-style-type:export-only;
 	margin-top:0cm;
 	margin-right:0cm;
@@ -159,7 +159,7 @@ p.MsoListCxSpFirst, li.MsoListCxSpFirst, div.MsoListCxSpFirst
 p.MsoListCxSpMiddle, li.MsoListCxSpMiddle, div.MsoListCxSpMiddle
 	{mso-style-priority:4;
 	mso-style-unhide:no;
-	mso-style-parent:"MsoListParagraph";
+	mso-style-parent:"List Paragraph";
 	mso-style-type:export-only;
 	margin-top:0cm;
 	margin-right:0cm;
@@ -180,7 +180,7 @@ p.MsoListCxSpMiddle, li.MsoListCxSpMiddle, div.MsoListCxSpMiddle
 p.MsoListCxSpLast, li.MsoListCxSpLast, div.MsoListCxSpLast
 	{mso-style-priority:4;
 	mso-style-unhide:no;
-	mso-style-parent:"MsoListParagraph";
+	mso-style-parent:"List Paragraph";
 	mso-style-type:export-only;
 	margin-top:0cm;
 	margin-right:0cm;
@@ -201,6 +201,7 @@ p.MsoListCxSpLast, li.MsoListCxSpLast, div.MsoListCxSpLast
 p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
 	{mso-style-priority:34;
 	mso-style-unhide:no;
+	mso-style-name:"List Paragraph";
 	mso-style-qformat:yes;
 	margin-top:0cm;
 	margin-right:0cm;
@@ -272,6 +273,7 @@ h1
 	{mso-style-priority:1;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
+	mso-style-name:"Heading 1";
 	mso-style-link:"Heading 1 Char";
 	mso-style-next:Normal;
 	margin-top:13.5pt;
@@ -338,6 +340,7 @@ h1.Annex
         {mso-style-priority:2;
         mso-style-unhide:no;
         mso-style-qformat:yes;
+	mso-style-name:"Heading 2";
         mso-style-parent:"Heading 1";
         mso-style-link:"Heading 2 Char";
         mso-style-next:Normal;
@@ -373,6 +376,7 @@ h2
 	{mso-style-priority:3;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
+	mso-style-name:"Heading 3";
 	mso-style-parent:"Heading 1";
 	mso-style-link:"Heading 3 Char";
 	mso-style-next:Normal;
@@ -407,6 +411,7 @@ h3      {mso-list:l1 level3 lfo6;
 	{mso-style-priority:4;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
+	mso-style-name:"Heading 4";
 	mso-style-parent:"Heading 3";
 	mso-style-link:"Heading 4 Char";
 	mso-style-next:Normal;
@@ -439,6 +444,7 @@ h4      {mso-list:l1 level4 lfo6;
 	{mso-style-priority:5;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
+	mso-style-name:"Heading 5";
 	mso-style-parent:"Heading 4";
 	mso-style-link:"Heading 5 Char";
 	mso-style-next:Normal;
@@ -471,6 +477,7 @@ h6
 	{mso-style-priority:6;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
+	mso-style-name:"Heading 6";
 	mso-style-parent:"Heading 5";
 	mso-style-link:"Heading 6 Char";
 	mso-style-next:Normal;
@@ -502,6 +509,7 @@ h6      {mso-list:l1 level6 lfo6;
 p.MsoToc1, li.MsoToc1, div.MsoToc1
 	{mso-style-priority:39;
 	mso-style-unhide:no;
+	mso-style-name:"TOC 1";
 	mso-style-next:Normal;
 	margin-top:6.0pt;
 	margin-right:25.0pt;
@@ -523,6 +531,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
 	{mso-style-noshow:yes;
 	mso-style-priority:39;
 	mso-style-unhide:no;
+	mso-style-name:"TOC 2";
 	mso-style-parent:"TOC 1";
 	mso-style-next:Normal;
 	margin-top:0cm;
@@ -545,6 +554,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
 	{mso-style-noshow:yes;
 	mso-style-priority:39;
 	mso-style-unhide:no;
+	mso-style-name:"TOC 3";
 	mso-style-parent:"TOC 2";
 	mso-style-next:Normal;
 	margin-top:0cm;
@@ -645,6 +655,7 @@ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
         mso-ansi-language:EN-GB;}
 span.MsoFootnoteReference
 	{mso-style-priority:99;
+        mso-style-name:"Footnote Reference";
 	vertical-align:super;}
 p.MsoCaption, li.MsoCaption, div.MsoCaption
 	{mso-style-priority:35;
@@ -1022,6 +1033,7 @@ span.BodyTextChar, span.Char3
 p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
 	{mso-style-noshow:yes;
 	mso-style-priority:99;
+	mso-style-name:"Comment Text";
 	mso-style-link:"Comment Text Char";
 	margin-top:0cm;
 	margin-right:0cm;

data/lib/isodoc/iso/i18n.rb

@@ -1,16 +1,17 @@
 module IsoDoc
   module Iso
     class I18n < IsoDoc::I18n
+      def load_file(fname)
+        YAML.load_file(File.join(File.dirname(__FILE__), fname))
+      end
+
       def load_yaml1(lang, script)
-        y = if lang == "en"
-          YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
-        elsif lang == "fr"
-          YAML.load_file(File.join(File.dirname(__FILE__), "i18n-fr.yaml"))
-        elsif lang == "zh" && script == "Hans"
-          YAML.load_file(File.join(File.dirname(__FILE__), "i18n-zh-Hans.yaml"))
-        else
-          YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
-        end
+        y = if lang == "en" then load_file("i18n-en.yaml")
+            elsif lang == "fr" then load_file("i18n-fr.yaml")
+            elsif lang == "zh" && script == "Hans"
+              load_file("i18n-zh-Hans.yaml")
+            else load_file("i18n-en.yaml")
+            end
         super.merge(y)
       end
     end