isodoc 0.9.18 → 0.9.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc1164b1e3776905b856a609bf053e2825f6885edf53a793ecf2ec9bb961d8c9
-  data.tar.gz: 91df81ab9d6ce87fb42b471fe08fca08e790b5372158bca5802380ee1189ec8d
+  metadata.gz: ee247cb9d9b705d6a00ec5a27a2cb20295f16c48ffbe4cb6152e934b7c16893b
+  data.tar.gz: b4ddb650b8fcc3fd95f3f6104956cba1e96639158eaf19874704e51bc48aed60
 SHA512:
-  metadata.gz: f68093afb5788e3d98095cd95afb2ded814f6107f5df39d4036328de31f7dfe91b8f0d49f9286447c516e1ace65cb30b55d39ab532fa614eeb4d82aaba3503bc
-  data.tar.gz: a49b38262be2f2c216f5a341d953523b03c83d0894d813d6a3a6fef1be750c558ad9dbb032720074748daf474fcdac226f21017d933282a635d3da10d75911fc
+  metadata.gz: cfc35a27e441b0f50dcb24aed67e1576024e2246c8784193541532361aaa068981ac1bcfc31a35fc8625149daec18c55fbd14ccd231c9ea8ab155c9193100421
+  data.tar.gz: 73c4c6f98f010ad651d86b834514af80f90fcc9b50d5d50a26bf066a3c9a09d9d888494f732f1458dcb6eac0e098d25e911fb97fd43548da43881c412cd00776

data/.travis.yml

@@ -1,17 +1,15 @@
+dist: trusty
 sudo: false
 language: ruby
-
 rvm:
   - 2.5
   - 2.4
   - 2.3
   - ruby-head
-
-before_install: 
-  - gem install bundler -v 1.16.2
-  - npm install -g puppeteer
-  - npm install
-
+before_install:
+  - travis_retry sudo apt-get update
+  - curl -L https://raw.githubusercontent.com/metanorma/metanorma-linux-setup/master/ubuntu-install-puppeteer.sh | bash
 matrix:
   allow_failures:
     - rvm: ruby-head
+

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    isodoc (0.9.18)
+    isodoc (0.9.19)
       asciimath
       html2doc (~> 0.8.6)
       htmlentities (~> 4.3.4)
@@ -18,7 +18,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    asciidoctor (1.5.8)
+    asciidoctor (2.0.0)
     asciimath (1.0.8)
     ast (2.4.0)
     byebug (9.1.0)
@@ -55,7 +55,7 @@ GEM
     htmlentities (4.3.4)
     image_size (2.0.0)
     json (2.2.0)
-    liquid (4.0.1)
+    liquid (4.0.3)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -76,7 +76,7 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     parallel (1.14.0)
-    parser (2.6.0.0)
+    parser (2.6.2.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
     pry (0.12.2)

data/README.adoc

@@ -1,18 +1,18 @@
 = isodoc: Ruby gem for converting ISODoc documents into HTML/Word
 
 image:https://img.shields.io/gem/v/isodoc.svg["Gem Version", link="https://rubygems.org/gems/isodoc"]
-image:https://img.shields.io/travis/riboseinc/isodoc/master.svg["Build Status", link="https://travis-ci.org/riboseinc/isodoc"]
-image:https://codeclimate.com/github/riboseinc/isodoc/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/riboseinc/isodoc"]
+image:https://img.shields.io/travis/metanorma/isodoc/master.svg["Build Status", link="https://travis-ci.org/metanorma/isodoc"]
+image:https://codeclimate.com/github/metanorma/isodoc/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/isodoc"]
 
 == Purpose
 
-This Gem converts documents in the https://github.com/riboseinc/isodoc-models[ISODoc document model] into HTML and Microsoft Word.
+This Gem converts documents in the https://github.com/metanorma/metanorma-model-standoc[Metanorma document model] into HTML and Microsoft Word.
 
 == Usage
 
 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
+i18nyaml:: YAML file giving internationalisation equivalents for keywords in rendering output; see https://github.com/metanorma/metanorma-iso#document-attributes for further documentation
 bodyfont:: Font for body text
 headerfont:: Font for header text
 monospacefont:: Font for monospace text
@@ -80,6 +80,6 @@ NOTE: In the HTML stylesheets specific to standards, the Cover page and Intro pa
 
 == Converting Word output into "`Native Word`" (`.docx`)
 
-This gem relies on https://github.com/riboseinc/html2doc[html2doc] to generate Microsoft Word documents.
+This gem relies on https://github.com/metanorma/html2doc[html2doc] to generate Microsoft Word documents.
 
-Please see https://github.com/riboseinc/html2doc#converting-document-output-to-native-word-docx[this post-processing procedure] to convert output into a native-`docx` document.
+Please see https://github.com/metanorma/html2doc#converting-document-output-to-native-word-docx[this post-processing procedure] to convert output into a native-`docx` document.

data/appveyor.yml

@@ -0,0 +1,30 @@
+version: '{build}'
+
+environment:
+  matrix:
+    - RUBY_VERSION: 25
+    - RUBY_VERSION: 24
+    - RUBY_VERSION: 23
+    - RUBY_VERSION: _trunk
+
+matrix:
+  allow_failures:
+    - RUBY_VERSION: _trunk
+
+install:
+  - ps: . { iwr -useb https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/appveyor.ps1 } | iex
+  - refreshenv
+
+build_script:
+  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
+  - bundle update
+  - bundle install
+
+before_test:
+  - ruby -v
+  - gem -v
+  - bundle -v
+
+test_script:
+  - bundle exec rake
+

data/isodoc.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
     This gem is in active development.
   DESCRIPTION
 
-  spec.homepage      = "https://github.com/riboseinc/isodoc"
+  spec.homepage      = "https://github.com/metanorma/isodoc"
   spec.license       = "BSD-2-Clause"
 
   spec.bindir        = "bin"

data/lib/isodoc/convert.rb

@@ -62,11 +62,14 @@ module IsoDoc
       @closemathdelim = "`"
       @lang = "en"
       @script = "Latn"
-      @tmpimagedir = "_images"
       @maxwidth = 1200
       @maxheight = 800
     end
 
+    def tmpimagedir_suffix
+      "_images"
+    end
+
     def default_fonts(_options)
       {
         bodyfont: "Arial",

data/lib/isodoc/function/to_word_html.rb

@@ -29,11 +29,11 @@ module IsoDoc::Function
 
     # tmp image dir is same directory as @filename
     def tmpimagedir
-      @filename + @tmpimagedir
+      @filename + tmpimagedir_suffix
     end
 
     def rel_tmpimagedir
-      @filename.sub(%r{^.*/([^/]+)$}, "\\1") + @tmpimagedir
+      @filename.sub(%r{^.*/([^/]+)$}, "\\1") + tmpimagedir_suffix
     end
 
     # isodoc.css overrides any CSS injected by Html2Doc, which

data/lib/isodoc/headlesshtml_convert.rb

@@ -10,9 +10,8 @@ module IsoDoc
     include HtmlFunction::Footnotes
     include HtmlFunction::Html
 
-    def initialize(options)
-      super
-      @tmpimagedir = "_headlessimages"
+    def tmpimagedir_suffix
+      "_headlessimages"
     end
 
     def convert(filename, file = nil, debug = false)
@@ -24,7 +23,7 @@ module IsoDoc
       postprocess(result, filename + ".tmp", dir)
       FileUtils.rm_rf dir
       strip_head(filename + ".tmp.html", outname_html + ".headless.html")
-      FileUtils.rm_r ["#{filename}.tmp.html", tmpimagedir]
+      FileUtils.rm_rf ["#{filename}.tmp.html", tmpimagedir]
     end
 
     def strip_head(input, output)

data/lib/isodoc/html_convert.rb

@@ -9,6 +9,15 @@ module IsoDoc
     include HtmlFunction::Footnotes
     include HtmlFunction::Html
 
-    @tmpimagedir = "_images"
+    def tmpimagedir_suffix
+      "_htmlimages"
+    end
+
+    def convert(filename, file = nil, debug = false)
+      ret = super
+      Dir.exists?(tmpimagedir) and Dir["#{tmpimagedir}/*"].empty? and
+        FileUtils.rm_r tmpimagedir
+      ret
+    end
   end
 end

data/lib/isodoc/html_function/html.rb

@@ -58,7 +58,7 @@ module IsoDoc::HtmlFunction
     end
 
     MATHJAX_ADDR =
-      "https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js".freeze
+      "https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/latest.js".freeze
     MATHJAX = <<~"MATHJAX".freeze
       <script type="text/x-mathjax-config">
         MathJax.Hub.Config({
@@ -67,7 +67,7 @@ module IsoDoc::HtmlFunction
           }
        });
       </script>
-      <script src="#{MATHJAX_ADDR}?config=AM_HTMLorMML"></script>
+      <script src="#{MATHJAX_ADDR}?config=AM_HTMLorMML" async="async"></script>
     MATHJAX
 
     def mathjax(open, close)

data/lib/isodoc/pdf_convert.rb

@@ -14,11 +14,14 @@ module IsoDoc
       @standardstylesheet = nil
       super
       @scripts = @scripts_pdf if @scripts_pdf
-      @tmpimagedir = "_pdfimages"
       @maxwidth = 500
       @maxheight = 800
     end
 
+    def tmpimagedir_suffix
+      "_pdfimages"
+    end
+
     def convert(filename, file = nil, debug = false)
       file = File.read(filename, encoding: "utf-8") if file.nil?
       @openmathdelim, @closemathdelim = extract_delims(file)
@@ -28,7 +31,7 @@ module IsoDoc
       postprocess(result, filename, dir)
       FileUtils.rm_rf dir
       ::Metanorma::Output::Pdf.new.convert("#{filename}.html", outname_html + ".pdf")
-      FileUtils.rm_r ["#{filename}.html", tmpimagedir]
+      FileUtils.rm_rf ["#{filename}.html", tmpimagedir]
     end
 
     def xref_parse(node, out)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "0.9.18".freeze
+  VERSION = "0.9.19".freeze
 end

data/lib/isodoc/word_convert.rb

@@ -29,5 +29,11 @@ module IsoDoc
     include WordFunction::Footnotes
     include WordFunction::Body
     include WordFunction::Postprocess
+
+    def convert(filename, file = nil, debug = false)
+      ret = super
+      FileUtils.rm_rf tmpimagedir
+      ret
+    end
   end
 end

data/spec/isodoc/footnotes_spec.rb

@@ -152,7 +152,7 @@ RSpec.describe IsoDoc do
            }
         });
        </script>
-       <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=AM_HTMLorMML"></script>
+       <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/latest.js?config=AM_HTMLorMML" async="async"></script>
        <script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>
        </body>
     OUTPUT

data/spec/isodoc/postproc_spec.rb

@@ -21,7 +21,7 @@ RSpec.describe IsoDoc do
     html = File.read("test.html")
     expect(html).to match(%r{<title>test</title>})
     expect(html).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(%r{cdnjs\.cloudflare\.com/ajax/libs/mathjax/})
     expect(html).to match(/delimiters: \[\['\(#\(', '\)#\)'\]\]/)
   end
 
@@ -41,7 +41,7 @@ RSpec.describe IsoDoc do
     html = File.read("test.html")
     expect(html).not_to match(%r{<title>test</title>})
     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(%r{cdnjs\.cloudflare\.com/ajax/libs/mathjax/})
     expect(html).to match(/delimiters: \[\['\(#\(', '\)#\)'\]\]/)
   end
 
@@ -468,7 +468,7 @@ ICAgICAgIDogRU5EIERPQyBJRAoKRklMRU5BTUU6IHRlc3QKCg==
 
   it "moves images in HTML" do
     FileUtils.rm_f "test.html"
-    FileUtils.rm_rf "test_images"
+    FileUtils.rm_rf "test_htmlimages"
     IsoDoc::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
         <preface><foreword>
@@ -483,16 +483,16 @@ ICAgICAgIDogRU5EIERPQyBJRAoKRklMRU5BTUU6IHRlc3QKCg==
     INPUT
     html = File.read("test.html").sub(/^.*<main class="main-section">/m, '<main class="main-section">').
       sub(%r{</main>.*$}m, "</main>")
-    expect(`ls test_images`).to match(/\.png$/)
+    expect(`ls test_htmlimages`).to match(/\.png$/)
     expect(html.gsub(/\/[0-9a-f-]+\.png/, "/_.png")).to be_equivalent_to <<~"OUTPUT"
            <main class="main-section"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
              <br />
              <div>
                <h1 class="ForewordTitle">Foreword</h1>
                <div id="_" class="figure">
-               <img src="test_images/_.png" height="776" width="922" />
-<img src="test_images/_.png" height="800" width="53" />
-<img src="test_images/_.png" height="83" width="99" />
+               <img src="test_htmlimages/_.png" height="776" width="922" />
+<img src="test_htmlimages/_.png" height="800" width="53" />
+<img src="test_htmlimages/_.png" height="83" width="99" />
        <p class="FigureTitle" align="center">Figure 1&#xA0;&#x2014; Split-it-right sample divider</p></div>
              </div>
              <p class="zzSTDTitle1"></p>
@@ -503,7 +503,7 @@ ICAgICAgIDogRU5EIERPQyBJRAoKRklMRU5BTUU6IHRlc3QKCg==
 
   it "moves images in HTML, using relative file location" do
     FileUtils.rm_f "spec/test.html"
-    FileUtils.rm_rf "spec/test_images"
+    FileUtils.rm_rf "spec/test_htmlimages"
     IsoDoc::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("spec/test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
         <preface><foreword>
@@ -518,16 +518,16 @@ ICAgICAgIDogRU5EIERPQyBJRAoKRklMRU5BTUU6IHRlc3QKCg==
     INPUT
     html = File.read("spec/test.html").sub(/^.*<main class="main-section">/m, '<main class="main-section">').
       sub(%r{</main>.*$}m, "</main>")
-    expect(`ls test_images`).to match(/\.png$/)
+    expect(`ls test_htmlimages`).to match(/\.png$/)
     expect(html.gsub(/\/[0-9a-f-]+\.png/, "/_.png")).to be_equivalent_to <<~"OUTPUT"
            <main class="main-section"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
              <br />
              <div>
                <h1 class="ForewordTitle">Foreword</h1>
                <div id="_" class="figure">
-               <img src="test_images/_.png" height="776" width="922" />
-<img src="test_images/_.png" height="800" width="53" />
-<img src="test_images/_.png" height="83" width="99" />
+               <img src="test_htmlimages/_.png" height="776" width="922" />
+<img src="test_htmlimages/_.png" height="800" width="53" />
+<img src="test_htmlimages/_.png" height="83" width="99" />
        <p class="FigureTitle" align="center">Figure 1&#xA0;&#x2014; Split-it-right sample divider</p></div>
              </div>
              <p class="zzSTDTitle1"></p>
@@ -538,7 +538,7 @@ ICAgICAgIDogRU5EIERPQyBJRAoKRklMRU5BTUU6IHRlc3QKCg==
 
   it "encodes images in HTML as data URIs" do
     FileUtils.rm_f "test.html"
-    FileUtils.rm_rf "test_images"
+    FileUtils.rm_rf "test_htmlimages"
     IsoDoc::HtmlConvert.new({htmlstylesheet: "spec/assets/html.css", datauriimage: true}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
         <preface><foreword>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 0.9.18
+  version: 0.9.19
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-06 00:00:00.000000000 Z
+date: 2019-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -327,6 +327,7 @@ files:
 - LICENSE
 - README.adoc
 - Rakefile
+- appveyor.yml
 - bin/rspec
 - isodoc.gemspec
 - lib/isodoc-yaml/i18n-en.yaml
@@ -391,7 +392,7 @@ files:
 - spec/isodoc/terms_spec.rb
 - spec/isodoc/xref_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/riboseinc/isodoc
+homepage: https://github.com/metanorma/isodoc
 licenses:
 - BSD-2-Clause
 metadata: {}