asciidoctor-rsd 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b34cc6eb881832f419827f68e71d0934c1634a1624ce72a982b9b3f91acd84e2
-  data.tar.gz: 504689a09ddec754e31539a0a00745c963937041966bd8d254de90d218c417cf
+  metadata.gz: 04c9816718afed531d4179413757dd82608d751ffce7aa9dcf353db78a7240af
+  data.tar.gz: 8d44773ff6f70116d8e8164d953b66b65f4f23bf8d5d43b72787e0a1be9731c5
 SHA512:
-  metadata.gz: 7b240e36e65a9edc28f7ffeda4c34e7df7c522ed1e7c59b2c1bfdf48d17e360d2a84170d8b6bd3b86612cd58a72ea5e05055d43202828588fa1719d025879ec8
-  data.tar.gz: c124c3352f66520909ffdb3eb7ca881c9e51f15b5e158d3517710f3a59f5997cfc5c875599e78f26b22fc4afa1c82b1ebaf02b5a14ea4cc240322ec72f21cfe9
+  metadata.gz: 3cd7bb758a501f97bf999d86bddcbb338b82f4a2a2f470b4efc5ba183cd2fb8c06870639ca2480d2903fd71ba9681842649288e61e8bf391ba857d6ad4924619
+  data.tar.gz: 69f88b7921a6988ee328507cd76fdfdb2a8cf813e33fa4b2a09173d050722a37ab51977b579d9bca90b47ad70e10c776921fde1cc90ac9434b6cfcca59c8ca0e

data/asciidoctor-rsd.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "nokogiri"
   spec.add_dependency "asciidoctor-iso", "~> 0.10.1"
-  spec.add_dependency "isodoc", ">= 0.8.4"
+  spec.add_dependency "isodoc", ">= 0.8.8"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "byebug", "~> 9.1"

data/lib/asciidoctor/rsd/converter.rb

@@ -14,6 +14,11 @@ module Asciidoctor
 
       register_for "rsd"
 
+      def initialize(backend, opts)
+        super
+        @libdir = File.dirname(__FILE__)
+      end
+
       def metadata_author(node, xml)
         xml.contributor do |c|
           c.role **{ type: "author" }
@@ -96,7 +101,8 @@ module Asciidoctor
 
       def doctype(node)
         d = node.attr("doctype")
-        unless %w{policy-and-procedures best-practices supporting-document report legal directives proposal standard}.include? d
+        unless %w{policy-and-procedures best-practices supporting-document
+          report legal directives proposal standard}.include? d
           warn "#{d} is not a legal document type: reverting to 'standard'"
           d = "standard"
         end
@@ -158,13 +164,17 @@ module Asciidoctor
 
       def html_converter(node)
         IsoDoc::Rsd::HtmlConvert.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"),
+            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"),
+            htmlstylesheet: node.attr("htmlstylesheet"),
+            htmlcoverpage: node.attr("htmlcoverpage"),
+            htmlintropage: node.attr("htmlintropage"),
+            scripts: node.attr("scripts"),
         )
       end
 
@@ -177,6 +187,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/rsd/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/rsd/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/rsd/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Rsd
-    VERSION = "0.3.4"
+    VERSION = "0.3.5"
   end
 end

data/lib/isodoc/rsd/html_convert.rb

@@ -1,5 +1,6 @@
 require "isodoc"
 require_relative "metadata"
+require "fileutils"
 
 module IsoDoc
   module Rsd
@@ -8,29 +9,29 @@ module IsoDoc
     # schema encapsulation of the document for validation
     #
     class HtmlConvert < IsoDoc::HtmlConvert
-      def rsd_html_path(file)
-        File.join(File.dirname(__FILE__), File.join("html", file))
-      end
-
       def initialize(options)
+        @libdir = File.dirname(__FILE__)
         super
-        @htmlstylesheet = generate_css(rsd_html_path("htmlstyle.scss"), true, default_fonts(options))
-        @htmlcoverpage = rsd_html_path("html_rsd_titlepage.html")
-        @htmlintropage = rsd_html_path("html_rsd_intro.html")
-        @scripts = rsd_html_path("scripts.html")
-        system "cp #{html_doc_path('logo.svg')} logo.svg"
+        #system "cp #{html_doc_path('logo.svg')} logo.svg"
+        FileUtils.cp html_doc_path('logo.svg'), "logo.svg"
         @files_to_delete << "logo.svg"
       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_rsd_titlepage.html"),
+          htmlintropage: html_doc_path("html_rsd_intro.html"),
+          scripts: html_doc_path("scripts.html"),
+        }
       end
 
       def metadata_init(lang, script, labels)

