metanorma-m3d 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e56ff0f758437606bfe1cd38596fa6d53e827e00b1c1c74d9b394a897a0709da
-  data.tar.gz: 75b1c8474c4031c75ee5c85539c285e5cb291bd7122f55b45aa3cb8eb272087c
+  metadata.gz: eea55d65f6aa596e1a3dc63aec7f0096a50d4992e8fba2837885e8dd08d1c572
+  data.tar.gz: 9cc10f954832573d6ccb424d5223319d5faf1f1e01e807b2125c46eebb6a75f7
 SHA512:
-  metadata.gz: 7d9d0fb6708b39019c1688f1db57607b15e26eb30ddc61c3721983cb4c2b48f5e034b56447d123ce48bbec4c4320baa7820c8dd018dec81faa6350c62c08b14a
-  data.tar.gz: 758cd891a9273629b2b681791ab6a41e0bd54bf35b1784ee2b31395c297ff0150cbe97e7b74f2ff64316c9e501b6462413b9b67c7e16ea5a15a1e47786479460
+  metadata.gz: aa0dfeaf79115cec35344aec9cd3ce72e6391cf2ad83a1301e5186b5feb8766b76202bf2587190f5c7c65f08dee7ef9eaf089678f494870863c0349d6c704f0c
+  data.tar.gz: fb1ad009eb9102b5c8ea2f90000e43b3b7849396a64652da45728640b60face4baeae887a022cbefbccf1df17883211cf97b9ae891d1bcccfb0fb162c5578711

data/README.adoc

@@ -99,19 +99,17 @@ DocBook document authoring tool). Asciidoctor has built-in capability to output
 Text, DocBook and HTML; so it can be used to preview the file as it is being
 authored.
 
-Note that in order to generate HTML preview output close to what is intended
-in the M3D standard, the Asciidoc
-document includes a fair amount of formatting instructions (e.g. disabling
-section numbering where appropriate, the titling of Appendixes as Annexes), as
-well as M3D boilerplate text, and predefined section headers (sections are
-recognised by fixed titles such as `Normative References`). Authoring M3D
-standards in this fashion assumes that users will be populating an Asciidoc
-template, and not removing needed formatting instructions.
+Generating documents via a document model substantially automated formatting
+associated with the document, including automating numbering of headings, figures,
+tables etc, and automatically generating references and citations.
 
 == Document Attributes
 
+=== Common attributes
+
 The gem relies on Asciidoctor document attributes to provide necessary
-metadata about the document. These include:
+metadata about the document. The https://github.com/riboseinc/metanorma-standoc[metanorma-standoc]
+gem documents the Asciidoctor document attributes common to all metanorma gems. These include:
 
 `:edition:`:: The document edition
 
@@ -147,7 +145,11 @@ report:: report
 The attribute `:draft:`, if present, includes review notes in the XML output;
 these are otherwise suppressed.
 
-== AsciiM3D features not also present in AsciiISO
+== Asciidoctor features specific to CSAND
+
+The https://github.com/riboseinc/metanorma-standoc[metanorma-standoc]
+gem documents the customisations of Asciidoctor markup common to all metanorma gems.
+The following markup is specific to this gem:
 
 * `+[keyword]#...#+`: encodes keywords, such as "MUST", "MUST NOT". (Encoded as
 `<span class="keyword">...</span>`.

data/lib/asciidoctor/m3d/isostandard.rng

@@ -744,6 +744,9 @@
     </define>
     <define name="preface">
       <element name="preface">
+        <optional>
+          <ref name="preface_abstract"/>
+        </optional>
         <ref name="foreword"/>
         <optional>
           <ref name="introduction"/>
@@ -811,6 +814,11 @@
       </optional>
     </element>
   </define>
+  <define name="preface_abstract">
+    <element name="abstract">
+      <ref name="Basic-Section"/>
+    </element>
+  </define>
   <define name="foreword">
     <element name="foreword">
       <ref name="Basic-Section"/>

data/lib/isodoc/m3d/html/html_m3d_titlepage.html

@@ -51,10 +51,10 @@
   </div>
 
   <div class="coverpage-stage-block" >
-    <span class="coverpage-maturity" id="{{ status | replace: ' ', '-' | downcase }}">{{ status }}</span>
+    <span class="coverpage-maturity" id="{{ status | replace: ' ', '-' | downcase }}">{% if unpublished %}{{ status }}{% endif %}</span>
 </div>
 
-{% if status != "Published" and status != "Withdrawn" %}
+{% if unpublished %}
   <div class="coverpage-warning">
     <span class="title">Warning for Drafts</span>
 

data/lib/isodoc/m3d/html/word_m3d_titlepage.html

@@ -22,12 +22,13 @@ margin-left:4.25pt;margin-right:4.25pt'>
 
 <p class="MsoNormal" align="center" style='text-align:center;border:none;
 mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
-lang="EN-GB" style='font-size:40.0pt'>{{ stageabbr }} stage<o:p></o:p></span></p>
+lang="EN-GB" style='font-size:40.0pt'>{% if unpublished %}{{ status }}{% endif %}<o:p></o:p></span></p>
 
 </div>
 
 <p class="MsoNormal" style='margin-bottom:6.0pt'><span lang="EN-GB"><o:p>&nbsp;</o:p></span></p>
 
+{% if unpublished %}
 <div style='mso-element:para-border-div;border:solid windowtext 1.0pt;
 mso-border-alt:solid windowtext .5pt;padding:1.0pt 4.0pt 1.0pt 4.0pt;
 margin-left:4.25pt;margin-right:4.25pt'>
@@ -35,24 +36,18 @@ margin-left:4.25pt;margin-right:4.25pt'>
 <p class="MsoNormal" align="center" style='margin-bottom:6.0pt;text-align:center;
 border:none;mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:
 1.0pt 4.0pt 1.0pt 4.0pt'><b style='mso-bidi-font-weight:normal'><span
-lang="EN-GB" style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>Warning for WDs
-and CDs<o:p></o:p></span></b></p>
+lang="EN-GB" style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>Warning for Drafts<o:p></o:p></span></b></p>
 
 <p class="MsoNormal" style='margin-bottom:6.0pt;border:none;mso-border-alt:solid windowtext .5pt;
 padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang="EN-GB"
-style='font-size:10.0pt;mso-bidi-font-size:11.0pt;mso-bidi-font-weight:bold'>This
-document is not an ISO International Standard. It is distributed for review and
-comment. It is subject to change without notice and may not be referred to as
-an International Standard.<o:p></o:p></span></p>
-
-<p class="MsoNormal" style='border:none;mso-border-alt:solid windowtext .5pt;
-padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang="EN-GB"
-style='font-size:10.0pt;mso-bidi-font-size:11.0pt;mso-bidi-font-weight:bold'>Recipients
-of this draft are invited to submit, with their comments, notification of any
-relevant patent rights of which they are aware and to provide supporting
-documentation.</span><span lang="EN-GB" style='font-size:10.0pt;mso-bidi-font-size:
-11.0pt'><o:p></o:p></span></p>
+style='font-size:10.0pt;mso-bidi-font-size:11.0pt;mso-bidi-font-weight:bold'>This document is not an M3AAWG Standard. It is distributed for review and
+    comment, and is subject to change without notice and may not be referred to as
+    a Standard. Recipients of this draft are invited to submit, with their
+    comments, notification of any relevant patent rights of which they are aware
+    and to provide supporting documentation.
+<o:p></o:p></span></p>
 
 </div>
+{% endif %}
 
 

data/lib/isodoc/m3d/m3dhtmlconvert.rb

@@ -84,11 +84,6 @@ module IsoDoc
       def html_toc(docxml)
         docxml
       end
-
-      def info(isoxml, out)
-        @meta.url isoxml, out
-        super
-      end
     end
   end
 end

data/lib/isodoc/m3d/m3dpdfconvert.rb

@@ -84,11 +84,6 @@ module IsoDoc
       def html_toc(docxml)
         docxml
       end
-
-      def info(isoxml, out)
-        @meta.url isoxml, out
-        super
-      end
     end
   end
 end

data/lib/isodoc/m3d/m3dwordconvert.rb

@@ -60,11 +60,6 @@ module IsoDoc
         main = isoxml&.at(ns("//title[@language='en']"))&.text
         set_metadata(:doctitle, main)
       end
-
-      def info(isoxml, out)
-        @meta.url isoxml, out
-        super
-      end
     end
   end
 end

data/lib/isodoc/m3d/metadata.rb

@@ -40,6 +40,10 @@ module IsoDoc
         end
       end
 
+            def unpublished(status)
+        %w(published withdrawn).include? status.downcase
+      end
+
       def version(isoxml, _out)
         super
         revdate = get[:revdate]
@@ -66,11 +70,6 @@ module IsoDoc
         return isodate unless m && m[:yr] && m[:mo]
         return "#{MONTHS[m[:mo].to_sym]} #{m[:yr]}"
       end
-
-      def url(isoxml, _out)
-        url = isoxml.at(ns("//bibdata/source"))
-        set(:url, url.text) if url
-      end
     end
   end
 end

data/lib/metanorma/m3d/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module M3d
-    VERSION = "1.0.9"
+    VERSION = "1.0.10"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-m3d
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor