isodoc 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc0387545ca3d334dd9c9aa2e6cf59c2fef6bf8bfc81bef16c36667af7c800a3
-  data.tar.gz: 5b3a0b9229ad81cc0eb236004191e8ec9c3c909e57990befe194176b2b58d492
+  metadata.gz: 986c12ed2b13ccc9a053a01bd349fd2aab55c45ce0c165f8da27462b406e44a7
+  data.tar.gz: 70cc1c851e800931a2dc4bf146fbe988256ffe7b3810b72ff0047cfbe7f0aa8b
 SHA512:
-  metadata.gz: 67e6e1c9f59b56faa46e10f4006d532057b52a601edb0cd0be98689ab3d398630882c8ed79850714c44b68806aad0aeb6addb95245b994545ebf53e87cc35bb8
-  data.tar.gz: 1947a59bb969065aa5f3b6ed4b991b70c930509327de9baac70bdd3d4099dc679613e0e7fb3a4c0be493a59bdbfeaaa584c9493cde775fb0f52420d2d27ee72f
+  metadata.gz: ac13334d0028a116d294601f1b3354ef46138a5a0f7baa05052b23701755873547acb0de1ad7590bfea6af345e8ea11af9b7f6d916ce3e7cbaf497ceac16a026
+  data.tar.gz: 04a396b315e1c7c5abd31cd144d1ed9f6c9c2a73dd3004a3713f83d18c8b54e9035e15fe44e8547a8c6ff77291125799544fdd25b11f23979e9f1e49e9da1535

data/.travis.yml

@@ -6,6 +6,7 @@ os:
 - linux
 - osx
 rvm:
+- 2.6
 - 2.5
 - 2.4
 - ruby-head

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    isodoc (0.10.2)
+    isodoc (0.10.3)
       asciimath
       html2doc (~> 0.8.11)
       htmlentities (~> 4.3.4)
@@ -81,7 +81,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     rainbow (3.0.0)
-    rake (12.3.2)
+    rake (12.3.3)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)

data/appveyor.yml

@@ -7,6 +7,7 @@ cache:
 
 environment:
   matrix:
+    - RUBY_VERSION: 26
     - RUBY_VERSION: 25
     - RUBY_VERSION: 24
     - RUBY_VERSION: _trunk

data/lib/isodoc/function/utils.rb

@@ -137,6 +137,7 @@ module IsoDoc::Function
       meta = @meta.get.merge(@labels || {})
       docxml = docxml.
         gsub(/\[TERMREF\]\s*/, l10n("[#{@source_lbl}: ")).
+        gsub(/\s*\[MODIFICATION\]\s*\[\/TERMREF\]/, l10n(", #{@modified_lbl} [/TERMREF]")).
         gsub(/\s*\[\/TERMREF\]\s*/, l10n("]")).
         gsub(/\s*\[MODIFICATION\]/, l10n(", #{@modified_lbl} — "))
       template = liquid(docxml)

data/lib/isodoc/html_function/html.rb

@@ -44,7 +44,9 @@ module IsoDoc::HtmlFunction
     def toHTML(result, filename)
       result = (from_xhtml(html_cleanup(to_xhtml(result))))
       result = populate_template(result, :html)
-      result = script_cdata(from_xhtml(move_images(to_xhtml(result))))
+      #result = script_cdata(from_xhtml(move_images(to_xhtml(result))))
+      result = from_xhtml(move_images(to_xhtml(result)))
+      result = script_cdata(inject_script(result))
       File.open("#{filename}.html", "w:UTF-8") do |f|
         f.write(result)
       end
@@ -169,14 +171,20 @@ module IsoDoc::HtmlFunction
       html_intro(docxml) if @htmlintropage
       docxml.at("//body") << mathjax(@openmathdelim, @closemathdelim)
       docxml.at("//body") << sourcecode_highlighter
-      if @scripts
-        scripts = File.read(@scripts, encoding: "UTF-8")
-        a = docxml.at("//body").add_child docxml.create_cdata(scripts)
-      end
+      #if @scripts
+      #  scripts = File.read(@scripts, encoding: "UTF-8")
+      #  a = docxml.at("//body").add_child docxml.create_cdata(scripts)
+      #end
       html_main(docxml)
       docxml
     end
 
+    def inject_script(doc)
+      return doc unless @scripts
+      scripts = File.read(@scripts, encoding: "UTF-8")
+      doc.sub("</body>", scripts + "\n</body>")
+    end
+
     def html_cover(docxml)
       cover = File.read(@htmlcoverpage, encoding: "UTF-8")
       coverxml = to_xhtml_fragment(cover)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "0.10.2".freeze
+  VERSION = "0.10.3".freeze
 end

data/spec/isodoc/postproc_spec.rb

@@ -706,6 +706,46 @@ TOCLEVEL
     expect(html).to match(%r{<h2 class="TermNum" id="paddy">1\.2\.</h2>})
   end
 
+    it "processes empty term modifications" do
+    FileUtils.rm_f "test.html"
+    FileUtils.rm_f "test.doc"
+    IsoDoc::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", <<~"INPUT", false)
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <sections>
+    <terms id="_terms_and_definitions" obligation="normative"><title>Terms and Definitions</title>
+
+<term id="paddy1"><preferred>paddy</preferred>
+<domain>rice</domain>
+<definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></definition>
+<termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f892">
+  <p id="_65c9a509-9a89-4b54-a890-274126aeb55c">Foreign seeds, husks, bran, sand, dust.</p>
+  <ul>
+  <li>A</li>
+  </ul>
+</termexample>
+<termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f894">
+  <ul>
+  <li>A</li>
+  </ul>
+</termexample>
+
+<termsource status="modified">
+  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
+    <modification>
+    <p id="_e73a417d-ad39-417d-a4c8-20e4e2529489"/>
+  </modification>
+</termsource></term>
+
+</terms>
+</sections>
+</iso-standard>
+    INPUT
+    expect(File.exist?("test.html")).to be true
+    html = File.read("test.html")
+    expect(html).to include '[SOURCE: <a href="#ISO7301">ISO 7301:2011, Clause 3.1</a>, modified]'
+  end
+
+
   it "creates continuation styles for multiparagraph list items in Word" do
     FileUtils.rm_f "test.doc"
     FileUtils.rm_f "test.html"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-14 00:00:00.000000000 Z
+date: 2019-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath