metanorma-csa 1.9.3 → 2.0.1

data/lib/isodoc/csa/html/htmlstyle.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 {
@@ -239,51 +248,55 @@ body {
 main {
   margin: 0 3em 0 6em; }
 
-#toc {
+#toc, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
   font-family: {{bodyfont}};
   font-weight: 400; }
-  #toc ul {
+  #toc ul, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul {
     margin: 0;
     padding: 0;
     list-style: none; }
-    #toc ul li a {
+    #toc ul li a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul li a {
       padding: 5px 10px; }
-    #toc ul a {
+    #toc ul a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a {
       color: #4D7EA5;
       text-decoration: none;
       display: block; }
-      #toc ul a:hover {
+      #toc ul a:hover, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a:hover {
         box-shadow: none;
         color: #4D7EA5; }
-  #toc .h2 {
+  #toc .h2, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .h2 {
     padding-left: 30px; }
-  #toc .h3 {
+  #toc .h3, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .h3 {
     padding-left: 50px; }
-  #toc .toc-active, #toc li:hover {
+  #toc .toc-active, #toc li:hover, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
     background: #4D7EA5;
     box-shadow: inset -5px 0px 10px -5px #4D7EA5 !important; }
-    #toc .toc-active a, #toc li:hover a {
+    #toc .toc-active a, #toc li:hover a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
       color: #4D7EA5; }
   @media print {
-    #toc .toc-active, #toc li:hover {
+    #toc .toc-active, #toc li:hover, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
       background: white;
       box-shadow: none !important; }
-    #toc .toc-active a {
+    #toc .toc-active a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a {
       color: #4D7EA5; }
-    #toc li:hover a {
+    #toc li:hover a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
       color: black; } }
   @media screen and (max-width: 768px) {
-    #toc {
+    #toc, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
       padding: 0 1.5em;
       overflow: visible; } }
-  #toc .toc-active a {
+  #toc .toc-active a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a {
     color: white; }
-  #toc li a {
+  #toc li a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li a {
     text-transform: none; }
-  #toc ul a:hover {
+  #toc ul a:hover, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a:hover {
     box-shadow: none;
     color: white; }
 
+#toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
+  margin-top: 0;
+  margin-bottom: 0; }
+
 li {
   margin-left: 1em;
   list-style-position: outside; }
@@ -344,7 +357,7 @@ li {
     display: none; }
   h1.toc-contents {
     margin-top: 1em; }
-  ul#toc-list {
+  ul#toc-list, ul#toc-list > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
     padding: 0;
     margin: 0; } }
 
@@ -506,7 +519,7 @@ dt {
 /*
 3.1 Titles
 */
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
   font-family: {{headerfont}};
   line-height: 1.2em;
   color: black;
@@ -514,18 +527,18 @@ h1, h2, h3, h4, h5, h6 {
   margin-top: 1.5em;
   margin-bottom: 0.3em; }
 
-h1 {
+h1, .h1 {
   font-size: 1.8em;
   text-transform: uppercase;
   /*  margin-top: 2em;*/ }
 
-h1#content {
+h1#content, #content.h1 {
   margin-top: 2em; }
 
-h2 {
+h2, .h2 {
   font-size: 1.6em; }
 
-h3 {
+h3, .h3 {
   font-size: 1.5em; }
 
 /*
@@ -604,7 +617,7 @@ ul, ol {
   margin: 2em 0; }
 
 /*
-h2 p {
+h2 p,.h2 p {
 display: inline;
 }
 */
@@ -964,7 +977,7 @@ img.csa-logo {
   color: white;
   text-transform: uppercase; }
 
-.section-title h1 {
+.section-title h1, .section-title .h1 {
   font-size: 2em;
   font-weight: 800;
   line-height: 1em;
@@ -973,11 +986,11 @@ img.csa-logo {
   color: white;
   text-transform: none; }
 
-h2 {
+h2, .h2 {
   border-bottom: solid 1px #4D7EA5;
   color: #4D7EA5; }
 
-h3, h4, h5, h6 {
+h3, h4, h5, h6, .h3, .h4, .h5, .h6 {
   color: #EE9C4F; }
 
 /*

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

@@ -18,7 +18,7 @@ main {
   margin: 0 3em 0 6em;
 }
 
-#toc {
+#toc, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
   @include toc(#4D7EA5, #4D7EA5, #4D7EA5);
   @include sidebarToc();
 
@@ -38,6 +38,12 @@ main {
   }
 }
 
+#toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
+   margin-top: 0;
+   margin-bottom: 0;
+ }
+
+
 li {
   margin-left: 1em;
   list-style-position: outside;
@@ -68,7 +74,7 @@ nav {
     margin-top: 1em;
   }
 
-  ul#toc-list {
+  ul#toc-list, ul#toc-list > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
     padding: 0;
     margin: 0;
   }
@@ -186,7 +192,7 @@ dt {
 3.1 Titles
 */
 
-h1,h2,h3,h4,h5,h6 {
+h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6 {
   font-family: $headerfont;
   line-height: 1.2em;
   color: black;
@@ -195,21 +201,21 @@ h1,h2,h3,h4,h5,h6 {
   margin-bottom: 0.3em;
 }
 
-h1 {
+h1,.h1 {
   font-size: 1.8em;
   text-transform: uppercase;
 /*  margin-top: 2em;*/
 }
 
-h1#content {
+h1#content,.h1#content {
   margin-top: 2em;
 }
 
-h2 {
+h2,.h2 {
   font-size: 1.6em;
 }
 
-h3 {
+h3,.h3 {
   font-size: 1.5em;
 }
 /*
@@ -283,7 +289,7 @@ ul, ol {
   @include rule(1px, #00427e)
 }
 /*
-h2 p {
+h2 p,.h2 p {
 display: inline;
 }
 */
@@ -663,7 +669,7 @@ img.csa-logo {
   text-transform: uppercase;
 }
 
-.section-title h1 {
+.section-title h1, .section-title .h1 {
   font-size: 2em;
   font-weight: 800;
   line-height: 1em;
@@ -673,12 +679,12 @@ img.csa-logo {
   text-transform: none;
 }
 
-h2 {
+h2,.h2 {
   border-bottom: solid 1px #4D7EA5;
   color: #4D7EA5;
 }
 
-h3, h4, h5, h6 {
+h3, h4, h5, h6, .h3, .h4, .h5, .h6 {
   color: #EE9C4F;
 }
 

data/lib/isodoc/csa/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/csa/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-unhide: no;
   mso-style-qformat: yes;
@@ -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-unhide: no;
   mso-style-qformat: yes;
@@ -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-unhide: no;
   mso-style-qformat: yes;
@@ -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-unhide: no;
   mso-style-qformat: yes;
@@ -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-unhide: no;
   mso-style-qformat: yes;
@@ -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-unhide: no;
   mso-style-qformat: yes;
@@ -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-unhide: no;

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

@@ -340,7 +340,7 @@ div.figure, p.figure
 	
 	
 	
-h1
+h1, .h1
 	{mso-style-priority:1;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
@@ -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-unhide:no;
 	mso-style-qformat:yes;
@@ -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-unhide:no;
 	mso-style-qformat:yes;
@@ -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-unhide:no;
 	mso-style-qformat:yes;
@@ -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-unhide:no;
 	mso-style-qformat:yes;
@@ -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-unhide:no;
 	mso-style-qformat:yes;
@@ -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-unhide:no;

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

@@ -9,9 +9,9 @@ require "isodoc/csa/presentation_xml_convert"
 require "metanorma/csa"
 require "fileutils"
 
-module Asciidoctor
+module Metanorma
   module Csa
-    class Converter < ::Asciidoctor::Generic::Converter
+    class Converter < ::Metanorma::Generic::Converter
       XML_ROOT_TAG = "csa-standard"
       XML_NAMESPACE = "https://www.metanorma.org/ns/csa"
 
@@ -91,7 +91,7 @@ module Asciidoctor
       def pdf_converter(node)
         return if node.attr("no-pdf")
 
-        IsoDoc::Csa::PdfConvert.new(html_extract_attributes(node))
+        IsoDoc::Csa::PdfConvert.new(pdf_extract_attributes(node))
       end
 
       def doc_converter(node)

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

@@ -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>
@@ -1959,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>
@@ -1973,7 +1991,7 @@
         </element>
       </optional>
       <optional>
-        <element name="grammar-info">
+        <element name="grammar">
           <ref name="Grammar"/>
         </element>
       </optional>

data/lib/metanorma/csa/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Csa
-    VERSION = "1.9.3".freeze
+    VERSION = "2.0.1".freeze
   end
 end

data/lib/metanorma-csa.rb

@@ -1,5 +1,5 @@
 require 'asciidoctor' unless defined? Asciidoctor::Converter
-require_relative 'asciidoctor/csa/converter'
+require_relative 'metanorma/csa/converter'
 require_relative 'isodoc/csa/html_convert'
 require_relative 'isodoc/csa/pdf_convert'
 require_relative 'isodoc/csa/word_convert'

data/metanorma-csa.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "metanorma-generic", "~> 1.11.0"
+  spec.add_dependency "metanorma-generic", "~> 2.0.0"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

data/metanorma.yml

@@ -6,7 +6,7 @@ xml_root_tag: csa-standard
 html_bodyfont: 'Lato,"Source Sans Pro",sans-serif'
 html_headerfont: 'Lato,"Source Sans Pro",sans-serif'
 html_monospacefont: '"Source Code Pro",monospace'
-validate_rng_file: lib/asciidoctor/csa/csa.rng
+validate_rng_file: lib/metanorma/csa/csa.rng
 htmlcoverpage: lib/isodoc/csa/html/html_csa_titlepage.html
 htmlintropage: lib/isodoc/csa/html/html_csa_intro.html
 htmlstylesheet: lib/isodoc/csa/html/htmlstyle.scss