isodoc 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0321e7f3851982b8a41f0b4ad71cb942c8e559121780f3089bc3954ea06438d4
-  data.tar.gz: 5f86453bbf454a1d430a31b8cfaa5bab753b19b7117e5fec70ae34b15dad419b
+  metadata.gz: 7021ada69c40cacdfa9a54827a70bf9a949ea194a75c5a9bc9818cc76d458b95
+  data.tar.gz: 2f046c37b8094b3288f257f22e7efea00513bdafc09b6f9b2fa1ec4848a9bbe8
 SHA512:
-  metadata.gz: '01875c7a9de4657a22eec95a6a9a613e1f227ab5d345015d8ff83478cb03019a5dec57fea43e8c08e114fd05ac3597e285c1d0cdf757d6a51a71a73ab8e6522d'
-  data.tar.gz: a7160ab90056650b4e72ab7df23549442f9938ec1a3c9b96cb8ef32b6b700fa4dd6c30edadb380bf85d3e131b0ddb4871c2e005c5b135cdbc3435bd19eea5725
+  metadata.gz: 0ae6effbeb78bce850bfe83a84bb311509e9f2f04ad7627e64f69c020974c6c6977768302b14ee13c5515f2da497dae17021aa9596e4525f58878e9b65b5d7a1
+  data.tar.gz: ccb84fc0e38711603a797dfa2560d3066291122c6a9fc6b1f71407999936a06e24611f075df121115025af70800a0cbd4008f346c22807564c587433f5edcc7b

data/Gemfile

@@ -1,6 +1,4 @@
 source "https://rubygems.org"
 
 # Specify your gem's dependencies in ribose.gemspec
-gem "html2doc",
-      git: "https://github.com/riboseinc/html2doc.git"
 gemspec

data/Gemfile.lock

@@ -1,17 +1,3 @@
-GIT
-  remote: https://github.com/riboseinc/html2doc.git
-  revision: e9c0077be0c3d36bb09fa35743a79b00dd5ac560
-  specs:
-    html2doc (0.8.1)
-      asciimath
-      htmlentities (~> 4.3.4)
-      image_size
-      mime-types
-      nokogiri
-      ruby-xslt
-      thread_safe
-      uuidtools
-
 PATH
   remote: .
   specs:
@@ -54,6 +40,15 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
+    html2doc (0.8.2)
+      asciimath
+      htmlentities (~> 4.3.4)
+      image_size
+      mime-types
+      nokogiri
+      ruby-xslt
+      thread_safe
+      uuidtools
     htmlentities (4.3.4)
     image_size (2.0.0)
     jaro_winkler (1.5.1)
@@ -138,7 +133,6 @@ DEPENDENCIES
   equivalent-xml (~> 0.6)
   guard (~> 2.14)
   guard-rspec (~> 4.7)
-  html2doc!
   isodoc!
   rake (~> 12.0)
   rspec (~> 3.6)

data/lib/isodoc.rb

@@ -19,6 +19,7 @@ require "isodoc/convert"
 require "isodoc/metadata"
 require "isodoc/html_convert"
 require "isodoc/word_convert"
+require "isodoc/pdf_convert"
 require "isodoc/iso/html_convert"
 require "isodoc/iso/word_convert"
 

data/lib/isodoc/convert.rb

@@ -3,6 +3,7 @@ require "sass"
 
 module IsoDoc
   class Convert < ::IsoDoc::Common
+    attr_reader :options
 
     # htmlstylesheet: Generic stylesheet for HTML
     # wordstylesheet: Generic stylesheet for Word
@@ -16,6 +17,7 @@ module IsoDoc
     # ulstyle: list style in Word CSS for unordered lists
     # olstyle: list style in Word CSS for ordered lists
     def initialize(options)
+      @options = options
       @htmlstylesheet = options[:htmlstylesheet]
       @wordstylesheet = options[:wordstylesheet]
       @standardstylesheet = options[:standardstylesheet]
@@ -46,6 +48,9 @@ module IsoDoc
       @lang = "en"
       @script = "Latn"
       @files_to_delete = []
+      @tmpimagedir = "_images"
+      @maxwidth = 1200
+      @maxheight = 800
     end
 
     def html_doc_path(file)

data/lib/isodoc/function/blocks.rb

@@ -74,8 +74,8 @@ module IsoDoc::Function
     end
 
     EXAMPLE_TBL_ATTR =
-      { width: "110pt", valign: "top", class: "example_label",
-        style: "width:82.8pt;padding:.75pt .75pt .75pt .75pt" }.freeze
+      { valign: "top", class: "example_label",
+        style: "width:82.8pt;" }.freeze
 
     # used if we are boxing examples
     def example_div_parse(node, out)
@@ -204,8 +204,8 @@ module IsoDoc::Function
     end
 
     def image_parse(node, out, caption)
-      attrs = { src: node["src"], 
-                height: node["height"] || "auto", 
+      attrs = { src: node["src"],
+                height: node["height"] || "auto",
                 width: node["width"] || "auto" }
       out.img **attr_code(attrs)
       image_title_parse(out, caption)

data/lib/isodoc/html_convert.rb

@@ -8,5 +8,7 @@ module IsoDoc
     include HtmlFunction::Comments
     include HtmlFunction::Footnotes
     include HtmlFunction::Html
+
+    @tmpimagedir = "_images"
   end
 end

data/lib/isodoc/html_function/html.rb

@@ -28,7 +28,7 @@ module IsoDoc::HtmlFunction
     def postprocess(result, filename, dir)
       result = from_xhtml(cleanup(to_xhtml(result)))
       toHTML(result, filename)
-      @files_to_delete.each { |f| system "rm #{f}" }
+      @files_to_delete.each { |f| system "rm -r #{f}" }
     end
 
     def script_cdata(result)
@@ -49,7 +49,7 @@ module IsoDoc::HtmlFunction
     def html_cleanup(x)
       footnote_backlinks(html_toc(
         term_header(move_images(html_footnote_filter(html_preface(htmlstyle(x))))))
-      )
+                        )
     end
 
     MATHJAX_ADDR =
@@ -188,12 +188,12 @@ module IsoDoc::HtmlFunction
 
     # presupposes that the image source is local
     def move_images(docxml)
-      system "rm -r _images; mkdir _images"
+      system "rm -r #{@tmpimagedir}; mkdir #{@tmpimagedir}"
       docxml.xpath("//*[local-name() = 'img']").each do |i|
         next if /^data:image/.match? i["src"]
         matched = /\.(?<suffix>\S+)$/.match i["src"]
         uuid = UUIDTools::UUID.random_create.to_s
-        new_full_filename = File.join("_images", "#{uuid}.#{matched[:suffix]}")
+        new_full_filename = File.join(@tmpimagedir, "#{uuid}.#{matched[:suffix]}")
         move_image1(i, new_full_filename)
       end
       docxml
@@ -202,9 +202,7 @@ module IsoDoc::HtmlFunction
     def move_image1(i, new_full_filename)
       system "cp #{i['src']} #{new_full_filename}"
       i["src"] = new_full_filename
-      if i["width"] != "auto" && i["height"] != "auto"
-        i["width"], i["height"] = Html2Doc.image_resize(i, 800, 1200)
-      end
+      i["width"], i["height"] = Html2Doc.image_resize(i, @maxheight, @maxwidth)
     end
 
     def html_toc(docxml)

data/lib/isodoc/pdf_convert.rb

@@ -0,0 +1,31 @@
+require_relative "html_function/comments.rb"
+require_relative "html_function/footnotes.rb"
+require_relative "html_function/html.rb"
+
+module IsoDoc
+  class PdfConvert < ::IsoDoc::Convert
+
+    include HtmlFunction::Comments
+    include HtmlFunction::Footnotes
+    include HtmlFunction::Html
+
+    def initialize(options)
+      super
+      @tmpimagedir = "_pdfimages"
+            @maxwidth = 500
+      @maxheight = 800
+    end
+
+    def convert(filename, file = nil, debug = false)
+      file = File.read(filename, encoding: "utf-8") if file.nil?
+      @openmathdelim, @closemathdelim = extract_delims(file)
+      docxml, outname_html, dir = convert_init(file, filename, debug)
+      result = convert1(docxml, filename, dir)
+      return result if debug
+      postprocess(result, filename, dir)
+      system "rm -fr #{dir}"
+      Metanorma::Output::Pdf.new.convert(filename + ".html", filename)
+      system "rm -r #{filename + '.html'} #{@tmpimagedir}"
+    end
+  end
+end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "0.8.3".freeze
+  VERSION = "0.8.4".freeze
 end

data/spec/isodoc/blocks_spec.rb

@@ -335,7 +335,7 @@ INPUT
                  <h1 class="ForewordTitle">Foreword</h1>
                  <table id="samplecode" class="example">
                    <tr>
-                     <td width="110pt" valign="top" class="example_label" style="width:82.8pt;padding:.75pt .75pt .75pt .75pt">EXAMPLE</td>
+                     <td valign="top" class="example_label" style="width:82.8pt;">EXAMPLE</td>
                      <td valign="top" class="example">
          <p>Hello</p>
        </td>
