asciidoctor-m3d 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 842e662db881efd542ce7d9212b641a29f7d0e09
-  data.tar.gz: 726174ec00747868c445e860e4ee14823496d3d9
+SHA256:
+  metadata.gz: 2f796b6eb0ec3b88d6cc2932585c61db7b591fb7ddd352e66e955b8bf25468d2
+  data.tar.gz: a953610472abcf575045b14b3f8054d30b35697791bdf6d4e2cb05357edf3b52
 SHA512:
-  metadata.gz: 47d301acc7da5911dcc256392ebbb85c5fd84f305127f5a5bdca58aac7b489f03110ab90391495a80572778cfb67f36d083a3d79f05a7e913e0f07be996be1a8
-  data.tar.gz: ac46f2e039e772a2056c71e76573cfa82d795617365ab5e5b850eef524f3238baa4987af58fa60f49eb3ceeb43d439428b15f31b5ff002a7c30d9cf5174fb740
+  metadata.gz: bf31275e3c03d11b5c967563dbed2ecd68296276a88654a2fe3a8a1c4ad136d6d3754c6b17ec01a6ca2dcede0f6baacee6a8005c6a36cca3e7b41adf57f3d898
+  data.tar.gz: 1d6e010ac13c03ebd7fe0ba7a37ee432370e8f303167d61cc1bf409a33dde726004427d10945ad29e5c48af75f7d07d34fb75787d094f8edf4b6d4f5a68ebf77

data/.travis.yml

@@ -0,0 +1,7 @@
+sudo: false
+language: ruby
+rvm:
+  - 2.4.3
+before_install:
+  - gem install bundler -v 1.16.1
+  - unset _JAVA_OPTIONS

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: acb439aa79a102bff01f876b6f19bdf468a47861
+  revision: 8e9f119ed5c38e7d75d975b1a945ebb069f94a27
   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: 71a0d3a0f6ed4c001968949187103247de97a879
+  revision: cd4f1ecfcf31b0462f783159c8978007c929ceb8
   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-m3d (0.2.5)
+    asciidoctor-m3d (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.3.0)
+    docile (1.3.1)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    ffi (1.9.23)
+    ffi (1.9.25)
     formatador (0.2.5)
     guard (2.14.2)
       formatador (>= 0.2.4)
@@ -75,17 +88,17 @@ 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)
@@ -108,7 +121,7 @@ GEM
     parallel (1.12.1)
     parser (2.5.1.0)
       ast (~> 2.4.0)
-    powerpack (0.1.1)
+    powerpack (0.1.2)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -131,7 +144,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    rubocop (0.56.0)
+    rubocop (0.57.2)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5)
       powerpack (~> 0.1)
@@ -157,20 +171,21 @@ GEM
     thor (0.20.0)
     thread_safe (0.3.6)
     timecop (0.9.1)
-    unicode-display_width (1.3.2)
+    unicode-display_width (1.4.0)
     uuidtools (2.1.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  asciidoctor-m3d!
   asciidoctor-iso!
+  asciidoctor-m3d!
   bundler (~> 1.15)
   byebug (~> 9.1)
   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-m3d.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-m3d.rb

@@ -1,4 +1,5 @@
 require "asciidoctor" unless defined? Asciidoctor::Converter
 require_relative "asciidoctor/m3d/converter"
-require_relative "asciidoctor/m3d/m3dconvert"
+require_relative "isodoc/m3d/m3dhtmlconvert"
+require_relative "isodoc/m3d/m3dwordconvert"
 require_relative "asciidoctor/m3d/version"

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

@@ -1,6 +1,7 @@
 require "asciidoctor"
 require "asciidoctor/m3d/version"
-require "asciidoctor/m3d/m3dconvert"
+require "isodoc/m3d/m3dhtmlconvert"
+require "isodoc/m3d/m3dwordconvert"
 require "asciidoctor/iso/converter"
 
 module Asciidoctor
@@ -33,7 +34,7 @@ module Asciidoctor
 
       def metadata_committee(node, xml)
         xml.editorialgroup do |a|
-          a.technical_committee node.attr("technical-committee"),
+          a.committee node.attr("technical-committee"),
             **attr_code(type: node.attr("technical-committee-type"))
         end
       end
@@ -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}.include? d
+          warn "#{d} is not a legal document type: reverting to 'report'"
+          d = "report"
+        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)
-        M3dConvert.new(
-          htmlstylesheet: generate_css(html_doc_path("htmlstyle.scss"), true),
-          standardstylesheet: generate_css(html_doc_path("m3d.scss"), true),
-          htmlcoverpage: html_doc_path("html_m3d_titlepage.html"),
-          htmlintropage: html_doc_path("html_m3d_intro.html"),
-          scripts: html_doc_path("scripts.html"),
+      def html_converter(node)
+        IsoDoc::M3d::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::M3d::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/m3d/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/m3d/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">