metanorma-csd 1.0.1 → 1.0.2

data/lib/isodoc/csd/{csdconvert.rb → html_convert.rb}

@@ -76,6 +76,7 @@ module IsoDoc
 
       def html_head()
         <<~HEAD.freeze
+        <title>{{ doctitle }}</title>
     <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
 
     <!--TOC script import-->

data/lib/isodoc/csd/word_convert.rb

@@ -0,0 +1,96 @@
+require "isodoc"
+require_relative "metadata"
+
+module IsoDoc
+  module Csd
+    # A {Converter} implementation that generates CSD output, and a document
+    # schema encapsulation of the document for validation
+    class WordConvert < IsoDoc::WordConvert
+      def initialize(options)
+        @libdir = File.dirname(__FILE__)
+        super
+      end
+
+      def default_fonts(options)
+        {
+          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("csd.scss"),
+          header: html_doc_path("header.html"),
+          wordcoverpage: html_doc_path("word_csd_titlepage.html"),
+          wordintropage: html_doc_path("word_csd_intro.html"),
+          ulstyle: "l3",
+          olstyle: "l2",
+        }
+      end
+
+      def metadata_init(lang, script, labels)
+        @meta = Metadata.new(lang, script, labels)
+      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 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 pre_parse(node, out)
+        out.pre node.text # content.gsub(/</, "&lt;").gsub(/>/, "&gt;")
+      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 i18n_init(lang, script)
+        super
+        @annex_lbl = "Appendix"
+      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 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
+

data/lib/metanorma-csd.rb

@@ -1,6 +1,7 @@
 require "asciidoctor" unless defined? Asciidoctor::Converter
 require_relative "asciidoctor/csd/converter"
-require_relative "isodoc/csd/csdconvert"
+require_relative "isodoc/csd/html_convert"
+require_relative "isodoc/csd/word_convert"
 require_relative "asciidoctor/csd/version"
 
 if defined? Metanorma

data/lib/metanorma/csd/processor.rb

@@ -13,7 +13,8 @@ module Metanorma
       def output_formats
         super.merge(
           html: "html",
-          pdf: "pdf"
+          pdf: "pdf",
+          doc: "doc"
         )
       end
 
@@ -29,13 +30,15 @@ module Metanorma
         case format
         when :html
           IsoDoc::Csd::HtmlConvert.new(options).convert(outname, isodoc_node)
+        when :doc
+          IsoDoc::Csd::WordConvert.new(options).convert(outname, isodoc_node)
         when :pdf
           #require 'tempfile'
           # Tempfile.open("#{outname}.html") do |tmp|
           outname_html = outname + ".html"
           IsoDoc::Csd::HtmlConvert.new(options).convert(outname_html, isodoc_node)
           puts outname_html
-          system "cat #{outname_html}"
+          #system "cat #{outname_html}"
           Metanorma::Output::Pdf.new.convert(outname_html, outname)
         else
           super

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-csd
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-15 00:00:00.000000000 Z
+date: 2018-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -224,7 +224,6 @@ files:
 - lib/asciidoctor/csd/isostandard.rng
 - lib/asciidoctor/csd/pdf.js
 - lib/asciidoctor/csd/version.rb
-- lib/isodoc/csd/csdconvert.rb
 - lib/isodoc/csd/html/csd.scss
 - lib/isodoc/csd/html/dots-w@2x.png
 - lib/isodoc/csd/html/dots@2x.png
@@ -233,7 +232,12 @@ files:
 - lib/isodoc/csd/html/html_csd_titlepage.html
 - lib/isodoc/csd/html/htmlstyle.scss
 - lib/isodoc/csd/html/scripts.html
+- lib/isodoc/csd/html/word_csd_intro.html
+- lib/isodoc/csd/html/word_csd_titlepage.html
+- lib/isodoc/csd/html/wordstyle.scss
+- lib/isodoc/csd/html_convert.rb
 - lib/isodoc/csd/metadata.rb
+- lib/isodoc/csd/word_convert.rb
 - lib/metanorma-csd.rb
 - lib/metanorma/csd.rb
 - lib/metanorma/csd/processor.rb