asciidoctor-csd 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee70980fdab95cdcec168095febdcb817ebd2a37697498df49bca41971a6cce8
-  data.tar.gz: c23a81f3d5bbd536361ac4f9cd5eb7497357d3e860edcb6b0bf8eb4944276191
+  metadata.gz: db09e64e71d053c8d6f96dace3585128671e73b2d17fa457c94874437d395be6
+  data.tar.gz: 229faf5e732ae9dab4c76439f8f68bde91d7fd6bbee0f8c19c3456f0953393b3
 SHA512:
-  metadata.gz: c7254bffe6f9b937fcea7975c0ac8917c53325b16f569e66834115247c0f7fff74f3be8431087727f796b35b4d7110099338599b8df8ccab13cdf7e227264c17
-  data.tar.gz: 6335116e1c1bb883ab6a60df3e2498b543457948c3c4e2af38c910076d2692093634d524893c335bf0ad55848921e2ba92fb488870c6335d4cfeec9de723305a
+  metadata.gz: 92e902e976ab3c90c717bbde1d1fbbb2e0b1fad4bf9c7b8e6f7fb1f5677b9011afde70fab98aa202387e5318186384fa2fb090e0c96230541383900d417c7043
+  data.tar.gz: 4a226694a83f6b0bdbd699bab3cc1f5986c81413834566752e544afbe964f2f74e559c3cf7822463740654a589ad60bae1ae441c3b1e6767f89d1caeba6f66bb

data/asciidoctor-csd.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  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/csd/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/csd/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/csd/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Csd
-    VERSION = "0.4.4"
+    VERSION = "0.4.5"
   end
 end

data/lib/isodoc/csd/csdconvert.rb

@@ -6,28 +6,26 @@ module IsoDoc
     # A {Converter} implementation that generates CSD 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_csd_titlepage.html")
-        @htmlintropage = html_doc_path("html_csd_intro.html")
-        @scripts = html_doc_path("scripts.html")
       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_csd_titlepage.html"),
+          htmlintropage: html_doc_path("html_csd_intro.html"),
+          scripts: html_doc_path("scripts.html"),
+        }
       end
 
       def metadata_init(lang, script, labels)

data/lib/metanorma/csd/processor.rb

@@ -30,7 +30,7 @@ module Metanorma
         when :html
           IsoDoc::Csd::HtmlConvert.new(options).convert(outname, isodoc_node)
         when :pdf
-          require 'tempfile'
+          #require 'tempfile'
           # Tempfile.open("#{outname}.html") do |tmp|
           outname_html = outname + ".html"
           IsoDoc::Csd::HtmlConvert.new(options).convert(outname_html, isodoc_node)

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-csd
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 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-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