metanorma-ribose 1.8.1 → 1.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e14900c0c35f275f27141edb40d206f712011f59cd70594fa10581b41476a34a
-  data.tar.gz: d7515001fa48bfab517c89180b53a5ee3495fb07746fdb9ed3f30b8b4a20eabd
+  metadata.gz: 15ecdae44d9c0f03941e38f784f1b766b2fc80283f0cc76a15b65c9d5f6f8c57
+  data.tar.gz: a0b8dde351cee3f3f3cecc58b874f006d5dc294777de296df53f5eefdbf7593e
 SHA512:
-  metadata.gz: e47b2ffe0e41caf3678f5ac613c47bfc3364c99f0dd210d8a438a3393cf87a792026c02464cf1638cf569709fb0aa66261153444d39ec2c30ca15f01fd46299b
-  data.tar.gz: 8c8ad48b490c279dc94777e3b197a182e5cff626779dd40aa7377ba3406d5037879a76c42744a11d32a16d2a64270e3b93714e936f7e3033d6730c5e85760615
+  metadata.gz: e354fdb71a7273590f7b3995967826e48ee29212351e10a5907784b21d1a4fcab29580a4b13f7012fcc42a8444105473e1d486742c82f98958d10bc3caaa422f
+  data.tar.gz: e1a9612a2af44a9401ff659f7d013d22a133ca4d73ef188a8217968abb2340b8841d74c2fba8ad051247faa08c9357653afe67b563d459f71e806f7280c605a6

data/lib/asciidoctor/ribose/converter.rb

@@ -26,7 +26,7 @@ module Asciidoctor
 
       def make_preface(xml, sect)
         if xml.at("//foreword | //introduction | //acknowledgements | "\
-            "//clause[@preface] | //executivesummary")
+                  "//clause[@preface] | //executivesummary")
           preface = sect.add_previous_sibling("<preface/>").first
           f = xml.at("//foreword") and preface.add_child f.remove
           f = xml.at("//executivesummary") and preface.add_child f.remove
@@ -45,7 +45,7 @@ module Asciidoctor
 
       def executivesummary_parse(attrs, xml, node)
         xml.executivesummary **attr_code(attrs) do |xml_section|
-          xml_section.title { |t| t << node.title || "Executive Summary" }
+          xml_section.title { |t| t << (node.title || "Executive Summary") }
           content = node.content
           xml_section << content
         end
@@ -67,7 +67,7 @@ module Asciidoctor
       def pdf_converter(node)
         return nil if node.attr("no-pdf")
 
-        IsoDoc::Ribose::PdfConvert.new(html_extract_attributes(node))
+        IsoDoc::Ribose::PdfConvert.new(pdf_extract_attributes(node))
       end
 
       def doc_converter(node)

data/lib/asciidoctor/ribose/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"/>

data/lib/isodoc/ribose/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 {
@@ -537,37 +546,38 @@ h2,
 h3,
 h4,
 h5,
-h6 {
+h6,
+.h1, .h2, .h3, .h4, .h5, .h6 {
   font-family: {{headerfont}};
   color: #1661AD;
   font-weight: 300;
   margin-top: 1.6em;
   margin-bottom: 0.3em; }
 
-h1 {
+h1, .h1 {
   font-size: 1.6em;
   text-transform: uppercase;
   margin-top: 2em; }
 
-h1#content {
+h1#content, #content.h1 {
   margin-top: 2em; }
 
-h2 {
+h2, .h2 {
   margin-top: 1.3em;
   font-size: 1.3em;
   font-weight: 400; }
 
-h3 {
+h3, .h3 {
   margin-top: 1.1em;
   font-size: 1.1em;
   font-weight: 100; }
 
-.TermNum,
-.Terms,
-.AltTerms {
-  color: #1661AD;
+.TermNum {
   font-weight: 100; }
 
+.TermNum, .Terms, .AltTerms {
+  color: #1661AD; }
+
 h2.TermNum {
   margin-bottom: 0; }
 
@@ -840,7 +850,7 @@ p {
   margin-top: 1em;
   margin-bottom: 1em; }
 
-h2 p {
+h2 p, .h2 p {
   display: inline; }
 
 /*
@@ -970,7 +980,8 @@ To top button
   h1,
   h2,
   h3,
-  h4 {
+  h4,
+  .h1, .h2, .h3, .h4 {
     page-break-after: avoid;
     margin-top: 1.2em; }
   .note,
@@ -996,12 +1007,12 @@ To top button
   h1.content {
     margin-top: 2em;
     line-height: 2.5em; }
-  h1 {
+  h1, .h1 {
     font-size: 1.5em;
     line-height: 1.5; }
-  h2 {
+  h2, .h2 {
     font-size: 1.2em; }
-  h3 {
+  h3, .h3 {
     font-size: 1em; }
   .Note {
     background-color: #fff495;

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

@@ -202,7 +202,8 @@ h2,
 h3,
 h4,
 h5,
-h6 {
+h6,
+.h1, .h2, .h3, .h4, .h5, .h6 {
   font-family: $headerfont;
   color: #1661AD;
   font-weight: 300;
@@ -210,35 +211,36 @@ h6 {
   margin-bottom: 0.3em;
 }
 
-h1 {
+h1, .h1 {
   font-size: 1.6em;
   text-transform: uppercase;
   margin-top: 2em;
 }
 
-h1#content {
+h1#content, .h1#content {
   margin-top: 2em;
 }
 
-h2 {
+h2, .h2 {
   margin-top: 1.3em;
   font-size: 1.3em;
   font-weight: 400;
 }
 
-h3 {
+h3, .h3 {
   margin-top: 1.1em;
   font-size: 1.1em;
   font-weight: 100;
 }
 
-.TermNum,
-.Terms,
-.AltTerms {
-  color: #1661AD;
+.TermNum {
   font-weight: 100;
 }
 
+.TermNum, .Terms, .AltTerms {
+  color: #1661AD;
+}
+
 h2.TermNum {
   margin-bottom: 0;
 }
@@ -499,7 +501,7 @@ p {
   margin-bottom: 1em;
 }
 
-h2 p {
+h2 p, .h2 p {
   display: inline;
 }
 
@@ -672,7 +674,8 @@ To top button
   h1,
   h2,
   h3,
-  h4 {
+  h4, 
+  .h1, .h2, .h3, .h4 {
     page-break-after: avoid;
     margin-top: 1.2em;
   }
@@ -716,16 +719,16 @@ To top button
     line-height: 2.5em;
   }
 
-  h1 {
+  h1, .h1 {
     font-size: 1.5em;
     line-height: 1.5;
   }
 
-  h2 {
+  h2, .h2 {
     font-size: 1.2em
   }
 
-  h3 {
+  h3, .h3 {
     font-size: 1em;
   }
 

data/lib/isodoc/ribose/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/ribose/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;
@@ -400,6 +398,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;
@@ -459,7 +461,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;
@@ -475,8 +477,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: {{normalfontsize}};
@@ -489,7 +489,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;
@@ -505,8 +509,6 @@ h3 {
   line-height: {{normalfontsize}};
   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: {{normalfontsize}};
@@ -518,7 +520,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;
@@ -534,8 +540,6 @@ h4 {
   line-height: {{normalfontsize}};
   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: {{normalfontsize}};
@@ -547,7 +551,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;
@@ -563,8 +571,6 @@ h5 {
   line-height: {{normalfontsize}};
   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: {{normalfontsize}};
@@ -576,7 +582,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;
@@ -592,8 +602,6 @@ h6 {
   line-height: {{normalfontsize}};
   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: {{normalfontsize}};
@@ -605,6 +613,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/ribose/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;
@@ -369,6 +367,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;
@@ -426,7 +428,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;
@@ -442,8 +444,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:$normalfontsize;
@@ -455,7 +455,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;
@@ -471,8 +475,6 @@ h3
 	line-height:$normalfontsize;
 	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:$normalfontsize;
@@ -483,7 +485,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;
@@ -499,8 +505,6 @@ h4
 	line-height:$normalfontsize;
 	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:$normalfontsize;
@@ -511,7 +515,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;
@@ -527,8 +535,6 @@ h5
 	line-height:$normalfontsize;
 	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:$normalfontsize;
@@ -539,7 +545,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;
@@ -555,8 +565,6 @@ h6
 	line-height:$normalfontsize;
 	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:$normalfontsize;
@@ -567,6 +575,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;