metanorma-m3d 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ce1cab8a9b21e8e30a3e3912b3e666971c100db21a961bfa8301fe80de2e7e6
-  data.tar.gz: 7c0db761524e67ae5844ba590539c34b7d745413079214ad99c65f566c11b237
+  metadata.gz: 33357663540823bfd36ac345d42da5814b1d69f3b7b8652434db43a927b8dd3f
+  data.tar.gz: 15cd653c3ec6952ca03bb33fb989c7eef1670aac3798f322fb8eddbe0b2aca4c
 SHA512:
-  metadata.gz: 8d298725888cd05582b6e6afd3cac80351e076ea95f2f75d7f33e77c2bfe70394d7e954119d85076950488d07d32eda480967499b27505478fda57b1fdcaca04
-  data.tar.gz: 13a5883114cebc29a19377837a26fd9235fcf90a78ac8389ef5c2da8159984550bf2e3050fff260922b11669d79f510b5afcfa91a065fd42f2ac02be7b891f0f
+  metadata.gz: 2d21bed6f5986e92fface06808c8096d89bb2d7e363103a282020b65226c2a8ad0680fbcce966b7a39393eb7eb821db3792a1c77406ce2507bb49c0beb534e62
+  data.tar.gz: 293bf2115c741bfca50a427b1138b3cc1516851114e231d7069aba386c9c9268579574ef2d3448e7676bc10fba25d2f6a3f442bdf0197c2951bec65557f1a15b

data/lib/asciidoctor/m3d/biblio.rng

@@ -384,7 +384,7 @@
   </define>
   <define name="LocalityType">
     <data type="string">
-      <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|example|volume|issue|locality:[a-zA-Z0-9_]+</param>
+      <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|locality:[a-zA-Z0-9_]+</param>
     </data>
   </define>
   <define name="referenceFrom">
@@ -700,8 +700,12 @@
         <ref name="btitle"/>
         <ref name="formattedref"/>
       </choice>
-      <ref name="bplace"/>
-      <ref name="seriesorganization"/>
+      <optional>
+        <ref name="bplace"/>
+      </optional>
+      <optional>
+        <ref name="seriesorganization"/>
+      </optional>
       <optional>
         <ref name="abbreviation"/>
       </optional>

data/lib/asciidoctor/m3d/isodoc.rng

@@ -956,6 +956,11 @@
   </define>
   <define name="li">
     <element name="li">
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
       <oneOrMore>
         <ref name="paragraph-with-footnote"/>
       </oneOrMore>
@@ -999,7 +1004,9 @@
   </define>
   <define name="dt">
     <element name="dt">
-      <ref name="TextElement"/>
+      <zeroOrMore>
+        <ref name="TextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="dd">

data/lib/asciidoctor/m3d/isostandard.rng

@@ -20,6 +20,9 @@
     <!-- add type to docidentifier in isodoc? -->
     <define name="docidentifier">
       <element name="docidentifier">
+        <optional>
+          <attribute name="type"/>
+        </optional>
         <choice>
           <text/>
           <group>
@@ -108,6 +111,27 @@
       <zeroOrMore>
         <ref name="docrelation"/>
       </zeroOrMore>
+      <zeroOrMore>
+        <ref name="series"/>
+      </zeroOrMore>
+      <optional>
+        <ref name="medium"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="bplace"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="extent"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="accesslocation"/>
+      </zeroOrMore>
+      <optional>
+        <ref name="bclassification"/>
+      </optional>
+      <optional>
+        <ref name="validity"/>
+      </optional>
       <optional>
         <ref name="editorialgroup"/>
       </optional>
@@ -164,6 +188,27 @@
       <zeroOrMore>
         <ref name="docrelation"/>
       </zeroOrMore>
+      <zeroOrMore>
+        <ref name="series"/>
+      </zeroOrMore>
+      <optional>
+        <ref name="medium"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="bplace"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="extent"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="accesslocation"/>
+      </zeroOrMore>
+      <optional>
+        <ref name="bclassification"/>
+      </optional>
+      <optional>
+        <ref name="validity"/>
+      </optional>
       <ref name="editorialgroup"/>
       <zeroOrMore>
         <ref name="ics"/>
@@ -548,10 +593,17 @@
     </define>
     <define name="li">
       <element name="li">
-        <oneOrMore>
-          <!-- ( paragraph-with-footnote | table | note | formula | admonition | ol | ul | dl | quote | sourcecode | review | example )+ -->
-          <ref name="BasicBlock"/>
-        </oneOrMore>
+        <group>
+          <optional>
+            <!-- ( paragraph-with-footnote | table | note | formula | admonition | ol | ul | dl | quote | sourcecode | review | example )+ -->
+            <attribute name="id">
+              <data type="ID"/>
+            </attribute>
+          </optional>
+          <oneOrMore>
+            <ref name="BasicBlock"/>
+          </oneOrMore>
+        </group>
         <!-- exclude figures? -->
       </element>
     </define>
@@ -859,7 +911,7 @@
     </element>
   </define>
   <define name="allParts">
-    <element name="allParts">
+    <element name="allparts">
       <data type="boolean"/>
     </element>
   </define>
@@ -947,17 +999,13 @@
       <optional>
         <ref name="section-title"/>
       </optional>
-      <choice>
-        <oneOrMore>
+      <zeroOrMore>
+        <choice>
           <ref name="term-clause"/>
-        </oneOrMore>
-        <zeroOrMore>
-          <choice>
-            <ref name="terms"/>
-            <ref name="definitions"/>
-          </choice>
-        </zeroOrMore>
-      </choice>
+          <ref name="terms"/>
+          <ref name="definitions"/>
+        </choice>
+      </zeroOrMore>
     </element>
   </define>
   <define name="reference-clause">

data/lib/asciidoctor/m3d/m3d.rng

@@ -16,6 +16,9 @@
     </define>
     <define name="docidentifier">
       <element name="docidentifier">
+        <optional>
+          <attribute name="type"/>
+        </optional>
         <text/>
       </element>
     </define>

data/lib/asciidoctor/m3d/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module M3d
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/lib/isodoc/m3d/html/header.html

@@ -211,7 +211,7 @@ style='font-size:8.0pt;font-family:"Garamond",serif;mso-bidi-font-family:Arial'>
 <div style='mso-element:footer' id=f2>
 
   <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; 2017 copyright by the Messaging, Malware and Mobile Anti-Abuse Working Group (M3AAWG)</p>
+  <p class=MsoFooter>&copy; {{docyear}} copyright by the Messaging, Malware and Mobile Anti-Abuse Working Group (M3AAWG)</p>
 </div>
 
 </body>

data/lib/isodoc/m3d/m3dhtmlconvert.rb

@@ -55,6 +55,7 @@ module IsoDoc
 
       def html_head()
         <<~HEAD.freeze
+        <title>{{ doctitle }}</title>
     <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
 
     <!--TOC script import-->

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-m3d
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-15 00:00:00.000000000 Z
+date: 2018-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor