asciidoctor-csd 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7813a1ce2465a643c8810db821bc62b5c8164ecd
-  data.tar.gz: 158c000b02fc25d6e0f477a27786717708c97549
+  metadata.gz: 83224d4a089042a0681c82f63bb9865ab354fb08
+  data.tar.gz: d5775bda938e59d3224131f5ebd6ac1fbf861a21
 SHA512:
-  metadata.gz: d35d0464d98b501bf40b7f8b11e43c864962b53e6b66d95221207b8cc0a3070fafb46b125bc5d748a0b9eb8f759f0d27bad81b14197ff4cf9c8342b634def076
-  data.tar.gz: f24400e256ac0e02ea6ceb71e1d5f4a864f763dd76f2af38d311473d7b3d38ccacb096471da937f8b48a6a96040fdc7d4a6874847b691cfb2bca5a2cabb93a2d
+  metadata.gz: f7d61eca2c9826563757e3df1285d0ccce6fa194224d1b63a1e5f9216a42686bba437b2bbf78c10262d4d48fa4df09c7f088d4b342aafa2d3795e29100b3f53e
+  data.tar.gz: 9df37d23f913052222f571efafc8aa3e7b8d8cce6141352159a1eb4722c59df000b536493f823605993f0a7298085f9582434daeb90f326cfe0ceb8edc2da208

data/Gemfile

@@ -1,11 +1,4 @@
 source "https://rubygems.org"
 
-# Specify your gem's dependencies in ribose.gemspec
-gem "isodoc",
-      git: "https://github.com/riboseinc/isodoc.git"
-gem "asciidoctor-iso",
-      git: "https://github.com/riboseinc/asciidoctor-iso.git"
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-
 # Specify your gem's dependencies in asciidoctor-csd.gemspec
 gemspec

data/Gemfile.lock

@@ -0,0 +1,130 @@
+PATH
+  remote: .
+  specs:
+    asciidoctor-csd (0.1.0)
+      asciidoctor (~> 1.5.6)
+      asciimath
+      htmlentities (~> 4.3.4)
+      image_size
+      mime-types
+      nokogiri (~> 1.8.1)
+      ruby-jing
+      ruby-xslt
+      thread_safe
+      uuidtools
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    asciidoctor (1.5.6.1)
+    asciimath (1.0.4)
+    ast (2.4.0)
+    byebug (9.1.0)
+    coderay (1.1.2)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    equivalent-xml (0.6.0)
+      nokogiri (>= 1.4.3)
+    ffi (1.9.18)
+    formatador (0.2.5)
+    guard (2.14.2)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    htmlentities (4.3.4)
+    image_size (1.5.0)
+    json (2.1.0)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    lumberjack (1.0.12)
+    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.2)
+      mini_portile2 (~> 2.3.0)
+    notiffany (0.1.1)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    optout (0.0.2)
+    parallel (1.12.1)
+    parser (2.4.0.2)
+      ast (~> 2.3)
+    powerpack (0.1.1)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    rainbow (3.0.0)
+    rake (12.3.0)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    rubocop (0.52.1)
+      parallel (~> 1.10)
+      parser (>= 2.4.0.2, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-jing (0.0.1)
+      optout (>= 0.0.2)
+    ruby-progressbar (1.9.0)
+    ruby-xslt (0.9.10)
+    ruby_dep (1.5.0)
+    shellany (0.0.1)
+    simplecov (0.15.1)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    timecop (0.9.1)
+    unicode-display_width (1.3.0)
+    uuidtools (2.1.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  asciidoctor-csd!
+  bundler (~> 1.15)
+  byebug (~> 9.1)
+  equivalent-xml (~> 0.6)
+  guard (~> 2.14)
+  guard-rspec (~> 4.7)
+  rake (~> 12.0)
+  rspec (~> 3.6)
+  rubocop (~> 0.50)
+  simplecov (~> 0.15)
+  timecop (~> 0.9)
+
+BUNDLED WITH
+   1.16.1

data/README.adoc

@@ -28,11 +28,8 @@ expressions.
 International Standards. 
 * The XML representation is processed in turn to generate the following outputs
 as end deliverable CSD standard drafts.
-** Microsoft Word output (`.doc`), following the style conventions of the 
-https://www.csd.org/csd-templates.html[CSD Standard Microsoft Word template]. 
-(In development)
-** PDF (forthcoming)
-** HTML (forthcoming)
+** HTML 
+** PDF
 
 This AsciiDoc syntax for writing CSD standards is hereby named "AsciiCSD".
 
@@ -50,39 +47,21 @@ 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/csd/csd2wordhtml.rb` is work in progress, and not yet
-integrated into the executable.
+The gem then converts the XML into HTML and PDF.
 
-=== Content Warnings
+=== PDF output
 
-The gem also realises several format checks as prescribed in ISO/IEC
-DIR 2, and warns the user about them in the console:
+PDF output is generated by printing the HTML output as PDF. This is done
+within the gem, using 
+https://developers.google.com/web/updates/2017/04/headless-chrome[Headless Chrome],
+via the https://github.com/GoogleChrome/puppeteer[Puppeteer] Node library.
 
-* Numbers with what looks like dots instead of commas for decimal points.
+To get the PDF output working, do the following:
 
-* Groups of numbers without spacing for every three digits. (The gem attempts
-to ignore CSD references.)
-
-* No space before percent sign.
-
-* 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.)
-
-* 5 levels of subclause nesting. (Never actuated, AsciiDoc only permits 4
-levels of subsections.)
-
-* Non-CSD/IEC reference turning up as normative.
-
-* Term definition starts with an article, or ends with a period.
-
-* Title intro or title part appears in only one of French or English.
+* Install Node, with at least version 7.6.0: https://nodejs.org/en/download/,
+https://nodejs.org/en/download/package-manager/ . (For Mac, `brew install node`)
+* Install npm: https://docs.npmjs.com/getting-started/installing-node
+* Install puppeteer: `npm install -g --save --save-exact puppeteer`
 
 == Approach
 
@@ -94,11 +73,6 @@ https://github.com/riboseinc/isodoc-models[StandardDocument model].
 The CSD format ("CSD XML") intends to introduce rigour into the CSD
 standards authoring process, and is prescribed in a separate document.
 
-CSD XML is still under development, but it already contains all the markup
-needed to render a CSD document into HTML.
-
-WARNING: The current RNG model of CSD XML is out of sync with the UML.
-
 === Asciidoctor
 
 Asciidoctor has been selected as the authoring tool to generate the document
@@ -110,110 +84,9 @@ DocBook document authoring tool). Asciidoctor has built-in capability to output
 Text, DocBook and HTML; so it can be used to preview the file as it is being
 authored.
 
-Note that in order to generate HTML preview output close to what is intended
-in the CSD standard, the Asciidoc
-document includes a fair amount of formatting instructions (e.g. disabling
-section numbering where appropriate, the titling of Appendixes as Annexes), as
-well as CSD boilerplate text, and predefined section headers (sections are
-recognised by fixed titles such as `Normative References`). Authoring CSD
-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 CSD 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 CSD 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
-csdlated 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 CSD Standards; these will be ignored in
-generating CSD 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 csdlation, 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 CSD documents are cited
-without brackets by CSD number, and optionally year, whether they are normative
-or in the bibliography (e.g. `CSD 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. `[CSD
-20483:2013]`). For the same reason, CSD references listed in the bibliography
-will be listed under an CSD 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 CSD reference, these need to be explicitly listed as
-separate references. (This is not done in the Rice model document, which lists
-CSD 6646, but under _Terms and Definitions_ cites the dated CSD 6646:2011.
-
-* _References_: CSD references that are undated but published have their date
-indicated under the CSD 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.
+Generating documents via a document model substantially automated formatting
+associated with the document, including automating numbering of headings, figures,
+tables etc, and automatically generating references and citations.
 
 == Document Attributes
 

data/asciidoctor-csd.gemspec

@@ -25,18 +25,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "asciidoctor", "~> 1.5.6"
-  spec.add_dependency "asciimath"
-  spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "image_size"
-  spec.add_dependency "mime-types"
-  spec.add_dependency "nokogiri"
-  spec.add_dependency "ruby-jing"
-  spec.add_dependency "ruby-xslt"
-  spec.add_dependency "thread_safe"
-  spec.add_dependency "uuidtools"
-  spec.add_dependency "asciidoctor-iso", ">= 0.7.5"
-  spec.add_dependency "isodoc"
+  spec.add_dependency "asciidoctor-iso", ">= 0.7.9"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "byebug", "~> 9.1"

data/lib/asciidoctor/csd/biblio.rng

@@ -442,9 +442,9 @@
     <optional>
       <ref name="status"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="copyright"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="docrelation"/>
     </zeroOrMore>
@@ -489,10 +489,31 @@
           <value>issued</value>
         </choice>
       </attribute>
-      <ref name="bfrom"/>
-      <optional>
-        <ref name="bto"/>
-      </optional>
+      <!-- ( ( bfrom, bto? ) | date_on ) -->
+      <choice>
+        <group>
+          <element name="from">
+            <choice>
+              <data type="gYear"/>
+              <data type="date"/>
+            </choice>
+          </element>
+          <optional>
+            <element name="to">
+              <choice>
+                <data type="gYear"/>
+                <data type="date"/>
+              </choice>
+            </element>
+          </optional>
+        </group>
+        <element name="on">
+          <choice>
+            <data type="gYear"/>
+            <data type="date"/>
+          </choice>
+        </element>
+      </choice>
     </element>
   </define>
   <define name="bfrom">
@@ -511,6 +532,14 @@
       </choice>
     </element>
   </define>
+  <define name="date_on">
+    <element name="on">
+      <choice>
+        <data type="gYear"/>
+        <data type="date"/>
+      </choice>
+    </element>
+  </define>
   <define name="docidentifier">
     <element name="docidentifier">
       <optional>

data/lib/asciidoctor/csd/converter.rb

@@ -92,15 +92,23 @@ module Asciidoctor
         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)
         ret = ret1.to_xml(indent: 2)
         unless node.attr("nodoc") || !node.attr("docfile")
-          filename = node.attr("docfile").gsub(/\.adoc/, ".xml").
+          filename = node.attr("docfile").gsub(/\.adoc$/, ".xml").
             gsub(%r{^.*/}, "")
           File.open(filename, "w") { |f| f.write(ret) }
-          html_converter(node).convert filename unless node.attr("nodoc")
+          html_converter(node).convert filename
+          pdf_convert(filename.sub(/\.xml$/, ""))
         end
         @files_to_delete.each { |f| system "rm #{f}" }
         ret

data/lib/asciidoctor/csd/csd.rng

@@ -35,6 +35,7 @@
           <value>final-draft</value>
           <value>published</value>
           <value>withdrawn</value>
+          <ref name="LocalizedString"/>
         </choice>
       </element>
     </define>

data/lib/asciidoctor/csd/isodoc.rng

@@ -729,7 +729,7 @@
   </define>
   <define name="source">
     <element name="source">
-      <data type="anyURI"/>
+      <ref name="TypedUri"/>
     </element>
   </define>
   <define name="em">

data/lib/asciidoctor/csd/isostandard.rng

@@ -72,9 +72,9 @@
         </oneOrMore>
         <ref name="formattedref"/>
       </choice>
-      <optional>
+      <zeroOrMore>
         <ref name="bsource"/>
-      </optional>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="docidentifier"/>
       </zeroOrMore>
@@ -96,9 +96,9 @@
       <zeroOrMore>
         <ref name="script"/>
       </zeroOrMore>
-      <optional>
+      <zeroOrMore>
         <ref name="abstract"/>
-      </optional>
+      </zeroOrMore>
       <optional>
         <ref name="status"/>
       </optional>
@@ -127,9 +127,9 @@
       <optional>
         <ref name="formattedref"/>
       </optional>
-      <optional>
+      <zeroOrMore>
         <ref name="bsource"/>
-      </optional>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="docidentifier"/>
       </zeroOrMore>
@@ -151,9 +151,9 @@
       <zeroOrMore>
         <ref name="script"/>
       </zeroOrMore>
-      <optional>
+      <zeroOrMore>
         <ref name="abstract"/>
-      </optional>
+      </zeroOrMore>
       <optional>
         <ref name="status"/>
       </optional>
@@ -166,12 +166,45 @@
         <ref name="ics"/>
       </zeroOrMore>
     </define>
-    <define name="bfrom">
-      <element name="from">
+    <define name="bdate">
+      <element name="date">
+        <attribute name="type">
+          <choice>
+            <value>published</value>
+            <value>accessed</value>
+            <value>created</value>
+            <value>implemented</value>
+            <value>obsoleted</value>
+            <value>confirmed</value>
+            <value>updated</value>
+            <value>issued</value>
+          </choice>
+        </attribute>
+        <!-- ( ( bfrom, bto? ) | date_on ) -->
         <choice>
-          <data type="gYear"/>
-          <data type="date"/>
-          <value>--</value>
+          <group>
+            <element name="from">
+              <choice>
+                <data type="gYear"/>
+                <data type="date"/>
+              </choice>
+            </element>
+            <optional>
+              <element name="to">
+                <choice>
+                  <data type="gYear"/>
+                  <data type="date"/>
+                </choice>
+              </element>
+            </optional>
+          </group>
+          <element name="on">
+            <choice>
+              <data type="gYear"/>
+              <data type="date"/>
+              <value>--</value>
+            </choice>
+          </element>
         </choice>
       </element>
     </define>

data/lib/asciidoctor/csd/pdf.js

@@ -0,0 +1,24 @@
+'use strict';
+
+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/csd/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Csd
-    VERSION = "0.2.6"
+    VERSION = "0.2.8"
   end
 end

data/lib/isodoc/csd/csdconvert.rb

@@ -12,7 +12,7 @@ module IsoDoc
       def initialize(options)
         super
         @htmlstylesheet = generate_css(html_doc_path("htmlstyle.scss"), true, default_fonts(options))
-        @standardstylesheet = generate_css(html_doc_path("csd.scss"), true, default_fonts(options))
+        # @standardstylesheet = generate_css(html_doc_path("csd.scss"), true, default_fonts(options))
         @htmlcoverpage = html_doc_path("html_csd_titlepage.html")
         @htmlintropage = html_doc_path("html_csd_intro.html")
         @scripts = html_doc_path("scripts.html")
@@ -49,7 +49,6 @@ module IsoDoc
         set_metadata(:tc, tc.text) if tc
       end
 
-
       def docid(isoxml, _out)
         docnumber = isoxml.at(ns("//bibdata/docidentifier"))
         docstatus = isoxml.at(ns("//bibdata/status"))
@@ -93,7 +92,7 @@ module IsoDoc
         out.pre node.text # content.gsub(/</, "&lt;").gsub(/>/, "&gt;")
       end
 
-      def term_defs_boilerplate(div, source, term)
+      def term_defs_boilerplate(div, source, term, preface)
         if source.empty? && term.nil?
           div << @no_terms_boilerplate
         else
@@ -131,6 +130,7 @@ module IsoDoc
     <!--Font awesome import for the link icon-->
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/solid.css" integrity="sha384-v2Tw72dyUXeU3y4aM2Y0tBJQkGfplr39mxZqlTBDUZAb9BGoC40+rdFCG0m10lXk" crossorigin="anonymous">
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/fontawesome.css" integrity="sha384-q3jl8XQu1OpdLgGFvNRnPdj5VIlCvgsDQTQB6owSOHWlAurxul7f+JpUOVdAiJ5P" crossorigin="anonymous">
+<style class="anchorjs"></style>
         HEAD
       end
 
@@ -146,6 +146,20 @@ module IsoDoc
       def html_toc(docxml)
         docxml
       end
+
+      def cleanup(docxml)
+        super
+        term_cleanup(docxml)
+      end
+
+      def term_cleanup(docxml)
+        docxml.xpath("//p[@class = 'Terms']").each do |d|
+          h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
+          h2.add_child("&nbsp;")
+          h2.add_child(d.remove)
+        end
+        docxml
+      end
     end
   end
 end

data/lib/isodoc/csd/html/csd.scss

@@ -15,7 +15,7 @@ p.Sourcecode, li.Sourcecode, div.Sourcecode, pre.Sourcecode
 	mso-fareast-font-family:Calibri;
 	mso-bidi-font-family:"Courier New";
 	mso-ansi-language:EN-GB;}
-p.Biblio, li.Biblio, div.Biblio
+p.Biblio, li.Biblio, div.Biblio, p.NormRef, li.NormRef, div.NormRef
 	{mso-style-unhide:no;
 	mso-style-qformat:yes;
 	mso-style-parent:"";

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

@@ -13,20 +13,89 @@ a, abbr, acronym, address, big, cite, code,
 del, dfn, em, img, ins, kbd, q, s, samp,
 small, strike, strong, sub, sup, tt, var,
 b, u, i, center,
+ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+        margin: 0;
+        padding: 0;
+}
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+        border: 0;
+        font-size: 100%;
+}
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, tt, var,
+b, u, i, center,
+dl, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+        vertical-align: baseline;
+}
+
+
+html, body, div, span, applet, object, iframe,
+p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
 dl, dt, dd, ol, ul, li,
 fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed, 
-figure, figcaption, footer, header, hgroup, 
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
 menu, nav, output, ruby, section, summary,
 time, mark, audio, video {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	font-size: 100%;
-	font-family: $bodyfont;
-	vertical-align: baseline;
+  font-family: $bodyfont;
+}
+
+h1, h2, h3, h4, h5, h6, .h2Annex {
+  font-family: $headerfont;
+}
+
+dl {
+  display: grid;
+  grid-template-columns: max-content auto;
+}
+
+dt {
+  grid-column-start: 1;
 }
+
+dd {
+  grid-column-start: 2;
+}
+
+dd p {
+  margin-top: 0px;
+}
+
+
 /* HTML5 display-role reset for older browsers */
 article, aside, details, figcaption, figure, 
 footer, header, hgroup, menu, nav, section {
@@ -35,11 +104,6 @@ footer, header, hgroup, menu, nav, section {
 body {
 	line-height: 1;
 }
-/*
-ol, ul {
-	list-style: none;
-}
-*/
 blockquote, q {
 	quotes: none;
 }
@@ -366,10 +430,17 @@ p.document-stage {
       margin-top: 2em;
   }
   
-  h2 {font-size: 1.3em; }
+  h2 {
+    font-size: 1.3em; 
+    font-weight: 400;
+  }
   
-  h3 {font-size: 1.1em;}
+  h3 {
+    font-size: 1.1em;
+    font-weight: 400;   
+  }
 
+  /*
   span[id^="toc"]:after {
     float: left;
     padding-right: 4px;
@@ -380,10 +451,9 @@ p.document-stage {
     color: #cfcfcf;
     content: "\f0c1";
   }
+  */
 
- 
-
-  p.TermNum, p.Terms, p.AltTerms {
+  .TermNum, .Terms, .AltTerms {
     color: #485094;
     font-weight: 400;
   }
@@ -401,10 +471,17 @@ p.document-stage {
     margin: 0;
   }
   
+  /*
   p.AltTerms {
     font-style: italic;
     margin: 0;
   }
+  */
+
+span.obligation {
+    font-weight: 400;
+}
+
 
 /*
     3.2 Links
@@ -444,11 +521,43 @@ p.document-stage {
     3.3 Lists
 */
         
-    ul {margin-left: 0.5em;}
-      
-    #toc-list ul {margin-bottom: 0.25em;}
+    ul {
+    margin-left: 1.2em;
+  }
       
-    #toc-list li {list-style-type: none;}
+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
@@ -461,13 +570,18 @@ p.document-stage {
         margin: 2em 0;
       }
 
+h2 p {
+  display: inline;
+}
+
 /*
     3.5 Bibliograhy
 */
 
-p.Biblio {
+p.Biblio, p.NormRef {
     margin-top: 1em;
     margin-left: 2em;
+    text-indent:-2em;
 }
 
 /*
@@ -579,12 +693,15 @@ a.footnote-number {
     margin-right: auto;
 }
 
+.QuoteAttribution
+        {text-align:right;}
+
 
 /*
     3.12 Formulas
 */
 
-.formula {
+.formula, .Formula {
     background-color: #f7f7f7;
     padding: 1.5em;
     margin-top: 2em;
@@ -639,6 +756,21 @@ p {
     margin-bottom: 1em;
 }
 
+/* Admonitions */
+
+.Admonition, .admonition {
+    background-color: #ffb3b3;
+    /* color: #47430c;*/
+    padding: 0.5em;
+    margin: 1.5em 0 1.5em 0;
+    text-align: left;
+}
+
+.Admonition p, .admonition p {
+    margin: 0;
+}
+
+
 /*
     4.0 Page header
 */
@@ -663,8 +795,11 @@ p {
   .coverpage-title {
       padding-bottom: 0.5em;
       font-family: $headerfont;
-      font-size: 1.5em;
-      font-weight: 900;
+      font-size: 1.2em;
+	line-height: 1.2em;
+	font-weight: 900; 
+	padding-left: 1em;
+	padding-right: 1em;
   }
   
   .WordSection11 {
@@ -683,6 +818,7 @@ p {
 
   .coverpage {
     text-align: center;
+    padding-left: 1.5em;
   }
 
   .coverpage-logo span, .coverpage-tc-name span {
@@ -791,3 +927,47 @@ To top button
   #myBtn:hover {
     opacity: 1;
   }
+
+a.anchorjs-link:hover {
+  background: none;
+  color: #485094;
+  box-shadow: none;
+}
+
+@page {
+    margin: 2cm 1cm 2cm 1cm;
+}
+
+@media print {
+    h1, .WordSection11 {page-break-before: always;}
+    #toggle, .document-stage-band,
+    .document-type-band,#myBtn {display: none;}
+    .container {padding-left: 0;}
+
+
+  nav {
+    position: relative;
+    width: auto;
+    font-size: 0.9em;
+    overflow: auto;
+    padding: 0;
+    margin-right: 0;
+    background-color: white; }
+
+  #toc .toc-active a {
+  color: #485094; }
+
+  #toc .toc-active, #toc li:hover {
+  background: white;
+  box-shadow: none !important; }
+
+  #toc li:hover a {
+  color: black; }
+
+
+  h1.toc-contents {
+    margin-top: 2em; }
+
+
+}
+

data/lib/isodoc/csd/html/scripts.html

@@ -57,13 +57,26 @@ $('#toggle').on('click', function(){
     }
     </script>
 
-<script>
+  <script>
+/**
+ * AnchorJS - v4.1.0 - 2017-09-20
+ * https://github.com/bryanbraun/anchorjs
+ * Copyright (c) 2017 Bryan Braun; Licensed MIT
+ */
+!function(A,e){"use strict";"function"==typeof define&&define.amd?define([],e):"object"==typeof module&&module.exports?module.exports=e():(A.AnchorJS=e(),A.anchors=new A.AnchorJS)}(this,function(){"use strict";return function(A){function e(A){A.icon=A.hasOwnProperty("icon")?A.icon:"",A.visible=A.hasOwnProperty("visible")?A.visible:"hover",A.placement=A.hasOwnProperty("placement")?A.placement:"right",A.ariaLabel=A.hasOwnProperty("ariaLabel")?A.ariaLabel:"Anchor",A.class=A.hasOwnProperty("class")?A.class:"",A.truncate=A.hasOwnProperty("truncate")?Math.floor(A.truncate):64}function t(A){var e;if("string"==typeof A||A instanceof String)e=[].slice.call(document.querySelectorAll(A));else{if(!(Array.isArray(A)||A instanceof NodeList))throw new Error("The selector provided to AnchorJS was invalid.");e=[].slice.call(A)}return e}function i(){if(null===document.head.querySelector("style.anchorjs")){var A,e=document.createElement("style");e.className="anchorjs",e.appendChild(document.createTextNode("")),void 0===(A=document.head.querySelector('[rel="stylesheet"], style'))?document.head.appendChild(e):document.head.insertBefore(e,A),e.sheet.insertRule(" .anchorjs-link {   opacity: 0;   text-decoration: none;   -webkit-font-smoothing: antialiased;   -moz-osx-font-smoothing: grayscale; }",e.sheet.cssRules.length),e.sheet.insertRule(" *:hover > .anchorjs-link, .anchorjs-link:focus  {   opacity: 1; }",e.sheet.cssRules.length),e.sheet.insertRule(" [data-anchorjs-icon]::after {   content: attr(data-anchorjs-icon); }",e.sheet.cssRules.length),e.sheet.insertRule(' @font-face {   font-family: "anchorjs-icons";   src: url(data:n/a;base64,AAEAAAALAIAAAwAwT1MvMg8yG2cAAAE4AAAAYGNtYXDp3gC3AAABpAAAAExnYXNwAAAAEAAAA9wAAAAIZ2x5ZlQCcfwAAAH4AAABCGhlYWQHFvHyAAAAvAAAADZoaGVhBnACFwAAAPQAAAAkaG10eASAADEAAAGYAAAADGxvY2EACACEAAAB8AAAAAhtYXhwAAYAVwAAARgAAAAgbmFtZQGOH9cAAAMAAAAAunBvc3QAAwAAAAADvAAAACAAAQAAAAEAAHzE2p9fDzz1AAkEAAAAAADRecUWAAAAANQA6R8AAAAAAoACwAAAAAgAAgAAAAAAAAABAAADwP/AAAACgAAA/9MCrQABAAAAAAAAAAAAAAAAAAAAAwABAAAAAwBVAAIAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAMCQAGQAAUAAAKZAswAAACPApkCzAAAAesAMwEJAAAAAAAAAAAAAAAAAAAAARAAAAAAAAAAAAAAAAAAAAAAQAAg//0DwP/AAEADwABAAAAAAQAAAAAAAAAAAAAAIAAAAAAAAAIAAAACgAAxAAAAAwAAAAMAAAAcAAEAAwAAABwAAwABAAAAHAAEADAAAAAIAAgAAgAAACDpy//9//8AAAAg6cv//f///+EWNwADAAEAAAAAAAAAAAAAAAAACACEAAEAAAAAAAAAAAAAAAAxAAACAAQARAKAAsAAKwBUAAABIiYnJjQ3NzY2MzIWFxYUBwcGIicmNDc3NjQnJiYjIgYHBwYUFxYUBwYGIwciJicmNDc3NjIXFhQHBwYUFxYWMzI2Nzc2NCcmNDc2MhcWFAcHBgYjARQGDAUtLXoWOR8fORYtLTgKGwoKCjgaGg0gEhIgDXoaGgkJBQwHdR85Fi0tOAobCgoKOBoaDSASEiANehoaCQkKGwotLXoWOR8BMwUFLYEuehYXFxYugC44CQkKGwo4GkoaDQ0NDXoaShoKGwoFBe8XFi6ALjgJCQobCjgaShoNDQ0NehpKGgobCgoKLYEuehYXAAAADACWAAEAAAAAAAEACAAAAAEAAAAAAAIAAwAIAAEAAAAAAAMACAAAAAEAAAAAAAQACAAAAAEAAAAAAAUAAQALAAEAAAAAAAYACAAAAAMAAQQJAAEAEAAMAAMAAQQJAAIABgAcAAMAAQQJAAMAEAAMAAMAAQQJAAQAEAAMAAMAAQQJAAUAAgAiAAMAAQQJAAYAEAAMYW5jaG9yanM0MDBAAGEAbgBjAGgAbwByAGoAcwA0ADAAMABAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAH//wAP) format("truetype"); }',e.sheet.cssRules.length)}}this.options=A||{},this.elements=[],e(this.options),this.isTouchDevice=function(){return!!("ontouchstart"in window||window.DocumentTouch&&document instanceof DocumentTouch)},this.add=function(A){var n,o,s,a,r,c,h,l,u,d,f,p=[];if(e(this.options),"touch"===(f=this.options.visible)&&(f=this.isTouchDevice()?"always":"hover"),A||(A="h2, h3, h4, h5, h6"),0===(n=t(A)).length)return this;for(i(),o=document.querySelectorAll("[id]"),s=[].map.call(o,function(A){return A.id}),r=0;r<n.length;r++)if(this.hasAnchorJSLink(n[r]))p.push(r);else{if(n[r].hasAttribute("id"))a=n[r].getAttribute("id");else if(n[r].hasAttribute("data-anchor-id"))a=n[r].getAttribute("data-anchor-id");else{u=l=this.urlify(n[r].textContent),h=0;do{void 0!==c&&(u=l+"-"+h),c=s.indexOf(u),h+=1}while(-1!==c);c=void 0,s.push(u),n[r].setAttribute("id",u),a=u}a.replace(/-/g," "),(d=document.createElement("a")).className="anchorjs-link "+this.options.class,d.href="#"+a,d.setAttribute("aria-label",this.options.ariaLabel),d.setAttribute("data-anchorjs-icon",this.options.icon),"always"===f&&(d.style.opacity="1"),""===this.options.icon&&(d.style.font="1em/1 anchorjs-icons","left"===this.options.placement&&(d.style.lineHeight="inherit")),"left"===this.options.placement?(d.style.position="absolute",d.style.marginLeft="-1em",d.style.paddingRight="0.5em",n[r].insertBefore(d,n[r].firstChild)):(d.style.paddingLeft="0.375em",n[r].appendChild(d))}for(r=0;r<p.length;r++)n.splice(p[r]-r,1);return this.elements=this.elements.concat(n),this},this.remove=function(A){for(var e,i,n=t(A),o=0;o<n.length;o++)(i=n[o].querySelector(".anchorjs-link"))&&(-1!==(e=this.elements.indexOf(n[o]))&&this.elements.splice(e,1),n[o].removeChild(i));return this},this.removeAll=function(){this.remove(this.elements)},this.urlify=function(A){var t=/[& +$,:;=?@"#{}|^~[`%!'<>\]\.\/\(\)\*\\]/g;return this.options.truncate||e(this.options),A.trim().replace(/\'/gi,"").replace(t,"-").replace(/-{2,}/g,"-").substring(0,this.options.truncate).replace(/^-+|-+$/gm,"").toLowerCase()},this.hasAnchorJSLink=function(A){var e=A.firstChild&&(" "+A.firstChild.className+" ").indexOf(" anchorjs-link ")>-1,t=A.lastChild&&(" "+A.lastChild.className+" ").indexOf(" anchorjs-link ")>-1;return e||t||!1}}});  </script>
+
+  <script>
   $(document).ready(function() {
-	  $('[id^=toc]').each(function ()
-	  {
-	     var currentToc = $(this);
+          $('[id^=toc]').each(function ()
+          {
+             var currentToc = $(this);
        var url = window.location.href;
-	     currentToc.wrap("<a href='" + url + "#" + currentToc.attr("id") + "' </a>");
-	  });
+             currentToc.wrap("<a href='" + url + "#" + currentToc.attr("id") + "' </a>");
+          });
 });
+  anchors.options = {
+  placement: 'left'
+};
+anchors.add('h1, h2, h3, h4');
 </script>
+

metadata

@@ -1,183 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-csd
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-22 00:00:00.000000000 Z
+date: 2018-06-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: asciidoctor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.6
-- !ruby/object:Gem::Dependency
-  name: asciimath
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: htmlentities
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.3.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.3.4
-- !ruby/object:Gem::Dependency
-  name: image_size
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-jing
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-xslt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: thread_safe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: uuidtools
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: asciidoctor-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.5
-- !ruby/object:Gem::Dependency
-  name: isodoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.9
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -331,6 +177,7 @@ files:
 - ".gitignore"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.adoc
 - Rakefile
@@ -345,6 +192,7 @@ files:
 - lib/asciidoctor/csd/csd.rng
 - lib/asciidoctor/csd/isodoc.rng
 - lib/asciidoctor/csd/isostandard.rng
+- lib/asciidoctor/csd/pdf.js
 - lib/asciidoctor/csd/version.rb
 - lib/isodoc/csd/csdconvert.rb
 - lib/isodoc/csd/html/csd.scss
@@ -375,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: asciidoctor-csd lets you write CSD in AsciiDoc.