asciidoctor-csand 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d9fb3d68f1bb9fe0cc1369cea6e5cf3579d694e7bcb43e78a145b3bd2a8737c
-  data.tar.gz: 19b0fabc65c704e896fb0af1aa35b314664d1f5a8d82dd16ac221d90755f3f13
+  metadata.gz: 0d7e6e92559f254c6172e582d1aff73f44789487860bc5a6a0b67ec98bc41bce
+  data.tar.gz: e042c895b6106a7a026b3c787d903f0783b0401ccaae927acc6460430efd05e5
 SHA512:
-  metadata.gz: 8b84547f8a921c19d061d87e40fa27fa3f7808e193a9eaee900696336fc7685a9224f21a3e575bedaf7ac7e4a04ead7bd61be0795cfb69152d2eb7ea2f9b36af
-  data.tar.gz: 4bc5b7c6b183d5bda0abac8cf4a2f2954cf1d895df35249e5a644ddeca42765405394b90cba8f912487c2b7d7d78a72d93d462bbeb28e826b4183a5e5d664201
+  metadata.gz: 5e0ea4a9836f667bdc0362111756af5e9304882c1d9684d6986ca98df9183e441a9adcd11138f032d33f502e549aa8a1427656245d9867d95ac1f29b83ef1c29
+  data.tar.gz: 438c2bc286577005b2b423b4ba1e0c146d676af42e028f3dff6bdd8cd1163f6c7180b49d37794d5e8c4be14828401c1d76d4f6c23d89d84f92a1757f44c3a917

data/Gemfile

@@ -1,7 +1,7 @@
 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 "isodoc", github: "riboseinc/isodoc"
+#gem "asciidoctor-iso", github: "riboseinc/asciidoctor-iso"
 
 gemspec

data/asciidoctor-csand.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "uuidtools"
 
   spec.add_dependency "asciidoctor-iso", ">= 0.9.0"
-  spec.add_dependency "isodoc", "~> 0.8.7"
+  spec.add_dependency "isodoc", "~> 0.8.8"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "byebug", "~> 9.1"

data/lib/asciidoctor/csand/converter.rb

@@ -112,10 +112,6 @@ module Asciidoctor
                         File.join(File.dirname(__FILE__), "csand.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|
@@ -145,6 +141,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
 

data/lib/asciidoctor/csand/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/csand/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/csand/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Csand
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
 end

data/lib/isodoc/csand/csandconvert.rb

@@ -6,28 +6,26 @@ module IsoDoc
     # 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 initialize(options)
+        @libdir = File.dirname(__FILE__)
         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))
-        @htmlcoverpage = html_doc_path("html_csand_titlepage.html")
-        @htmlintropage = html_doc_path("html_csand_intro.html")
-        @scripts = html_doc_path("scripts.html")
       end
 
       def default_fonts(options)
-        b = options[:bodyfont] ||
-          (options[:script] == "Hans" ? '"SimSun",serif' :
-           '"Source Sans Pro",sans-serif')
-        h = options[:headerfont] ||
-          (options[:script] == "Hans" ? '"SimHei",sans-serif' :
-           '"Source Sans Pro",sans-serif')
-        m = options[:monospacefont] || '"Space Mono",monospace'
-        "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n"
+        {
+          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Source Sans Pro",sans-serif'),
+          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Source Sans Pro",sans-serif'),
+          monospacefont: '"Space Mono",monospace'
+        }
+      end
+
+      def default_file_locations(options)
+        {
+          htmlstylesheet: html_doc_path("htmlstyle.scss"),
+          htmlcoverpage: html_doc_path("html_csand_titlepage.html"),
+          htmlintropage: html_doc_path("html_csand_intro.html"),
+          scripts: html_doc_path("scripts.html"),
+        }
       end
 
       def metadata_init(lang, script, labels)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-csand
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 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
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.8.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.8.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement