isodoc 0.9.11 → 0.9.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '00160137956d6bf94a5ae197a7cb4b88ad74c0a4c60b421cb37bbe23abe8cd31'
-  data.tar.gz: aaeb75e3aecc1cf19729b046332dcab2ca732357f08c22f2631eddf65ec5bf5f
+  metadata.gz: a6c03a961d5e4f165ec88b0cadd23ce527a11dc362321fa1b0f3a13dd85661ba
+  data.tar.gz: 1e3dea00b58de59aa785fa6b62d3edceb73f6be39989dfce81ab89760b53bd96
 SHA512:
-  metadata.gz: f2ebe7192825e49355716ec580fc6da530d48475a6da2a9d4896c0a7d36927967b02f0f1f1a1cc198d91f0f4a1839d257bdc1b9d6e4d0b73ecc288ee08db3709
-  data.tar.gz: 01e04c0e9c669c5d6746fc5618f517bda045258202e234550223d37180d4db5d2dea873df2e651733f64cbf942d7963b5d4634a236f7e21949ee4467c536dcf1
+  metadata.gz: cab6416eca981238438c32ec69ae6b184bd57402b2083d7d38c72e7ff44f1789132955ae5549624e1851ed86d60318bccd064068cb05c918e69579ac2ed65433
+  data.tar.gz: 35e405f5e62583960fe5d55b1b4d961290bf64629126b9b56ab3053c5799afa0278d7ddd73f249c91a58100fe8945db4f09720d03bed961b2f9da206dc51be77

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    isodoc (0.9.11)
+    isodoc (0.9.12)
       asciimath
       html2doc (~> 0.8.6)
       htmlentities (~> 4.3.4)
@@ -18,6 +18,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    asciidoctor (1.5.8)
     asciimath (1.0.6)
     ast (2.4.0)
     byebug (9.1.0)
@@ -53,7 +54,6 @@ GEM
       uuidtools
     htmlentities (4.3.4)
     image_size (2.0.0)
-    jaro_winkler (1.5.1)
     json (2.1.0)
     liquid (4.0.1)
     listen (3.1.5)
@@ -61,7 +61,8 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
-    metanorma (0.3.2)
+    metanorma (0.3.5)
+      asciidoctor
     method_source (0.9.2)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
@@ -81,7 +82,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     rainbow (3.0.0)
-    rake (12.3.1)
+    rake (12.3.2)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
@@ -99,14 +100,13 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubocop (0.60.0)
-      jaro_winkler (~> 1.5.1)
+    rubocop (0.54.0)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
+      parser (>= 2.5)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
+      unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.10.0)
     ruby-xslt (0.9.10)
     ruby_dep (1.5.0)
@@ -141,7 +141,7 @@ DEPENDENCIES
   guard-rspec (~> 4.7)
   isodoc!
   rspec (~> 3.6)
-  rubocop (~> 0.50)
+  rubocop (= 0.54.0)
   simplecov (~> 0.15)
   timecop (~> 0.9)
 

data/isodoc.gemspec

@@ -47,7 +47,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
   spec.add_development_dependency "rspec", "~> 3.6"
-  spec.add_development_dependency "rubocop", "~> 0.50"
+  spec.add_development_dependency "rubocop", "= 0.54.0"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
 end

data/lib/isodoc/function/blocks.rb

@@ -127,6 +127,10 @@ module IsoDoc::Function
       end
     end
 
+    def pre_parse(node, out)
+      out.pre node.text, **attr_code(id: node["id"])
+    end
+
     def annotation_parse(node, out)
       @sourcecode = false
       @annotation = true

data/lib/isodoc/function/to_word_html.rb

@@ -29,9 +29,12 @@ module IsoDoc::Function
 
     # tmp image dir is same directory as @filename
     def tmpimagedir
-      @filename.sub(%r{^.*/([^/]+)$}, "\\1") + @tmpimagedir
+      @filename + @tmpimagedir
     end
 
+    def rel_tmpimagedir
+      @filename.sub(%r{^.*/([^/]+)$}, "\\1") + @tmpimagedir
+    end
 
     # isodoc.css overrides any CSS injected by Html2Doc, which
     # is inserted before this CSS.
@@ -178,6 +181,7 @@ module IsoDoc::Function
         when "example" then example_parse(node, out)
         when "image" then image_parse(node, out, nil)
         when "sourcecode" then sourcecode_parse(node, out)
+        when "pre" then pre_parse(node, out)
         when "annotation" then annotation_parse(node, out)
         when "term" then termdef_parse(node, out)
         when "preferred" then term_parse(node, out)

data/lib/isodoc/html_function/html.rb

@@ -214,10 +214,11 @@ module IsoDoc::HtmlFunction
     def move_image1(i)
       matched = /\.(?<suffix>\S+)$/.match i["src"]
       uuid = UUIDTools::UUID.random_create.to_s
-      new_full_filename = File.join(tmpimagedir, "#{uuid}.#{matched[:suffix]}")
+      fname = "#{uuid}.#{matched[:suffix]}"
+      new_full_filename = File.join(tmpimagedir, fname)
       local_filename = File.join(@localdir, i["src"])
       FileUtils.cp local_filename, new_full_filename
-      i["src"] = new_full_filename
+      i["src"] = File.join(rel_tmpimagedir, fname)
       i["width"], i["height"] = Html2Doc.image_resize(i, local_filename, @maxheight, @maxwidth)
     end
 

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "0.9.11".freeze
+  VERSION = "0.9.12".freeze
 end

data/spec/isodoc/blocks_spec.rb

@@ -237,6 +237,10 @@ INPUT
   <dt>A</dt>
   <dd><p>B</p></dd>
   </dl>
+</figure>
+<figure>
+<pre>A &lt;
+B</pre>
 </figure>
     </foreword></preface>
     </iso-standard>
@@ -254,6 +258,10 @@ INPUT
        </div></aside>
          <p><b>Key</b></p><dl><dt><p>A</p></dt><dd><p>B</p></dd></dl>
        <p class="FigureTitle" align="center">Figure 1&#160;&#8212; Split-it-right <i>sample</i> divider</p></div>
+               <div class="figure">
+<pre>A &lt;
+B</pre>
+</div>
                </div>
                <p class="zzSTDTitle1"/>
              </div>
@@ -277,6 +285,10 @@ INPUT
   <dt>A</dt>
   <dd><p>B</p></dd>
   </dl>
+</figure>
+<figure>
+<pre>A &lt;
+B</pre>
 </figure>
     </foreword></preface>
     </iso-standard>
@@ -301,6 +313,10 @@ INPUT
        </div></aside>
          <p><b>Key</b></p><table class="dl"><tr><td valign="top" align="left"><p align="left" style="margin-left:0pt;text-align:left;">A</p></td><td valign="top"><p>B</p></td></tr></table>
        <p class="FigureTitle" align="center">Figure 1&#160;&#8212; Split-it-right sample divider</p></div>
+               <div class="figure">
+<pre>A &lt;
+B</pre>
+</div>
              </div>
              <p>&#160;</p>
            </div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 0.9.12
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-27 00:00:00.000000000 Z
+date: 2018-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -266,16 +266,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.50'
+        version: 0.54.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.50'
+        version: 0.54.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement