metanorma-acme 1.0.1 → 1.0.3

data/.rubocop.yml

@@ -0,0 +1,15 @@
+# This project follows the Ribose OSS style guide.
+# https://github.com/riboseinc/oss-guides
+# All project-specific additions and overrides should be specified in this file.
+
+inherit_from:
+  # Thoughtbot's style guide from: https://github.com/thoughtbot/guides
+  - ".rubocop.tb.yml"
+  # Overrides from Ribose
+  - ".rubocop.ribose.yml"
+AllCops:
+  DisplayCopNames: false
+  StyleGuideCopsOnly: false
+  TargetRubyVersion: 2.5
+Rails:
+  Enabled: true

data/.travis.yml

@@ -7,7 +7,7 @@ rvm:
   - 2.3
   - ruby-head
 before_install:
-  - gem install bundler
+  - gem install bundler -v 1.16.1
   - unset _JAVA_OPTIONS
 matrix:
   allow_failures:

data/README.adoc

@@ -12,7 +12,8 @@ It has been created as an exemplar for generating new instances of Metanorma gem
 You can customise output of this gem for your own purposes without needing to customise the gem fully. You can use the
 following asciidoctor document variables to set the stylesheets that are passed as arguments to the `isodoc` gem:
 
-````
+[source,asciidoc]
+----
 :body-font: (name of the main font to be used)
 :header-font: (name of the header font to be used)
 :monospace-font: (name of the monospace font to be used)
@@ -27,7 +28,7 @@ following asciidoctor document variables to set the stylesheets that are passed
 :wordintropage: (intro page for Word)
 :ulstyle: (list style selector for unordered lists for Word)
 :olstyle: (list style selector for ordered lists for Word)
-````
+----
 
 You should run the gem through the https://github.com/riboseinc/metanorma-cli[Metanorma CLI]: 
 

data/lib/asciidoctor/acme/acme.rng

@@ -7,7 +7,7 @@
   -->
   <include href="isostandard.rng">
     <start>
-      <ref name="acme-standard"/>
+      <ref name="rsd-standard"/>
     </start>
     <define name="language">
       <element name="language">
@@ -16,6 +16,9 @@
     </define>
     <define name="docidentifier">
       <element name="docidentifier">
+        <optional>
+          <attribute name="type"/>
+        </optional>
         <text/>
       </element>
     </define>
@@ -29,30 +32,38 @@
         <attribute name="id">
           <data type="ID"/>
         </attribute>
-        <optional>
-          <ref name="source"/>
-        </optional>
         <optional>
           <ref name="tname"/>
         </optional>
         <choice>
+          <ref name="image"/>
+          <ref name="pre"/>
           <oneOrMore>
-            <ref name="figure"/>
+            <ref name="subfigure"/>
           </oneOrMore>
-          <group>
-            <choice>
-              <zeroOrMore>
-                <ref name="TextElement"/>
-              </zeroOrMore>
-              <ref name="pre"/>
-            </choice>
-            <zeroOrMore>
-              <ref name="note"/>
-            </zeroOrMore>
-            <optional>
-              <ref name="dl"/>
-            </optional>
-          </group>
+        </choice>
+        <zeroOrMore>
+          <ref name="fn"/>
+        </zeroOrMore>
+        <optional>
+          <ref name="dl"/>
+        </optional>
+        <zeroOrMore>
+          <ref name="note"/>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="subfigure">
+      <element name="figure">
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <ref name="tname"/>
+        </optional>
+        <choice>
+          <ref name="image"/>
+          <ref name="pre"/>
         </choice>
       </element>
     </define>
@@ -106,7 +117,9 @@
     </define>
     <define name="editorialgroup">
       <element name="editorialgroup">
-        <ref name="committee"/>
+        <oneOrMore>
+          <ref name="committee"/>
+        </oneOrMore>
       </element>
     </define>
     <define name="BibData">
@@ -190,8 +203,8 @@
       <text/>
     </element>
   </define>
-  <define name="acme-standard">
-    <element name="acme-standard">
+  <define name="rsd-standard">
+    <element name="rsd-standard">
       <ref name="bibdata"/>
       <optional>
         <ref name="version"/>

data/lib/asciidoctor/acme/biblio.rng

@@ -259,6 +259,9 @@
   </define>
   <define name="uri">
     <element name="uri">
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <data type="anyURI"/>
     </element>
   </define>
@@ -411,6 +414,20 @@
       <ref name="BibliographicItem"/>
     </element>
   </define>
+  <define name="relaton_collection">
+    <element name="relaton-collection">
+      <optional>
+        <attribute name="type"/>
+      </optional>
+      <ref name="btitle"/>
+      <zeroOrMore>
+        <ref name="contributor"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="docrelation"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="BibItemType" combine="choice">
     <choice>
       <value>article</value>
@@ -444,6 +461,9 @@
         <ref name="BibItemType"/>
       </attribute>
     </optional>
+    <optional>
+      <ref name="fetched"/>
+    </optional>
     <choice>
       <oneOrMore>
         <ref name="btitle"/>
@@ -523,6 +543,14 @@
       <ref name="FormattedString"/>
     </element>
   </define>
+  <define name="fetched">
+    <element name="fetched">
+      <choice>
+        <data type="dateTime"/>
+        <data type="date"/>
+      </choice>
+    </element>
+  </define>
   <define name="validity">
     <element name="validity">
       <optional>
@@ -538,17 +566,26 @@
   </define>
   <define name="validityBegins">
     <element name="validityBegins">
-      <data type="dateTime"/>
+      <choice>
+        <data type="dateTime"/>
+        <data type="date"/>
+      </choice>
     </element>
   </define>
   <define name="validityEnds">
     <element name="validityEnds">
-      <data type="dateTime"/>
+      <choice>
+        <data type="dateTime"/>
+        <data type="date"/>
+      </choice>
     </element>
   </define>
   <define name="validityRevision">
     <element name="revision">
-      <data type="dateTime"/>
+      <choice>
+        <data type="dateTime"/>
+        <data type="date"/>
+      </choice>
     </element>
   </define>
   <define name="TypedTitleString">
@@ -599,6 +636,7 @@
           <value>issued</value>
           <value>transmitted</value>
           <value>copied</value>
+          <value>unchanged</value>
         </choice>
       </attribute>
       <choice>
@@ -732,6 +770,7 @@
     <element name="from">
       <choice>
         <data type="dateTime"/>
+        <data type="date"/>
         <data type="gYear"/>
       </choice>
     </element>
@@ -740,6 +779,7 @@
     <element name="to">
       <choice>
         <data type="dateTime"/>
+        <data type="date"/>
         <data type="gYear"/>
       </choice>
     </element>

data/lib/asciidoctor/acme/converter.rb

@@ -1,5 +1,6 @@
 require "asciidoctor"
 require "asciidoctor/standoc/converter"
+require "fileutils"
 
 module Asciidoctor
   module Acme
@@ -33,6 +34,12 @@ module Asciidoctor
         xml.editorialgroup do |a|
           a.committee node.attr("committee"),
             **attr_code(type: node.attr("committee-type"))
+          i = 2
+          while node.attr("committee_#{i}") do
+            a.committee node.attr("committee_#{i}"),
+              **attr_code(type: node.attr("committee-type_#{i}"))
+            i += 1
+          end
         end
       end
 
@@ -119,7 +126,7 @@ module Asciidoctor
           word_converter(node).convert filename unless node.attr("nodoc")
           pdf_convert(filename.sub(/\.xml$/, "")) unless node.attr("nodoc")
         end
-        @files_to_delete.each { |f| system "rm #{f}" }
+        @files_to_delete.each { |f| FileUtils.rm f }
         ret
       end
 

data/lib/asciidoctor/acme/isostandard.rng

@@ -69,6 +69,9 @@
           <ref name="BibItemType"/>
         </attribute>
       </optional>
+      <optional>
+        <ref name="fetched"/>
+      </optional>
       <choice>
         <oneOrMore>
           <ref name="btitle"/>
@@ -788,13 +791,15 @@
   </define>
   <define name="editorialgroup">
     <element name="editorialgroup">
-      <ref name="technical-committee"/>
-      <optional>
+      <oneOrMore>
+        <ref name="technical-committee"/>
+      </oneOrMore>
+      <zeroOrMore>
         <ref name="subcommittee"/>
-      </optional>
-      <optional>
+      </zeroOrMore>
+      <zeroOrMore>
         <ref name="workgroup"/>
-      </optional>
+      </zeroOrMore>
       <optional>
         <ref name="secretariat"/>
       </optional>

data/lib/isodoc/acme/html/acme.scss

