metanorma-acme 0.3.3 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f439036427eeadbfc4bf41f65e4c4d8e655fc754708a3f05e8e55a7fd38f576f
-  data.tar.gz: 066e2fa159203120aa60a98d774e9ce83ab2e4775354b0f6699d9c3d0e779bd2
+  metadata.gz: 50076c0a8cec8d60eaec16b8844110b892a462ad28485e4e56b73202da4e8af4
+  data.tar.gz: 72134238abb869d305b46246de35bb0523de8753ad717e2ab1bc472f49ac7a65
 SHA512:
-  metadata.gz: f714a3a4da7da69ecd037fafb25666dd54d76e945b9813d1f2f1deaed0e44d6329e4f58daf0f7307352a8e643d246e4c086bf72136151e00ed9276a7f600b23b
-  data.tar.gz: 478b6069bba6f07a30b25760bb67c5b4b9264a393b19d427dba30d6803156159e807feed15f0d96814a9365e1dab3154201132093db0d49452697565203e67f1
+  metadata.gz: aa00611552960fa5afeb6a99af13792df6fa25238f47aba6a899d7efca11991e03188c6281b376e1367f10252ac24233be09656be7c96fbe6e00faa8b7c372cb
+  data.tar.gz: 872af1e115d6316d43477e78e142493b6a58c38d2be7fdd6265e2909540ddc66c1664ccd292a5d1884fd8e6c1404ca44a31d75a3809078d0513478b6c0f0b456

data/.travis.yml

@@ -4,6 +4,7 @@ language: ruby
 rvm:
   - 2.5
   - 2.4
+  - 2.3
   - ruby-head
 before_install:
   - gem install bundler

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/README.adoc

@@ -1,13 +1,43 @@
 = metanorma-acme: Sample Asciidoctor processor for Metanorma documents
 
-////
 image:https://img.shields.io/gem/v/metanorma-acme.svg["Gem Version", link="https://rubygems.org/gems/metanorma-acme"]
 image:https://img.shields.io/travis/riboseinc/metanorma-acme/master.svg["Build Status", link="https://travis-ci.org/riboseinc/metanorma-acme"]
 image:https://codeclimate.com/github/riboseinc/metanorma-acme/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/riboseinc/metanorma-acme"]
-////
 
 == Functionality
 
 This is an example of a https://github.com/riboseinc/metanorma[Metanorma] gem for processing input formats (Asciidoctor) and generating output formats (Word, HTML, PDF). 
-It has been created as an exemplar for generating new instances of Metanorma gems, as illustrated in https://github.com/riboseinc/asciidoctor-iso/wiki/Gem-Customisation-Guide
+It has been created as an exemplar for generating new instances of Metanorma gems, as illustrated in https://github.com/riboseinc/metanorma-iso/wiki/Gem-Customisation-Guide
 
+You can customise output of this gem for your own purposes without needing to customise the gem fully. You can use the
+following asciidoctor document variables to set the stylesheets that are passed as arguments to the `isodoc` gem:
+
+````
+:body-font: (name of the main font to be used)
+:header-font: (name of the header font to be used)
+:monospace-font: (name of the monospace font to be used)
+:htmlstylesheet: (stylesheet for HTML)
+:htmlcoverpage: (cover page for HTML)
+:htmlintropage: (intro page for HTML)
+:scripts: (scripts for HTML)
+:wordstylesheet: (default stylesheet for Word)
+:standardstylesheet: (standard-specific stylesheet for Word)
+:header: (header/footer HTML for Word)
+:wordcoverpage: (cover page for Word)
+:wordintropage: (intro page for Word)
+:ulstyle: (list style selector for unordered lists for Word)
+:olstyle: (list style selector for ordered lists for Word)
+````
+
+You should run the gem through the https://github.com/riboseinc/metanorma-cli[Metanorma CLI]: 
+
+[source, console]
+----
+metanorma -r metanorma-acme -t acme test.adoc
+----
+
+The CSS stylesheets are normally expected to be https://sass-lang.com/guide[SCSS], with the font names `$body-font, $header-font, $monospace-font` used as variables; but if you supply the stylesheets, you can bypass that customisation, and give the font names in the stylesheets.
+
+The cover page and intro page are still expected to be http://liquidmarkup.org[Liquid Template] files, giving metadata fields from `isodoc/metadata.rb` in curly brackets. See https://github.com/riboseinc/isodoc/blob/master/lib/isodoc/metadata.rb for the default metadata field settings.
+
+The use of HTML and CSS for Word is idiosyncratic, and involves some trial and error; consult the documentation above for more information.

data/lib/asciidoctor/acme/converter.rb

@@ -1,5 +1,5 @@
 require "asciidoctor"
-require "asciidoctor/iso/converter"
+require "asciidoctor/standoc/converter"
 
 module Asciidoctor
   module Acme
@@ -7,7 +7,7 @@ module Asciidoctor
     # A {Converter} implementation that generates RSD output, and a document
     # schema encapsulation of the document for validation
     #
-    class Converter < ISO::Converter
+    class Converter < Standoc::Converter
 
       register_for "acme"
 
@@ -154,27 +154,11 @@ module Asciidoctor
       end
 
       def html_converter(node)
-        IsoDoc::Acme::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"),
-        )
+        IsoDoc::Acme::HtmlConvert.new(html_extract_attributes(node))
       end
 
       def word_converter(node)
-        IsoDoc::Acme::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"),
-        )
+        IsoDoc::Acme::WordConvert.new(doc_extract_attributes(node))
       end
 
       def inline_quoted(node)

data/lib/isodoc/acme/html_convert.rb

@@ -1,5 +1,6 @@
 require "isodoc"
 require_relative "metadata"
+require "fileutils"
 
 module IsoDoc
   module Acme
@@ -8,37 +9,37 @@ module IsoDoc
     # schema encapsulation of the document for validation
     #
     class HtmlConvert < IsoDoc::HtmlConvert
-      def html_path_acme(file)
-        File.join(File.dirname(__FILE__), File.join("html", file))
-      end
-
       def initialize(options)
+        @libdir = File.dirname(__FILE__)
         super
-        @htmlstylesheet = generate_css(html_path_acme("htmlstyle.scss"), true, default_fonts(options))
-        @htmlcoverpage = html_path_acme("html_acme_titlepage.html")
-        @htmlintropage = html_path_acme("html_acme_intro.html")
-        @scripts = html_path_acme("scripts.html")
-        system "cp #{html_path_acme('logo.jpg')} logo.jpg"
+        #system "cp #{html_doc_path('logo.jpg')} logo.jpg"
+        FileUtils.cp html_doc_path('logo.jpg'), "logo.jpg"
         @files_to_delete << "logo.jpg"
       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 metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
+      def default_file_locations(_options)
+        {
+          htmlstylesheet: html_doc_path("htmlstyle.scss"),
+          htmlcoverpage: html_doc_path("html_acme_titlepage.html"),
+          htmlintropage: html_doc_path("html_acme_intro.html"),
+          scripts: html_doc_path("scripts.html"),
+        }
       end
 
-      def html_head
-        <<~HEAD.freeze
+        def metadata_init(lang, script, labels)
+          @meta = Metadata.new(lang, script, labels)
+        end
+
+        def html_head
+          <<~HEAD.freeze
     <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
 
     <!--TOC script import-->
@@ -51,148 +52,148 @@ module IsoDoc
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/solid.css" integrity="sha384-v2Tw72dyUXeU3y4aM2Y0tBJQkGfplr39mxZqlTBDUZAb9BGoC40+rdFCG0m10lXk" crossorigin="anonymous">
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/fontawesome.css" integrity="sha384-q3jl8XQu1OpdLgGFvNRnPdj5VIlCvgsDQTQB6owSOHWlAurxul7f+JpUOVdAiJ5P" crossorigin="anonymous">
     <style class="anchorjs"></style>
-        HEAD
-      end
-
-      def make_body(xml, docxml)
-        body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72", "xml:lang": "EN-US", class: "container" }
-        xml.body **body_attr do |body|
-          make_body1(body, docxml)
-          make_body2(body, docxml)
-          make_body3(body, docxml)
+          HEAD
         end
-      end
 
-      def html_toc(docxml)
-        docxml
-      end
+        def make_body(xml, docxml)
+          body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72", "xml:lang": "EN-US", class: "container" }
+          xml.body **body_attr do |body|
+            make_body1(body, docxml)
+            make_body2(body, docxml)
+            make_body3(body, docxml)
+          end
+        end
 
-      def annex_name(annex, name, div)
-        div.h1 **{ class: "Annex" } do |t|
-          t << "#{get_anchors[annex['id']][:label]} "
-          t << "<b>#{name.text}</b>"
+        def html_toc(docxml)
+          docxml
         end
-      end
 
-      def annex_name_lbl(clause, num)
-        obl = l10n("(#{@inform_annex_lbl})")
-        obl = l10n("(#{@norm_annex_lbl})") if clause["obligation"] == "normative"
-        l10n("<b>#{@annex_lbl} #{num}</b> #{obl}")
-      end
+        def annex_name(annex, name, div)
+          div.h1 **{ class: "Annex" } do |t|
+            t << "#{get_anchors[annex['id']][:label]} "
+            t << "<b>#{name.text}</b>"
+          end
+        end
 
-      def pre_parse(node, out)
-        out.pre node.text # content.gsub(/</, "&lt;").gsub(/>/, "&gt;")
-      end
+        def annex_name_lbl(clause, num)
+          obl = l10n("(#{@inform_annex_lbl})")
+          obl = l10n("(#{@norm_annex_lbl})") if clause["obligation"] == "normative"
+          l10n("<b>#{@annex_lbl} #{num}</b> #{obl}")
+        end
 
-      def term_defs_boilerplate(div, source, term, preface)
-        if source.empty? && term.nil?
-          div << @no_terms_boilerplate
-        else
-          div << term_defs_boilerplate_cont(source, term)
+        def pre_parse(node, out)
+          out.pre node.text # content.gsub(/</, "&lt;").gsub(/>/, "&gt;")
         end
-      end
 
-      def i18n_init(lang, script)
-        super
-        @annex_lbl = "Appendix"
-      end
+        def term_defs_boilerplate(div, source, term, preface)
+          if source.empty? && term.nil?
+            div << @no_terms_boilerplate
+          else
+            div << term_defs_boilerplate_cont(source, term)
+          end
+        end
 
-      def error_parse(node, out)
-        # catch elements not defined in ISO
-        case node.name
-        when "pre"
-          pre_parse(node, out)
-        when "keyword"
-          out.span node.text, **{ class: "keyword" }
-        else
+        def i18n_init(lang, script)
           super
+          @annex_lbl = "Appendix"
         end
-      end
 
-      def fileloc(loc)
-        File.join(File.dirname(__FILE__), loc)
-      end
+        def error_parse(node, out)
+          # catch elements not defined in ISO
+          case node.name
+          when "pre"
+            pre_parse(node, out)
+          when "keyword"
+            out.span node.text, **{ class: "keyword" }
+          else
+            super
+          end
+        end
 
-      def cleanup(docxml)
-        super
-        term_cleanup(docxml)
-      end
+        def fileloc(loc)
+          File.join(File.dirname(__FILE__), loc)
+        end
 
-      def term_cleanup(docxml)
-        docxml.xpath("//p[@class = 'Terms']").each do |d|
-          h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
-          h2.add_child("&nbsp;")
-          h2.add_child(d.remove)
+        def cleanup(docxml)
+          super
+          term_cleanup(docxml)
         end
-        docxml
-      end
 
-      def info(isoxml, out)
-        @meta.security isoxml, out
-        super
-      end
+        def term_cleanup(docxml)
+          docxml.xpath("//p[@class = 'Terms']").each do |d|
+            h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
+            h2.add_child("&nbsp;")
+            h2.add_child(d.remove)
+          end
+          docxml
+        end
 
-      def annex_name(annex, name, div)
-        div.h1 **{ class: "Annex" } do |t|
-          t << "#{get_anchors[annex['id']][:label]} "
-          t << "<b>#{name.text}</b>"
+        def info(isoxml, out)
+          @meta.security isoxml, out
+          super
         end
-      end
 
-      def annex_name_lbl(clause, num)
-        obl = l10n("(#{@inform_annex_lbl})")
-        obl = l10n("(#{@norm_annex_lbl})") if clause["obligation"] == "normative"
-        l10n("<b>#{@annex_lbl} #{num}</b> #{obl}")
-      end
+        def annex_name(annex, name, div)
+          div.h1 **{ class: "Annex" } do |t|
+            t << "#{get_anchors[annex['id']][:label]} "
+            t << "<b>#{name.text}</b>"
+          end
+        end
 
-      def pre_parse(node, out)
-        out.pre node.text # content.gsub(/</, "&lt;").gsub(/>/, "&gt;")
-      end
+        def annex_name_lbl(clause, num)
+          obl = l10n("(#{@inform_annex_lbl})")
+          obl = l10n("(#{@norm_annex_lbl})") if clause["obligation"] == "normative"
+          l10n("<b>#{@annex_lbl} #{num}</b> #{obl}")
+        end
 
-      def term_defs_boilerplate(div, source, term, preface)
-        if source.empty? && term.nil?
-          div << @no_terms_boilerplate
-        else
-          div << term_defs_boilerplate_cont(source, term)
+        def pre_parse(node, out)
+          out.pre node.text # content.gsub(/</, "&lt;").gsub(/>/, "&gt;")
         end
-      end
 
-      def i18n_init(lang, script)
-        super
-        @annex_lbl = "Appendix"
-      end
+        def term_defs_boilerplate(div, source, term, preface)
+          if source.empty? && term.nil?
+            div << @no_terms_boilerplate
+          else
+            div << term_defs_boilerplate_cont(source, term)
+          end
+        end
 
-      def error_parse(node, out)
-        # catch elements not defined in ISO
-        case node.name
-        when "pre"
-          pre_parse(node, out)
-        when "keyword"
-          out.span node.text, **{ class: "keyword" }
-        else
+        def i18n_init(lang, script)
           super
+          @annex_lbl = "Appendix"
         end
-      end
 
-      def fileloc(loc)
-        File.join(File.dirname(__FILE__), loc)
-      end
+        def error_parse(node, out)
+          # catch elements not defined in ISO
+          case node.name
+          when "pre"
+            pre_parse(node, out)
+          when "keyword"
+            out.span node.text, **{ class: "keyword" }
+          else
+            super
+          end
+        end
 
-      def cleanup(docxml)
-        super
-        term_cleanup(docxml)
-      end
+        def fileloc(loc)
+          File.join(File.dirname(__FILE__), loc)
+        end
 
-      def term_cleanup(docxml)
-        docxml.xpath("//p[@class = 'Terms']").each do |d|
-          h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
-          h2.add_child("&nbsp;")
-          h2.add_child(d.remove)
+        def cleanup(docxml)
+          super
+          term_cleanup(docxml)
         end
-        docxml
-      end
 
+        def term_cleanup(docxml)
+          docxml.xpath("//p[@class = 'Terms']").each do |d|
+            h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
+            h2.add_child("&nbsp;")
+            h2.add_child(d.remove)
+          end
+          docxml
+        end
+
+      end
     end
   end
-end
 

data/lib/isodoc/acme/pdf_convert.rb

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

data/lib/isodoc/acme/word_convert.rb

@@ -1,5 +1,6 @@
 require "isodoc"
 require_relative "metadata"
+require "fileutils"
 
 module IsoDoc
   module Acme
@@ -7,33 +8,34 @@ module IsoDoc
     # schema encapsulation of the document for validation
 
     class WordConvert < IsoDoc::WordConvert
-      def html_path_acme(file)
-        File.join(File.dirname(__FILE__), File.join("html", file))
-      end
-
       def initialize(options)
+        @libdir = File.dirname(__FILE__)
         super
-        @wordstylesheet = generate_css(html_path_acme("wordstyle.scss"), false, default_fonts(options))
-        @standardstylesheet = generate_css(html_path_acme("acme.scss"), false, default_fonts(options))
-        @header = html_path_acme("header.html")
-        @wordcoverpage = html_path_acme("word_acme_titlepage.html")
-        @wordintropage = html_path_acme("word_acme_intro.html")
-        @ulstyle = "l3"
-        @olstyle = "l2"
-        system "cp #{html_path_acme('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' :
-           '"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("acme.scss"),
+          header: html_doc_path("header.html"),
+          wordcoverpage: html_doc_path("word_acme_titlepage.html"),
+          wordintropage: html_doc_path("word_acme_intro.html"),
+          ulstyle: "l3",
+          olstyle: "l2",
+        }
+      end
+
+
       def metadata_init(lang, script, labels)
         @meta = Metadata.new(lang, script, labels)
       end
@@ -77,7 +79,7 @@ module IsoDoc
         h1 = to_xhtml_fragment(h.dup)
         h1.traverse do |x|
           x.replace(" ") if x.name == "span" &&
-            /mso-tab-count/.match?(x["style"])
+            /mso-tab-count/.match(x["style"])
           x.remove if x.name == "span" && x["class"] == "MsoCommentReference"
           x.remove if x.name == "a" && x["epub:type"] == "footnote"
           x.replace(x.children) if x.name == "a"

data/lib/metanorma/acme/processor.rb

@@ -26,6 +26,35 @@ module Metanorma
         Metanorma::Input::Asciidoc.new.process(file, @asciidoctor_backend)
       end
 
+      def extract_options(file)
+        head = file.sub(/\n\n.*$/m, "\n")
+        /\n:htmlstylesheet: (?<htmlstylesheet>[^\n]+)\n/ =~ head
+        /\n:htmlcoverpage: (?<htmlcoverpage>[^\n]+)\n/ =~ head
+        /\n:htmlintropage: (?<htmlintropage>[^\n]+)\n/ =~ head
+        /\n:scripts: (?<scripts>[^\n]+)\n/ =~ head
+        /\n:wordstylesheet: (?<wordstylesheet>[^\n]+)\n/ =~ head
+        /\n:standardstylesheet: (?<standardstylesheet>[^\n]+)\n/ =~ head
+        /\n:header: (?<header>[^\n]+)\n/ =~ head
+        /\n:wordcoverpage: (?<wordcoverpage>[^\n]+)\n/ =~ head
+        /\n:wordintropage: (?<wordintropage>[^\n]+)\n/ =~ head
+        /\n:ulstyle: (?<ulstyle>[^\n]+)\n/ =~ head
+        /\n:olstyle: (?<olstyle>[^\n]+)\n/ =~ head
+        new_options = {
+          htmlstylesheet: defined?(htmlstylesheet) ? htmlstylesheet : nil,
+          htmlcoverpage: defined?(htmlcoverpage) ? htmlcoverpage : nil,
+          htmlintropage: defined?(htmlintropage) ? htmlintropage : nil,
+          scripts: defined?(scripts) ? scripts : nil,
+          wordstylesheet: defined?(wordstylesheet) ? wordstylesheet : nil,
+          standardstylesheet: defined?(standardstylesheet) ? standardstylesheet : nil,
+          header: defined?(header) ? header : nil,
+          wordcoverpage: defined?(wordcoverpage) ? wordcoverpage : nil,
+          wordintropage: defined?(wordintropage) ? wordintropage : nil,
+          ulstyle: defined?(ulstyle) ? ulstyle : nil,
+          olstyle: defined?(olstyle) ? olstyle : nil,
+        }.reject { |_, val| val.nil? }
+        super.merge(new_options)
+      end
+
       def output(isodoc_node, outname, format, options={})
         case format
         when :html
@@ -34,14 +63,6 @@ module Metanorma
           IsoDoc::Acme::WordConvert.new(options).convert(outname, isodoc_node)
         when :pdf
           IsoDoc::Acme::PdfConvert.new(options).convert(outname, isodoc_node)
-=begin
-          require 'tempfile'
-          outname_html = outname + ".html"
-          IsoDoc::Acme::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

data/lib/metanorma/acme/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Acme
-    VERSION = "0.3.3"
+    VERSION = "0.3.6"
   end
 end

data/metanorma-acme.gemspec

@@ -29,8 +29,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "ruby-jing"
 
-  spec.add_dependency "asciidoctor-iso", "~> 0.9.3"
-  spec.add_dependency "isodoc", "~> 0.8.1"
+  spec.add_dependency "metanorma-standoc", "~> 1.0.0"
+  spec.add_dependency "isodoc", "~> 0.8.8"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "byebug", "~> 9.1"
@@ -43,4 +43,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "metanorma", "~> 0.2.5"
+  spec.add_development_dependency "metanorma-cli", "~> 0.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-acme
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-17 00:00:00.000000000 Z
+date: 2018-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -53,33 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: asciidoctor-iso
+  name: metanorma-standoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +234,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.5
+- !ruby/object:Gem::Dependency
+  name: metanorma-cli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 description: |
   Metanorma for the (fictitious) Acme Corp.
 
@@ -301,7 +315,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Metanorma for the (fictitious) Acme Corp.