asciidoctor-m3d 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8395d9fb94512b2244e4b81296608efca78620ea6853e3f6ed729bce1d5b8039
-  data.tar.gz: 4183cd867f98a89fe5aaa5ff076fa518f872729496b444e7765e8c40242685e0
+  metadata.gz: 83d10db87814ca2f4540bdad055320326c525b4a6676edf445d352d314aadac9
+  data.tar.gz: 3cd66f21196357af8127fc9ebe3e4b9fec82e3d6f79b92ad46e4bf01afec6d27
 SHA512:
-  metadata.gz: 9a77b75a2b63ad4bc1ed5b2e02555e73a1960b7b53b10b0c2011fd4997f800ff0b6903888aa530cb55fbded1dfa6f69e5d1d870426ad65ec92eeb6ffe976606b
-  data.tar.gz: 02f2d8e9c7ba16a7f9a984147b5462b1dd9dd9fb5225f9b7c73bba7e8af042bc262bf922f0cefb3115431941318b3b3b5558d850e118935d402793f01d857a9a
+  metadata.gz: 50d85745f85fa0fdf306280170deefc472f67f20796a7296264f396d4e1ae205d24e00f8009f437d383d7b569ac192dcf5f9f9b1f83505fb12a2d34c583310b3
+  data.tar.gz: 4883cb64d20a1bb8f80ebfacc44baffc50011086e9ed3cfc961c4fad9d9533b2ac5404d764df8a0a0d1f0cdd0cff58141ba7faa5be7f2e2e0529c3736ca9e8f5

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/riboseinc/asciidoctor-iso
-  revision: 1fca67f1a4e7a67461ea3999918abc10bca3ca2c
+  revision: e06e2d75dbe3a7969c2973582155ec52f3afc4b2
   specs:
     asciidoctor-iso (0.9.0)
       asciidoctor (~> 1.5.7)
@@ -44,7 +44,7 @@ GIT
 PATH
   remote: .
   specs:
-    asciidoctor-m3d (0.3.0)
+    asciidoctor-m3d (0.3.1)
       asciidoctor (~> 1.5.7)
       asciidoctor-iso (>= 0.9.0)
       asciimath
@@ -65,9 +65,50 @@ GEM
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     asciidoctor (1.5.7.1)
+    asciidoctor-csand (0.3.0)
+      asciidoctor (~> 1.5.7)
+      asciidoctor-iso (>= 0.9.0)
+      asciimath
+      htmlentities (~> 4.3.4)
+      image_size
+      isodoc (>= 0.8.0)
+      mime-types
+      nokogiri
+      ruby-jing
+      ruby-xslt
+      thread_safe
+      uuidtools
+    asciidoctor-csd (0.4.0)
+      asciidoctor-iso (>= 0.9.0)
+      isodoc (>= 0.8.0)
+    asciidoctor-gb (0.3.0)
+      asciidoctor-iso (>= 0.9.0)
+      isodoc (>= 0.8.0)
+      twitter_cldr
+    asciidoctor-rfc (0.9.0)
+      asciidoctor (~> 1.5.7)
+      htmlentities (~> 4.3.4)
+      nokogiri
+      ruby-jing
+      thread_safe
+    asciidoctor-rsd (0.3.1)
+      asciidoctor (~> 1.5.7)
+      asciidoctor-iso (>= 0.8.0)
+      asciimath
+      htmlentities (~> 4.3.4)
+      image_size
+      isodoc (>= 0.7.0)
+      mime-types
+      nokogiri
+      ruby-jing
+      ruby-xslt
+      thread_safe
+      uuidtools
     asciimath (1.0.4)
     ast (2.4.0)
     byebug (9.1.0)
+    camertron-eprun (1.1.1)
+    cldr-plurals-runtime-rb (1.0.1)
     coderay (1.1.2)
     diff-lcs (1.3)
     docile (1.3.1)
@@ -93,11 +134,11 @@ GEM
     htmlentities (4.3.4)
     httpclient (2.8.3)
     image_size (2.0.0)
-    iso-bib-item (0.1.6)
+    iso-bib-item (0.1.8)
       duplicate
       isoics (~> 0.1.6)
       nokogiri
-    isobib (0.1.6)
+    isobib (0.1.7)
       algoliasearch
       iso-bib-item (~> 0.1.2)
     isoics (0.1.6)
@@ -109,6 +150,15 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
+    metanorma (0.2.2)
+      asciidoctor-csand (>= 0.3.0)
+      asciidoctor-csd (>= 0.4.0)
+      asciidoctor-gb (>= 0.3.0)
+      asciidoctor-iso (>= 0.9.0)
+      asciidoctor-m3d (>= 0.3.1)
+      asciidoctor-rfc (>= 0.9.0)
+      asciidoctor-rsd (>= 0.3.0)
+      isodoc (>= 0.8.0)
     method_source (0.9.0)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
@@ -174,6 +224,12 @@ GEM
     thor (0.20.0)
     thread_safe (0.3.6)
     timecop (0.9.1)
+    twitter_cldr (4.4.3)
+      camertron-eprun
+      cldr-plurals-runtime-rb (~> 1.0)
+      tzinfo
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
     unicode-display_width (1.4.0)
     uuidtools (2.1.5)
 
@@ -190,6 +246,7 @@ DEPENDENCIES
   guard-rspec (~> 4.7)
   html2doc!
   isodoc!
+  metanorma
   rake (~> 12.0)
   rspec (~> 3.6)
   rubocop (~> 0.50)

data/README.adoc

@@ -28,20 +28,21 @@ expressions.
 International Standards.
 * The XML representation is processed in turn to generate the following outputs
 as end deliverable M3D standard drafts.
-** Microsoft Word output (`.doc`), following the style conventions of the
-https://www.m3d.org/m3d-templates.html[M3D Standard Microsoft Word template].
-(In development)
-** PDF (forthcoming)
-** HTML (forthcoming)
+** HTML
+** DOC
 
 This AsciiDoc syntax for writing M3D standards is hereby named "AsciiM3D".
 
 == Usage
 
+The preferred way to invoke this gem is via the `metanorma` script:
+
 [source,console]
 ----
-$ asciidoctor a.adoc  # HTML output of Asciidoc file
-$ asciidoctor -b m3d -r 'asciidoctor-m3d' a.adoc  # M3D XML output
+$ metanorma --type m3d a.adoc                   # output HTML and DOC
+$ metanorma --type m3d --extensions html a.adoc # output just HTML
+$ metanorma --type m3d --extensions pdf a.adoc  # output just DOC
+$ metanorma --type m3d --extensions xml a.adoc  # output M3D XML
 ----
 
 The gem translates the document into M3D XML format, and then
@@ -50,39 +51,27 @@ reported to console against the XML, and are intended for users to
 check that they have provided all necessary components of the
 document.
 
-TODO: The gem will then convert the XML to Word Document, HTML, and
-PDF, and output those files with the appropriate file suffixes.
-`lib/asciidoctor/m3d/m3d2wordhtml.rb` is work in progress, and not yet
-integrated into the executable.
-
-=== Content Warnings
-
-The gem also realises several format checks as prescribed in ISO/IEC
-DIR 2, and warns the user about them in the console:
-
-* Numbers with what looks like dots instead of commas for decimal points.
-
-* Groups of numbers without spacing for every three digits. (The gem attempts
-to ignore M3D references.)
+The gem then converts the XML into HTML and PDF.
 
-* No space before percent sign.
+The gem can also be invoked directly within asciidoctor, though this is deprecated:
 
-* No bracketing of tolerance in percentage (e.g. `15 ± 7 % .`)
-
-* No recommendations, permissions or requirements (detected by keyword) in:
-foreword, scope, introduction, term examples and examples, notes, footnotes.
-
-* No subclauses that are the only child of a clause. (In clauses, annexes, or
-scopes.)
+[source,console]
+----
+$ asciidoctor -b m3d -r 'asciidoctor-m3d' a.adoc  
+----
 
-* 5 levels of subclause nesting. (Never actuated, AsciiDoc only permits 4
-levels of subsections.)
+=== Installation
 
-* Non-M3D/IEC reference turning up as normative.
+If you are using a Mac, the https://github.com/riboseinc/metanorma-macos-setup
+repository has instructions on setting up your machine to run Metanorma
+scripts such as this one. You need only run the following in a Terminal console:
 
-* Term definition starts with an article, or ends with a period.
+[source,console]
+----
+$ bash <(curl -s https://raw.githubusercontent.com/riboseinc/metanorma-macos-setup/master/metanorma-setup)
+$ gem install asciidoctor-m3d
+----
 
-* Title intro or title part appears in only one of French or English.
 
 == Approach
 
@@ -97,8 +86,6 @@ standards authoring process, and is prescribed in a separate document.
 M3D XML is still under development, but it already contains all the markup
 needed to render a M3D document into HTML.
 
-WARNING: The current RNG model of M3D XML is out of sync with the UML.
-
 === Asciidoctor
 
 Asciidoctor has been selected as the authoring tool to generate the document
@@ -119,102 +106,6 @@ 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.
 
-=== Features not visible in HTML preview
-
-The gem uses built-in Asciidoc formatting as much as possible, so that users
-can retain the ability to preview documents; for _Terms and Definitions_
-clauses, which have a good deal of explicit structure, macros have been
-introduced for semantic markup (admitted terms, deprecated terms, etc). The
-default HTML output of an Asciidoc-formatted M3D document is quite close to the
-intended final output, with the following exceptions. Note that the final
-outputs of the conversion (Microsoft Word, PDF, HTML) do not have these exceptions,
-and comply with the M3D Standard specifications.
-
-* _Terms and Definitions_: each term is marked up as an unnumbered subclause,
-the semantic markup of alternate and other terms is not rendered visually.
-
-* _Formulas_: Asciidoctor has no provision for the automated numbering of
-isolated block formulas ("stem"), and does not display the number assigned a
-block formula in its default HTML processor—although it does provide automated
-numbering of examples. Formula numbering is provided in the final outputs
-of the conversion.
-
-* _Missing elements_: The document model does not yet include Asciidoc elements
-that do not appear to be relevant to M3D Standards; these will be ignored in
-generating M3D XML. Those elements include:
-* sidebars (`aside`) (as distinct from warnings),
-* ASCII art/preformatted text (`literal`) (as distinct from sourcecode listings),
-* page breaks (`thematic break`).
-
-* _Markup_: Some connecting text which is used to convey markup structure is
-left out: in particular, `DEPRECATED` and `SOURCE` (replaced by formatting
-macros).
-
-* _Tables_: Table footnotes are treated like all other footnotes: they are
-rendered at the bottom of the document, rather than the bottom of the table,
-and they are not numbered separately.
-
-* _Cross-references_: Footnoted cross-references are indicated with the reference
-text `fn` in m3dlation, or `fn:` as a prefix to the reference text. The default
-HTML processor leaves these as is: if no reference text is given, only `fn`
-will be displayed (though it will still hyperlink to the right reference).
-
-* _References_: The convention for references is that M3D documents are cited
-without brackets by M3D number, and optionally year, whether they are normative
-or in the bibliography (e.g. `M3D 20483:2013`); while all other references are
-cited by bracketed number in the bibliography (e.g. `[1]`). The default HTML
-processor treats all references the same, and will bracket them (e.g. `[M3D
-20483:2013]`). For the same reason, M3D references listed in the bibliography
-will be listed under an M3D reference, rather than a bracketed number.
-
-* _References_: References are rendered cited throughout, since they are
-automated. For that reason, if reference is to be made to both an undated and a
-dated version of an M3D reference, these need to be explicitly listed as
-separate references. (This is not done in the Rice model document, which lists
-M3D 6646, but under _Terms and Definitions_ cites the dated M3D 6646:2011.
-
-* _References_: M3D references that are undated but published have their date
-indicated under the M3D standards format in an explanatory footnote. Because of
-constraints introduced by Asciidoctor, that explanation is instead given in
-square brackets in Asciidoc format.
-
-* _Annexes_: Subheadings cannot preserve subsection numbering, while also
-appearing inline with their text (e.g. Rice document, Annex B.2): they appear
-as headings in separate lines.
-
-* _Annexes_: Cross-references to Annex subclauses are automatically prefixed
-with `Clause` rather than `Annex` or nothing.
-
-* _Metadata_: Document metadata such as document numbers, technical committees
-and title wording are not rendered in the default HTML output.
-
-* _Patent Notice_: Patent notices are treated and rendered as a subsection of
-the introduction, with an explicit subheading.
-
-* _Numbering_: The numbering of figures and tables is sequential in the default
-HTML processor: it does not include the Clause or Annex number. This,
-_Figure 1_, not _Figure A.1_.
-
-* _Notes_: There is no automatic note numbering by the default HTML processor.
-
-* _Review Notes_: The reviewer on the review note is not displayed.
-
-* _Keys_: Keys to formulas and figures are expected to be marked up as
-definition lists consistently, rather than as inline prose.
-
-* _Figures_: Simple figures are marked up as images, figures containing
-subfigures as examples. Numbering by the default HTML processor may be
-inconsistent. Subfigures are automatically numbered as independent figures.
-
-* _Markup_: The default HTML processor does not support CSS extensions such as
-small caps or strike through, though these can be marked up as CSS classes
-through custom macros in Asciidoctor: a custom CSS stylesheet will be needed to
-render them.
-
-
-
-TODO: May need to only encode figures as examples.
-
 == Document Attributes
 
 The gem relies on Asciidoctor document attributes to provide necessary
@@ -251,6 +142,8 @@ report:: report
 
 `:language:` :: The language of the document (only `en` for now)  (mandatory)
 
+`:url:` :: The URL that the HTML version of the document will be published to
+(optional)
 
 The attribute `:draft:`, if present, includes review notes in the XML output;
 these are otherwise suppressed.

data/asciidoctor-m3d.gemspec

@@ -49,4 +49,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop", "~> 0.50"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
+  spec.add_development_dependency "metanorma"
 end

data/lib/asciidoctor/m3d/converter.rb

@@ -14,6 +14,25 @@ module Asciidoctor
 
       register_for "m3d"
 
+      def metadata(node, xml)
+        title node, xml
+        metadata_source(node, xml)
+        metadata_id(node, xml)
+        metadata_author(node, xml)
+        metadata_publisher(node, xml)
+        xml.language node.attr("language")
+        xml.script (node.attr("script") || "Latn")
+        metadata_status(node, xml)
+        metadata_copyright(node, xml)
+        metadata_committee(node, xml)
+        metadata_ics(node, xml)
+      end
+
+      def metadata_source(node, xml)
+        return unless node.attr("url")
+        xml.source node.attr("url")
+      end
+
       def metadata_author(node, xml)
         xml.contributor do |c|
           c.role **{ type: "author" }

data/lib/asciidoctor/m3d/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module M3d
-    VERSION = "0.3.1"
+    VERSION = "0.3.2"
   end
 end

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

@@ -138,7 +138,7 @@ background:#E0E0E0'><o:p>&nbsp;</o:p></span></p>
 
 <div style='mso-element:header' id=fh1>
 
-<p class=MsoHeader><img width="323" height="39" src="logo.png"></img>
+<p class=MsoHeader><img width="323" height="39" src="logo.jpg"></img>
 <!--[if gte vml 1]><v:line id="_x0000_s2049" alt=""
  style='position:absolute;flip:y;z-index:251659264;mso-wrap-style:none;
  mso-wrap-edited:f;mso-width-percent:0;mso-height-percent:0;

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

@@ -16,6 +16,7 @@
   <div class="coverpage">
     <div class="wrapper-top">
 
+  <div class="coverpage-logo"> <img src="m3-logo.png" alt="m3 logo"/> </div>
   <div class="coverpage-doc-identity">
     <div class="doc-number">
       <span class="docnumber">{{ docnumber }}</span>
@@ -24,13 +25,19 @@
     </div>
 
     <div class="coverpage-title">
-      <span class="title-first">{{ doctitle }}</span>
-      <!--<span class="title-second">{{ docsubtitle }}</span>-->
+      <div class="titles">
+        <div class="title-second">{{ docsubtitle }}</div>
+      <div class="title-first">{{ doctitle }}</div>
+      </div>
     </div>
   </div>
 
-  <div class="coverpage-logo">
-    <span>The Calendaring and Scheduling Consortium</span>
+  <div class="docinfo">
+    Updated <span class="date">{{ revdate_monthyear }}</span>,
+    Version <span class="version">{{ draft }}</span> <br/>
+    {% if url %}
+    Shortened URL to this document:  <a href="{{ url }}">{{ url }}</a>
+    {% endif %}
   </div>
 
   <div class="coverpage-tc-name">
@@ -52,7 +59,7 @@
     <span class="title">Warning for Drafts</span>
 
     <p class="content">
-    This document is not a Ribose Standard. It is distributed for review and
+    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
@@ -63,7 +70,7 @@
 
 <div class="copyright">
   <p class="year">
-    &copy; {{ docyear }} The Calendaring and Scheduling Consortium, Inc.
+    &copy; {{ docyear }} Messaging, Malware and Mobile Anti-Abuse Working Group
   </p>
 
   <p class="message">
@@ -75,15 +82,15 @@
   </p>
 
 <div class="contact-info">
-  <p class="name">The Calendaring and Scheduling Consortium, Inc.</p>
+  <p class="name">Messaging, Malware and Mobile Anti-Abuse Working Group</p>
   <p class="address">
-    4390 Chaffin Lane<br />
-    McKinleyville<br />
-    California 95519<br />
+    781 Beach Street, Suite 302<br />
+    San Francisco<br />
+    California 94109<br />
     United States of America<br />
     <br />
-    <a href="mailto:copyright@ribose.com">copyright@ribose.com</a><br />
-    <a href="open.ribose.com">open.ribose.com</a>
+    <!--<a href="mailto:copyright@ribose.com">copyright@ribose.com</a><br />-->
+    <a href="https://www.m3aawg.org">www.m3aawg.org</a>
   </p>
 </div>
 </div>

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

@@ -7,6 +7,14 @@
    License: none (public domain)
 */
 
+/* Colors
+Orange: #EE9C4F
+Blue: #69C5DC
+Drak Gray: #A5A8AB
+Gray: #69C5DC
+Light Gray: #F5F6F6
+*/
+
 html, body, div, span, applet, object, iframe,
 h1, h2, h3, h4, h5, h6, p, blockquote, pre,
 a, abbr, acronym, address, big, cite, code,
@@ -164,7 +172,7 @@ table {
         position: fixed;
         height: 100%;
         width: 30px;
-        background-color:#1d1d1d;
+        background-color:#69C5DC;
         color: white!important;
         cursor: pointer;
         z-index: 100;
@@ -179,7 +187,6 @@ table {
         
     }
 
-
     .container {
         padding-left: 360px;
     }
@@ -203,10 +210,13 @@ table {
         padding: 0 1.5em 0 1.5em;
         overflow: visible;
     }
+
+    nav {
+         padding-left: 3em;
+    }
 }
   
 
-
 #toc ul {
     margin: 0;
     padding: 0;
@@ -218,7 +228,7 @@ table {
 }
 
 #toc a {
-    color: #485094;
+    color: #69C5DC;
     text-decoration: none;
     display: block;
 }
@@ -240,9 +250,8 @@ table {
 }
 
 #toc .toc-active, #toc li:hover {
-    background: #1d1d1d;
-    box-shadow: inset -5px 0px 10px -5px #1d1d1d!important;
-
+    background: #69C5DC;
+    box-shadow: inset -5px 0px 10px -5px #69C5DC!important;
 }
 
 #toc li:hover a {
@@ -303,7 +312,7 @@ p.document-type, p.document-stage {
 
 p.document-type {
     font-weight: 400;
-    height: 210px;
+    height: 120;
 }
 
 #governance-band p.document-type {
@@ -361,7 +370,7 @@ p.document-stage {
 }
 
 #working-draft-band {
-    background-color: #fda706;
+    background-color: #F22E15;
 }
 
 #committee-draft {
@@ -388,20 +397,20 @@ p.document-stage {
     background-color: #7e0d13;
 }
 
-#published {
-    border-bottom: solid 3px #0ac442;
+#standard {
+    border-bottom: solid 3px #69C5DC;
 }
 
 #published-band {
-    background-color: #0ac442;
+    background-color: #69C5DC;
 }
 
-#withdrawn {
-    border-bottom: solid 3px #a0a0a0;
+#obsolete {
+    border-bottom: solid 3px #7e0d13;
 }
 
-#withdrawn-band {
-    background-color: #a0a0a0;
+#obsolete-band {
+    background-color: #7e0d13;
 }
 
 /*
@@ -414,7 +423,7 @@ p.document-stage {
   
   h1,h2,h3,h4,h5,h6 {
     font-family: $headerfont;
-    color: #0e1a85;
+    color: black;
     font-weight: 600;
     margin-top: 2em;
     margin-bottom: 0.3em;
@@ -432,15 +441,12 @@ p.document-stage {
   
   h2 {
     font-size: 1.3em; 
-    font-weight: 400;
   }
   
   h3 {
     font-size: 1.1em;
-    font-weight: 400;   
   }
 
-  /*
   span[id^="toc"]:after {
     float: left;
     padding-right: 4px;
@@ -451,10 +457,9 @@ p.document-stage {
     color: #cfcfcf;
     content: "\f0c1";
   }
-  */
 
   .TermNum, .Terms, .AltTerms {
-    color: #485094;
+    color: black;
     font-weight: 400;
   }
 
@@ -471,17 +476,16 @@ p.document-stage {
     margin: 0;
   }
   
-  /*
   p.AltTerms {
     font-style: italic;
     margin: 0;
   }
-  */
 
+  /*
 span.obligation {
     font-weight: 400;
 }
-
+*/
 
 /*
     3.2 Links
@@ -489,27 +493,27 @@ span.obligation {
   
     a, a:visited{
         text-decoration: none;
-        color: #485094;
+        color: #69C5DC;
     }
       
     a:hover {
         color: white;
-        background: #1d1d1d;
-        box-shadow: 3px 0 0 #1d1d1d, -3px 0 0 #1d1d1d;
+        background: #69C5DC;
+        box-shadow: 3px 0 0 #69C5DC, -3px 0 0 #69C5DC;
         /* padding: 2px 0 2px 0; */
     }
 
     ::selection {
-        background: #1d1d1d; /* WebKit/Blink Browsers */
+        background: #69C5DC; /* WebKit/Blink Browsers */
         color: white;
       }
       ::-moz-selection {
-        background: #1d1d1d; /* Gecko Browsers */
+        background: #69C5DC; /* Gecko Browsers */
         color: white;
       }
 
       .contact-info a:hover {
-          color: #485094;
+          color: #69C5DC;
           text-decoration: underline;
           background: none;
           box-shadow: 0 0 0 0;
@@ -522,42 +526,15 @@ span.obligation {
 */
         
     ul {
-    margin-left: 1.2em;
+    margin-left: 0.5em;
   }
       
-ul {
-  margin-left: 1.2em; }
-
-ul > li {
-  list-style: none;
-}
-
-  ul > li:before {
-    content: "—";
-    display: inline-block; width: 1em;
-    margin-left: -1.2em;
-  }
-  
-  li p {
-    display: inline;
-  }
-
-li:first-child {
-  margin-top: 1em;
-}
-
 #toc ul {
   margin-bottom: 0.25em; }
 
 #toc li {
   list-style-type: none; }
 
-#toc li:before {
-  content: " ";
-  display: none;
-}
-
-
 
 /*
     3.4 Rules
@@ -566,14 +543,10 @@ li:first-child {
     .rule {
         width: 100%;
         height: 1px;
-        background-color: #0e1a85;
+        background-color: #F22E15;
         margin: 2em 0;
       }
 
-h2 p {
-  display: inline;
-}
-
 /*
     3.5 Bibliograhy
 */
@@ -581,7 +554,6 @@ h2 p {
 p.Biblio, p.NormRef {
     margin-top: 1em;
     margin-left: 2em;
-    text-indent:-2em;
 }
 
 /*
@@ -590,11 +562,14 @@ p.Biblio, p.NormRef {
 
 .figure, .Sourcecode {
     font-family: $monospacefont;
-    background-color: #f7f7f7;
     font-size: 0.8em;
     line-height: 1.6em;
     padding: 1.5em;
-    margin: 2em 0 1em 0;
+    background-color: #F5F6F6;
+    border-left: solid 5px #69C5DC;
+    color: rgb(91, 94, 95);
+    padding: 1.2em 1.2em 1.2em 2.2em;
+    margin: 2em 0 2em -1em;;
     overflow: auto;
 }
 
@@ -609,10 +584,11 @@ p.Biblio, p.NormRef {
 */
 
 .Note {
-    background-color: #fff495;
-    color: #47430c;
-    padding: 1.2em;
-    margin: 2em 0 1em 0;
+    background-color: #F5F6F6;
+    border-left: solid 5px #69C5DC;
+    color: rgb(91, 94, 95);
+    padding: 1.2em 1.2em 1.2em 2.2em;
+    margin: 2em 0 2em -1em;
 }
 
 /*
@@ -620,9 +596,11 @@ p.Biblio, p.NormRef {
 */
 
 .example {
-    background-color: #e1eef1;
-    padding: 1.2em;
-    margin: 2em 0 1em 0;
+    background-color: #F5F6F6;
+    border-left: solid 5px #69C5DC;
+    color: rgb(91, 94, 95);
+    padding: 1.2em 1.2em 1.2em 2.2em;
+    margin: 2em 0 2em -1em;
 }
 
 .example .example-title {
@@ -636,6 +614,11 @@ p.Biblio, p.NormRef {
     3.9 Tables
 */
 
+table, th, td {
+  border: none!important;
+  font-size: 0.95em;
+}
+
 table {
   border-collapse: collapse;
   width: 100%;
@@ -644,11 +627,7 @@ table {
   margin-left: auto;
   margin-right: auto;
   padding-right: 2em;
-}
-
-table, th, td {
-  border: 1px solid black;
-  font-size: 0.95em;
+  border: solid 1px #F5F6F6!important;
 }
 
 td, th {
@@ -659,6 +638,16 @@ td.header {
   font-weight: 400;
 }
 
+tr:nth-child(even) {
+    background-color: #FBF9F8;
+}
+
+thead {
+    background-color: #69C5DC;
+    color: white;
+    border: none;
+}
+
 p.TableTitle {
   text-align: center;
   margin-top: 2.5em;
@@ -684,13 +673,12 @@ a.footnote-number {
 */
 
 .Quote {
-    background-color: #f7f7f7;
+    background-color: #F5F6F6;
+    border-left: solid 5px #69C5DC;
+    color: rgb(91, 94, 95);
+    padding: 1.2em 1.2em 1.2em 2.2em;
+    margin: 2em 0 2em -1em;;
     font-style: italic;
-    width: 80%;
-    padding: 1.5em;
-    margin-top: 2em;
-    margin-left: auto;
-    margin-right: auto;
 }
 
 .QuoteAttribution
@@ -702,9 +690,11 @@ a.footnote-number {
 */
 
 .formula, .Formula {
-    background-color: #f7f7f7;
-    padding: 1.5em;
-    margin-top: 2em;
+    background-color: #F5F6F6;
+    border-left: solid 5px #69C5DC;
+    color: rgb(91, 94, 95);
+    padding: 1.2em 1.2em 1.2em 2.2em;
+    margin: 2em 0 2em -1em;;
     text-align: center;
 }
 
@@ -779,12 +769,12 @@ p {
     4.1 Top Logo
 */
 
-.wrapper-top {
-    background-color:#0e1a85;
-    /* background-image: url("img/dots@2x.png"); */
-    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAYAAABccqhmAAAACXBIWXMAABYlAAAWJQFJUiTwAAADwUlEQVR4nO3YgQ2AMAwDwcAiWZ1NizrH30lIeIEq9nPOGSDqPgC7+93v/suy3Mmvhx+6VAAIcwFAmc4nyzYAIMgGAGEuACirdyBZtgEASTYACHMBQFm9A8myDQBIsgFAmAsAyuodSJZtAECSDQDCXABQVu9AsmwDAJJsABDmAoCyegeSZRsAkGQDgDAXAJTVO5As2wCAJBsAhLkAoKzegWTZBgAk2QAgzAUAZfUOJMs2ACDJBgBhLgAoq3cgWbYBAEk2AAhzAUBZvQPJsg0ASLIBQJgLAMrqHUiWbQBAkg0AwlwAUFbvQLJsAwCSbAAQ5gKAsnoHkmUbAJBkA4AwFwCU1TuQLNsAgCQbAIS5AKCs3oFk2QYAJNkAIMwFAGX1DiTLNgAgyQYAYS4AKKt3IFm2AQBJNgAIcwFAWb0DybINAEiyAUCYCwDK6h1Ilm0AQJINAMJcAFBW70CybAMAkmwAEOYCgLJ6B5JlGwCQZAOAMBcAlNU7kCzbAIAkGwCEuQCgrN6BZNkGACTZACDMBQBl9Q4kyzYAIMkGAGEuACirdyBZtgEASTYACHMBQFm9A8myDQBIsgFAmAsAyuodSJZtAECSDQDCXABQVu9AsmwDAJJsABDmAoCyegeSZRsAkGQDgDAXAJTVO5As2wCAJBsAhLkAoKzegWTZBgAk2QAgzAUAZfUOJMs2ACDJBgBhLgAoq3cgWbYBAEk2AAhzAUBZvQPJsg0ASLIBQJgLAMrqHUiWbQBAkg0AwlwAUFbvQLJsAwCSbAAQ5gKAsnoHkmUbAJBkA4AwFwCU1TuQLNsAgCQbAIS5AKCs3oFk2QYAJNkAIMwFAGX1DiTLNgAgyQYAYS4AKKt3IFm2AQBJNgAIcwFAWb0DybINAEiyAUCYCwDK6h1Ilm0AQJINAMJcAFBW70CybAMAkmwAEOYCgLJ6B5JlGwCQZAOAMBcAlNU7kCzbAIAkGwCEuQCgrN6BZNkGACTZACDMBQBl9Q4kyzYAIMkGAGEuACirdyBZtgEASTYACHMBQFm9A8myDQBIsgFAmAsAyuodSJZtAECSDQDCXABQVu9AsmwDAJJsABDmAoCyegeSZRsAkGQDgDAXAJTVO5As2wCAJBsAhLkAoKzegWTZBgAk2QAgzAUAZfUOJMs2ACDJBgBhLgAoq3cgWbYBAEk2AAhzAUBZvQPJsg0ASLIBQJgLAMrqHUiWbQBAkg0AwlwAUFbvQLJsAwCSbAAQ5gKAsnoHkmUbAJBkA4AwFwCU1TuQLNsAgCQbAFTNzA9ggAr9aahO8QAAAABJRU5ErkJggg==');
-    color: #ffffff;
-    padding: 2em 0;
+
+.coverpage {
+    /*background: radial-gradient(#2D5D8E, #0D1E2B);*/
+    /*background-image: url("img/dots@2x.png");*/
+    color: black;
+    padding: 2em 0 0 2em;
 }
 
   .doc-number {
@@ -795,11 +785,8 @@ p {
   .coverpage-title {
       padding-bottom: 0.5em;
       font-family: $headerfont;
-      font-size: 1.2em;
-	line-height: 1.2em;
+      font-size: 1.5em;
 	font-weight: 900; 
-	padding-left: 1em;
-	padding-right: 1em;
   }
 
   .coverpage-date {
@@ -807,12 +794,8 @@ p {
 	font-weight: 900; 
   }
   
-  .title-section1 {
-    padding: 0 2em 0 3em;
-  }
-
   .prefatory-section {
-    padding: 0 3em 0 6em;
+    padding: 0 2em 0 3em;
   }
   
   
@@ -823,28 +806,73 @@ p {
 
   .coverpage {
     text-align: center;
-    padding-left: 1.5em;
   }
 
+    .coverpage-logo {
+      margin-top: 2em;
+      margin-bottom: 2em;
+      background-color: white;
+  }
+
+  .coverpage-logo img {
+      width: 400px;
+  }
+
+
   .coverpage-logo span, .coverpage-tc-name span {
     font-family: $bodyfont;
       text-transform: uppercase;
-      font-weight: 600;
+      font-weight: 300;
+      display: block;
   }
-  
+ 
+ /* 
   .coverpage-tc-name {
     font-size: 1.2em;
     line-height: 1.2em;
     margin: 0.25em 0;
   }
+  */
   
 /*
     4.2 Document Identity
 */
 
-  .coverpage-doc-identity {
+.titles {
+    background-color: #69C5DC;
+}
+
+  .title-first {
     font-size: 2em;
     line-height: 2em;
+    padding-bottom: 1em;
+    font-weight: 900;
+    text-transform: uppercase;
+    background-color: #69C5DC;
+    color: white;
+  }
+
+  .title-second {
+      font-size: 1.5em;
+      line-height: 2em;
+      margin-top: 3em;
+      padding-top: 1em;
+      font-weight: 600;
+      text-transform: uppercase;
+      color: white;
+  }
+
+   .docinfo {
+      margin-top: 2em;
+      margin-bottom: 3em;
+  }
+
+
+  .coverpage-doc-identity {
+    height: 100px;
+    width: 100%;
+    background-size: 240px 80px;
+    margin: auto;
   }
   
   
@@ -855,12 +883,33 @@ p {
   .coverpage-stage-block {
     font-family: $bodyfont;
     font-weight: 700;
-    font-size: 1.25em;
-    margin: 2em 0em 2em 0em;
+    font-size: 1em;
+    margin: 1em 0em 1em 0em;
     text-transform: uppercase;
   }
 
+.section-title {
+    background-color: #69C5DC;
+    padding: 1em 2em 1em 5.5em;
+    margin: 4em -3em 3em -5em;
+    border-bottom: 4px solid #F22E15;
+}
 
+
+.section-title h1 {
+    font-size: 2em;
+    font-weight: 800;
+    line-height: 1em;
+    margin-top: 0.5em;
+    margin-bottom: 0;
+    color: white;
+    text-transform: none;
+}
+
+h2 {
+    border-bottom: solid 1px #69C5DC;
+    color: black;
+}
   
   
 /*
@@ -869,15 +918,15 @@ p {
 
   
   .coverpage-warning {
-    border-top: solid 1px #f36f36;
-    border-bottom: solid 1px #f36f36;
+    border-top: solid 1px #F22E15;
+    border-bottom: solid 1px #F22E15;
     margin: 1em 2em;
-    color: #485094;
+    color: black;
     padding: 1em;
   }
   
   .coverpage-warning .title {
-    color: #f36f36;
+    color: #F22E15;
     font-family: $headerfont;
     font-weight: 700;
     text-transform: uppercase;
@@ -897,7 +946,7 @@ p {
   }
   
   
-  .copyright .name, .copyright .address {color: #485094;}
+  .copyright .name, .copyright .address {color: black;}
   
 
 
@@ -921,7 +970,7 @@ To top button
     font-size: 12px;
     border: none;
     outline: none;
-    background-color: #1d1d1d;
+    background-color: #69C5DC;
     opacity: 0.15;
     color: white;
     cursor: pointer;
@@ -938,3 +987,15 @@ a.anchorjs-link:hover {
   color: #485094;
   box-shadow: none;
 }
+
+@page {
+    margin: 1cm;
+}
+
+@media print {
+    .section-title {page-break-before: always;}
+    nav, #toc, #toggle, .document-stage-band,
+    .document-type-band {display: none;}
+    .container {padding-left: 0;}
+
+}

data/lib/isodoc/m3d/m3dhtmlconvert.rb

@@ -11,24 +11,30 @@ module IsoDoc
         File.join(File.dirname(__FILE__), File.join("html", file))
       end
 
+      def add_image(filenames)
+        filenames.each do |filename|
+          system "cp #{html_doc_path(filename)} #{filename}"
+          @files_to_delete << filename
+        end
+      end
+
       def initialize(options)
         super
         @htmlstylesheet = generate_css(html_doc_path("htmlstyle.scss"), true, default_fonts(options))
         @htmlcoverpage = html_doc_path("html_m3d_titlepage.html")
         @htmlintropage = html_doc_path("html_m3d_intro.html")
         @scripts = html_doc_path("scripts.html")
-        system "cp #{html_doc_path('logo.jpg')}  logo.jpg"
-        @files_to_delete << "logo.jpg"
+        add_image(%w(logo.jpg m3-logo.png))
       end
 
       def default_fonts(options)
         b = options[:bodyfont] ||
           (options[:script] == "Hans" ? '"SimSun",serif' :
-           '"Garamond",serif')
+           '"Overpass",sans-serif')
         h = options[:headerfont] ||
           (options[:script] == "Hans" ? '"SimHei",sans-serif' :
-           '"Garamond",serif')
-        m = options[:monospacefont] || '"Courier New",monospace'
+           '"Overpass",sans-serif')
+        m = options[:monospacefont] || '"Space Mono",monospace'
         "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n"
       end
 
@@ -136,6 +142,11 @@ module IsoDoc
         end
         docxml
       end
+
+      def info(isoxml, out)
+        @meta.url isoxml, out
+        super
+      end
     end
   end
 end

data/lib/isodoc/m3d/m3dwordconvert.rb

@@ -33,6 +33,10 @@ module IsoDoc
         "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n"
       end
 
+      def metadata_init(lang, script, labels)
+        @meta = Metadata.new(lang, script, labels)
+      end
+
       def colophon(body, docxml)
         section_break(body)
         body.div **{ class: "colophon" } do |div|
@@ -84,6 +88,11 @@ module IsoDoc
         end
         from_xhtml(h1)
       end
+
+      def info(isoxml, out)
+        @meta.url isoxml, out
+        super
+      end
     end
   end
 end

data/lib/isodoc/m3d/metadata.rb

@@ -77,6 +77,11 @@ 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/processor.rb

@@ -17,6 +17,10 @@ module Metanorma
         }
       end
 
+      def version
+        "Asciidoctor::M3d #{Asciidoctor::M3d::VERSION}"
+      end
+
       def input_to_isodoc(file)
         Metanorma::Input::Asciidoc.new.process(file, @asciidoctor_backend)
       end
@@ -32,4 +36,4 @@ module Metanorma
 
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-m3d
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-20 00:00:00.000000000 Z
+date: 2018-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -318,6 +318,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: metanorma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   asciidoctor-m3d lets you write M3AAWG Documents (M3D) in AsciiDoc syntax.
 
@@ -363,6 +377,7 @@ files:
 - lib/isodoc/m3d/html/html_m3d_titlepage.html
 - lib/isodoc/m3d/html/htmlstyle.scss
 - lib/isodoc/m3d/html/logo.jpg
+- lib/isodoc/m3d/html/m3-logo.png
 - lib/isodoc/m3d/html/m3d.scss
 - lib/isodoc/m3d/html/scripts.html
 - lib/isodoc/m3d/html/word_m3d_intro.html
@@ -395,7 +410,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: asciidoctor-m3d lets you write M3AAWG Documents (M3D) in AsciiDoc.