@@ -535,6 +535,8 @@ table.MsoISOTable
 	mso-yfti-tbllook:480;
 	mso-border-insideh:.75pt solid windowtext;
 	mso-border-insidev:.75pt solid windowtext;
+        mso-table-bspace:12.0pt;
+        mso-table-anchor-vertical:paragraph;
 	font-size:10.0pt;
 	font-family:$bodyfont;}
 table.MsoISOTable tr
@@ -561,6 +563,8 @@ table.MsoTableGrid
 	mso-para-margin:0cm;
 	mso-para-margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
+        mso-table-bspace:12.0pt;
+        mso-table-anchor-vertical:paragraph;
 	font-size:10.0pt;
 	font-family:$bodyfont;}
 td { page-break-inside:avoid; }
@@ -611,12 +615,21 @@ div.example {
   margin-left:70.9pt;
   text-indent:-70.9pt;
 }
-p.example, li.example, div.example, td.example, td.example p
+p.example, li.example, div.example, td.example
         {       margin:0in;
         margin-bottom:.0001pt;
         mso-pagination:none;
         font-size:10.0pt;
         font-family:$bodyfont;}
+
+table.example {
+        margin-bottom:12pt;
+}
+
+td.example p.MsoListParagraph {
+  font-size: 10.0pt;
+}
+
 span.note_label, span.example_label, td.example_label, td.note_label
 {
 font-size: 10.0pt;

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

@@ -208,7 +208,12 @@ table {
     }
 }
 
-
+@media screen {
+  img { 
+      width: 100%; 
+      height: auto;
+  }
+}
 
 #toc ul {
     margin: 0;
@@ -517,7 +522,7 @@ p.document-stage {
     margin-left: -1.2em;
   }
 
-  ul li p {
+  ul li p:first-child {
     display: inline;
   }
 

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

@@ -76,6 +76,66 @@ p.MsoNormal, li.MsoNormal, div.MsoNormal
 	mso-fareast-font-family:"Times New Roman";
 	mso-ansi-language:EN-US;
 	mso-fareast-language:EN-US;}
+p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
+        {mso-style-priority:34;
+        mso-style-unhide:no;
+        mso-style-qformat:yes;
+        margin-top:0cm;
+        margin-right:0cm;
+        margin-bottom:12.0pt;
+        /* do not put in margin-left, it is specific to list level */
+        mso-add-space:auto;
+        mso-pagination:widow-orphan;
+        font-size:10.5pt;
+        font-family:$bodyfont;
+        mso-ansi-language:EN-AU;
+        mso-fareast-language:EN-US;}
+p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphCxSpFirst
+        {mso-style-priority:34;
+        mso-style-unhide:no;
+        mso-style-qformat:yes;
+        mso-style-type:export-only;
+        margin-top:0cm;
+        margin-right:0cm;
+        margin-bottom:12.0pt;
+        /* do not put in margin-left, it is specific to list level */
+        mso-add-space:auto;
+        mso-pagination:widow-orphan;
+        font-size:10.5pt;
+        font-family:$bodyfont;
+        mso-ansi-language:EN-AU;
+        mso-fareast-language:EN-US;}
+p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagraphCxSpMiddle
+        {mso-style-priority:34;
+        mso-style-unhide:no;
+        mso-style-qformat:yes;
+        mso-style-type:export-only;
+        margin-top:0cm;
+        margin-right:0cm;
+        margin-bottom:12.0pt;
+        /* do not put in margin-left, it is specific to list level */
+        mso-add-space:auto;
+        mso-pagination:widow-orphan;
+        font-size:10.5pt;
+        font-family:$bodyfont;
+        mso-ansi-language:EN-AU;
+        mso-fareast-language:EN-US;}
+p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxSpLast
+        {mso-style-priority:34;
+        mso-style-unhide:no;
+        mso-style-qformat:yes;
+        mso-style-type:export-only;
+        margin-top:0cm;
+        margin-right:0cm;
+        margin-bottom:12.0pt;
+        /* do not put in margin-left, it is specific to list level */
+        mso-add-space:auto;
+        mso-pagination:widow-orphan;
+        font-size:10.5pt;
+        font-family:$bodyfont;
+        mso-ansi-language:EN-AU;
+        mso-fareast-language:EN-US;}
+
 p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
 	{mso-style-noshow:yes;
 	mso-style-unhide:no;
@@ -216,19 +276,6 @@ a:visited, span.MsoHyperlinkFollowed
 	color:purple;
 	text-decoration:underline;
 	text-underline:single;}
-p
-	{mso-style-priority:99;
-	mso-margin-top-alt:auto;
-	margin-right:0cm;
-	mso-margin-bottom-alt:auto;
-	margin-left:0cm;
-	mso-pagination:widow-orphan;
-	font-size:10.0pt;
-	font-family:$bodyfont;
-	mso-fareast-font-family:"MS Mincho";
-	mso-bidi-font-family:"Times New Roman";
-	mso-ansi-language:EN-US;
-	mso-fareast-language:EN-US;}
 p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject
 	{mso-style-noshow:yes;
 	mso-style-unhide:no;
@@ -254,75 +301,6 @@ p.MsoAcetate, li.MsoAcetate, div.MsoAcetate
 	mso-fareast-font-family:"Times New Roman";
 	mso-ansi-language:EN-US;
 	mso-fareast-language:EN-US;}
-p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
-	{mso-style-priority:34;
-	mso-style-unhide:no;
-	mso-style-qformat:yes;
-	margin-top:0cm;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	margin-left:36.0pt;
-	mso-add-space:auto;
-	mso-pagination:widow-orphan;
-	font-size:10.5pt;
-	mso-bidi-font-size:11.0pt;
-	font-family:"Arial",sans-serif;
-	mso-fareast-font-family:"Times New Roman";
-	mso-ansi-language:EN-US;
-	mso-fareast-language:EN-US;}
-p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphCxSpFirst
-	{mso-style-priority:34;
-	mso-style-unhide:no;
-	mso-style-qformat:yes;
-	mso-style-type:export-only;
-	margin-top:0cm;
-	margin-right:0cm;
-	margin-bottom:0cm;
-	margin-left:36.0pt;
-	margin-bottom:.0001pt;
-	mso-add-space:auto;
-	mso-pagination:widow-orphan;
-	font-size:10.5pt;
-	mso-bidi-font-size:11.0pt;
-	font-family:"Arial",sans-serif;
-	mso-fareast-font-family:"Times New Roman";
-	mso-ansi-language:EN-US;
-	mso-fareast-language:EN-US;}
-p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagraphCxSpMiddle
-	{mso-style-priority:34;
-	mso-style-unhide:no;
-	mso-style-qformat:yes;
-	mso-style-type:export-only;
-	margin-top:0cm;
-	margin-right:0cm;
-	margin-bottom:0cm;
-	margin-left:36.0pt;
-	margin-bottom:.0001pt;
-	mso-add-space:auto;
-	mso-pagination:widow-orphan;
-	font-size:10.5pt;
-	mso-bidi-font-size:11.0pt;
-	font-family:"Arial",sans-serif;
-	mso-fareast-font-family:"Times New Roman";
-	mso-ansi-language:EN-US;
-	mso-fareast-language:EN-US;}
-p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxSpLast
-	{mso-style-priority:34;
-	mso-style-unhide:no;
-	mso-style-qformat:yes;
-	mso-style-type:export-only;
-	margin-top:0cm;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	margin-left:36.0pt;
-	mso-add-space:auto;
-	mso-pagination:widow-orphan;
-	font-size:10.5pt;
-	mso-bidi-font-size:11.0pt;
-	font-family:"Arial",sans-serif;
-	mso-fareast-font-family:"Times New Roman";
-	mso-ansi-language:EN-US;
-	mso-fareast-language:EN-US;}
 span.blackgraphtxsidebar
 	{mso-style-name:blackgraphtxsidebar;
 	mso-style-unhide:no;
@@ -334,7 +312,8 @@ span.blackgraphtx
 .MsoChpDefault
 	{mso-style-type:export-only;
 	mso-default-props:yes;}
-
+div.figure 
+        {text-align: center;}
 
 
 h1
@@ -412,6 +391,7 @@ h1.Annex
         mso-hyphenate:none;
         tab-stops:27.0pt 35.0pt;
         font-size:12.0pt;
+        font-weight:bold;
         mso-bidi-font-size:11.0pt;
         font-family:$headerfont;
         mso-fareast-font-family:$headerfont;
@@ -1105,6 +1085,8 @@ table.MsoNormalTable
 	mso-para-margin:0cm;
 	mso-para-margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
+        mso-table-anchor-vertical:paragraph;
+        mso-table-bspace:12.0pt;
 	font-size:10.0pt;
 	font-family:$bodyfont;}
 br.section