metanorma-ribose 1.5.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e69ff209f277bc026b6eb77c0b64f6ed9c4effd94c31c90371ee96a79e83c3d
-  data.tar.gz: 92b9c79eb0d905c5d5aa4178ea6862a03bb904ce7134fb0600d8b6280c728eff
+  metadata.gz: c8d13747d6512c513911ea027a3a41108f7416310e806395b4ad640f22c92987
+  data.tar.gz: a0498926879d2174ace5a1696fd6cf584916199d9a76edbe96870b3cdc8e59d2
 SHA512:
-  metadata.gz: 9da40510ba3f2e3c45c480ecbe0d7647c6a399c52d1ae48371dd7387723a2e9da55c6e68eca7c62cc00bbb7e4077732e7c630fdd0bb859ca8bd0a56c56533ea9
-  data.tar.gz: dc2283df95b0c822229e148d83acb28e4010195d1350fb1ad74fef27d27847a79d1bf6f10e18237320b037a9df9fb35f3a94ea55f9ab3c0f937143c57a35064b
+  metadata.gz: eb1b495cca8f02b13be45ac124d8b792e00936859dfd8cd791639025c55465c49f9936a3d64194a0da39f2ca84e62b591acfe63de099b2df84ae2b5026ac8fd9
+  data.tar.gz: fd44d288034bc4710c83fd378863facff23eb854a3774da10e2dd3295ae133b71b94025424ffde0d59f06b83b4baf179b570b1e8391877d82fda706408db0095

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/converter.rb

@@ -13,8 +13,7 @@ module Asciidoctor
       register_for "ribose"
 
       def sectiontype(node, level = true)
-        ret = node&.attr("heading")&.downcase ||
-          node.title.gsub(/<[^>]+>/, "").downcase
+        ret = sectiontype1(node)
         ret1 = sectiontype_streamline(ret)
         return ret1 if "symbols and abbreviated terms" == ret1
         return ret1 if "executive summary" == ret1
@@ -38,7 +37,7 @@ module Asciidoctor
       end
 
       def clause_parse(attrs, xml, node)
-        sectiontype(node) == "executive summary" and
+        sectiontype1(node) == "executive summary" and
           return executivesummary_parse(attrs, xml, node)
         super
       end

data/lib/asciidoctor/ribose/isodoc.rng

@@ -42,8 +42,11 @@
     </define>
     <define name="xref">
       <element name="xref">
+        <!-- attribute target { xsd:IDREF }, -->
         <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 +64,11 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="droploc">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -578,6 +586,8 @@
             <ref name="ol"/>
             <ref name="dl"/>
             <ref name="formula"/>
+            <ref name="quote"/>
+            <ref name="sourcecode"/>
           </choice>
         </oneOrMore>
       </element>
@@ -661,6 +671,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 +717,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 +864,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 +892,7 @@
       <oneOrMore>
         <choice>
           <ref name="content"/>
-          <ref name="preface_abstract"/>
+          <ref name="abstract"/>
           <ref name="foreword"/>
           <ref name="introduction"/>
           <ref name="acknowledgements"/>
@@ -922,6 +959,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -961,9 +1001,6 @@
   </define>
   <define name="content-subsection">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Content-Section"/>
     </element>
   </define>
@@ -992,6 +1029,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1011,9 +1051,6 @@
   </define>
   <define name="clause">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Clause-Section"/>
     </element>
   </define>
@@ -1042,18 +1079,24 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <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"/>
@@ -1180,6 +1223,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -1447,11 +1493,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>
@@ -1501,4 +1542,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

@@ -1,21 +1,6 @@
 module IsoDoc
   module Ribose
     module BaseConvert
-      def metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
-      end
-
-      def xref_init(lang, script, klass, labels, options)
-        @xrefs = Xref.new(lang, script, klass, labels, options)
-      end
-
-      def annex_name(annex, name, div)
-        div.h1 **{ class: "Annex" } do |t|
-          t << "#{@xrefs.anchor(annex['id'], :label)}<br/><br/>"
-          name&.children&.each { |c2| parse(c2, t) }
-        end
-      end
-
       def executivesummary docxml, out
         f = docxml.at(ns("//executivesummary")) || return
         title_attr = { class: "IntroTitle" }
@@ -28,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/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}}; }