asciidoctor-m3d 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fc3703757601c52c0293d4b0e892a064dd4901c0c1a69a2951f3b7bfad52cbf
-  data.tar.gz: ca2a3e4ec89a9336d4fd6d7871a925ba2d3cfabea687e845394fccf4111055e9
+  metadata.gz: c187f43da3255bc153970ebfc350cd1f5805651db163825e3daec3acc6b88aa3
+  data.tar.gz: f9e507017ff918a9c21121f11a495da133d383694deec07990c46d234e730d40
 SHA512:
-  metadata.gz: f6d3888561a821afc1ca18d9042d3e25ba87fa45e5451520f72bdf8c1ae8c58e114adf43217a406d8470a1a18eba3a96fe1d3a9395ddfca89af1cb6feed4a394
-  data.tar.gz: 405ff3bb3f0f51f4330d4b318b7fd42ddc775e898d0c23b5cff01f95b9ddbf95fcc75c74a17b78fdf99958bbb9199ae97b09297c0cb4fc093e2e8dab9a4910e3
+  metadata.gz: 77998d580f213145f8638904868087cad5ab5db539e6c3a73e3bda76ce20ec804f0443fd68b98fddc8e8a273ac7390f2b221c5adebac197e1b3ab20430f813c7
+  data.tar.gz: '068f628dbc31bc240ff49ab77ccffe75a8163bb3e55888d7b77225ff3d75f1ec06891df233dbb6024bdc889247c6fe97af7bc907f39c0ee83738a13f51c8512f'

data/Gemfile

@@ -1,8 +1,4 @@
 source "https://rubygems.org"
 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/asciidoctor-m3d.gemspec

@@ -36,8 +36,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thread_safe"
   spec.add_dependency "uuidtools"
 
-  spec.add_dependency "asciidoctor-iso", ">= 0.9.0"
-  spec.add_dependency "isodoc", ">= 0.8.0"
+  spec.add_dependency "asciidoctor-iso", "~> 0.10.2"
+  spec.add_dependency "isodoc", "~> 0.8.8"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "byebug", "~> 9.1"

data/lib/asciidoctor/m3d/converter.rb

@@ -133,10 +133,6 @@ module Asciidoctor
                         File.join(File.dirname(__FILE__), "m3d.rng"))
       end
 
-      def html_doc_path(file)
-        File.join(File.dirname(__FILE__), File.join("html", file))
-      end
-
       def literal(node)
         noko do |xml|
           xml.figure **id_attr(node) do |f|
@@ -166,6 +162,10 @@ module Asciidoctor
           titlefont: node.attr("title-font"),
           i18nyaml: node.attr("i18nyaml"),
           scope: node.attr("scope"),
+          htmlstylesheet: node.attr("htmlstylesheet"),
+          htmlcoverpage: node.attr("htmlcoverpage"),
+          htmlintropage: node.attr("htmlintropage"),
+          scripts: node.attr("scripts"),
         )
       end
 
@@ -178,6 +178,13 @@ module Asciidoctor
           titlefont: node.attr("title-font"),
           i18nyaml: node.attr("i18nyaml"),
           scope: node.attr("scope"),
+          wordstylesheet: node.attr("wordstylesheet"),
+          standardstylesheet: node.attr("standardstylesheet"),
+          header: node.attr("header"),
+          wordcoverpage: node.attr("wordcoverpage"),
+          wordintropage: node.attr("wordintropage"),
+          ulstyle: node.attr("ulstyle"),
+          olstyle: node.attr("olstyle"),
         )
       end
 

data/lib/asciidoctor/m3d/isodoc.rng

@@ -18,7 +18,21 @@
   of this.
 -->
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <include href="biblio.rng"/>
+  <include href="biblio.rng">
+    <define name="status">
+      <element name="status">
+        <choice>
+          <value>proposal</value>
+          <value>working_draft</value>
+          <value>committee_draft</value>
+          <value>draft_standard</value>
+          <value>final_draft</value>
+          <value>published</value>
+          <value>withdrawn</value>
+        </choice>
+      </element>
+    </define>
+  </include>
   <start>
     <ref name="standard-document"/>
   </start>
@@ -28,9 +42,10 @@
       <optional>
         <ref name="version"/>
       </optional>
-      <oneOrMore>
-        <ref name="sections"/>
-      </oneOrMore>
+      <optional>
+        <ref name="preface"/>
+      </optional>
+      <ref name="sections"/>
       <zeroOrMore>
         <ref name="annex"/>
       </zeroOrMore>
@@ -44,11 +59,6 @@
       <ref name="BibData"/>
     </element>
   </define>
-  <define name="status">
-    <element name="status">
-      <ref name="FormattedString"/>
-    </element>
-  </define>
   <define name="version">
     <element name="version">
       <optional>
@@ -77,6 +87,13 @@
       <text/>
     </element>
   </define>
+  <define name="preface">
+    <element name="preface">
+      <oneOrMore>
+        <ref name="content"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="sections">
     <element name="sections">
       <oneOrMore>
@@ -104,7 +121,9 @@
   </define>
   <define name="section-title">
     <element name="title">
-      <text/>
+      <zeroOrMore>
+        <ref name="TextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="content">
@@ -324,7 +343,7 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
-      <ref name="BasicBlock"/>
+      <ref name="paragraph"/>
     </element>
   </define>
   <define name="termsource">
@@ -423,7 +442,7 @@
         <data type="ID"/>
       </attribute>
       <oneOrMore>
-        <ref name="paragraph-with-footnote"/>
+        <ref name="paragraph"/>
       </oneOrMore>
     </element>
   </define>
@@ -690,21 +709,20 @@
         <ref name="tname"/>
       </optional>
       <choice>
-        <oneOrMore>
+        <ref name="image"/>
+        <zeroOrMore>
           <ref name="figure"/>
-        </oneOrMore>
-        <group>
-          <zeroOrMore>
-            <ref name="TextElement"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-          <optional>
-            <ref name="dl"/>
-          </optional>
-        </group>
+        </zeroOrMore>
       </choice>
+      <zeroOrMore>
+        <ref name="fn"/>
+      </zeroOrMore>
+      <optional>
+        <ref name="dl"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="note"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="TextElement">

data/lib/asciidoctor/m3d/isostandard.rng

@@ -681,6 +681,14 @@
         <ref name="paragraph"/>
       </element>
     </define>
+    <define name="preface">
+      <element name="preface">
+        <ref name="foreword"/>
+        <optional>
+          <ref name="introduction"/>
+        </optional>
+      </element>
+    </define>
   </include>
   <!-- end overrides -->
   <!--
@@ -706,14 +714,6 @@
       <ref name="bibliography"/>
     </element>
   </define>
-  <define name="preface">
-    <element name="preface">
-      <ref name="foreword"/>
-      <optional>
-        <ref name="introduction"/>
-      </optional>
-    </element>
-  </define>
   <define name="bibliography">
     <element name="bibliography">
       <oneOrMore>

data/lib/asciidoctor/m3d/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module M3d
-    VERSION = "0.3.3"
+    VERSION = "0.3.4"
   end
 end

data/lib/isodoc/m3d/m3dhtmlconvert.rb

@@ -1,41 +1,42 @@
 require "isodoc"
 require_relative "metadata"
 require_relative "m3dhtmlrender"
+require "fileutils"
 
 module IsoDoc
   module M3d
     # A {Converter} implementation that generates CSAND output, and a document
     # schema encapsulation of the document for validation
     class HtmlConvert < IsoDoc::HtmlConvert
-      def html_doc_path(file)
-        File.join(File.dirname(__FILE__), File.join("html", file))
-      end
-
       def add_image(filenames)
         filenames.each do |filename|
-          system "cp #{html_doc_path(filename)} #{filename}"
+          #system "cp #{html_doc_path(filename)} #{filename}"
+          FileUtils.cp html_doc_path(filename), filename
           @files_to_delete << filename
         end
       end
 
       def initialize(options)
+        @libdir = File.dirname(__FILE__)
         super
-        @htmlstylesheet = generate_css(html_doc_path("htmlstyle.scss"), true, default_fonts(options))
-        @htmlcoverpage = html_doc_path("html_m3d_titlepage.html")
-        @htmlintropage = html_doc_path("html_m3d_intro.html")
-        @scripts = html_doc_path("scripts.html")
         add_image(%w(logo.jpg m3-logo.png))
       end
 
       def default_fonts(options)
-        b = options[:bodyfont] ||
-          (options[:script] == "Hans" ? '"SimSun",serif' :
-           '"Overpass",sans-serif')
-        h = options[:headerfont] ||
-          (options[:script] == "Hans" ? '"SimHei",sans-serif' :
-           '"Overpass",sans-serif')
-        m = options[:monospacefont] || '"Space Mono",monospace'
-        "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n"
+        {
+          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Overpass",sans-serif'),
+          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Overpass",sans-serif'),
+          monospacefont: '"Space Mono",monospace'
+        }
+      end
+
+      def default_file_locations(_options)
+        {
+          htmlstylesheet: html_doc_path("htmlstyle.scss"),
+          htmlcoverpage: html_doc_path("html_m3d_titlepage.html"),
+          htmlintropage: html_doc_path("html_m3d_intro.html"),
+          scripts: html_doc_path("scripts.html"),
+        }
       end
 
       def metadata_init(lang, script, labels)

data/lib/isodoc/m3d/m3dwordconvert.rb

@@ -1,5 +1,6 @@
 require "isodoc"
 require_relative "m3wordrender"
+require "fileutils"
 
 module IsoDoc
   module M3d
@@ -7,30 +8,34 @@ module IsoDoc
     # schema encapsulation of the document for validation
 
     class WordConvert < IsoDoc::WordConvert
-      def html_doc_path(file)
-        File.join(File.dirname(__FILE__), File.join("html", file))
-      end
-
       def initialize(options)
+        @libdir = File.dirname(__FILE__)
         super
-        @wordstylesheet = generate_css(html_doc_path("wordstyle.scss"), false, default_fonts(options))
-        @standardstylesheet = generate_css(html_doc_path("m3d.scss"), false, default_fonts(options))
-        @header = html_doc_path("header.html")
-        @wordintropage = html_doc_path("word_m3d_intro.html")
-        @ulstyle = "l3"
-        @olstyle = "l2"
-        system "cp #{html_doc_path('logo.jpg')}  logo.jpg"
+        #system "cp #{html_doc_path('logo.jpg')}  logo.jpg"
+        FileUtils.cp html_doc_path("logo.jpg"), "logo.jpg"
       end
 
       def default_fonts(options)
-        b = options[:bodyfont] ||
-          (options[:script] == "Hans" ? '"SimSun",serif' :
-           '"Garamond",serif')
-        h = options[:headerfont] ||
-          (options[:script] == "Hans" ? '"SimHei",sans-serif' :
-           '"Garamond",serif')
-        m = options[:monospacefont] || '"Courier New",monospace'
-        "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n"
+        {
+          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Garamond",serif'),
+          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Garamond",serif'),
+          monospacefont: '"Courier New",monospace'
+        }
+      end
+
+      def default_file_locations(_options)
+        {
+          htmlstylesheet: html_doc_path("htmlstyle.scss"),
+          htmlcoverpage: html_doc_path("html_m3d_titlepage.html"),
+          htmlintropage: html_doc_path("html_m3d_intro.html"),
+          scripts: html_doc_path("scripts.html"),
+          wordstylesheet: html_doc_path("wordstyle.scss"),
+          standardstylesheet: html_doc_path("m3d.scss"),
+          header: html_doc_path("header.html"),
+          wordintropage: html_doc_path("word_m3d_intro.html"),
+          ulstyle: "l3",
+          olstyle: "l2",
+        }
       end
 
       def metadata_init(lang, script, labels)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-m3d
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-08 00:00:00.000000000 Z
+date: 2018-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -154,30 +154,30 @@ dependencies:
   name: asciidoctor-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.2
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement