metanorma-cc 1.8.2 → 2.0.0

data/lib/isodoc/cc/html/_coverpage.css

@@ -68,6 +68,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; }
@@ -79,6 +85,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 {

data/lib/isodoc/cc/html/htmlstyle.css

@@ -68,6 +68,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; }
@@ -79,6 +85,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 {
@@ -287,6 +296,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; }
@@ -298,6 +313,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 {
@@ -723,26 +741,26 @@ nav #toc {
     top: 20px; }
 
 /* Typograpy */
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
   color: #0e1a85;
   font-weight: 600;
   margin-top: 2em;
   margin-bottom: 0.3em; }
 
-h1 {
+h1, .h1 {
   font-size: 1.4em;
   text-transform: uppercase;
   margin-top: 2em; }
-  h1#content {
+  h1#content, #content.h1 {
     margin-top: 2em; }
 
-h2 {
+h2, .h2 {
   font-size: 1.3em;
   font-weight: 400; }
-  h2 p {
+  h2 p, .h2 p {
     display: inline; }
 
-h3 {
+h3, .h3 {
   font-size: 1.1em;
   font-weight: 400; }
 
@@ -751,10 +769,12 @@ p {
   margin-bottom: 1em; }
 
 /* Terms */
-.TermNum, .Terms, .AltTerms {
-  color: #485094;
+.TermNum {
   font-weight: 400; }
 
+.TermNum, .Terms, .AltTerms {
+  color: #485094; }
+
 p.TermNum {
   font-size: 0.9em;
   line-height: 1em;
@@ -1029,7 +1049,7 @@ a.anchorjs-link:hover {
   margin: 2cm 1cm 2cm 1cm; }
 
 @media print {
-  h1, .title-section1 {
+  h1, .h1, .title-section1 {
     page-break-before: always; }
   h1.toc-contents {
     margin-top: 2em; } }

data/lib/isodoc/cc/html/htmlstyle.scss

@@ -96,14 +96,14 @@ nav {
 
 /* Typograpy */
 
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
   color: #0e1a85;
   font-weight: 600;
   margin-top: 2em;
   margin-bottom: 0.3em;
 }
 
-h1 {
+h1, .h1 {
   font-size: 1.4em;
   text-transform: uppercase;
   margin-top: 2em;
@@ -113,7 +113,7 @@ h1 {
   }
 }
 
-h2 {
+h2, .h2 {
   font-size: 1.3em;
   font-weight: 400;
 
@@ -122,7 +122,7 @@ h2 {
   }
 }
 
-h3 {
+h3, .h3 {
   font-size: 1.1em;
   font-weight: 400;
 }
@@ -135,9 +135,12 @@ p {
 
 /* Terms */
 
+.TermNum {
+  font-weight: 400;
+}
+
 .TermNum, .Terms, .AltTerms {
   color: #485094;
-  font-weight: 400;
 }
 
 p.TermNum {
@@ -398,7 +401,7 @@ a.anchorjs-link:hover {
 }
 
 @media print {
-  h1, .title-section1 {
+  h1, .h1, .title-section1 {
     page-break-before: always;
   }
 

data/lib/isodoc/cc/html/scripts.html

@@ -17,7 +17,6 @@ $('#toggle').on('click', function(){
     else {
         $('nav').show();
         $('nav').animate({ 'left': '0px' }, 'slow');
-        $('.container').animate({ 'padding-left': '360px' }, 'slow');
     }
 });
 </script>

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

@@ -370,7 +370,7 @@ span.blackgraphtx {
 div.figure, p.figure {
   text-align: center; }
 
-h1 {
+h1, .h1 {
   mso-style-priority: 1;
   mso-style-name: "Heading 1";
   mso-style-unhide: no;
@@ -385,8 +385,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;
   font-size: 13.0pt;
@@ -399,6 +397,10 @@ h1 {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
+h1 {
+  mso-outline-level: 1;
+  mso-list: l1 level1 lfo6; }
+
 h1.Annex {
   mso-style-priority: 1;
   mso-style-unhide: no;
@@ -457,7 +459,7 @@ h1.Annex {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
-h2 {
+h2, .h2 {
   mso-style-priority: 2;
   mso-style-name: "Heading 2";
   mso-style-unhide: no;
@@ -473,8 +475,6 @@ h2 {
   line-height: 12.5pt;
   mso-pagination: widow-orphan;
   page-break-after: avoid;
-  mso-outline-level: 2;
-  mso-list: l1 level2 lfo6;
   mso-hyphenate: none;
   tab-stops: 27.0pt 35.0pt;
   font-size: 12.0pt;
@@ -486,7 +486,11 @@ h2 {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
-h3 {
+h2 {
+  mso-outline-level: 2;
+  mso-list: l1 level2 lfo6; }
+
+h3, .h3 {
   mso-style-priority: 3;
   mso-style-name: "Heading 3";
   mso-style-unhide: no;
@@ -502,8 +506,6 @@ h3 {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   page-break-after: avoid;
-  mso-outline-level: 3;
-  mso-list: l1 level3 lfo6;
   mso-hyphenate: none;
   tab-stops: list 36.0pt left 44.0pt;
   font-size: 11.0pt;
@@ -514,7 +516,11 @@ h3 {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
-h4 {
+h3 {
+  mso-outline-level: 3;
+  mso-list: l1 level3 lfo6; }
+
+h4, .h4 {
   mso-style-priority: 4;
   mso-style-name: "Heading 4";
   mso-style-unhide: no;
@@ -530,8 +536,6 @@ h4 {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   page-break-after: avoid;
-  mso-outline-level: 4;
-  mso-list: l1 level4 lfo6;
   mso-hyphenate: none;
   tab-stops: 51.05pt 57.0pt 68.0pt;
   font-size: 11.0pt;
@@ -542,7 +546,11 @@ h4 {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
-h5 {
+h4 {
+  mso-outline-level: 4;
+  mso-list: l1 level4 lfo6; }
+
+h5, .h5 {
   mso-style-priority: 5;
   mso-style-name: "Heading 5";
   mso-style-unhide: no;
@@ -558,8 +566,6 @@ h5 {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   page-break-after: avoid;
-  mso-outline-level: 5;
-  mso-list: l1 level5 lfo6;
   mso-hyphenate: none;
   tab-stops: 51.05pt list 54.0pt;
   font-size: 11.0pt;
@@ -570,7 +576,11 @@ h5 {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
-h6 {
+h5 {
+  mso-outline-level: 5;
+  mso-list: l1 level5 lfo6; }
+
+h6, .h6 {
   mso-style-priority: 6;
   mso-style-name: "Heading 6";
   mso-style-unhide: no;
@@ -586,8 +596,6 @@ h6 {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   page-break-after: avoid;
-  mso-outline-level: 6;
-  mso-list: l1 level6 lfo6;
   mso-hyphenate: none;
   tab-stops: 51.05pt list 72.0pt;
   font-size: 11.0pt;
@@ -598,6 +606,10 @@ h6 {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
+h6 {
+  mso-outline-level: 6;
+  mso-list: l1 level6 lfo6; }
+
 p.MsoToc1, li.MsoToc1, div.MsoToc1 {
   mso-style-priority: 39;
   mso-style-name: "TOC 1";

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

@@ -340,7 +340,7 @@ div.figure, p.figure
 	
 	
 	
-h1
+h1, .h1
 	{mso-style-priority:1;
         mso-style-name:"Heading 1";
 	mso-style-unhide:no;
@@ -355,8 +355,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;
 	font-size:13.0pt;
@@ -368,6 +366,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.Annex
 	{mso-style-priority:1;
 	mso-style-unhide:no;
@@ -424,7 +426,7 @@ h1.Annex
         mso-ansi-language:EN-GB;
         mso-fareast-language:JA;
         mso-bidi-font-weight:normal;}
-h2
+h2, .h2
 	{mso-style-priority:2;
         mso-style-name:"Heading 2";
 	mso-style-unhide:no;
@@ -440,8 +442,6 @@ h2
 	line-height:12.5pt;
 	mso-pagination:widow-orphan;
 	page-break-after:avoid;
-	mso-outline-level:2;
-	mso-list:l1 level2 lfo6;
 	mso-hyphenate:none;
 	tab-stops:27.0pt 35.0pt;
 	font-size:12.0pt;
@@ -452,7 +452,11 @@ h2
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
-h3
+h2 {
+	mso-outline-level:2;
+	mso-list:l1 level2 lfo6;
+}
+h3, .h3
 	{mso-style-priority:3;
         mso-style-name:"Heading 3";
 	mso-style-unhide:no;
@@ -468,8 +472,6 @@ h3
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	page-break-after:avoid;
-	mso-outline-level:3;
-	mso-list:l1 level3 lfo6;
 	mso-hyphenate:none;
 	tab-stops:list 36.0pt left 44.0pt;
 	font-size:11.0pt;
@@ -479,7 +481,11 @@ h3
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
-h4
+h3 {
+	mso-outline-level:3;
+	mso-list:l1 level3 lfo6;
+}
+h4, .h4
 	{mso-style-priority:4;
         mso-style-name:"Heading 4";
 	mso-style-unhide:no;
@@ -495,8 +501,6 @@ h4
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	page-break-after:avoid;
-	mso-outline-level:4;
-	mso-list:l1 level4 lfo6;
 	mso-hyphenate:none;
 	tab-stops:51.05pt 57.0pt 68.0pt;
 	font-size:11.0pt;
@@ -506,7 +510,11 @@ h4
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
-h5
+h4 {
+	mso-outline-level:4;
+	mso-list:l1 level4 lfo6;
+}
+h5, .h5
 	{mso-style-priority:5;
         mso-style-name:"Heading 5";
 	mso-style-unhide:no;
@@ -522,8 +530,6 @@ h5
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	page-break-after:avoid;
-	mso-outline-level:5;
-	mso-list:l1 level5 lfo6;
 	mso-hyphenate:none;
 	tab-stops:51.05pt list 54.0pt;
 	font-size:11.0pt;
@@ -533,7 +539,11 @@ h5
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
-h6
+h5 {
+	mso-outline-level:5;
+	mso-list:l1 level5 lfo6;
+}
+h6, .h6
 	{mso-style-priority:6;
         mso-style-name:"Heading 6";
 	mso-style-unhide:no;
@@ -549,8 +559,6 @@ h6
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	page-break-after:avoid;
-	mso-outline-level:6;
-	mso-list:l1 level6 lfo6;
 	mso-hyphenate:none;
 	tab-stops:51.05pt list 72.0pt;
 	font-size:11.0pt;
@@ -560,6 +568,10 @@ h6
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
+h6 {
+	mso-outline-level:6;
+	mso-list:l1 level6 lfo6;
+}
 p.MsoToc1, li.MsoToc1, div.MsoToc1
 	{mso-style-priority:39;
         mso-style-name:"TOC 1";

data/lib/{asciidoctor → metanorma}/cc/converter.rb

@@ -3,13 +3,13 @@ require "isodoc/cc/html_convert"
 require "isodoc/cc/word_convert"
 require "isodoc/cc/presentation_xml_convert"
 require "metanorma/cc"
-require "asciidoctor/standoc/converter"
-require "asciidoctor/generic/converter"
+require "metanorma/standoc/converter"
+require "metanorma/generic/converter"
 require_relative "validate_section"
 
-module Asciidoctor
+module Metanorma
   module CC
-    class Converter < Asciidoctor::Generic::Converter
+    class Converter < Metanorma::Generic::Converter
       XML_ROOT_TAG = "csd-standard".freeze
       XML_NAMESPACE = "https://www.metanorma.org/ns/csd".freeze
 
@@ -35,13 +35,13 @@ module Asciidoctor
       end
 
       def outputs(node, ret)
-        File.open(@filename + ".xml", "w:UTF-8") { |f| f.write(ret) }
-        presentation_xml_converter(node).convert(@filename + ".xml")
-        html_converter(node).convert(@filename + ".presentation.xml",
+        File.open("#{@filename}.xml", "w:UTF-8") { |f| f.write(ret) }
+        presentation_xml_converter(node).convert("#{@filename}.xml")
+        html_converter(node).convert("#{@filename}.presentation.xml",
                                      nil, false, "#{@filename}.html")
-        doc_converter(node).convert(@filename + ".presentation.xml",
+        doc_converter(node).convert("#{@filename}.presentation.xml",
                                     nil, false, "#{@filename}.doc")
-        pdf_converter(node)&.convert(@filename + ".presentation.xml",
+        pdf_converter(node)&.convert("#{@filename}.presentation.xml",
                                      nil, false, "#{@filename}.pdf")
       end
 
@@ -52,7 +52,7 @@ module Asciidoctor
       def pdf_converter(node)
         return if node.attr("no-pdf")
 
-        IsoDoc::CC::PdfConvert.new(html_extract_attributes(node))
+        IsoDoc::CC::PdfConvert.new(pdf_extract_attributes(node))
       end
 
       def doc_converter(node)

data/lib/{asciidoctor → metanorma}/cc/isodoc.rng

@@ -58,7 +58,7 @@
           <attribute name="alt"/>
         </optional>
         <optional>
-          <attribute name="updatetype">
+          <attribute name="update-type">
             <data type="boolean"/>
           </attribute>
         </optional>
@@ -1796,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>
@@ -1814,9 +1828,6 @@
       <optional>
         <ref name="termsubject"/>
       </optional>
-      <optional>
-        <ref name="termusage"/>
-      </optional>
       <oneOrMore>
         <ref name="termdefinition"/>
       </oneOrMore>
@@ -1880,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>
@@ -1942,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>
@@ -1956,7 +1991,7 @@
         </element>
       </optional>
       <optional>
-        <element name="grammarInfo">
+        <element name="grammar">
           <ref name="Grammar"/>
         </element>
       </optional>
@@ -1983,6 +2018,11 @@
         <ref name="GrammarGender"/>
       </element>
     </zeroOrMore>
+    <zeroOrMore>
+      <element name="number">
+        <ref name="GrammarNumber"/>
+      </element>
+    </zeroOrMore>
     <optional>
       <element name="isPreposition">
         <data type="boolean"/>
@@ -2014,7 +2054,7 @@
       </element>
     </optional>
     <zeroOrMore>
-      <element name="grammarvalue">
+      <element name="grammar-value">
         <text/>
       </element>
     </zeroOrMore>
@@ -2027,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>
@@ -2041,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>
@@ -2061,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>
@@ -2076,7 +2119,7 @@
     </element>
   </define>
   <define name="nonverbalrep">
-    <element name="nonverbalrepresentation">
+    <element name="non-verbal-representation">
       <oneOrMore>
         <choice>
           <ref name="table"/>