isodoc 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef21cf58dadc44402088da8688039f145c7c772d2241207790e22721d4509acf
-  data.tar.gz: 5ba2928a7dd29b05b5042bec243d40ef5bc0b57c4cbbf9062469bef4f89ec6e1
+  metadata.gz: a81fec6b1ecfd841b735e5b0b36fca370a1928f7f7a79ee4a1348fd183eb087c
+  data.tar.gz: 82fe58f01f7b8315eb3a1d99863084e7f53c2dc1d30220b1a6940f9cc8a23b02
 SHA512:
-  metadata.gz: 4d20eccad075ca4cafff9e8b873514d7d955fe19c02f21b032a7c578b5441b414cb5d3e1f8abbe701b686b2e5ff56d1c8dc6b1fa86e6707727b2a76d05b9b513
-  data.tar.gz: f69deb2000b76e5e24902aad3d11179395f6930a446b5b10244510f7d1be26667164ef1acb16e1c44233d617a1368e53b2d4f15ba4640e83c82be13d66f5e4fa
+  metadata.gz: 986f56381b796b2107885544234df9d0e5716953a59c6af9f3b706473f16eec46eb5abbf5132324c237a6f7749f75264be71c84c6e576aa302eeed89f10aa56f
+  data.tar.gz: b07f326e9ff729e8cc2b964cea990c4fb51524887690797d42cb4e87fa324e77a4c6d1130f365e55d3bc455aaa76d18409241f43b3af89586305d0a0282683d5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    isodoc (1.0.8)
+    isodoc (1.0.9)
       asciimath
       html2doc (~> 0.9.0)
       htmlentities (~> 4.3.4)
@@ -26,7 +26,7 @@ GEM
     docile (1.3.2)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    ffi (1.11.2)
+    ffi (1.11.3)
     formatador (0.2.5)
     guard (2.16.1)
       formatador (>= 0.2.4)
@@ -58,7 +58,7 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.0.13)
-    metanorma (0.3.17)
+    metanorma (0.3.18)
       asciidoctor
       htmlentities
     method_source (0.9.2)
@@ -72,7 +72,7 @@ GEM
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.19.0)
+    parallel (1.19.1)
     parser (2.6.5.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)

data/lib/isodoc/function/cleanup.rb

@@ -177,7 +177,7 @@ module IsoDoc::Function
       return docxml unless dl
       dl_out = extract_symbols_list(dl)
       dl_out.sort! { |a, b| a[:key] <=> b[:key] }
-      dl.replace(dl_out.map { |d| d[:dt].to_s + d[:dd].to_s }.join("\n"))
+      dl.children = dl_out.map { |d| d[:dt].to_s + d[:dd].to_s }.join("\n")
       docxml
     end
   end

data/lib/isodoc/function/lists.rb

@@ -62,8 +62,12 @@ module IsoDoc::Function
       %w{dt dd}.include? n.name
     end
 
+    def dl_attr(node)
+      attr_code(id: node["id"])
+    end
+
     def dl_parse(node, out)
-      out.dl  **attr_code(id: node["id"]) do |v|
+      out.dl  **dl_attr(node) do |v|
         node.elements.select { |n| dt_dd? n }.each_slice(2) do |dt, dd|
           v.dt **attr_code(id: dt["id"]) do |term|
             dt_parse(dt, term) 

data/lib/isodoc/function/xref_anchor.rb

@@ -25,6 +25,7 @@ module IsoDoc::Function
     end
 
     def anchor(id, lbl, warning = true)
+      return nil if id.nil? || id.empty?
       unless @anchors[id]
         if warning
           @seen ||= Seen_Anchor.instance

data/lib/isodoc/html_function/html.rb

@@ -269,7 +269,7 @@ module IsoDoc::HtmlFunction
 
     def datauri(i)
       type = i["src"].split(".")[-1]
-      bin = IO.binread(File.join(@localdir, i["src"]))
+      bin = IO.binread(image_localfile(i))
       data = Base64.strict_encode64(bin)
       i["src"] = "data:image/#{type};base64,#{data}"
     end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.0.8".freeze
+  VERSION = "1.0.9".freeze
 end

data/spec/isodoc/cleanup_spec.rb

@@ -731,6 +731,7 @@ INPUT
                       <?xml version="1.0"?>
        <div id="L" class="Symbols">
                       <h1>4.<span style="mso-tab-count:1">&#xA0; </span>Symbols and Abbreviated Terms</h1>
+                      <dl>
                       <dt>
          <p>
            <span class="stem">(#(x)#)</span>
@@ -756,6 +757,7 @@ INPUT
            <span class="stem">(#(&#x3B1;)#)</span>
          </p>
        </dt><dd>Definition 1</dd>
+       </dl>
                     </div>
 
     OUTPUT

data/spec/isodoc/postproc_spec.rb

@@ -300,7 +300,7 @@ ICAgICAgIDogRU5EIERPQyBJRAoKRklMRU5BTUU6IHRlc3QKCg==
     IsoDoc::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css", wordintropage: "spec/assets/wordintro.html"}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
         <sections>
-               <clause inline-header="false" obligation="normative"><title>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
+               <clause id="A" inline-header="false" obligation="normative"><title>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
 
          <title>Introduction<bookmark id="Q"/> to this<fn reference="1">
   <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6">Formerly denoted as 15 % (m/m).</p>
@@ -382,7 +382,7 @@ ICAgICAgIDogRU5EIERPQyBJRAoKRklMRU5BTUU6IHRlc3QKCg==
     IsoDoc::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css", wordintropage: "spec/assets/wordintro.html", doctoclevels: 3}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
         <sections>
-               <clause inline-header="false" obligation="normative"><title>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
+               <clause id="A" inline-header="false" obligation="normative"><title>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
 
          <title>Introduction<bookmark id="Q"/> to this<fn reference="1">
   <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6">Formerly denoted as 15 % (m/m).</p>
@@ -496,7 +496,7 @@ TOCLEVEL
     IsoDoc::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css", wordintropage: "spec/assets/wordintro.html"}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
         <sections>
-               <clause inline-header="false" obligation="normative"><title>Clause 4</title><fn reference="3">
+               <clause id="A" inline-header="false" obligation="normative"><title>Clause 4</title><fn reference="3">
   <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6">This is a footnote.</p>
 </fn><clause id="N" inline-header="false" obligation="normative">
 
@@ -518,7 +518,7 @@ TOCLEVEL
     expect(xmlpp(html)).to be_equivalent_to xmlpp(<<~"OUTPUT")
            <main  xmlns:epub="epub" class="main-section"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
              <p class="zzSTDTitle1"></p>
-             <div>
+             <div id="A">
                <h1>1.&#xA0; Clause 4</h1>
                <a rel="footnote" href="#fn:3" epub:type="footnote" id="fnref:1">
                  <sup>1</sup>
@@ -629,6 +629,7 @@ TOCLEVEL
         <preface><foreword>
          <figure id="_">
          <name>Split-it-right sample divider</name>
+                  <image src="#{File.expand_path(File.join(File.dirname(__FILE__), "..", "assets/rice_image1.png"))}" id="_" mimetype="image/png"/>
                   <image src="assets/rice_image1.png" id="_" mimetype="image/png"/>
                   <image src="assets/rice_image1.png" id="_" width="20000" height="300000" mimetype="image/png"/>
                   <image src="assets/rice_image1.png" id="_" width="99" height="auto" mimetype="image/png"/>
@@ -646,6 +647,7 @@ TOCLEVEL
                <h1 class="ForewordTitle">Foreword</h1>
                <div id="_" class="figure">
                <img src="test_htmlimages/_.png" height="776" width="922" />
+               <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" style="text-align:center;">Figure 1&#xA0;&#x2014; Split-it-right sample divider</p></div>
@@ -664,6 +666,7 @@ TOCLEVEL
         <preface><foreword>
          <figure id="_">
          <name>Split-it-right sample divider</name>
+                  <image src="#{File.expand_path(File.join(File.dirname(__FILE__), "..", "assets/rice_image1.png"))}" id="_" mimetype="image/png"/>
                   <image src="spec/assets/rice_image1.png" id="_" mimetype="image/png"/>
        </figure>
        </foreword></preface>
@@ -678,6 +681,39 @@ TOCLEVEL
                <h1 class="ForewordTitle">Foreword</h1>
                <div id="_" class="figure">
                <img src="data:image/png;base64,_" height="776" width="922" />
+               <img src="data:image/png;base64,_" height="776" width="922" />
+       <p class="FigureTitle" style="text-align:center;">Figure 1&#xA0;&#x2014; Split-it-right sample divider</p></div>
+             </div>
+             <p class="zzSTDTitle1"></p>
+           </main>
+    OUTPUT
+
+  end
+
+    it "encodes images in HTML as data URIs, using relative file location" do
+    FileUtils.rm_f "spec/test.html"
+    FileUtils.rm_rf "spec/test_htmlimages"
+    IsoDoc::HtmlConvert.new({htmlstylesheet: "spec/assets/html.css", datauriimage: true}).convert("spec/test", <<~"INPUT", false)
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+        <preface><foreword>
+         <figure id="_">
+         <name>Split-it-right sample divider</name>
+                  <image src="#{File.expand_path(File.join(File.dirname(__FILE__), "..", "assets/rice_image1.png"))}" id="_" mimetype="image/png"/>
+                  <image src="assets/rice_image1.png" id="_" mimetype="image/png"/>
+       </figure>
+       </foreword></preface>
+        </iso-standard>
+    INPUT
+    html = File.read("spec/test.html").sub(/^.*<main class="main-section">/m, '<main class="main-section">').
+      sub(%r{</main>.*$}m, "</main>")
+    expect(xmlpp(html.gsub(%r{src="data:image/png;base64,[^"]+"}, %{src="data:image/png;base64,_"}))).to be_equivalent_to xmlpp(<<~"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="data:image/png;base64,_" height="776" width="922" />
+               <img src="data:image/png;base64,_" height="776" width="922" />
        <p class="FigureTitle" style="text-align:center;">Figure 1&#xA0;&#x2014; Split-it-right sample divider</p></div>
              </div>
              <p class="zzSTDTitle1"></p>
@@ -686,6 +722,7 @@ TOCLEVEL
 
   end
 
+
   it "processes IsoXML terms for HTML" do
     FileUtils.rm_f "test.html"
     FileUtils.rm_f "test.doc"

data/spec/isodoc/section_spec.rb

@@ -475,6 +475,32 @@ OUTPUT
 OUTPUT
     end
 
+    it "processes section titles without ID" do
+    expect(xmlpp(IsoDoc::HtmlConvert.new({suppressheadingnumbers: true}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <preface>
+        <introduction id="B" obligation="informative"><title>Introduction</title><clause obligation="informative">
+         <title>Introduction Subsection</title>
+       </clause>
+       </introduction>
+       </preface>
+       </iso-standard>
+       INPUT
+    #{HTML_HDR}
+      <br/>
+      <div class='Section3' id='B'>
+        <h1 class='IntroTitle'>Introduction</h1>
+        <div>
+          <h1>Introduction Subsection</h1>
+        </div>
+      </div>
+      <p class='zzSTDTitle1'/>
+    </div>
+  </body>
+</html>
+       OUTPUT
+    end
+
   it "processes simple terms & definitions" do
         expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
                <iso-standard xmlns="http://riboseinc.com/isoxml">

metadata

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