@@ -369,7 +369,7 @@ INPUT
                  <h1 class="ForewordTitle">Foreword</h1>
                  <table id="samplecode" class="example">
                    <tr>
-                     <td width="110pt" valign="top" class="example_label" style="width:82.8pt;padding:.75pt .75pt .75pt .75pt">EXAMPLE  1</td>
+                     <td valign="top" class="example_label" style="width:82.8pt;">EXAMPLE  1</td>
                      <td valign="top" class="example">
          <p>Hello</p>
        </td>
@@ -377,7 +377,7 @@ INPUT
                  </table>
                  <table id="samplecode2" class="example">
                    <tr>
-                     <td width="110pt" valign="top" class="example_label" style="width:82.8pt;padding:.75pt .75pt .75pt .75pt">EXAMPLE  2</td>
+                     <td valign="top" class="example_label" style="width:82.8pt;">EXAMPLE  2</td>
                      <td valign="top" class="example">
                  <p>Hello</p>
                  </td>

data/spec/isodoc/postproc_spec.rb

@@ -425,10 +425,9 @@ CkZJTEVOQU1FOiB0ZXN0Cgo=
                <h1 class="ForewordTitle">Foreword</h1>
                <div id="_" class="figure">
 
-                <img src="_images/_.png" height="auto" width="auto" />
-                <img src="_images/_.png" height="1200" width="80" />
-                <img src="_images/_.png" height="auto" width="99" />
-
+<img src="_images/_.png" height="673" width="800" />
+<img src="_images/_.png" height="1200" width="80" />
+<img src="_images/_.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>

data/spec/isodoc/terms_spec.rb

@@ -68,13 +68,13 @@ RSpec.describe IsoDoc do
        <p class="TermNum" id="paddy1">1.1</p><p class="Terms" style="text-align:left;">paddy</p>
 
        <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">&lt;rice&gt; rice retaining its husk after threshing</p>
-       <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f892" class="example"><tr><td width="110pt" valign="top" class="example_label" style="width:82.8pt;padding:.75pt .75pt .75pt .75pt">EXAMPLE 1</td><td valign="top" class="example">
+       <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f892" class="example"><tr><td valign="top" class="example_label" style="width:82.8pt;">EXAMPLE 1</td><td valign="top" class="example">
          <p id="_65c9a509-9a89-4b54-a890-274126aeb55c">Foreign seeds, husks, bran, sand, dust.</p>
          <ul>
          <li>A</li>
          </ul>
        </td></tr></table>
-       <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f894" class="example"><tr><td width="110pt" valign="top" class="example_label" style="width:82.8pt;padding:.75pt .75pt .75pt .75pt">EXAMPLE 2</td><td valign="top" class="example">
+       <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f894" class="example"><tr><td valign="top" class="example_label" style="width:82.8pt;">EXAMPLE 2</td><td valign="top" class="example">
          <ul>
          <li>A</li>
          </ul>
@@ -87,7 +87,7 @@ RSpec.describe IsoDoc do
        <p class="AltTerms" style="text-align:left;">rough rice</p>
        <p class="DeprecatedTerms" style="text-align:left;">DEPRECATED: cargo rice</p>
        <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p>
-       <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f893" class="example"><tr><td width="110pt" valign="top" class="example_label" style="width:82.8pt;padding:.75pt .75pt .75pt .75pt">EXAMPLE 1</td><td valign="top" class="example">
+       <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f893" class="example"><tr><td valign="top" class="example_label" style="width:82.8pt;">EXAMPLE 1</td><td valign="top" class="example">
          <ul>
          <li>A</li>
          </ul>
@@ -171,13 +171,13 @@ OUTPUT
        <p class="TermNum" id="paddy1">1.1</p><p class="Terms" style="text-align:left;">paddy</p>
 
        <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">&lt;rice&gt; rice retaining its husk after threshing</p>
-       <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f892" class="example"><tr><td width="110pt" valign="top" class="example_label" style="width:82.8pt;padding:.75pt .75pt .75pt .75pt">EXAMPLE 1</td><td valign="top" class="example">
+       <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f892" class="example"><tr><td valign="top" class="example_label" style="width:82.8pt;">EXAMPLE 1</td><td valign="top" class="example">
          <p id="_65c9a509-9a89-4b54-a890-274126aeb55c">Foreign seeds, husks, bran, sand, dust.</p>
          <ul>
          <li>A</li>
          </ul>
        </td></tr></table>
-       <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f894" class="example"><tr><td width="110pt" valign="top" class="example_label" style="width:82.8pt;padding:.75pt .75pt .75pt .75pt">EXAMPLE 2</td><td valign="top" class="example">
+       <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f894" class="example"><tr><td valign="top" class="example_label" style="width:82.8pt;">EXAMPLE 2</td><td valign="top" class="example">
          <ul>
          <li>A</li>
          </ul>
@@ -190,7 +190,7 @@ OUTPUT
        <p class="AltTerms" style="text-align:left;">rough rice</p>
        <p class="DeprecatedTerms" style="text-align:left;">DEPRECATED: cargo rice</p>
        <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p>
-       <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f893" class="example"><tr><td width="110pt" valign="top" class="example_label" style="width:82.8pt;padding:.75pt .75pt .75pt .75pt">EXAMPLE 1</td><td valign="top" class="example">
+       <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f893" class="example"><tr><td valign="top" class="example_label" style="width:82.8pt;">EXAMPLE 1</td><td valign="top" class="example">
          <ul>
          <li>A</li>
          </ul>

data/spec/isodoc/xref_spec.rb

@@ -436,7 +436,7 @@ RSpec.describe IsoDoc do
                  <h1>1.&#160; Scope</h1>
                  <table id="N" class="example">
                    <tr>
-                     <td width="110pt" valign="top" class="example_label" style="width:82.8pt;padding:.75pt .75pt .75pt .75pt">EXAMPLE</td>
+                     <td valign="top" class="example_label" style="width:82.8pt;">EXAMPLE</td>
                      <td valign="top" class="example">
          <p>Hello</p>
        </td>
@@ -460,10 +460,10 @@ RSpec.describe IsoDoc do
                <div id="widgets">
                  <h1>3.&#160; Widgets</h1>
                  <div id="widgets1">
-               <table id="note1" class="example"><tr><td width="110pt" valign="top" class="example_label" style="width:82.8pt;padding:.75pt .75pt .75pt .75pt">EXAMPLE  1</td><td valign="top" class="example">
+               <table id="note1" class="example"><tr><td valign="top" class="example_label" style="width:82.8pt;">EXAMPLE  1</td><td valign="top" class="example">
          <p>Hello</p>
        </td></tr></table>
-               <table id="note2" class="example"><tr><td width="110pt" valign="top" class="example_label" style="width:82.8pt;padding:.75pt .75pt .75pt .75pt">EXAMPLE  2</td><td valign="top" class="example">
+               <table id="note2" class="example"><tr><td valign="top" class="example_label" style="width:82.8pt;">EXAMPLE  2</td><td valign="top" class="example">
          <p>Hello</p>
        </td></tr></table>
        <p>    <a href="#note1">Example  1</a> <a href="#note2">Example  2</a> </p>
@@ -472,15 +472,15 @@ RSpec.describe IsoDoc do
                <br/>
                <div id="annex1" class="Section3">
                  <div id="annex1a">
-               <table id="AN" class="example"><tr><td width="110pt" valign="top" class="example_label" style="width:82.8pt;padding:.75pt .75pt .75pt .75pt">EXAMPLE</td><td valign="top" class="example">
+               <table id="AN" class="example"><tr><td valign="top" class="example_label" style="width:82.8pt;">EXAMPLE</td><td valign="top" class="example">
          <p>Hello</p>
        </td></tr></table>
            </div>
                  <div id="annex1b">
-               <table id="Anote1" class="example"><tr><td width="110pt" valign="top" class="example_label" style="width:82.8pt;padding:.75pt .75pt .75pt .75pt">EXAMPLE  1</td><td valign="top" class="example">
+               <table id="Anote1" class="example"><tr><td valign="top" class="example_label" style="width:82.8pt;">EXAMPLE  1</td><td valign="top" class="example">
          <p>Hello</p>
        </td></tr></table>
-               <table id="Anote2" class="example"><tr><td width="110pt" valign="top" class="example_label" style="width:82.8pt;padding:.75pt .75pt .75pt .75pt">EXAMPLE  2</td><td valign="top" class="example">
+               <table id="Anote2" class="example"><tr><td valign="top" class="example_label" style="width:82.8pt;">EXAMPLE  2</td><td valign="top" class="example">
          <p>Hello</p>
        </td></tr></table>
            </div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-11 00:00:00.000000000 Z
+date: 2018-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -355,6 +355,7 @@ files:
 - lib/isodoc/iso/html_convert.rb
 - lib/isodoc/iso/word_convert.rb
 - lib/isodoc/metadata.rb
+- lib/isodoc/pdf_convert.rb
 - lib/isodoc/version.rb
 - lib/isodoc/word_convert.rb
 - lib/isodoc/word_function.rb