data/lib/isodoc/rsd/pdf_convert.rb

@@ -1,34 +1,35 @@
 require "isodoc"
 require_relative "metadata"
+require "fileutils"
 
 module IsoDoc
   module Rsd
     # A {Converter} implementation that generates PDF HTML output, and a
     # document schema encapsulation of the document for validation
     class PdfConvert < IsoDoc::PdfConvert
-      def rsd_html_path(file)
-        File.join(File.dirname(__FILE__), File.join("html", file))
-      end
-
       def initialize(options)
+        @libdir = File.dirname(__FILE__)
         super
-        @htmlstylesheet = generate_css(rsd_html_path("htmlstyle.scss"), true, default_fonts(options))
-        @htmlcoverpage = rsd_html_path("html_rsd_titlepage.html")
-        @htmlintropage = rsd_html_path("html_rsd_intro.html")
-        @scripts = rsd_html_path("scripts.html")
-        system "cp #{html_doc_path('logo.svg')} logo.svg"
+        #system "cp #{html_doc_path('logo.svg')} logo.svg"
+        FileUtils.cp html_doc_path('logo.svg'), "logo.svg"
         @files_to_delete << "logo.svg"
       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_rsd_titlepage.html"),
+          htmlintropage: html_doc_path("html_rsd_intro.html"),
+          scripts: html_doc_path("scripts.html"),
+        }
       end
 
       def metadata_init(lang, script, labels)

data/lib/isodoc/rsd/word_convert.rb

@@ -1,5 +1,6 @@
 require "isodoc"
 require_relative "metadata"
+require "fileutils"
 
 module IsoDoc
   module Rsd
@@ -7,32 +8,32 @@ module IsoDoc
     # schema encapsulation of the document for validation
 
     class WordConvert < IsoDoc::WordConvert
-      def rsd_html_path(file)
-        File.join(File.dirname(__FILE__), File.join("html", file))
-      end
-
       def initialize(options)
+        @libdir = File.dirname(__FILE__)
         super
-        @wordstylesheet = generate_css(rsd_html_path("wordstyle.scss"), false, default_fonts(options))
-        @standardstylesheet = generate_css(rsd_html_path("rsd.scss"), false, default_fonts(options))
-        @header = rsd_html_path("header.html")
-        @wordcoverpage = rsd_html_path("word_rsd_titlepage.html")
-        @wordintropage = rsd_html_path("word_rsd_intro.html")
-        @ulstyle = "l3"
-        @olstyle = "l2"
-        system "cp #{html_doc_path('logo.svg')} logo.svg"
+        #system "cp #{html_doc_path('logo.svg')} logo.svg"
+        FileUtils.cp html_doc_path('logo.svg'), "logo.svg"
         @files_to_delete << "logo.svg"
       end
 
       def default_fonts(options)
-        b = options[:bodyfont] ||
-          (options[:script] == "Hans" ? '"SimSun",serif' :
-           '"Arial",sans-serif')
-        h = options[:headerfont] ||
-          (options[:script] == "Hans" ? '"SimHei",sans-serif' :
-           '"Arial",sans-serif')
-        m = options[:monospacefont] || '"Courier New",monospace'
-        "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n"
+        {
+          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Arial",sans-serif'),
+          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Arial",sans-serif'),
+          monospacefont: '"Courier New",monospace'
+        }
+      end
+
+      def default_file_locations(options)
+        {
+          wordstylesheet: html_doc_path("wordstyle.scss"),
+          standardstylesheet: html_doc_path("rsd.scss"),
+          header: html_doc_path("header.html"),
+          wordcoverpage: html_doc_path("word_rsd_titlepage.html"),
+          wordintropage: html_doc_path("word_rsd_intro.html"),
+          ulstyle: "l3",
+          olstyle: "l2",
+        }
       end
 
       def metadata_init(lang, script, labels)

data/lib/metanorma/rsd/processor.rb

@@ -34,14 +34,6 @@ module Metanorma
           IsoDoc::Rsd::WordConvert.new(options).convert(outname, isodoc_node)
         when :pdf
           IsoDoc::Rsd::PdfConvert.new(options).convert(outname, isodoc_node)
-=begin
-          require 'tempfile'
-          outname_html = outname + ".html"
-          IsoDoc::Rsd::HtmlConvert.new(options).convert(outname_html, isodoc_node)
-          puts outname_html
-          system "cat #{outname_html}"
-          Metanorma::Output::Pdf.new.convert(outname_html, outname)
-=end
         else
           super
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-rsd
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.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
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.8.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.8.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement