metanorma-standoc 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 224cd7ca429d40a2ab00d82a364e88799f10fe25ab5590a71a80302140dbbc92
-  data.tar.gz: 51e3067befe646bf8bf072f1b28ea98bd9ffdee0c402e4447eb285df39197cd7
+  metadata.gz: 8fdc800133b8aec3e4931bada3fe492a537f19c2807767b5124c8f4e39b3649b
+  data.tar.gz: ead7bf5902bd28d515fbade4cf7093e1aa88ef5a22faf179f32dae4f42c6da17
 SHA512:
-  metadata.gz: 76fd5c9ba4a47de3cbaca82fbf8fa355dc8b3e00b10fe50cc6482e675e7c49288b85f849d74df33fddb433eddee4554cbeeac6c473119920620bdd956143b4e4
-  data.tar.gz: 62eefb42214c569b86eaec612a2769c7141686a78e4c2c7c6a62cec6dd819e75db6d856703dedd1b327c90e5ebd2878f74e21ac81af62627a40f417300af4b53
+  metadata.gz: 2c51bf19c625ff3822b45ced863b8d27b231789b2d500abe68bc063b1f92be5f4f9b052bba8fc1d656386c336327ee7f08958cffefb36d12c60079a3dde725b1
+  data.tar.gz: d22b6b4f30f2cbff1b415190d12ed8c1c2d5a41d25ed5c6da7ed1d2738f5cdaa2dec58d0bb2c210ce2f2682792b4606eb48e6a47bd2f56835fee7c3b3ff2cf3c

data/.rubocop.yml

@@ -3,13 +3,8 @@
 # All project-specific additions and overrides should be specified in this file.
 
 inherit_from:
-  # Thoughtbot's style guide from: https://github.com/thoughtbot/guides
-  - ".rubocop.tb.yml"
-  # Overrides from Ribose
-  - ".rubocop.ribose.yml"
+  - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:
-  DisplayCopNames: false
-  StyleGuideCopsOnly: false
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.3
 Rails:
   Enabled: true

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metanorma-standoc (1.0.8)
+    metanorma-standoc (1.0.9)
       asciidoctor (~> 1.5.7)
       iev (~> 0.2.0)
       isodoc (~> 0.9.0)
@@ -17,7 +17,7 @@ GEM
     algoliasearch (1.23.2)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
-    asciidoctor (1.5.7.1)
+    asciidoctor (1.5.8)
     asciimath (1.0.6)
     ast (2.4.0)
     byebug (10.0.2)
@@ -31,7 +31,7 @@ GEM
       nokogiri (>= 1.4.3)
     ffi (1.9.25)
     formatador (0.2.5)
-    gb-agencies (0.0.3)
+    gb-agencies (0.0.5)
     gbbib (0.4.1)
       cnccs (~> 0.1.1)
       gb-agencies (~> 0.0.1)
@@ -51,7 +51,7 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     hashdiff (0.3.7)
-    html2doc (0.8.5)
+    html2doc (0.8.6)
       asciimath
       htmlentities (~> 4.3.4)
       image_size
@@ -78,12 +78,12 @@ GEM
       algoliasearch
       iecbib (~> 0.2.1)
       iso-bib-item (~> 0.4.2)
-    isodoc (0.9.5)
+    isodoc (0.9.8)
       asciimath
-      html2doc (~> 0.8.1)
+      html2doc (~> 0.8.6)
       htmlentities (~> 4.3.4)
       liquid
-      metanorma (~> 0.2.7)
+      metanorma (~> 0.3.0)
       nokogiri
       rake (~> 12.0)
       roman-numerals
@@ -100,8 +100,8 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
-    metanorma (0.2.11)
-    method_source (0.9.0)
+    metanorma (0.3.0)
+    method_source (0.9.2)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2018.0812)
@@ -114,10 +114,10 @@ GEM
       shellany (~> 0.0)
     optout (0.0.2)
     parallel (1.12.1)
-    parser (2.5.1.2)
+    parser (2.5.3.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
-    pry (0.11.3)
+    pry (0.12.1)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (3.0.3)
@@ -162,7 +162,7 @@ GEM
     ruby_deep_clone (0.8.0)
     ruby_dep (1.5.0)
     safe_yaml (1.0.4)
-    sass (3.6.0)
+    sass (3.7.2)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -178,7 +178,7 @@ GEM
     simplecov-html (0.10.2)
     sterile (1.0.13)
       nokogiri
-    thor (0.20.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
     timecop (0.9.1)
     unicode-display_width (1.4.0)
@@ -198,7 +198,7 @@ DEPENDENCIES
   equivalent-xml (~> 0.6)
   guard (~> 2.14)
   guard-rspec (~> 4.7)
-  metanorma (~> 0.2.6)
+  metanorma (~> 0.3.0)
   metanorma-standoc!
   rake (~> 12.0)
   rspec (~> 3.6)
@@ -209,4 +209,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.16.6
+   1.17.1

data/README.adoc

@@ -8,6 +8,116 @@ WARNING: This gem is still under development.
 
 Gem for serialising the https://github.com/riboseinc/metanorma-model-standoc[Metanorma Standoc] model. 
 
+== Functionality
+
+This gem processes Metanorma documents following a template for generating standards documents, according
+to a range of standards classes. This gem provides underlying generic functionality; behaviour specific
+to each standards class is refined in the gem specific to that standards class (e.g. https://github.com/riboseinc/metanorma-iso).
+The following outputs are generated.
+
+* Metanorma XML representation of the document, intended as a document model for 
+Standards. The Metanorma XML representation is processed in turn, to generate one or more of 
+the following outputs as end deliverables, depending on each standards class gem:
+* Microsoft Word output (`.doc`)
+* HTML output (`.html`)
+* PDF (`.pdf`)
+
+The following input formats are supported:
+
+* http://asciidoctor.org/[Asciidoctor]
+
+This README provides an overview of the functionality of the gem; see also
+https://github.com/riboseinc/metanorma-iso/blob/master/docs/guidance.adoc[Guidance for authoring].
+https://github.com/riboseinc/metanorma-iso/blob/master/docs/quickstart.adoc[Quickstart guide]
+gives a summary overview.
+
+NOTE: http://asciimath.org[AsciiMathML] is used for mathematical formatting.
+The gem uses the https://github.com/asciidoctor/asciimath[Ruby AsciiMath parser],
+which is syntactically stricter than the common MathJax processor;
+if you do not get expected results, try bracketting terms your in AsciiMathML
+expressions.
+
+=== Installation
+
+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:
+
+[source,console]
+----
+$ bash <(curl -s https://raw.githubusercontent.com/riboseinc/metanorma-macos-setup/master/metanorma-setup)
+$ gem install metanorma-standoc
+$ gem install metanorma-cli 
+----
+
+The metanorma-cli gem is the command-line interface for the Metanorma tool suite
+(incorporating the `metanorma` executable seen above).
+
+== Approach
+=== Document model
+
+The https://github.com/riboseinc/metanorma-model-iso[Metanorma document model] used in document generation
+intends to introduce rigour into the standards authoring process; existing 
+document templates do not support such rigour down to the element level. It also introduces
+flexibility by decoupling the document structure from its presentation.
+
+Formal definitions of standards prescribe the contents of standards to a level
+amenable to an explicit document model. The ISO International Standard format,
+ss prescribed in
+http://www.iec.ch/members_experts/refdocs/iec/isoiecdir-2%7Bed7.0%7Den.pdf[ISO/IEC DIR 2 "Principles and rules for the structure and drafting of ISO and IEC documents"],
+is one of the more detailed such prescriptions available. A formal document
+model would allow checking for consistency in format and content, and expedite
+authoring and quality control of ISO standards. Authoring standards through a
+more abstract formal model also permit enhanced functionality such as  
+cross-reference link checking and auto-numbering of sections, figures, tables and formulas.
+Outputting a document in different languages also becomes straightforward.
+
+=== Asciidoctor
+
+Asciidoctor has been selected as the authoring tool to generate the document
+model representation of standards. It is a document formatting tool like
+Markdown and DocBook, which combines the relative ease of use of the former
+(using relatively lightweight markup), and the rigour and expressively of the
+latter (it has a well-defined syntax, and was in fact initially developed as a
+DocBook document authoring tool). Asciidoctor has built-in capability to output
+Text and HTML; so it can be used to preview the file as it is being
+authored. However the gem natively outputs HTML and Word output, so there should
+not be much need for this.
+
+Asciidoctor has some formatting constraints because of its own document model,
+that users need to be aware. For example, Asciidoc has a strict division between
+inline and block elements, which disallows certain kinds of nesting; so a list
+cannot be embedded within a paragraph, it can only constitute its own paragraph
+(though lists themselves can be nested within each other). Asciidoctor also disallows
+multiple paragraphs in footnotes, 
+http://discuss.asciidoctor.org/footnotes-with-paragraph-breaks-td4130.html[by design].
+(The document model does not impose this constraint, so you could edit the generated
+XML to break up paragraphs within a footnote.)
+
+== Different behaviour from native Asciidoctor
+
+=== Autonumbering
+
+Autonumbering in Metanorma extends to formulas (which are encoded as "stem" blocks) and notes.
+Autonumbering is applied in the conversion from Metanorma XML to output formats (`isodoc`);
+by default it restarts for each annex, but is continuous for the main body of text.
+
+=== Unsupported blocks
+
+Sidebars (`aside`) are not supported, and have been repurposed for reviewer comments.
+Page breaks (`thematic break`) are not supported; ASCII art/preformatted text (`literal`)
+are not supported in most standards classes.
+
+=== Footnotes
+
+Table and figure footnotes are treated diffferently from all other footnotes: they are
+rendered at the bottom of the table or figure, and they are numbered separately.
+
+=== References
+
+References to well-defined standards codes use the document identifiers for citations
+(e.g. `ISO 20483:2013`); generic references in bibliographies use bracketed numbers `[1]`.
+
 [[model_additions]]
 == Asciidoctor model additions
 
@@ -61,8 +171,8 @@ _paddy_ (<<paddy>>) from which the husk only has been removed
 If the Terms and Definitions of a standard are partly or fully sourced from
 another standard, that standard is cited in a `source` attribute to the section,
 which is set to the reference anchor of the standard (given under the Normative
-Referencecs)..
-The boilerplate of the Terms and Definitions section is adjusted accordingly.
+Referencecs).
+Any boilerplate of the Terms and Definitions section is adjusted accordingly.
 
 [source,asciidoctor]
 --
@@ -358,3 +468,206 @@ command line:
 If PlantUML is not installed locally, the source PlantUML is incorporated into
 the output document as sourcecode. 
 
+== Bibliography integration
+
+Bibliographic entries for standards are expected to use the standard document
+identifier as the item label; e.g.
+
+[source,asciidoctor]
+--
+* [[[ref1,ISO 712]]], _Cereals and cereal products -- Determination of moisture content -- Reference method_
+--
+
+By default, the https://github.com/riboseinc/relaton[`relaton`] gem is used to look up the reference details for
+standards known to have online bibliographies. For bibliographic standards to be looked up via relaton,
+the standard document identifier needs to be encoded in a format recognised by relaton as a key:
+
+* For ISO: `ISO(identifier)`, or any identifier prefixed with `ISO`
+* For IEC: `IEC(identifier)`, or any identifier prefixed with `IEC`
+* For IETF: `IETF(identifier)` (e.g. `IETF(I-D.-burger-xcon-mmodels)`), or any identifier prefixed with `RFC`
+* For GB: `CN(identifier)` (e.g. `CN(JB/T 13368-2018)`)
+
+The full bibliographic details of the item are screenscraped from the online bibliography and inserted into the XML file 
+(although only the title of the reference is used in rendering).
+
+In addition, if any entries in Terms and Definitions cite the International Electrotechnical Vocabulary (IEV),
+the http://www.electropedia.org[IEV Electropedia] termbank is queried during validation, to confirm
+that the cited entries are the same as what is cited online; those queries are routed through the `iev` gem
+
+TODO: update
+
+[[cache]]
+The results of all `relaton` searches done to date, across all documents,
+are cached in the global cache file `~/.relaton-bib.pstore`,  
+so they do not need to be re-fetched each time a document is processed.
+(The web query takes a few seconds per reference.)
+
+The results of all `relaton` searches done to date in a given directory
+are stored in the same directory as the current document,
+as the file `{filename}.relaton.pstore`. The local cache overrides entries in
+the global cache, and can be manually edited. The local cache is only used
+if the `:local-cache:` or `:local-cache-only:` document attribute is set.
+
+If the document attribute `:no-isobib:` is set, the reference details for
+items are not looked up via `isobib`, and the `isobib` caches are not used.
+If the document attribute `:no-isobib-cache:` is set, the reference details for
+items are still looked up via `isobib`, but the `isobib` caches are not used.
+
+Any entry in the cache that corresponds to an undated ISO reference fetches its details
+from the latest available entry on the ISO web site. If the entry is more than 60
+days old, it is refetched.
+
+The results of all `iev` searches done to date across all documents are cached
+in the global cache fule `~/iev.pstore`, and the results of all `iev` searches
+done to date for the current document are stored in the same directory as the
+current document, in the file `(filename).iev.pstore`.
+
+== Document Attributes
+
+The gem relies on Asciidoctor document attributes to provide necessary
+metadata about the document. These include:
+
+`:nodoc:`:: Do not generate Word and HTML output, only generate XML output.
+Can be used as a command-line option (like all other document attributes):
+`asciidoctor -a nodoc -b iso -r "metanorma-iso" a.adoc`
+
+`:novalid:`:: Suppress validation.
+
+`:flush-caches:`:: If set, delete and reinitialise the <<cache,cache>> of `relaton` searches.
+
+`:no-isobib:`:: If set, do not use the `relaton` or `iev` gem functionality to look up
+ISO and IEV references online, nor the <<cache,cache>> of `relaton` and `iev` searches.
+
+`:no-isobib-cache:`:: If set, use the `relaton` and `iev` gem functionality to look up
+ISO and IEV references online, but do not use the <<cache,cache>> of `relaton` and `iev` searches.
+
+`:local-cache:`:: Use the local relaton and iev search caches to override the global `relaton` and `iev` search
+caches.
+
+`:local-cache-only:`:: Use the local relaton and iev search caches to the exclusion of the global `relaton` and `iev` search
+caches.
+
+`:i18nyaml:`:: Name of YAML file of internationalisation text, to use instead
+of the built-in English, French or Chinese text used to label parts of the document
+(e.g. "Table", "Foreword", boilerplate text for Normative References, etc.)
+Use if you wish to output an standard in a language other than those three.
+A sample YAML file for English, with "Foreword" replaced with "Frontispiece",
+is available at https://github.com/riboseinc/metanorma-iso/blob/master/spec/examples/english.yaml[]
+
+`:docnumber:`:: The numeric component of the document identifier (mandatory). The full identifier is formed by prefixing and suffixing this element with other strings derived from metadata.
+
+`:edition:`:: The document edition
+
+`:revdate:`:: The date the document was last updated
+
+`:copyright-year:`:: The year which will be claimed as when the copyright for
+the document was issued
+
+`:library-ics:` :: The ICS (International Categorization for Standards) number for the standard. There may be more than one ICS for a document; if so, they should be comma-delimited. (The ics identifier is added to the document metadata, but is not output to the current document templates.)
+
+`:title:` :: The title of the document
+
+`:doctype:`:: The document type; e.g. "standard", "guide", "report".
+
+`:status:` :: The status of the document; e.g. "draft", "published".
+
+`:technical-committee:`:: The name of the relevant technical committee
+
+`:draft:`:: The document draft (used in addition to document stage, for multiple iterations: expected format _X.Y_)
+
+`:issued-date:`::
+The date on which the standard was issued (authorised for publication by the issuing authority).
+
+`:published-date:`::
+The date on which the standard was published (distributed by the publisher).
+
+`:implemented-date:`::
+The date on which the standard became active.
+
+`:created-date:`::
+The date on which the first version of the standard was created.
+
+`:updated-date:`::
+The date on which the current version of the standard was updated.
+
+`:obsoleted-date:`::
+The date on which the standard was obsoleted/revoked.
+
+`:confirmed-date:`::
+The date on which the standard was reviewed and approved by the issuing authority.
+
+`:unchanged-date:`::
+The date on which the standard was last renewed without any changes in content.
+
+`:circulated-date:`::
+The date on which the unpublished standard was last circulated officially as a preprint. For standards, this is associated with the latest transition to a formally defined preparation stage, such as Working Draft or Committee Draft.
+
+`:date:`::
+An arbitrary date in the production of the standard. Content of the attribute should be a token, giving the type of date, then space, then the date itself. Multiple dates can be added as `:date_2:`, `date_3`, etc.
+
+`:uri:`:: The URI to which this standard is published.
+`:xml-uri:`:: The URI to which the (Metanorma) XML representation of this standard is published.
+`:html-uri:`:: The URI to which the HTML representation of this standard is published.
+`:pdf-uri:`:: The URI to which the PDF representation of this standard is published.
+`:doc-uri:`:: The URI to which the DOC representation of this standard is published.
+`:relaton-uri:`:: The URI to which the Relaton XML representation of this standard is published.
+
+`:language:` :: The language of the document (`en` or `fr`). Defaults to `en`.
+
+`:script:` :: The script of the document (defaults to `Latn`). Must be supplied as
+`Hans` for Simplified Chinese.
+
+`:publisher:`:: The standards agency publishing the standard; can be multiple
+(comma-delimited). Defaults to `ISO`.
+
+`:body-font:`:: Font for body text; will be inserted into CSS. Defaults to
+Cambria for Latin script, SimSun for Simplified Chinese.
+
+`:header-font:`:: Font for headers; will be inserted into CSS. Defaults to
+Cambria for Latin script, SimHei for Simplified Chinese.
+
+`:monospace-font`:: Font for monospace; will be inserted into CSS. Defaults to
+Courier New.
+
+`:htmlstylesheet`:: SCSS stylesheet to use for HTML output. Defaults to built in stylesheet,
+which adheres with ISO formatting requirements. Recommend against overriding this.
+
+`:htmlcoverpage`:: HTML template for cover page. Defaults to built in template. Recommend against overriding this.
+
+`:htmlintropage`:: HTML template for introductory section. Defaults to built in template. Recommend against overriding this.
+
+`:scripts`:: Javascript scripts for HTML output. Defaults to built in scripts. Recommend against overriding this.
+`:scripts-pdf`:: Javascript scripts for HTML > PDF output. Defaults to built in scripts. Recommend against overriding this.
+
+`:wordstylesheet`:: Primary SCSS stylesheet to use for Word output. Defaults to built in stylesheet,
+which adheres with ISO formatting requirements. Recommend against overriding this.
+
+`:standardstylesheet`:: Secondary SCSS stylesheet use for Word output. Defaults to built in stylesheet,
+which adheres with ISO formatting requirements. Recommend against overriding this.
+
+`:header`:: Header and footer file for Word output. Defaults to built in template. Recommend against overriding this.
+
+`:wordcoverpage`:: Word template for cover page. Defaults to built in template. Recommend against overriding this.
+
+`:wordintropage`:: Word template for introductory section. Defaults to built in template. Recommend against overriding this.
+
+`:ulstyle`:: Word CSS selector for unordered lists in supplied stylesheets. Defaults to value for built in stylesheet. Recommend against overriding this.
+
+`:olstyle`:: Word CSS selector for ordered lists in supplied stylesheets. Defaults to value for built in stylesheet. Recommend against overriding this.
+
+`:data-uri-image`:: Encode all images in HTML output as inline data-URIs.
+
+The attribute `:draft:`, if present, includes review notes in the XML output;
+these are otherwise suppressed.
+
+The document proper can reference the values of document attributes, which is convenient
+for reusability. For example,
+
+[source,asciidoc]
+--
+This document was prepared by Technical Committee ISO/TC {technical-committee-number}, _{technical-committee}_, Subcommittee SC {subcommittee-number}, _{subcommittee}_.
+--
+
+If the corresponding document attributes are not populated in the header, then the references
+themselves will not be populated.
+

data/lib/asciidoctor/standoc/biblio.rng

@@ -476,6 +476,9 @@
     <zeroOrMore>
       <ref name="docidentifier"/>
     </zeroOrMore>
+    <optional>
+      <ref name="docnumber"/>
+    </optional>
     <zeroOrMore>
       <ref name="bdate"/>
     </zeroOrMore>
@@ -637,6 +640,8 @@
           <value>transmitted</value>
           <value>copied</value>
           <value>unchanged</value>
+          <value>circulated</value>
+          <text/>
         </choice>
       </attribute>
       <choice>
@@ -673,6 +678,11 @@
       <text/>
     </element>
   </define>
+  <define name="docnumber">
+    <element name="docnumber">
+      <text/>
+    </element>
+  </define>
   <define name="bclassification">
     <element name="classification">
       <optional>

data/lib/asciidoctor/standoc/cleanup.rb

@@ -43,25 +43,13 @@ module Asciidoctor
         xmldoc
       end
 
-      # ISO as a prefix goes first
       def docidentifier_cleanup(xmldoc)
-        id = xmldoc.at("//bibdata/docidentifier/project-number")
-        return unless id
-
-        prefix = []
-        xmldoc.xpath("//bibdata/contributor[role/@type = 'publisher']"\
-                     "/organization").each do |x|
-          x1 = x.at("abbreviation")&.text || x.at("name")&.text
-          x1 == "ISO" and prefix.unshift("ISO") or prefix << x1
-        end
-
-        id.content = prefix.join("/") + " " + id.text
       end
 
       TEXT_ELEMS =
-        %w{status language script version author name callout phone
-           email street city state country postcode identifier referenceFrom
-           referenceTo docidentifier prefix initial addition surname forename
+        %w{status language script version author name callout phone email 
+           street city state country postcode identifier referenceFrom
+           referenceTo docidentifier docnumber prefix initial addition surname forename
            title draft secretariat title-main title-intro title-part}.freeze
 
       # it seems Nokogiri::XML is treating the content of <script> as cdata,

data/lib/asciidoctor/standoc/cleanup_ref.rb

@@ -102,16 +102,6 @@ module Asciidoctor
         "name = 'International Organization for Standardization' or "\
         "name = 'International Electrotechnical Commission']".freeze
 
-      def date_range(date)
-        from = date.at("./from")
-        to = date.at("./to")
-        on = date.at("./on")
-        return on.text if on
-        ret = "#{from.text}–"
-        ret += to.text if to
-        ret
-      end
-
       def reference_names(xmldoc)
         xmldoc.xpath("//bibitem[not(ancestor::bibitem)]").each do |ref|
           isopub = ref.at(ISO_PUBLISHER_XPATH)

data/lib/asciidoctor/standoc/front.rb

@@ -11,10 +11,11 @@ module Asciidoctor
     module Front
       def metadata_id(node, xml)
         part, subpart = node&.attr("partnumber")&.split(/-/)
-        xml.docidentifier do |i|
-          i.project_number node.attr("docnumber"),
-            **attr_code(part: part, subpart: subpart)
-        end
+        id = node.attr("docnumber") || ""
+        id += "-#{part}" if part
+        id += "-#{subpart}" if subpart
+        xml.docidentifier id
+        xml.docnumber node.attr("docnumber")
       end
 
       def metadata_version(node, xml)
@@ -104,10 +105,34 @@ module Asciidoctor
         node.attr("relaton-uri") && xml.source(node.attr("relaton-uri"), type: "relaton")
       end
 
+      def metadata_date1(node, xml, type)
+        date = node.attr("#{type}-date")
+        date and xml.date **{ type: type } do |d|
+          d.on date
+        end
+      end
+
+      DATETYPES = %w{ published accessed created implemented obsoleted
+                      confirmed updated issued circulated unchanged
+      }.freeze
+
+      def metadata_date(node, xml)
+        DATETYPES.each { |t| metadata_date1(node, xml, t) }
+        node.attributes.keys.each do |a|
+          next unless a == "date" || /^date_\d+$/.match(a)
+          type, date = node.attr(a).split(/ /, 2)
+          type or next
+          xml.date **{ type: type } do |d|
+            d.on date
+          end
+        end
+      end
+
       def metadata(node, xml)
         title node, xml
         metadata_source(node, xml)
         metadata_id(node, xml)
+        metadata_date(node, xml)
         metadata_author(node, xml)
         metadata_publisher(node, xml)
         xml.language (node.attr("language") || "en")

data/lib/asciidoctor/standoc/isodoc.rng

@@ -1034,6 +1034,9 @@
     <zeroOrMore>
       <ref name="docidentifier"/>
     </zeroOrMore>
+    <optional>
+      <ref name="docnumber"/>
+    </optional>
     <zeroOrMore>
       <ref name="bdate"/>
     </zeroOrMore>

data/lib/metanorma/standoc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Standoc
-    VERSION = "1.0.8".freeze
+    VERSION = "1.0.9".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -43,7 +43,7 @@ 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", "~> 0.2.6"
+  spec.add_development_dependency "metanorma", "~> 0.3.0"
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 end

data/spec/asciidoctor-standoc/base_spec.rb

@@ -43,6 +43,18 @@ RSpec.describe Asciidoctor::Standoc do
       :partnumber: 1
       :edition: 2
       :revdate: 2000-01-01
+      :published-date: 1000-01-01
+      :accessed-date: 1001-01-01
+      :created-date: 1002-01-01
+      :implemented-date: 1003-01-01
+      :obsoleted-date: 1004-01-01
+      :confirmed-date: 1005-01-01
+      :updated-date: 1006-01-01
+      :issued-date: 1007-01-01
+      :circulated-date: 1008-01-01
+      :unchanged-date: 1009-01-01
+      :date: Fred 1010-01-01
+      :date_2: Jack 1010-01-01
       :draft: 3.4
       :technical-committee: TC
       :technical-committee-number: 1
@@ -75,9 +87,44 @@ RSpec.describe Asciidoctor::Standoc do
 <standard-document xmlns="http://riboseinc.com/isoxml">
 <bibdata type="article">
 <title language="en" format="text/plain">Main Title — Title</title>
-  <docidentifier>
-    <project-number part="1"> 1000</project-number>
-  </docidentifier>
+  <docidentifier>1000-1</docidentifier>
+  <docnumber>1000</docnumber>
+  <date type="published">
+  <on>1000-01-01</on>
+</date>
+<date type="accessed">
+  <on>1001-01-01</on>
+</date>
+<date type="created">
+  <on>1002-01-01</on>
+</date>
+<date type="implemented">
+  <on>1003-01-01</on>
+</date>
+<date type="obsoleted">
+  <on>1004-01-01</on>
+</date>
+<date type="confirmed">
+  <on>1005-01-01</on>
+</date>
+<date type="updated">
+  <on>1006-01-01</on>
+</date>
+<date type="issued">
+  <on>1007-01-01</on>
+</date>
+<date type="circulated">
+  <on>1008-01-01</on>
+</date>
+<date type="unchanged">
+  <on>1009-01-01</on>
+</date>
+<date type="Fred">
+  <on>1010-01-01</on>
+</date>
+<date type="Jack">
+  <on>1010-01-01</on>
+</date>
   <language>en</language>
   <script>Latn</script>
   <status format="plain">published</status>
@@ -136,9 +183,8 @@ RSpec.describe Asciidoctor::Standoc do
          <source type="pdf">D</source>
          <source type="doc">E</source>
          <source type="relaton">F</source>
-         <docidentifier>
-           <project-number part="1" subpart="1">ISO/IEC/IETF 1000</project-number>
-         </docidentifier>
+         <docidentifier>1000-1-1</docidentifier>
+         <docnumber>1000</docnumber>
          <contributor>
            <role type="author"/>
            <organization>
@@ -271,12 +317,12 @@ RSpec.describe Asciidoctor::Standoc do
     expect(html).to match(%r[h1[^{]+\{[^{]+font-family: Comic Sans;]m)
     expect(html).to match(%r[an empty word cover page])
     expect(html).to match(%r[an empty word intro page])
-    expect(html).to match(%r[Content-Location: file:///C:/Doc/test_files/header.html
+    expect(html).to include(%[Content-Location: file:///C:/Doc/test_files/header.html
 Content-Transfer-Encoding: base64
 Content-Type: text/html charset="utf-8"
 
-Ci8qIGFuIGVtcHR5IGhlYWRlciAqLwoKU1RBUlQgRE9DIElEOiAgOiBFTkQgRE9DIElECgpGSUxF
-TkFNRTogdGVzdAoK
+Ci8qIGFuIGVtcHR5IGhlYWRlciAqLwoKU1RBUlQgRE9DIElEOiA6IEVORCBET0MgSUQKCkZJTEVO
+QU1FOiB0ZXN0Cgo=
 ])
   end
 

data/spec/asciidoctor-standoc/refs_spec.rb

@@ -512,9 +512,6 @@ RSpec.describe Asciidoctor::Standoc do
       <?xml version="1.0" encoding="UTF-8"?>
       <standard-document xmlns="http://riboseinc.com/isoxml">
       <bibdata type="article">
-        <docidentifier>
-          <project-number> </project-number>
-        </docidentifier>
         <language>en</language>
         <script>Latn</script>
         <status format="plain">published</status>

data/spec/spec_helper.rb

@@ -106,9 +106,6 @@ BLANK_HDR = <<~"HDR"
 <?xml version="1.0" encoding="UTF-8"?>
 <standard-document xmlns="http://riboseinc.com/isoxml">
 <bibdata type="article">
-  <docidentifier>
-    <project-number> </project-number>
-  </docidentifier>
   <language>en</language>
   <script>Latn</script>
   <status format="plain">published</status>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-26 00:00:00.000000000 Z
+date: 2018-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -240,14 +240,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement