metanorma-m3aawg 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22aff62dc924926aa7ab09848015f5e7ff323ea2b59ddb4722105e45fb705ac9
-  data.tar.gz: 6fd9fef7b7512f11a6f43746257f4a41d1d9452fe07d39bd6f93166b0e76b047
+  metadata.gz: 44bc008b2526c485f9be13de6951dcf6003758f95931a5d2efff0e8771b36915
+  data.tar.gz: e3adf48a8f4b9573372ed0538dd3ab0353f82fdcbe21188269ddf0a61e4c8885
 SHA512:
-  metadata.gz: 1d32906798587b973eff3894283069181f6add337ee2b3d40522821302a102553c1e0dcb9e4496bcc1078f30b546d4ed4c3e31ee99d449ca883a2af9a01d1fd1
-  data.tar.gz: e030f5e5de744da5097a66df718a8c171cec2c9536e50bf9df9ac1f67d119c088f9c223d32a7e99915902761547c98ff8bd08d456ed3b5a0d95b1c0db32d7b7e
+  metadata.gz: 709666016fd3247cf97f366a3bb4fa67dc4518a6d456a3d9f13ba73b18b6937e822d6d94fd161a277b96f54c4e1237edf4e4b0a55688f2b14c0912f4e6664d9f
+  data.tar.gz: bf307b0957e62dcb3f6e143040e12d89ce942281659b08272a8fb977824f548a0f73489d2abc051df8681eafd6b83ec5b50d580cbdcbad8fb84e6ef73bd1f8c9

data/lib/asciidoctor/m3aawg/basicdoc.rng

@@ -158,7 +158,17 @@
         <data type="ID"/>
       </attribute>
       <oneOrMore>
-        <ref name="paragraph"/>
+        <choice>
+          <ref name="formula"/>
+          <ref name="ul"/>
+          <ref name="ol"/>
+          <ref name="dl"/>
+          <ref name="quote"/>
+          <ref name="sourcecode"/>
+          <ref name="paragraph"/>
+          <ref name="table"/>
+          <ref name="figure"/>
+        </choice>
       </oneOrMore>
     </element>
   </define>
@@ -402,6 +412,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 +449,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"/>

data/lib/asciidoctor/m3aawg/isodoc.rng

@@ -581,6 +581,8 @@
             <ref name="ol"/>
             <ref name="dl"/>
             <ref name="formula"/>
+            <ref name="quote"/>
+            <ref name="sourcecode"/>
           </choice>
         </oneOrMore>
       </element>
@@ -664,6 +666,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>
@@ -700,6 +712,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>
@@ -1052,14 +1074,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"/>
@@ -1510,4 +1535,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/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

@@ -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}}; }

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

@@ -534,7 +534,7 @@ table.dl
 	margin-right:0cm;
 	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;
@@ -554,15 +554,15 @@ table.MsoISOTable
 	mso-border-insidev:.75pt solid windowtext;
 	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
 	{mso-style-name:"Table Grid";
@@ -733,6 +733,20 @@ div.example p.MsoListParagraph {
 
 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

data/lib/isodoc/m3aawg/html/word_m3d_intro.html

@@ -1,7 +1,9 @@
 <div class="coverpage">
   <p class="zzSTDPreTitle">Messaging, Malware and Mobile Anti-Abuse Working Group</p>
   <p class="zzSTDTitle1">{{doctitle}}</p>
-  <p><b>{{revdate_monthyear}}</b></p>
+  {% if edition %}<p><b>Version {{edition}}</b></p>{% endif %}
+  {% if revdate_monthyear %}<p><b>{{revdate_monthyear}}</b></p>{% endif %}
+  {% if url %}<p align='center' style="margin-top:12pt;">The direct URL to this paper is: <a href="{{url}}">{{url}}</a></p>{% endif %}
 </div>
 
 

data/lib/isodoc/m3aawg/html/word_m3d_titlepage.html

@@ -26,6 +26,12 @@ lang="EN-GB" style='font-size:40.0pt'>{% if unpublished %}{{ stage }}{% endif %}
 
 </div>
 
+{% if url %}
+<p class="MsoNormal" align="center" style='text-align:center'><span
+                     lang="EN-GB" style='font-size:12.0pt'>The direct URL to this paper is: <a href='{{url}}'>{{url}}</a></span></p>
+{% endif %}
+
+
 <p class="MsoNormal" style='margin-bottom:6.0pt'><span lang="EN-GB"><o:p>&nbsp;</o:p></span></p>
 
 {% if unpublished %}

data/lib/isodoc/m3aawg/html_convert.rb

@@ -14,8 +14,10 @@ module IsoDoc
 
       def default_fonts(options)
         {
-          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Overpass",sans-serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Overpass",sans-serif'),
+          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' :
+                     '"Overpass",sans-serif'),
+          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
+                       '"Overpass",sans-serif'),
           monospacefont: '"Space Mono",monospace'
         }
       end
@@ -33,9 +35,12 @@ module IsoDoc
       def colophon(body, docxml)
         body.div **{ class: "colophon" } do |div|
           div << <<~"COLOPHON"
-          <p>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>&copy; {{ docyear }} copyright by the Messaging, Malware and Mobile Anti-Abuse Working Group (M3AAWG)</p>
+          <p>As with all M<sup>3</sup>AAWG documents that we publish,
+          please check the M<sup>3</sup>AAWG website
+          (<a href="http://www.m3aawg.org">www.m3aawg.org</a>) for updates to
+          this paper.</p>
+          <p>&copy; #{@meta.get[:docyear]} copyright by the Messaging, Malware
+          and Mobile Anti-Abuse Working Group (M<sup>3</sup>AAWG)</p>
           COLOPHON
         end
       end
@@ -48,7 +53,8 @@ module IsoDoc
       end
 
       def make_body(xml, docxml)
-        body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72", "xml:lang": "EN-US", class: "container" }
+        body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72",
+                      "xml:lang": "EN-US", class: "container" }
         xml.body **body_attr do |body|
           make_body1(body, docxml)
           make_body2(body, docxml)