asciidoctor-rsd 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d9114d458a4618ee4a37a30188f66e58317e5d82
-  data.tar.gz: 58c1554bca805adeedac7803d434c849d8ec46cf
+SHA256:
+  metadata.gz: 125e4e4e5bd3ba63730512aed41030e1e94494d057555508f8881f0f93449574
+  data.tar.gz: fb16064348b81d89aea374e9081ca3b2d1167ccabc7fdd1d8e24f40541136553
 SHA512:
-  metadata.gz: f89e93f29f1e6a4b2a5c73867191a4853a67b670371801294a4f465dc73352004e95a9363150ecdfbe7f18d7e374222435ed67fb30d51505508946aa6c1ae417
-  data.tar.gz: 84b03de0c69348bf619459edbf592695d9241f40bf559b37c7946d3d0a2fb27b4ce0b749485e37fdc29f9568868f53a8e0476e23c90f80eecd10bc3ebef0175b
+  metadata.gz: dc1fa1e54d189d87c6420c018cf932f667bcd519278b03c29a91118d3e0c915d558000881f7c32eabcdab9bfecf841770e2f2a77997afba67b07cbfb6eb68681
+  data.tar.gz: 0a7e8c0277b0309970f8121931606837aca23d934ecf5745609006f054c1cd9f1062c3276003bd5741b064e0ce290f21402ba97c643650358cdcaab4f1142b78

data/Gemfile

@@ -3,5 +3,6 @@ git_source(:github) {|repo| "https://github.com/#{repo}" }
 
 gem "isodoc", github: "riboseinc/isodoc"
 gem "asciidoctor-iso", github: "riboseinc/asciidoctor-iso"
+gem "html2doc", github: "riboseinc/html2doc"
 
 gemspec

data/Gemfile.lock

@@ -1,25 +1,34 @@
 GIT
   remote: https://github.com/riboseinc/asciidoctor-iso
-  revision: f5e46b7dda5fb043b5872e166806f672fe70b909
+  revision: 975b5652397e67bbb5e48746882760c0745f163e
   specs:
-    asciidoctor-iso (0.7.5)
-      asciidoctor (~> 1.5.6)
-      html2doc
+    asciidoctor-iso (0.8.1)
+      asciidoctor (~> 1.5.7)
+      isobib (~> 0.1.4)
+      isodoc (>= 0.7.0)
+      ruby-jing
+
+GIT
+  remote: https://github.com/riboseinc/html2doc
+  revision: ae15cfc0a4c8ebeb74193a8aa4a7884938a08434
+  specs:
+    html2doc (0.8.0)
+      asciimath
       htmlentities (~> 4.3.4)
-      isodoc
+      image_size
+      mime-types
       nokogiri
-      ruby-jing
-      sass
+      ruby-xslt
       thread_safe
       uuidtools
 
 GIT
   remote: https://github.com/riboseinc/isodoc
-  revision: 871fc62c0249e81f2dba3ebb64e0109e6f7b25c8
+  revision: 8cdd3243c0479eb35e6a28d044759477f6fb2f44
   specs:
-    isodoc (0.5.9)
+    isodoc (0.7.0)
       asciimath
-      html2doc
+      html2doc (>= 0.7.1)
       htmlentities (~> 4.3.4)
       image_size
       liquid
@@ -27,19 +36,20 @@ GIT
       nokogiri
       roman-numerals
       ruby-xslt
+      sass
       thread_safe
       uuidtools
 
 PATH
   remote: .
   specs:
-    asciidoctor-rsd (0.2.4)
+    asciidoctor-rsd (0.2.6)
       asciidoctor (~> 1.5.7)
-      asciidoctor-iso (>= 0.7.5)
+      asciidoctor-iso (>= 0.8.0)
       asciimath
       htmlentities (~> 4.3.4)
       image_size
-      isodoc
+      isodoc (>= 0.7.0)
       mime-types
       nokogiri
       ruby-jing
@@ -50,16 +60,19 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    algoliasearch (1.22.0)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
     asciidoctor (1.5.7.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)
+    docile (1.3.1)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    ffi (1.9.18)
+    ffi (1.9.25)
     formatador (0.2.5)
     guard (2.14.2)
       formatador (>= 0.2.4)
@@ -75,24 +88,24 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    html2doc (0.7.0)
-      asciimath
-      htmlentities (~> 4.3.4)
-      image_size
-      mime-types
-      nokogiri
-      ruby-xslt
-      thread_safe
-      uuidtools
     htmlentities (4.3.4)
+    httpclient (2.8.3)
     image_size (2.0.0)
+    iso-bib-item (0.1.5)
+      isoics (~> 0.1.6)
+      nokogiri
+    isobib (0.1.5)
+      algoliasearch
+      iso-bib-item (~> 0.1.2)
+    isoics (0.1.6)
+    jaro_winkler (1.5.1)
     json (2.1.0)
     liquid (4.0.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)
+    lumberjack (1.0.13)
     method_source (0.9.0)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
@@ -106,15 +119,15 @@ GEM
       shellany (~> 0.0)
     optout (0.0.2)
     parallel (1.12.1)
-    parser (2.4.0.2)
-      ast (~> 2.3)
-    powerpack (0.1.1)
+    parser (2.5.1.0)
+      ast (~> 2.4.0)
+    powerpack (0.1.2)
     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)
+    rake (12.3.1)
+    rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     roman-numerals (0.3.0)
@@ -131,9 +144,10 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    rubocop (0.52.1)
+    rubocop (0.57.2)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.4.0.2, < 3.0)
+      parser (>= 2.5)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
@@ -149,15 +163,15 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
     shellany (0.0.1)
-    simplecov (0.15.1)
-      docile (~> 1.1.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       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)
+    unicode-display_width (1.4.0)
     uuidtools (2.1.5)
 
 PLATFORMS
@@ -171,6 +185,7 @@ DEPENDENCIES
   equivalent-xml (~> 0.6)
   guard (~> 2.14)
   guard-rspec (~> 4.7)
+  html2doc!
   isodoc!
   rake (~> 12.0)
   rspec (~> 3.6)
@@ -179,4 +194,4 @@ DEPENDENCIES
   timecop (~> 0.9)
 
 BUNDLED WITH
-   1.16.1
+   1.16.2

data/asciidoctor-rsd.gemspec

@@ -35,8 +35,9 @@ Gem::Specification.new do |spec|
   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.8.0"
+  spec.add_dependency "isodoc", ">= 0.7.0"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "byebug", "~> 9.1"

data/lib/asciidoctor-rsd.rb

@@ -1,4 +1,5 @@
 require "asciidoctor" unless defined? Asciidoctor::Converter
 require_relative "asciidoctor/rsd/converter"
-require_relative "asciidoctor/rsd/rsdconvert"
+require_relative "isodoc/rsd/rsdhtmlconvert"
+require_relative "isodoc/rsd/rsdwordconvert"
 require_relative "asciidoctor/rsd/version"

data/lib/asciidoctor/rsd/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/rsd/converter.rb

@@ -1,6 +1,7 @@
 require "asciidoctor"
 require "asciidoctor/rsd/version"
-require "asciidoctor/rsd/rsdconvert"
+require "isodoc/rsd/rsdhtmlconvert"
+require "isodoc/rsd/rsdwordconvert"
 require "asciidoctor/iso/converter"
 
 module Asciidoctor
@@ -47,7 +48,7 @@ module Asciidoctor
       end
 
       def metadata_status(node, xml)
-        xml.status **{ format: "plain" } { |s| s << node.attr("status") }
+        xml.status(**{ format: "plain" }) { |s| s << node.attr("status") }
       end
 
       def metadata_id(node, xml)
@@ -83,14 +84,26 @@ module Asciidoctor
         ret1
       end
 
+      def doctype(node)
+        d = node.attr("doctype")
+        unless %w{policy best-practices supporting-document report legal directives}.include? d
+          warn "#{d} is not a legal document type: reverting to 'standard'"
+          d = "standard"
+        end
+        d
+      end
+
       def document(node)
         init(node)
         ret1 = makexml(node)
         ret = ret1.to_xml(indent: 2)
-        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")
+        unless node.attr("nodoc") || !node.attr("docfile")
+          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")
+          word_converter(node).convert filename unless node.attr("nodoc")
+        end
         @files_to_delete.each { |f| system "rm #{f}" }
         ret
       end
@@ -125,25 +138,28 @@ module Asciidoctor
         return
       end
 
-      def html_converter(_node)
-        RsdConvert.new(
-          htmlstylesheet: generate_css(html_doc_path("htmlstyle.scss"), true),
-          standardstylesheet: generate_css(html_doc_path("rsd.scss"), true),
-          htmlcoverpage: html_doc_path("html_rsd_titlepage.html"),
-          htmlintropage: html_doc_path("html_rsd_intro.html"),
-          scripts: html_doc_path("scripts.html"),
+      def html_converter(node)
+        IsoDoc::Rsd::Convert.new(
+          script: node.attr("script"),
+          bodyfont: node.attr("body-font"),
+          headerfont: node.attr("header-font"),
+          monospacefont: node.attr("monospace-font"),
+          titlefont: node.attr("title-font"),
+          i18nyaml: node.attr("i18nyaml"),
+          scope: node.attr("scope"),
         )
       end
 
-      def default_fonts(node)
-        b = node.attr("body-font") ||
-          (node.attr("script") == "Hans" ? '"SimSun",serif' :
-           '"Overpass",sans-serif')
-        h = node.attr("header-font") ||
-          (node.attr("script") == "Hans" ? '"SimHei",sans-serif' :
-           '"Overpass",sans-serif')
-        m = node.attr("monospace-font") || '"Space Mono",monospace'
-        "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n"
+      def word_converter(node)
+        IsoDoc::Rsd::WordConvert.new(
+          script: node.attr("script"),
+          bodyfont: node.attr("body-font"),
+          headerfont: node.attr("header-font"),
+          monospacefont: node.attr("monospace-font"),
+          titlefont: node.attr("title-font"),
+          i18nyaml: node.attr("i18nyaml"),
+          scope: node.attr("scope"),
+        )
       end
 
       def inline_quoted(node)
@@ -168,7 +184,6 @@ module Asciidoctor
           end
         end.join
       end
-
     end
   end
 end

data/lib/asciidoctor/rsd/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/rsd/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>
@@ -114,6 +114,9 @@
       <zeroOrMore>
         <ref name="ics"/>
       </zeroOrMore>
+      <optional>
+        <ref name="allParts"/>
+      </optional>
     </define>
     <define name="BibData">
       <optional>
@@ -127,9 +130,9 @@
       <optional>
         <ref name="formattedref"/>
       </optional>
-      <optional>
+      <zeroOrMore>
         <ref name="bsource"/>
-      </optional>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="docidentifier"/>
       </zeroOrMore>
@@ -151,9 +154,9 @@
       <zeroOrMore>
         <ref name="script"/>
       </zeroOrMore>
-      <optional>
+      <zeroOrMore>
         <ref name="abstract"/>
-      </optional>
+      </zeroOrMore>
       <optional>
         <ref name="status"/>
       </optional>
@@ -165,13 +168,49 @@
       <zeroOrMore>
         <ref name="ics"/>
       </zeroOrMore>
+      <optional>
+        <ref name="allParts"/>
+      </optional>
     </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>
@@ -819,6 +858,11 @@
       <ref name="FormattedString"/>
     </element>
   </define>
+  <define name="allParts">
+    <element name="allParts">
+      <data type="boolean"/>
+    </element>
+  </define>
   <define name="clause-hanging-paragraph-with-footnote">
     <element name="clause">
       <optional>
@@ -867,12 +911,17 @@
   </define>
   <define name="termdocsource">
     <element name="termdocsource">
-      <ref name="erefType"/>
+      <ref name="CitationType"/>
     </element>
   </define>
   <define name="ics">
     <element name="ics">
-      <text/>
+      <element name="code">
+        <text/>
+      </element>
+      <element name="text">
+        <text/>
+      </element>
     </element>
   </define>
   <define name="term-clause">