metanorma-m3aawg 1.5.0 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94c7b82480769b8de334650f945711c4db8c1487c569385493cd14b09c158e95
-  data.tar.gz: 4ed2f0a6757190d584b5bee3027d66c64b7780ebf077c59a8bc77bcb78d8fa67
+  metadata.gz: 1e4609234c251bfd60f7f8db10d5b2bf164086060667e333f3157d98bd09126b
+  data.tar.gz: 5cff4ab9b4f71cd267bcbd6246791418a8d0f0c96ff58b385c08bbec9cfffccd
 SHA512:
-  metadata.gz: 8537d1bbb48f69310f1f97472ff7d44ccc87cbb5f9425348e5dba8d60522171645371032528a2d058cb051e0556695e6fcecc3c755b14e20ade3a7b07e81f488
-  data.tar.gz: 14120e590dbab99118c4ad5def4030b5b5537aea4b5fc7bf067b35a23c95884c76803fde6fef29d7597d0708ed52d26f507833d89a7a16dec31dc83dd5587890
+  metadata.gz: e2f4d8ee7faf5754835acc43f0027ce303a60eb942e91d42109a2edce07ae58141364160be689813685f8a696a86028446040a6023faa50b808efc355f520959
+  data.tar.gz: 2a6bb8be8bd69a43010f69919736b43d2283bd7a2a0550325fca49f058f6835437c6d629f081c1186556a60e7201e47bd0e58acb03a72b16a5f1f108ef4db785

data/lib/asciidoctor/m3aawg/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/m3aawg/converter.rb

@@ -18,24 +18,8 @@ module Asciidoctor
 
       register_for "m3aawg"
 
-      def metadata_author(node, xml)
-        xml.contributor do |c|
-          c.role **{ type: "author" }
-          c.organization do |a|
-            a.name "Messaging Malware and Mobile Anti-Abuse Working Group"
-            a.abbreviation "M3AAWG"
-          end
-        end
-      end
-
-      def metadata_publisher(node, xml)
-        xml.contributor do |c|
-          c.role **{ type: "publisher" }
-          c.organization do |a|
-            a.name "Messaging Malware and Mobile Anti-Abuse Working Group"
-            a.abbreviation "M3AAWG"
-          end
-        end
+      def default_publisher
+        "Messaging Malware and Mobile Anti-Abuse Working Group"
       end
 
       def metadata_committee(node, xml)
@@ -65,19 +49,6 @@ module Asciidoctor
         xml.docnumber { |i| i << node.attr("docnumber") }
       end
 
-      def metadata_copyright(node, xml)
-        from = node.attr("copyright-year") || Date.today.year
-        xml.copyright do |c|
-          c.from from
-          c.owner do |owner|
-            owner.organization do |o|
-              o.name "Messaging Malware and Mobile Anti-Abuse Working Group"
-              o.abbreviation "M3AAWG"
-            end
-          end
-        end
-      end
-
       def title_validate(root)
         nil
       end
@@ -88,7 +59,7 @@ module Asciidoctor
       end
 
       def doctype(node)
-        d = node.attr("doctype")
+        d = super
         unless %w{policy best-practices supporting-document report}.include? d
           @log.add("Document Attributes", nil, "#{d} is not a legal document type: reverting to 'report'")
           d = "report"

data/lib/asciidoctor/m3aawg/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/m3aawg/m3d.rng

@@ -89,6 +89,13 @@
   </define>
   <define name="m3d-standard">
     <element name="m3d-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/m3aawg/html/header.html

@@ -144,7 +144,7 @@ mso-element-top:.05pt;mso-height-rule:exactly'>
 </table>
 </div>
 <p class=MsoFooter><b style='mso-bidi-font-weight:normal'><span lang=EN-US
-style='font-size:8.0pt;font-family:"Garamond",serif;mso-bidi-font-family:Arial'>{{doctitle}}<span style='mso-tab-count:2'>                                                                                                                                                                         </span><o:p></o:p></span></b></p>
+                      style='font-size:8.0pt;font-family:"Garamond",serif;mso-bidi-font-family:Arial'>{{doctitle}}{% if edition %}, Version {{edition}}{% endif %}<span style='mso-tab-count:2'>                                                                                                                                                                         </span><o:p></o:p></span></b></p>
 <p class=MsoFooter style='margin-right:18.0pt;tab-stops:center 181.5pt right 432.0pt'><span
 lang=EN-US style='mso-bidi-font-size:12.0pt;mso-bidi-font-family:Arial;
 background:#E0E0E0'><o:p>&nbsp;</o:p></span></p>
@@ -173,7 +173,7 @@ mso-element-top:.05pt;mso-height-rule:exactly'>
 </table>
 </div>
 <p class=MsoFooterLandscape><b style='mso-bidi-font-weight:normal'><span lang=EN-US
-style='font-size:8.0pt;font-family:"Garamond",serif;mso-bidi-font-family:Arial'>{{doctitle}}<span style='mso-tab-count:2'>                                                                                                                                                                         </span><o:p></o:p></span></b></p>
+style='font-size:8.0pt;font-family:"Garamond",serif;mso-bidi-font-family:Arial'>{{doctitle}}{% if edition %}, Version {{edition}}{% endif %}<span style='mso-tab-count:2'>                                                                                                                                                                         </span><o:p></o:p></span></b></p>
 <p class=MsoFooterLandscape style='margin-right:18.0pt;tab-stops:center 181.5pt right 432.0pt'><span
 lang=EN-US style='mso-bidi-font-size:12.0pt;mso-bidi-font-family:Arial;
 background:#E0E0E0'><o:p>&nbsp;</o:p></span></p>
@@ -255,7 +255,7 @@ lang=EN-US style='font-size:8.0pt;mso-bidi-font-family:Arial'><o:p></o:p></span>
 </div>
 
 <p class=MsoFooter><b style='mso-bidi-font-weight:normal'><span lang=EN-US
-style='font-size:8.0pt;font-family:"Garamond",serif;mso-bidi-font-family:Arial'>{{doctitle}}<span style='mso-tab-count:2'>                                                                                                                                                                         </span><o:p></o:p></span></b></p>
+style='font-size:8.0pt;font-family:"Garamond",serif;mso-bidi-font-family:Arial'>{{doctitle}}{% if edition %}, Version {{edition}}{% endif %}<span style='mso-tab-count:2'>                                                                                                                                                                         </span><o:p></o:p></span></b></p>
 
 </div>
 
@@ -313,7 +313,7 @@ lang=EN-US style='font-size:8.0pt;mso-bidi-font-family:Arial'><o:p></o:p></span>
 </div>
 
 <p class=MsoFooterLandscape><b style='mso-bidi-font-weight:normal'><span lang=EN-US
-style='font-size:8.0pt;font-family:"Garamond",serif;mso-bidi-font-family:Arial'>{{doctitle}}<span style='mso-tab-count:2'>                                                                                                                                                                         </span><o:p></o:p></span></b></p>
+style='font-size:8.0pt;font-family:"Garamond",serif;mso-bidi-font-family:Arial'>{{doctitle}}{% if edition %}, Version {{edition}}{% endif %}<span style='mso-tab-count:2'>                                                                                                                                                                         </span><o:p></o:p></span></b></p>
 
 </div>
 
@@ -321,6 +321,7 @@ style='font-size:8.0pt;font-family:"Garamond",serif;mso-bidi-font-family:Arial'>
 
   <p class=MsoFooter>As with all M3AAWG documents that we publish, please check the M3AAWG website (<a href="http://www.m3aawg.org">www.m3aawg.org</a>) for updates to this paper.</p>
   <p class=MsoFooter>&copy; {{docyear}} copyright by the Messaging, Malware and Mobile Anti-Abuse Working Group (M3AAWG)</p>
+  <p class=MsoFooter style="font-size:9pt;">{{docnumber}}</p>
 </div>
 
 </body>

data/lib/isodoc/m3aawg/html/html_m3d_intro.html

@@ -1,7 +1,8 @@
 <div class="coverpage">
   <p class="coverpage-title">Messaging, Malware and Mobile Anti-Abuse Working Group</p>
   <p class="coverpage-doc-identity">{{doctitle}}</p>
-  <p class="coverpage-date">{{revdate_monthyear}}</p>
+  {% if edition %}<p class="coverpage-date">{{edition}}</p>{% endif %}
+  {% if revdate_monthyear %}<p class="coverpage-date">{{revdate_monthyear}}</p>{% endif %}
 </div>
 
 <nav>

data/lib/isodoc/m3aawg/html/html_m3d_titlepage.html

@@ -3,7 +3,7 @@
 </div>
 
 <div class="document-type-band" id="standard-band">
-  <p class="document-type">Ribose {{ doctype }}</p>
+  <p class="document-type">M3AAWG {{ doctype }}</p>
 </div>
 
 
@@ -31,11 +31,10 @@
       </div>
 
       <div class="docinfo">
+        {% if edition %}Version {{edition}}<br/>{% endif %}
         {% if revdate_monthyear -%}Updated <span class="date">{{ revdate_monthyear }}</span>{%- endif -%}{%- if revdate_monthyear and draft -%},{%- endif -%}{%- if draft -%}Version <span class="version">{{ draft }}</span>{%- endif -%}
         <br/>
-        {% if url %}
-        Shortened URL to this document:  <a href="{{ url }}">{{ url }}</a>
-        {% endif %}
+        {% if url %}Shortened URL to this document:  <a href="{{ url }}">{{ url }}</a>{% endif %}
       </div>
 
       {% if tc %}

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

@@ -23,7 +23,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; }
@@ -238,6 +238,9 @@ body {
 main {
   margin: 0 3em 0 6em; }
 
+div.colophon {
+  margin: 0 3em 0 6em; }
+
 #toc {
   font-family: {{bodyfont}};
   font-weight: 400; }

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

@@ -28,6 +28,9 @@ body {
 main {
     margin: 0 3em 0 6em;
 }
+div.colophon {
+    margin: 0 3em 0 6em;
+}
 
 #toc {
     @include toc(#69C5DC, #69C5DC, #69C5DC);

data/lib/isodoc/m3aawg/html/m3d.css

@@ -562,7 +562,7 @@ table.dl {
   margin-bottom: 11.0pt;
   margin-left: 20.15pt; }
 
-table.MsoISOTable {
+table.MsoISOTable, table.MsoISOTableBig {
   mso-style-name: "Table ISO";
   mso-tstyle-rowband-size: 0;
   mso-tstyle-colband-size: 0;
@@ -583,17 +583,17 @@ table.MsoISOTable {
   font-size: 10.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: 10.0pt; }
 
 table.MsoTableGrid {
@@ -751,8 +751,20 @@ div.example p.MsoListParagraph {
   font-size: 10.0pt; }
 
 div.Note p.MsoListParagraph {
+  font-size: 10.0pt;
+  margin-left: 1.0cm; }
+
+div.Note span.stem {
   font-size: 10.0pt; }
 
+div.Note p.Sourcecode, div.Note pre.Sourcecode {
+  font-size: 8.0pt;
+  margin-left: 1.0cm; }
+
+div.Note table.dl {
+  font-size: 10.0pt;
+  margin-left: 1.0cm; }
+
 span.note_label, span.example_label, td.example_label, td.note_label {
   font-size: 10.0pt;
   font-family: {{bodyfont}}; }