asciidoctor-rsd 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2723df1c0ac9bb06a222642149ea3d90dbf267638b0782e3368982ef5ca81598
-  data.tar.gz: e75ebd707565d73372c8feabc3d0840f2d7bbf9c5dc7a73e7add5afba800bfce
+  metadata.gz: e526a0019eca20c9c067e73648cc475bc832be4b28236e8eb44d5b4db09c3943
+  data.tar.gz: 34fd9a52e1c5fa4cb258e268fd70b3689e77292393d0058fd4bb788d67316ca8
 SHA512:
-  metadata.gz: 8f513ee8972d8d48d2076b3555236aaa570cc12705ac693d6e9d6f72b05b95397fbc155672887567aaba44bfc96be57fd17e2423c00040ac9e5ad4fb601d42a5
-  data.tar.gz: 9b72a04b926ba90fafc6fb88c41a0c6fdb6dafa838139c0eb785c067cb95134e0071b44b53b64a2394143f35cd9253710a40b49fd01e6740d74a8df57dad54fe
+  metadata.gz: b54fca6af0a03b5975faf337cc8cc865c859229b9d3444774f36d92c198da12cf1904c38967d34e742bc4134402223a3872b48a9ae87e647dda901cda2ddef25
+  data.tar.gz: 7307404bd340d97a68687721bcc79f3e9579e9f29a0d660adca957da48d49c9b570afb8c5aafcac78c1d25f70e431277d29acabcf9db1b7a7b0456783fa519b7

data/Gemfile.lock

@@ -1,12 +1,12 @@
 GIT
   remote: https://github.com/riboseinc/asciidoctor-iso
-  revision: 1a28d27a2ea737a42ba1f01501bb11ff41b4551e
+  revision: 817ec3dc9345b85e3464bb9e4385562dbcdd9e9f
   specs:
-    asciidoctor-iso (0.9.0)
+    asciidoctor-iso (0.9.5)
       asciidoctor (~> 1.5.7)
-      iso-bib-item (~> 0.1.6)
-      isobib (~> 0.1.6)
+      iev (~> 0.1.0)
       isodoc (>= 0.8)
+      relaton (~> 0.0.1)
       ruby-jing
 
 GIT
@@ -25,9 +25,9 @@ GIT
 
 GIT
   remote: https://github.com/riboseinc/isodoc
-  revision: 601c1870fea386cb54fd8b2f112f680f71bd58a3
+  revision: adf9e4abfe0a9d0270b271bcadb075fc577b7a78
   specs:
-    isodoc (0.8)
+    isodoc (0.8.1)
       asciimath
       html2doc (>= 0.7.1)
       htmlentities (~> 4.3.4)
@@ -44,7 +44,7 @@ GIT
 PATH
   remote: .
   specs:
-    asciidoctor-rsd (0.3.0)
+    asciidoctor-rsd (0.3.2)
       asciidoctor (~> 1.5.7)
       asciidoctor-iso (>= 0.8.0)
       asciimath
@@ -65,9 +65,52 @@ GEM
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     asciidoctor (1.5.7.1)
+    asciidoctor-csand (0.3.1)
+      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.2)
+      asciidoctor-iso (>= 0.9.0)
+      isodoc (>= 0.8.0)
+    asciidoctor-gb (0.3.2)
+      asciidoctor-iso (>= 0.9.0)
+      gbbib
+      isodoc (>= 0.8.0)
+      twitter_cldr
+    asciidoctor-m3d (0.3.2)
+      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-rfc (0.9.0)
+      asciidoctor (~> 1.5.7)
+      htmlentities (~> 4.3.4)
+      nokogiri
+      ruby-jing
+      thread_safe
     asciimath (1.0.4)
     ast (2.4.0)
     byebug (9.1.0)
+    camertron-eprun (1.1.1)
+    cldr-plurals-runtime-rb (1.0.1)
+    cnccs (0.1.1)
     coderay (1.1.2)
     diff-lcs (1.3)
     docile (1.3.1)
@@ -76,6 +119,9 @@ GEM
       nokogiri (>= 1.4.3)
     ffi (1.9.25)
     formatador (0.2.5)
+    gbbib (0.1.4)
+      cnccs
+      iso-bib-item
     guard (2.14.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -92,14 +138,16 @@ GEM
       rspec (>= 2.99.0, < 4.0)
     htmlentities (4.3.4)
     httpclient (2.8.3)
+    iev (0.1.0)
+      nokogiri
     image_size (2.0.0)
-    iso-bib-item (0.1.6)
-      duplicate
+    iso-bib-item (0.1.10)
+      duplicate (~> 1.1.1)
       isoics (~> 0.1.6)
       nokogiri
-    isobib (0.1.6)
+    isobib (0.1.9)
       algoliasearch
-      iso-bib-item (~> 0.1.2)
+      iso-bib-item (~> 0.1.10)
     isoics (0.1.6)
     jaro_winkler (1.5.1)
     json (2.1.0)
@@ -109,13 +157,22 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
+    metanorma (0.2.5)
+      asciidoctor-csand (>= 0.3.0)
+      asciidoctor-csd (>= 0.4.0)
+      asciidoctor-gb (>= 0.3.0)
+      asciidoctor-iso (>= 0.9.1)
+      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)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.3.0)
     nenv (0.3.0)
-    nokogiri (1.8.3)
+    nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
@@ -133,6 +190,15 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
+    relaton (0.0.1)
+      asciidoctor (~> 1.5.7)
+      gbbib (~> 0.1.0)
+      iev (~> 0.1.0)
+      iso-bib-item (~> 0.1.6)
+      isobib (~> 0.1.8)
+      rfcbib (~> 0.1.0)
+    rfcbib (0.1.1)
+      iso-bib-item (~> 0.1.10)
     roman-numerals (0.3.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
@@ -174,6 +240,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 +262,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 RSD standard drafts.
-** Microsoft Word output (`.doc`), following the style conventions of the
-https://www.rsd.org/rsd-templates.html[RSD Standard Microsoft Word template].
-(In development)
-** PDF (forthcoming)
-** HTML (forthcoming)
+** DOC
+** HTML
 
 This AsciiDoc syntax for writing RSD standards is hereby named "AsciiRSD".
 
 == 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 rsd -r 'asciidoctor-rsd' a.adoc  # RSD XML output
+$ metanorma --type rsd a.adoc                   # output HTML and DOC
+$ metanorma --type rsd --extensions html a.adoc # output just HTML
+$ metanorma --type rsd --extensions doc a.adoc  # output just DOC
+$ metanorma --type rsd --extensions xml a.adoc  # output RSD XML
 ----
 
 The gem translates the document into RSD 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/rsd/rsd2wordhtml.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 RSD 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 rsd -r 'asciidoctor-rsd' a.adoc  
+----
 
-* 5 levels of subclause nesting. (Never actuated, AsciiDoc only permits 4
-levels of subsections.)
+=== Installation
 
-* Non-RSD/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-rsd
+----
 
-* Title intro or title part appears in only one of French or English.
 
 == Approach
 
@@ -119,102 +108,6 @@ recognised by fixed titles such as `Normative References`). Authoring RSD
 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 RSD 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 RSD 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 RSD Standards; these will be ignored in
-generating RSD 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 rsdlation, 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 RSD documents are cited
-without brackets by RSD number, and optionally year, whether they are normative
-or in the bibliography (e.g. `RSD 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. `[RSD
-20483:2013]`). For the same reason, RSD references listed in the bibliography
-will be listed under an RSD 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 RSD reference, these need to be explicitly listed as
-separate references. (This is not done in the Rice model document, which lists
-RSD 6646, but under _Terms and Definitions_ cites the dated RSD 6646:2011.
-
-* _References_: RSD references that are undated but published have their date
-indicated under the RSD 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
@@ -235,19 +128,23 @@ introduced with `=`, is ignored)
 RSD publications) (mandatory). The permitted types are:
 +
 --
-code:: Code Artifact
-presentation:: Presentation
-proposal:: Proposal; includes IETF DRAFT
-standard:: Recommendation; includes IETF RFC
-report:: report
+* policy-and-procedures
+* best-practices
+* supporting-document
+* report
+* legal
+* directives
+* proposal
+* standard
 --
 
 `:status:``:: The document status. The permitted types are: `proposal`,
 `working-draft`, `committee-draft`, `draft-standard`, `final-draft`,
 `published`, `withdrawn`.
 
-`:technical-committee:`:: The name of the relevant RSD technical committee
-(mandatory)
+`:committee:`:: The name of the relevant RSD committee (mandatory)
+`:committee-type:`:: The type of the relevant RSD committee (mandatory): `technical`
+or `provisional`.
 
 `:language:` :: The language of the document (only `en` for now)  (mandatory)
 

data/asciidoctor-rsd.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   DESCRIPTION
 
   spec.homepage      = "https://github.com/riboseinc/asciidoctor-rsd"
-  spec.license       = "MIT"
+  spec.license       = "BSD-2-Clause"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -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/rsd/biblio.rng

@@ -37,7 +37,7 @@
   <define name="edition">
     <a:documentation>ISO-15924: Latn</a:documentation>
     <element name="edition">
-      <data type="int"/>
+      <text/>
     </element>
   </define>
   <define name="LocalizedString">
@@ -102,9 +102,12 @@
         <attribute name="type">
           <choice>
             <value>author</value>
-            <value>edition</value>
+            <value>performer</value>
             <value>publisher</value>
-            <text/>
+            <value>editor</value>
+            <value>adapter</value>
+            <value>translator</value>
+            <value>distributor</value>
           </choice>
         </attribute>
       </optional>
@@ -145,18 +148,26 @@
   </define>
   <define name="fullname">
     <element name="name">
+      <choice>
+        <group>
+          <zeroOrMore>
+            <ref name="prefix"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="forename"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="initial"/>
+          </zeroOrMore>
+          <ref name="surname"/>
+          <zeroOrMore>
+            <ref name="addition"/>
+          </zeroOrMore>
+        </group>
+        <ref name="completeName"/>
+      </choice>
       <zeroOrMore>
-        <ref name="prefix"/>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="forename"/>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="initial"/>
-      </zeroOrMore>
-      <ref name="surname"/>
-      <zeroOrMore>
-        <ref name="addition"/>
+        <ref name="biblionote"/>
       </zeroOrMore>
     </element>
   </define>
@@ -185,6 +196,11 @@
       <ref name="LocalizedString"/>
     </element>
   </define>
+  <define name="completeName">
+    <element name="completename">
+      <ref name="LocalizedString"/>
+    </element>
+  </define>
   <define name="affiliation">
     <element name="affiliation">
       <optional>
@@ -209,6 +225,9 @@
   <define name="organization">
     <element name="organization">
       <ref name="orgname"/>
+      <optional>
+        <ref name="subdivision"/>
+      </optional>
       <optional>
         <ref name="abbreviation"/>
       </optional>
@@ -228,6 +247,11 @@
       <ref name="LocalizedString"/>
     </element>
   </define>
+  <define name="subdivision">
+    <element name="subdivision">
+      <ref name="LocalizedString"/>
+    </element>
+  </define>
   <define name="abbreviation">
     <element name="abbreviation">
       <ref name="LocalizedString"/>
@@ -346,19 +370,21 @@
   </define>
   <define name="locality">
     <element name="locality">
-      <!-- attribute type { ( "section" | "clause" | "part" | "paragraph" | "chapter" | "page" | "whole" | "table" | "annex" | "figure" | "note" | "example" | ("locality:", text) ) }, -->
-      <attribute name="type">
-        <ref name="LocalityType"/>
-      </attribute>
-      <ref name="referenceFrom"/>
-      <optional>
-        <ref name="referenceTo"/>
-      </optional>
+      <ref name="BibItemLocality"/>
     </element>
   </define>
+  <define name="BibItemLocality">
+    <attribute name="type">
+      <ref name="LocalityType"/>
+    </attribute>
+    <ref name="referenceFrom"/>
+    <optional>
+      <ref name="referenceTo"/>
+    </optional>
+  </define>
   <define name="LocalityType">
     <data type="string">
-      <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|example|locality:[a-zA-Z0-9_]+</param>
+      <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|example|volume|issue|locality:[a-zA-Z0-9_]+</param>
     </data>
   </define>
   <define name="referenceFrom">
@@ -398,6 +424,18 @@
       <value>techreport</value>
       <value>standard</value>
       <value>unpublished</value>
+      <value>map</value>
+      <value>electronic resource</value>
+      <value>audiovisual</value>
+      <value>film</value>
+      <value>video</value>
+      <value>broadcast</value>
+      <value>graphic work</value>
+      <value>music</value>
+      <value>patent</value>
+      <value>inbook</value>
+      <value>incollection</value>
+      <value>inproceedings</value>
     </choice>
   </define>
   <define name="BibliographicItem">
@@ -442,20 +480,41 @@
     <optional>
       <ref name="status"/>
     </optional>
-    <zeroOrMore>
+    <optional>
       <ref name="copyright"/>
-    </zeroOrMore>
+    </optional>
     <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>
   </define>
   <define name="btitle">
     <element name="title">
-      <ref name="FormattedString"/>
+      <ref name="TypedTitleString"/>
     </element>
   </define>
   <define name="bsource">
-    <element name="source">
+    <element name="uri">
       <ref name="TypedUri"/>
     </element>
   </define>
@@ -464,17 +523,68 @@
       <ref name="FormattedString"/>
     </element>
   </define>
-  <define name="link">
-    <element name="link">
-      <ref name="TypedUri"/>
+  <define name="validity">
+    <element name="validity">
+      <optional>
+        <ref name="validityBegins"/>
+      </optional>
+      <optional>
+        <ref name="validityEnds"/>
+      </optional>
+      <optional>
+        <ref name="validityRevision"/>
+      </optional>
+    </element>
+  </define>
+  <define name="validityBegins">
+    <element name="validityBegins">
+      <data type="dateTime"/>
+    </element>
+  </define>
+  <define name="validityEnds">
+    <element name="validityEnds">
+      <data type="dateTime"/>
     </element>
   </define>
+  <define name="validityRevision">
+    <element name="revision">
+      <data type="dateTime"/>
+    </element>
+  </define>
+  <define name="TypedTitleString">
+    <optional>
+      <attribute name="type">
+        <ref name="TitleType"/>
+      </attribute>
+    </optional>
+    <ref name="FormattedString"/>
+  </define>
+  <define name="TitleType">
+    <choice>
+      <value>alternative</value>
+      <value>original</value>
+      <value>unofficial</value>
+      <value>subtitle</value>
+      <value>main</value>
+    </choice>
+  </define>
   <define name="TypedUri">
     <optional>
       <attribute name="type"/>
     </optional>
     <data type="anyURI"/>
   </define>
+  <define name="DateType">
+    <optional>
+      <attribute name="text"/>
+    </optional>
+    <optional>
+      <choice>
+        <data type="gYear"/>
+        <data type="date"/>
+      </choice>
+    </optional>
+  </define>
   <define name="bdate">
     <element name="date">
       <attribute name="type">
@@ -487,9 +597,10 @@
           <value>confirmed</value>
           <value>updated</value>
           <value>issued</value>
+          <value>transmitted</value>
+          <value>copied</value>
         </choice>
       </attribute>
-      <!-- ( ( bfrom, bto? ) | date_on ) -->
       <choice>
         <group>
           <element name="from">
@@ -516,35 +627,126 @@
       </choice>
     </element>
   </define>
-  <define name="bfrom">
-    <element name="from">
+  <define name="docidentifier">
+    <element name="docidentifier">
+      <optional>
+        <attribute name="type"/>
+      </optional>
+      <text/>
+    </element>
+  </define>
+  <define name="bclassification">
+    <element name="classification">
+      <optional>
+        <attribute name="type"/>
+      </optional>
+      <text/>
+    </element>
+  </define>
+  <define name="bplace">
+    <element name="place">
+      <text/>
+    </element>
+  </define>
+  <define name="medium">
+    <element name="medium">
+      <optional>
+        <ref name="form"/>
+      </optional>
+      <optional>
+        <ref name="size"/>
+      </optional>
+      <optional>
+        <ref name="scale"/>
+      </optional>
+    </element>
+  </define>
+  <define name="form">
+    <element name="form">
+      <text/>
+    </element>
+  </define>
+  <define name="size">
+    <element name="size">
+      <text/>
+    </element>
+  </define>
+  <define name="scale">
+    <element name="scale">
+      <text/>
+    </element>
+  </define>
+  <define name="accesslocation">
+    <element name="accesslocation">
+      <text/>
+    </element>
+  </define>
+  <define name="extent">
+    <element name="extent">
+      <ref name="BibItemLocality"/>
+    </element>
+  </define>
+  <define name="series">
+    <element name="series">
+      <optional>
+        <attribute name="type">
+          <choice>
+            <value>main</value>
+            <value>alt</value>
+          </choice>
+        </attribute>
+      </optional>
       <choice>
-        <data type="gYear"/>
-        <data type="date"/>
+        <ref name="btitle"/>
+        <ref name="formattedref"/>
       </choice>
+      <ref name="bplace"/>
+      <ref name="seriesorganization"/>
+      <optional>
+        <ref name="abbreviation"/>
+      </optional>
+      <optional>
+        <ref name="seriesfrom"/>
+      </optional>
+      <optional>
+        <ref name="seriesto"/>
+      </optional>
+      <optional>
+        <ref name="seriesnumber"/>
+      </optional>
+      <optional>
+        <ref name="seriespartnumber"/>
+      </optional>
     </element>
   </define>
-  <define name="bto">
-    <element name="to">
+  <define name="seriesorganization">
+    <element name="organization">
+      <text/>
+    </element>
+  </define>
+  <define name="seriesfrom">
+    <element name="from">
       <choice>
+        <data type="dateTime"/>
         <data type="gYear"/>
-        <data type="date"/>
       </choice>
     </element>
   </define>
-  <define name="date_on">
-    <element name="on">
+  <define name="seriesto">
+    <element name="to">
       <choice>
+        <data type="dateTime"/>
         <data type="gYear"/>
-        <data type="date"/>
       </choice>
     </element>
   </define>
-  <define name="docidentifier">
-    <element name="docidentifier">
-      <optional>
-        <attribute name="type"/>
-      </optional>
+  <define name="seriesnumber">
+    <element name="number">
+      <text/>
+    </element>
+  </define>
+  <define name="seriespartnumber">
+    <element name="partnumber">
       <text/>
     </element>
   </define>
@@ -586,17 +788,20 @@
     <element name="relation">
       <attribute name="type">
         <choice>
-          <value>parent</value>
-          <value>child</value>
           <value>obsoletes</value>
           <value>updates</value>
           <value>updatedBy</value>
           <value>complements</value>
           <value>derivedFrom</value>
+          <value>translatedFrom</value>
           <value>adoptedFrom</value>
           <value>equivalent</value>
           <value>identical</value>
           <value>nonequivalent</value>
+          <value>includedIn</value>
+          <value>includes</value>
+          <value>instance</value>
+          <value>partOf</value>
         </choice>
       </attribute>
       <element name="bibitem">

data/lib/asciidoctor/rsd/converter.rb

@@ -34,8 +34,8 @@ module Asciidoctor
 
       def metadata_committee(node, xml)
         xml.editorialgroup do |a|
-          a.technical_committee node.attr("technical-committee"),
-            **attr_code(type: node.attr("technical-committee-type"))
+          a.committee node.attr("committee"),
+            **attr_code(type: node.attr("committee-type"))
         end
       end
 
@@ -86,13 +86,20 @@ module Asciidoctor
 
       def doctype(node)
         d = node.attr("doctype")
-        unless %w{policy best-practices supporting-document report legal directives}.include? d
+        unless %w{policy-and-procedures best-practices supporting-document report legal directives proposal standard}.include? d
           warn "#{d} is not a legal document type: reverting to 'standard'"
           d = "standard"
         end
         d
       end
 
+      def pdf_convert(filename)
+        url = "#{Dir.pwd}/#{filename}.html"
+        pdfjs = File.join(File.dirname(__FILE__), 'pdf.js')
+        system "export NODE_PATH=$(npm root --quiet -g);
+                node #{pdfjs} file://#{url} #{filename}.pdf"
+      end
+
       def document(node)
         init(node)
         ret1 = makexml(node)
@@ -103,6 +110,7 @@ module Asciidoctor
           File.open(filename, "w") { |f| f.write(ret) }
           html_converter(node).convert filename unless node.attr("nodoc")
           word_converter(node).convert filename unless node.attr("nodoc")
+          pdf_convert(filename.sub(/\.xml$/, "")) unless node.attr("nodoc")
         end
         @files_to_delete.each { |f| system "rm #{f}" }
         ret

data/lib/asciidoctor/rsd/isodoc.rng

@@ -998,7 +998,7 @@
       <ref name="formattedref"/>
     </optional>
     <zeroOrMore>
-      <ref name="source"/>
+      <ref name="bsource"/>
     </zeroOrMore>
     <zeroOrMore>
       <ref name="docidentifier"/>

data/lib/asciidoctor/rsd/isostandard.rng

@@ -804,7 +804,7 @@
           <data type="int"/>
         </attribute>
       </optional>
-      <data type="int"/>
+      <text/>
     </element>
   </define>
   <define name="tc-documentnumber">

data/lib/asciidoctor/rsd/pdf.js

@@ -0,0 +1,31 @@
+'use strict';
+
+try {
+    require.resolve("puppeteer");
+} catch(e) {
+    console.error("puppeteer Node library is not installed; will not generate PDF");
+    process.exit(e.code);
+}
+
+const puppeteer = require('puppeteer');
+
+const createPdf = async() => {
+  let browser;
+  try {
+    browser = await puppeteer.launch({args: ['--no-sandbox', '--disable-setuid-sandbox']});
+    const page = await browser.newPage();
+    await page.goto(process.argv[2], {waitUntil: 'networkidle2'});
+    await page.pdf({
+      path: process.argv[3],
+      format: 'A4'
+    });
+  } catch (err) {
+      console.log(err.message);
+  } finally {
+    if (browser) {
+      browser.close();
+    }
+    process.exit();
+  }
+};
+createPdf();

data/lib/asciidoctor/rsd/version.rb

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

data/lib/isodoc/rsd/html/html_rsd_titlepage.html

@@ -20,7 +20,7 @@
     <div class="doc-number">
       <span class="docnumber">{{ docnumber }}</span>
       <span class="docnumber-separator">:</span>
-      <span class="docyear">{{ docyear }}</span>
+      <span class="docyear">{{ docyear }} {{ draftinfo }}</span>
     </div>
 
     <div class="coverpage-title">
@@ -49,6 +49,10 @@
     <span class="coverpage-maturity" id="{{ status | replace: ' ', '-' | downcase }}">{{ status }}</span>
 </div>
 
+{% if doctype == "Policy And Procedures" or doctype == "Proposal" %}
+<div  class="coverpage-stage-block" >{{ revdate }}</div>
+{% endif %}
+
 {% if status != "Published" and status != "Withdrawn" %}
   <div class="coverpage-warning">
     <span class="title">Warning for Drafts</span>

data/lib/isodoc/rsd/html/word_rsd_titlepage.html

@@ -3,8 +3,8 @@ normal'><span lang="EN-GB" style='font-size:14.0pt;mso-no-proof:yes'>{{ docnumbe
 style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt'><o:p></o:p></span></b></p>
 
 <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB"
-style='mso-no-proof:yes'>{{ agency }}&nbsp;</span><span lang="EN-GB"><span
-style='mso-no-proof:yes'>{{ editorialgroup | join: "/" }}</span></p>
+style='mso-no-proof:yes'>Ribose&nbsp;</span><span lang="EN-GB"><span
+style='mso-no-proof:yes'>{{ tc | join: "/" }}</span></p>
 
 <p class="MsoNormal" align="center" style='text-align:center;line-height:18.0pt;margin-bottom:0.0pt'><b
 style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:24.0pt'>{{ doctitle }}</span>
@@ -20,6 +20,11 @@ margin-left:4.25pt;margin-right:4.25pt'>
 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:16.0pt'>{{ status }} {{ doctype }}<o:p></o:p></span></p>
 
+{% if doctype == "Policy And Procedures" or doctype == "Proposal" %}
+<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:16.0pt'>{{ revdate }}<o:p></o:p></span></p>
+{% endif %}
 </div>
 
 <p class="MsoNormal" style='margin-bottom:6.0pt'><span lang="EN-GB"><o:p>&nbsp;</o:p></span></p>
@@ -28,18 +33,20 @@ mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0
 mso-border-alt:solid windowtext .5pt;padding:1.0pt 4.0pt 1.0pt 4.0pt;
 margin-left:4.25pt;margin-right:4.25pt'>
 
+{% if status != "Published" and status != "Withdrawn" %}
 <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>
+style='font-size:10.0pt;mso-bidi-font-size:11.0pt;mso-bidi-font-weight:bold'>This document 
+is not a Ribose 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>
 
 <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"
@@ -49,6 +56,8 @@ 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>
 
+{% endif %}
+
 </div>
 
 

data/lib/metanorma/rsd/processor.rb

@@ -11,9 +11,15 @@ module Metanorma
       end
 
       def output_formats
-        {
-          html: "html"
-        }
+        super.merge(
+          html: "html",
+          doc: "doc",
+          pdf: "pdf"
+        )
+      end
+
+      def version
+        "Asciidoctor::Rsd #{Asciidoctor::Rsd::VERSION}"
       end
 
       def input_to_isodoc(file)
@@ -24,9 +30,19 @@ module Metanorma
         case format
         when :html
           IsoDoc::Rsd::HtmlConvert.new(options).convert(outname, isodoc_node)
+        when :doc
+          IsoDoc::Rsd::WordConvert.new(options).convert(outname, isodoc_node)
+        when :pdf
+          require 'tempfile'
+          outname_html = outname + ".html"
+          IsoDoc::Rsd::HtmlConvert.new(options).convert(outname_html, isodoc_node)
+          puts outname_html
+          system "cat #{outname_html}"
+          Metanorma::Output::Pdf.new.convert(outname_html, outname)
+        else
+          super
         end
       end
-
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-rsd
 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-07 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-rsd lets you write RSD in AsciiDoc syntax.
 
@@ -347,6 +361,7 @@ files:
 - lib/asciidoctor/rsd/isodoc.rng
 - lib/asciidoctor/rsd/isostandard.rng
 - lib/asciidoctor/rsd/m3d.rng
+- lib/asciidoctor/rsd/pdf.js
 - lib/asciidoctor/rsd/rsd.rng
 - lib/asciidoctor/rsd/version.rb
 - lib/isodoc/rsd/html/dots-w@2x.png
@@ -370,7 +385,7 @@ files:
 - lib/metanorma/rsd/processor.rb
 homepage: https://github.com/riboseinc/asciidoctor-rsd
 licenses:
-- MIT
+- BSD-2-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []