metanorma-ribose 1.6.0 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ce5853df8daa9d2d0663467fbb52f8d9aa124d85978e40614ca7db02bf4b443
-  data.tar.gz: c97dd624276bacd15828fcc6b7f0167ec23eab046212313f2f4a5cf0be1889c6
+  metadata.gz: 76c92e3101791882684034ffa9ec62ee39a2838a14fdda750cb37f7272446e00
+  data.tar.gz: ff0e212e1398c0de4ef6afba3ef4c6c7af882f0ca1e8aec0b4f1a99796211a7c
 SHA512:
-  metadata.gz: 64d52d28120af657e24fc8fe323312087a70de9a03451a577dc1acbbee9001cd5d068e36cca29217c14eb16e3d762cfa6a14a69933db235b863a458caf72ea5c
-  data.tar.gz: 18a54900b465640bcfcaf4c9991f657211fb86d3e370d7f6705682b98806eb3943e67bdb186505c9d78787920b37250e3bd2f16c73de6bff968f5495f37bcd97
+  metadata.gz: bc8cbb2fbda9c61fe7def3e027bbd0af199cd93578fe5d07526993410181a060b926670d3fbf36099d2e9983295a59208582e99fb5859212560e13f195034d47
+  data.tar.gz: 5c52d881e32cbb5adda06fe28f2c96185cc0937e1fd0421a97f3e8c31ae385fdae956dd21a49ddd31368adbcffefc431994babed20c92ddb64fcc41b0341beb1

data/.github/workflows/ubuntu.yml

@@ -39,7 +39,7 @@ jobs:
           polling_interval_seconds: 5
           timeout_minutes: 5
           max_attempts: 3
-          command: sudo bash -c "curl -L https://github.com/metanorma/plantuml-install/raw/master/ubuntu.sh | bash"
+          command: sudo apt-get update -y && sudo bash -c "curl -L https://github.com/metanorma/plantuml-install/raw/master/ubuntu.sh | bash"
       - name: Run specs
         run: |
           bundle exec rake

data/README.adoc

@@ -64,7 +64,8 @@ this general model can be found on its page. Details of the Ribose modifications
 to this general model can be found on the https://github.com/metanorma/metanorma-model-rsd[RSD model]
 repository.
 
-////
 == Examples
-////
+
+Example documents may be found in the https://github.com/metanorma/mn-samples-ribose[mn-samples-ribose]
+repository.
 

data/lib/asciidoctor/ribose/basicdoc.rng

@@ -402,6 +402,16 @@
           </choice>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="valign">
+          <choice>
+            <value>top</value>
+            <value>middle</value>
+            <value>bottom</value>
+            <value>baseline</value>
+          </choice>
+        </attribute>
+      </optional>
       <choice>
         <zeroOrMore>
           <ref name="TextElement"/>
@@ -429,6 +439,16 @@
           </choice>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="valign">
+          <choice>
+            <value>top</value>
+            <value>middle</value>
+            <value>bottom</value>
+            <value>baseline</value>
+          </choice>
+        </attribute>
+      </optional>
       <choice>
         <zeroOrMore>
           <ref name="TextElement"/>
@@ -998,6 +1018,9 @@
           <value>alphabet_upper</value>
         </choice>
       </attribute>
+      <optional>
+        <attribute name="start"/>
+      </optional>
       <oneOrMore>
         <ref name="li"/>
       </oneOrMore>

data/lib/asciidoctor/ribose/isodoc.rng

@@ -43,7 +43,9 @@
     <define name="xref">
       <element name="xref">
         <attribute name="target">
-          <data type="IDREF"/>
+          <data type="string">
+            <param name="pattern">\i\c*|\c+#\c+</param>
+          </data>
         </attribute>
         <optional>
           <attribute name="type">
@@ -61,6 +63,11 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="droploc">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -578,6 +585,8 @@
             <ref name="ol"/>
             <ref name="dl"/>
             <ref name="formula"/>
+            <ref name="quote"/>
+            <ref name="sourcecode"/>
           </choice>
         </oneOrMore>
       </element>
@@ -661,6 +670,16 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="valign">
+            <choice>
+              <value>top</value>
+              <value>middle</value>
+              <value>bottom</value>
+              <value>baseline</value>
+            </choice>
+          </attribute>
+        </optional>
         <choice>
           <zeroOrMore>
             <choice>
@@ -697,6 +716,16 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="valign">
+            <choice>
+              <value>top</value>
+              <value>middle</value>
+              <value>bottom</value>
+              <value>baseline</value>
+            </choice>
+          </attribute>
+        </optional>
         <choice>
           <zeroOrMore>
             <choice>
@@ -834,6 +863,13 @@
   </define>
   <define name="standard-document">
     <element name="standard-document">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <optional>
         <ref name="boilerplate"/>
@@ -855,7 +891,7 @@
       <oneOrMore>
         <choice>
           <ref name="content"/>
-          <ref name="preface_abstract"/>
+          <ref name="abstract"/>
           <ref name="foreword"/>
           <ref name="introduction"/>
           <ref name="acknowledgements"/>
@@ -1049,14 +1085,17 @@
       <ref name="section-title"/>
     </optional>
     <group>
-      <group>
-        <zeroOrMore>
-          <ref name="BasicBlock"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="note"/>
-        </zeroOrMore>
-      </group>
+      <choice>
+        <group>
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="note"/>
+          </zeroOrMore>
+        </group>
+        <ref name="amend"/>
+      </choice>
       <zeroOrMore>
         <choice>
           <ref name="clause-subsection"/>
@@ -1453,11 +1492,6 @@
       </optional>
     </element>
   </define>
-  <define name="preface_abstract">
-    <element name="abstract">
-      <ref name="Basic-Section"/>
-    </element>
-  </define>
   <define name="term-clause">
     <element name="clause">
       <optional>
@@ -1507,4 +1541,79 @@
       <ref name="CitationType"/>
     </element>
   </define>
+  <define name="amend">
+    <element name="amend">
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <attribute name="change">
+        <choice>
+          <value>add</value>
+          <value>modify</value>
+          <value>delete</value>
+        </choice>
+      </attribute>
+      <optional>
+        <attribute name="path"/>
+      </optional>
+      <optional>
+        <attribute name="path_end"/>
+      </optional>
+      <optional>
+        <attribute name="title"/>
+      </optional>
+      <optional>
+        <element name="location">
+          <zeroOrMore>
+            <ref name="locality"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <zeroOrMore>
+        <ref name="autonumber"/>
+      </zeroOrMore>
+      <optional>
+        <element name="description">
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <optional>
+        <element name="newcontent">
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <optional>
+        <element name="description">
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+    </element>
+  </define>
+  <define name="autonumber">
+    <element name="autonumber">
+      <attribute name="type">
+        <choice>
+          <value>requirement</value>
+          <value>recommendation</value>
+          <value>permission</value>
+          <value>table</value>
+          <value>figure</value>
+          <value>admonition</value>
+          <value>formula</value>
+          <value>sourcecode</value>
+          <value>example</value>
+          <value>note</value>
+        </choice>
+      </attribute>
+      <text/>
+    </element>
+  </define>
 </grammar>

data/lib/asciidoctor/ribose/rsd.rng

@@ -59,6 +59,13 @@
   </define>
   <define name="rsd-standard">
     <element name="rsd-standard">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <zeroOrMore>
         <ref name="termdocsource"/>

data/lib/isodoc/ribose/base_convert.rb

@@ -13,6 +13,11 @@ module IsoDoc
         end
       end
 
+      def is_clause?(name)
+        return true if name == "executivesummary"
+        super
+      end
+
       def clausedelim
         ""
       end

data/lib/isodoc/ribose/html/html_rsd_titlepage.html

@@ -52,8 +52,11 @@
           Published {{ publisheddate -}}
           {%- endif -%}
           {%- endif -%}</span></p>
-        {% if security %}
-        <p><span class="coverpage-maturity">Classification: {{ security }}</span></p>
+        {% if metadata_extensions["security"] %}
+        <p><span class="coverpage-maturity">Classification: {{  metadata_extensions["security"] }}</span></p>
+        {% endif %}
+        {% if metadata_extensions["recipient"] %}
+        <p><span class="coverpage-maturity">Recipient: {{  metadata_extensions["recipient"] }}</span></p>
         {% endif %}
       </div>
 

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

@@ -16,7 +16,7 @@ fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td,
 article, aside, canvas, details, embed,
 figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
+menu, output, ruby, section, summary,
 time, mark, audio, video {
   margin: 0;
   padding: 0; }

data/lib/isodoc/ribose/html/rsd.css

