isodoc 0.8.7 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f01104dabca281577926307a587e9999a2731d2d297550f1bab164e06b3edccf
-  data.tar.gz: 64cdd14aff259cf0146693a10a012e02857534a2f7a45b3051b42f8af972df85
+  metadata.gz: 175371d554a61e1c0a3c2c7c2b3d549b632278d5cd7cc440dd60f2f6f8460757
+  data.tar.gz: e94494f0e00b97dc7f23154b47c331b08d3b5c53d3f2ac1846b5a7b1cf6b6ff3
 SHA512:
-  metadata.gz: ef626e3f0b6842329ff5ca7ab9b91508c6578898735b3712b1e7b4e1943d3bf7f0775fa6430b8946f4d192343ce2d436bc7144bfb0150e3c68a5b3eada530b73
-  data.tar.gz: 51a3531c9264f52b4da6fdd1e63f40f0429c04ebf265ce84968be93a642e592bad9f2a6d963a252de91c1b2b2538759311413dea403698f53dbfbad70717008a
+  metadata.gz: ebf2dd5678bbd1b727fd1c70a41047c19bfc462fd38614508e5b234618a4c505413a6fb616adc0ced45db6328a01363467c00b20a4ee8f7ee9f096dea2f4b578
+  data.tar.gz: dcfcd9e5dec8df4179cba4dbfca9d41f0749060e739f894919e9650ad57d0bed0f31ab0ef3cc8847f4fe2365829171207cac42954e1fc579cf57427bc6eddedb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    isodoc (0.8.7)
+    isodoc (0.8.8)
       asciimath
       html2doc (~> 0.8.1)
       htmlentities (~> 4.3.4)

data/README.adoc

@@ -10,7 +10,7 @@ This Gem converts documents in the https://github.com/riboseinc/isodoc-models[IS
 
 == Usage
 
-The Gem contains two classes, `IsoDoc::Convert` (for HTML output) and `IsoDoc::WordConvert` (for Word output). They are initialised with the following rendering parameters:
+The Gem contains the subclasses `Iso::HtmlWordConvert` (for HTML output) and `IsoDoc::WordConvert` (for Word output). They are initialised with the following rendering parameters:
 
 i18nyaml:: YAML file giving internationalisation equivalents for keywords in rendering output; see https://github.com/riboseinc/asciidoctor-iso#document-attributes for further documentation
 bodyfont:: Font for body text
@@ -19,6 +19,18 @@ monospacefont:: Font for monospace text
 titlefont:: Font for document title text (currently used only in GB)
 script:: The ISO 15924 code for the main script that the standard document is in; used to pick the default fonts for the document
 alt:: Generate alternate rendering (currently used only in ISO)
+compliance:: Generate alternate rendering (currently used only in GB)
+htmlstylesheet:: Stylesheet for HTML output
+htmlcoverpage:: Cover page for HTML output
+htmlintropage:: Introductory page for HTML output
+scripts:: Scripts page for HTML output
+wordstylesheet:: Stylesheet for Word output
+standardstylesheet:: Secondary stylesheet for Word output
+header:: Header file for Word output
+wordcoverpage:: Cover page for Word output
+wordintropage:: Introductory page for Word output
+ulstyle:: Style identifier in Word stylesheet for unordered lists
+olstyle:: Style identifier in Word stylesheet for ordered list
 
 The IsoDoc gem classes themselves are abstract (though their current implementation contains rendering specific to the ISO standard.) Subclasses of the Isodoc gem classes are specific to different standards, and are associated with templates and stylesheets speciific to the rendering of those standards. Subclasses also provide the default values for the rendering parameters above; they should be used only as overrides.
 

data/lib/isodoc/convert.rb

@@ -16,11 +16,18 @@ module IsoDoc
     # i18nyaml: YAML file for internationalisation of text
     # ulstyle: list style in Word CSS for unordered lists
     # olstyle: list style in Word CSS for ordered lists
+    # bodyfont: font to use for body text
+    # headerfont: font to use for header text
+    # monospace: font to use for monospace text
     def initialize(options)
+      @libdir = File.dirname(__FILE__) unless @libdir
+      options.merge!(default_fonts(options)) { |_, old, new| old || new }.
+        merge!(default_file_locations(options)) { |_, old, new| old || new }
       @options = options
-      @htmlstylesheet = options[:htmlstylesheet]
-      @wordstylesheet = options[:wordstylesheet]
-      @standardstylesheet = options[:standardstylesheet]
+      @files_to_delete = []
+      @htmlstylesheet = generate_css(options[:htmlstylesheet], true, extract_fonts(options))
+      @wordstylesheet = generate_css(options[:wordstylesheet], false, extract_fonts(options))
+      @standardstylesheet = generate_css(options[:standardstylesheet], false, extract_fonts(options))
       @header = options[:header]
       @htmlcoverpage = options[:htmlcoverpage]
       @wordcoverpage = options[:wordcoverpage]
@@ -47,17 +54,51 @@ module IsoDoc
       @closemathdelim = "`"
       @lang = "en"
       @script = "Latn"
-      @files_to_delete = []
       @tmpimagedir = "_images"
       @maxwidth = 1200
       @maxheight = 800
     end
 
+    def default_fonts(_options)
+      {
+        bodyfont: "Arial",
+        headerfont: "Arial",
+        monospacefont: "Courier",
+      }
+    end
+
+    # none for this parent gem, but will be populated in child gems which have access to stylesheets &c; e.g.
+    # {
+    #      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"),
+    #      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
+    # }
+    def default_file_locations(_options)
+      {}
+    end
+
+    # extract fonts for use in generate_css
+    def extract_fonts(options)
+      b = options[:bodyfont] || "Arial"
+      h = options[:headerfont] || "Arial"
+      m = options[:monospacefont] || "Courier"
+      "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n"
+    end
+
     def html_doc_path(file)
-      File.join(File.dirname(__FILE__), File.join("html", file))
+      File.join(@libdir, File.join("html", file))
     end
 
     def generate_css(filename, stripwordcss, fontheader)
+      return nil unless filename
       stylesheet = File.read(filename, encoding: "UTF-8")
       stylesheet.gsub!(/(\s|\{)mso-[^:]+:[^;]+;/m, "\\1") if stripwordcss
       engine = Sass::Engine.new(fontheader + stylesheet, syntax: :scss)

data/lib/isodoc/html_function/html.rb

@@ -140,6 +140,7 @@ module IsoDoc::HtmlFunction
     end
 
     def htmlstyle(docxml)
+      return docxml unless @htmlstylesheet
       title = docxml.at("//*[local-name() = 'head']/*[local-name() = 'title']")
       head = docxml.at("//*[local-name() = 'head']")
       css = htmlstylesheet

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "0.8.7".freeze
+  VERSION = "0.8.8".freeze
 end

data/spec/isodoc/postproc_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe IsoDoc do
   it "generates HTML output docs with null configuration" do
     system "rm -f test.doc"
     system "rm -f test.html"
-    IsoDoc::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", <<~"INPUT", false)
+    IsoDoc::HtmlConvert.new({wordstylesheet: "spec/assets/word.css"}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <note>
@@ -35,8 +35,8 @@ RSpec.describe IsoDoc do
     INPUT
     expect(File.exist?("test.html")).to be true
     html = File.read("test.html")
-    expect(html).to match(%r{<title>test</title><style>})
-    expect(html).to match(/another empty stylesheet/)
+    expect(html).not_to match(%r{<title>test</title><style>})
+    expect(html).not_to match(/another empty stylesheet/)
     expect(html).to match(%r{cdnjs\.cloudflare\.com/ajax/libs/mathjax/2\.7\.1/MathJax\.js})
     expect(html).to match(/delimiters: \[\['\(#\(', '\)#\)'\]\]/)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 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: asciimath