@@ -667,7 +667,7 @@ div.WordSection2 {
 div.WordSection3 {
   page: WordSection3; }
 
-table.MsoISOTable {
+table.MsoISOTable, table.MsoISOTableBig {
   mso-style-name: "Table ISO";
   mso-tstyle-rowband-size: 0;
   mso-tstyle-colband-size: 0;
@@ -688,17 +688,17 @@ table.MsoISOTable {
   font-size: 12.0pt;
   font-family: {{bodyfont}}; }
 
-table.MsoISOTable th {
+table.MsoISOTable th, table.MsoISOTableBig th {
   border: solid windowtext 1pt;
   mso-border-alt: solid windowtext 1pt;
   padding: 0cm 2.85pt 0cm 2.85pt; }
 
-table.MsoISOTable td {
+table.MsoISOTable td, table.MsoISOTableBig td {
   border: solid windowtext 1pt;
   mso-border-alt: solid windowtext 1pt;
   padding: 0cm 2.85pt 0cm 2.85pt; }
 
-table.MsoISOTable p {
+table.MsoISOTable p, table.MsoISOTableBig p {
   font-size: 12.0pt; }
 
 table.MsoTableGrid {
@@ -785,8 +785,20 @@ div.example p.MsoListParagraph {
   font-size: 11.0pt; }
 
 div.Note p.MsoListParagraph {
+  font-size: 11.0pt;
+  margin-left: 1.0cm; }
+
+div.Note span.stem {
   font-size: 11.0pt; }
 
+div.Note p.Sourcecode, div.Note pre.Sourcecode {
+  font-size: 9.0pt;
+  margin-left: 1.0cm; }
+
+div.Note table.dl {
+  font-size: 11.0pt;
+  margin-left: 1.0cm; }
+
 span.note_label, span.example_label, td.example_label, td.note_label {
   font-size: 11.0pt;
   font-family: {{bodyfont}}; }

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

@@ -630,7 +630,7 @@ div.WordSection2
         mso-paper-source:0;}
 div.WordSection3
 	{page:WordSection3;}
-table.MsoISOTable
+table.MsoISOTable, table.MsoISOTableBig
 	{mso-style-name:"Table ISO";
 	mso-tstyle-rowband-size:0;
 	mso-tstyle-colband-size:0;
@@ -650,15 +650,15 @@ table.MsoISOTable
 	mso-border-insidev:.75pt solid windowtext;
 	font-size:12.0pt;
 	font-family:$bodyfont;}
-table.MsoISOTable th
+table.MsoISOTable th, table.MsoISOTableBig th
     {border:solid windowtext 1pt;
     mso-border-alt:solid windowtext 1pt;
     padding:0cm 2.85pt 0cm 2.85pt;}
-table.MsoISOTable td
+table.MsoISOTable td, table.MsoISOTableBig td
     {border:solid windowtext 1pt;
     mso-border-alt:solid windowtext 1pt;
     padding:0cm 2.85pt 0cm 2.85pt;}
-table.MsoISOTable p
+table.MsoISOTable p, table.MsoISOTableBig p
 {font-size:12.0pt; }
 table.MsoTableGrid
 	{mso-style-name:"Table Grid";
@@ -744,6 +744,20 @@ div.example p.MsoListParagraph {
 
 div.Note p.MsoListParagraph {
   font-size: 11.0pt;
+  margin-left: 1.0cm;
+}
+
+div.Note span.stem {
+  font-size: 11.0pt; }
+
+div.Note p.Sourcecode, div.Note pre.Sourcecode  {
+  font-size: 9.0pt;
+  margin-left: 1.0cm;
+}
+
+div.Note table.dl  {
+  font-size: 11.0pt;
+  margin-left: 1.0cm;
 }
 
 span.note_label, span.example_label, td.example_label, td.note_label

data/lib/isodoc/ribose/html/word_rsd_titlepage.html

@@ -54,16 +54,16 @@ mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0
 {{ revdate_MMMddyyyy || circulateddate }}</p>
 {% endif %}
 
-{% if security %}
+{% if metadata_extensions["security"] %}
 <p class="MsoNormal">&#xA0;</p>
 
-<p class="MsoNormal"><i> {{ security }}</i></p>
+<p class="MsoNormal"><i> {{ metadata_extensions["security"]   }}</i></p>
 {% endif %}
 
-{% if recipient %}
+{% if metadata_extensions["recipient"]   %}
 <p class="MsoNormal">&#xA0;</p>
 
-<p class="MsoNormal">Recipient: {{ recipient  }}</p>
+<p class="MsoNormal">Recipient: {{ metadata_extensions["recipient"]  }}</p>
 {% endif %}
 
 <div style='mso-element:para-border-div;border:solid windowtext 1.0pt;