isodoc 0.9.12 → 0.9.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6c03a961d5e4f165ec88b0cadd23ce527a11dc362321fa1b0f3a13dd85661ba
-  data.tar.gz: 1e3dea00b58de59aa785fa6b62d3edceb73f6be39989dfce81ab89760b53bd96
+  metadata.gz: 945e78a0cc8b1efc187b862f368b0ce1290e613bb6fda7a66c66aac003c7431d
+  data.tar.gz: 59f446c8cd4d8e2a82292c22d154de3dcd9f398086f9f33f8455a2dc62f027b9
 SHA512:
-  metadata.gz: cab6416eca981238438c32ec69ae6b184bd57402b2083d7d38c72e7ff44f1789132955ae5549624e1851ed86d60318bccd064068cb05c918e69579ac2ed65433
-  data.tar.gz: 35e405f5e62583960fe5d55b1b4d961290bf64629126b9b56ab3053c5799afa0278d7ddd73f249c91a58100fe8945db4f09720d03bed961b2f9da206dc51be77
+  metadata.gz: 8bddacabfb2f52f3200d338b7c7fae3f5497df524a87e49fe7623785dd9acd468ac78d77b62e968c090ef40b12f7faae92a67367326e06c7c66ef2aa4217b09f
+  data.tar.gz: 6d70b11d7058cfa38d9d467853003e3ccf994591969c81f38092490aa2e1399e1a2e091e2b1738e1cf89e62163916fa9b8d3be94c0c2595d8c099987764dd16b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    isodoc (0.9.12)
+    isodoc (0.9.13)
       asciimath
       html2doc (~> 0.8.6)
       htmlentities (~> 4.3.4)
@@ -67,10 +67,10 @@ GEM
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2018.0812)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     nenv (0.3.0)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.9.1)
+      mini_portile2 (~> 2.4.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
@@ -84,8 +84,8 @@ GEM
     rainbow (3.0.0)
     rake (12.3.2)
     rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
     roman-numerals (0.3.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -146,4 +146,4 @@ DEPENDENCIES
   timecop (~> 0.9)
 
 BUNDLED WITH
-   1.17.1
+   1.17.2

data/lib/isodoc/function/inline.rb

@@ -42,11 +42,13 @@ module IsoDoc::Function
     def get_linkend(node)
       link = anchor_linkend(node, docid_l10n(node["target"] || node["citeas"]))
       link += eref_localities(node.xpath(ns("./locality")), link)
-      text = node.children.select { |c| c.text? && !c.text.empty? }
-      link = text.join(" ") unless text.nil? || text.empty?
+      #text = node.children.select { |c| c.text? && !c.text.empty? }
+      #link = text.join(" ") unless text.nil? || text.empty?
+      contents = node.children.select { |c| c.name != "locality" }
+      return link if contents.nil? || contents.empty?
+      Nokogiri::XML::NodeSet.new(node.document, contents).to_xml
       # so not <origin bibitemid="ISO7301" citeas="ISO 7301">
       # <locality type="section"><reference>3.1</reference></locality></origin>
-      link
     end
 
     def xref_parse(node, out)

data/lib/isodoc/function/terms.rb

@@ -43,7 +43,8 @@ module IsoDoc::Function
       out.div **{ class: "Note" } do |div|
         first = node.first_element_child
         div.p do |p|
-          p << "#{get_anchors[node['id']][:label]}: "
+          anchor = get_anchors[node['id']]
+          p << "#{anchor&.dig(:label) || '???'}: "
           para_then_remainder(first, node, p, div)
         end
       end

data/lib/isodoc/function/to_word_html.rb

@@ -117,14 +117,16 @@ module IsoDoc::Function
 
     def smallcap_parse(node, xml)
       xml.span **{ style: "font-variant:small-caps;" } do |s|
-        s << node.inner_html
+        #s << node.inner_html
+        node.children.each { |n| parse(n, s) }
       end
     end
 
     def text_parse(node, out)
       return if node.nil? || node.text.nil?
       text = node.to_s
-      text = text.gsub("\n", "<br/>").gsub(" ", "&nbsp;") if in_sourcecode
+      text = text.gsub("\n", "<br/>").gsub("<br/> ", "<br/>&nbsp;").
+        gsub(/[ ](?=[ ])/, "&nbsp;") if in_sourcecode
       out << text
     end
 
@@ -134,7 +136,44 @@ module IsoDoc::Function
 
     def keyword_parse(node, out)
       out.span **{ class: "keyword" } do |s|
-        s << node.inner_html
+        #s << node.inner_html
+        node.children.each { |n| parse(n, s) }
+      end
+    end
+
+    def em_parse(node, out)
+      out.i do |e|
+        node.children.each { |n| parse(n, e) }
+      end
+    end
+    
+    def strong_parse(node, out)
+      out.b do |e|
+        node.children.each { |n| parse(n, e) }
+      end
+    end
+
+    def sup_parse(node, out)
+      out.sup do |e|
+        node.children.each { |n| parse(n, e) }
+      end
+    end
+
+    def sub_parse(node, out)
+      out.sub do |e|
+        node.children.each { |n| parse(n, e) }
+      end
+    end
+
+    def tt_parse(node, out)
+      out.tt do |e|
+        node.children.each { |n| parse(n, e) }
+      end
+    end
+
+    def strike_parse(node, out)
+      out.s do |e|
+        node.children.each { |n| parse(n, e) }
       end
     end
 
@@ -143,12 +182,18 @@ module IsoDoc::Function
         text_parse(node, out)
       else
         case node.name
-        when "em" then out.i { |e| e << node.inner_html }
-        when "strong" then out.b { |e| e << node.inner_html }
-        when "sup" then out.sup { |e| e << node.inner_html }
-        when "sub" then out.sub { |e| e << node.inner_html }
-        when "tt" then out.tt { |e| e << node.inner_html }
-        when "strike" then out.s { |e| e << node.inner_html }
+        #when "em" then out.i { |e| e << node.inner_html }
+        #when "strong" then out.b { |e| e << node.inner_html }
+        #when "sup" then out.sup { |e| e << node.inner_html }
+        #when "sub" then out.sub { |e| e << node.inner_html }
+        #when "tt" then out.tt { |e| e << node.inner_html }
+        #when "strike" then out.s { |e| e << node.inner_html }
+        when "em" then em_parse(node, out)
+        when "strong" then strong_parse(node, out)
+        when "sup" then sup_parse(node, out)
+        when "sub" then sub_parse(node, out)
+        when "tt" then tt_parse(node, out)
+        when "strike" then strike_parse(node, out)
         when "keyword" then keyword_parse(node, out)
         when "smallcap" then smallcap_parse(node, out)
         when "br" then out.br
@@ -158,7 +203,6 @@ module IsoDoc::Function
         when "callout" then callout_parse(node, out)
         when "stem" then stem_parse(node, out)
         when "clause" then clause_parse(node, out)
-          # when "subclause" then clause_parse(node, out)
         #when "appendix" then clause_parse(node, out)
         when "xref" then xref_parse(node, out)
         when "eref" then eref_parse(node, out)

data/lib/isodoc/function/xref_sect_gen.rb

@@ -10,7 +10,7 @@ module IsoDoc::Function
     end
 
     def initial_anchor_names(d)
-      preface_names(d.at(ns("//abstract")))
+      preface_names(d.at(ns("//preface/abstract")))
       preface_names(d.at(ns("//foreword")))
       preface_names(d.at(ns("//introduction")))
       sequential_asset_names(d.xpath(ns("//preface/abstract | //foreword | //introduction")))

data/lib/isodoc/version.rb

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

data/lib/isodoc/word_function/body.rb

@@ -1,6 +1,8 @@
 module IsoDoc::WordFunction
   module Body
     def make_body1(body, _docxml)
+      FileUtils.rm_rf tmpimagedir
+      FileUtils.mkdir tmpimagedir
       body.div **{ class: "WordSection1" } do |div1|
         div1.p { |p| p << "&nbsp;" } # placeholder
       end
@@ -172,7 +174,8 @@ module IsoDoc::WordFunction
       out.div **{ class: "Note" } do |div|
         first = node.first_element_child
         div.p **{ class: "Note" } do |p|
-          p << "#{get_anchors[node['id']][:label]}: "
+          anchor = get_anchors[node['id']]
+          p << "#{anchor&.dig(:label) || '???'}: "
           para_then_remainder(first, node, p, div)
         end
       end
@@ -191,8 +194,19 @@ module IsoDoc::WordFunction
       attrs
     end
 
+    def imgsrc(uri)
+      return uri unless %r{^data:image/}.match uri
+      %r{^data:image/(?<imgtype>[^;]+);base64,(?<imgdata>.+)$} =~ uri
+      uuid = UUIDTools::UUID.random_create.to_s
+      fname = "#{uuid}.#{imgtype}"
+      new_file = File.join(tmpimagedir, fname)
+      @files_to_delete << new_file
+      File.open(new_file, "wb") { |f| f.write(Base64.strict_decode64(imgdata)) }
+      File.join(rel_tmpimagedir, fname)
+    end
+
     def image_parse(node, out, caption)
-      attrs = { src: node["src"],
+      attrs = { src: imgsrc(node["src"]),
                 height: node["height"],
                 width: node["width"] }
       if node["height"] == "auto" || node["width"] == "auto"
@@ -206,7 +220,7 @@ module IsoDoc::WordFunction
     def xref_parse(node, out)
       target = /#/.match(node["target"]) ? node["target"].sub(/#/, ".doc#") :
         "##{node["target"]}"
-      out.a(**{ "href": target }) { |l| l << get_linkend(node) }
+        out.a(**{ "href": target }) { |l| l << get_linkend(node) }
     end
   end
 end

data/spec/isodoc/blocks_spec.rb

@@ -230,6 +230,7 @@ INPUT
   <name>Split-it-right <em>sample</em> divider</name>
   <image src="rice_images/rice_image1.png" height="20" width="30" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" imagetype="PNG"/>
   <image src="rice_images/rice_image1.png" height="20" width="auto" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" imagetype="PNG"/>
+  <image src="data:image/gif;base64,R0lGODlhEAAQAMQAAORHHOVSKudfOulrSOp3WOyDZu6QdvCchPGolfO0o/XBs/fNwfjZ0frl3/zy7////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkAABAALAAAAAAQABAAAAVVICSOZGlCQAosJ6mu7fiyZeKqNKToQGDsM8hBADgUXoGAiqhSvp5QAnQKGIgUhwFUYLCVDFCrKUE1lBavAViFIDlTImbKC5Gm2hB0SlBCBMQiB0UjIQA7" height="20" width="auto" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" imagetype="PNG"/>
   <fn reference="a">
   <p id="_ef2c85b8-5a5a-4ecd-a1e6-92acefaaa852">The time <stem type="AsciiMath">t_90</stem> was estimated to be 18,2 min for this example.</p>
 </fn>
@@ -253,6 +254,7 @@ B</pre>
 
          <img src="rice_images/rice_image1.png" height="20" width="30"/>
          <img src="rice_images/rice_image1.png" height="20" width="auto"/>
+         <img src="data:image/gif;base64,R0lGODlhEAAQAMQAAORHHOVSKudfOulrSOp3WOyDZu6QdvCchPGolfO0o/XBs/fNwfjZ0frl3/zy7////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkAABAALAAAAAAQABAAAAVVICSOZGlCQAosJ6mu7fiyZeKqNKToQGDsM8hBADgUXoGAiqhSvp5QAnQKGIgUhwFUYLCVDFCrKUE1lBavAViFIDlTImbKC5Gm2hB0SlBCBMQiB0UjIQA7" height="20" width="auto"/>
          <a href="#_" class="TableFootnoteRef">a</a><aside class="footnote"><div id="fn:_"><a id="_" class="TableFootnoteRef">a&#160; </a>
          <p id="_">The time <span class="stem">(#(t_90)#)</span> was estimated to be 18,2 min for this example.</p>
        </div></aside>
@@ -278,6 +280,7 @@ B</pre>
   <name>Split-it-right sample divider</name>
   <image src="rice_images/rice_image1.png" height="20" width="30" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" imagetype="PNG"/>
   <image src="rice_images/rice_image1.png" height="20" width="auto" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" imagetype="PNG"/>
+  <image src="data:image/gif;base64,R0lGODlhEAAQAMQAAORHHOVSKudfOulrSOp3WOyDZu6QdvCchPGolfO0o/XBs/fNwfjZ0frl3/zy7////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkAABAALAAAAAAQABAAAAVVICSOZGlCQAosJ6mu7fiyZeKqNKToQGDsM8hBADgUXoGAiqhSvp5QAnQKGIgUhwFUYLCVDFCrKUE1lBavAViFIDlTImbKC5Gm2hB0SlBCBMQiB0UjIQA7" height="20" width="auto" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" imagetype="PNG"/>
   <fn reference="a">
   <p id="_ef2c85b8-5a5a-4ecd-a1e6-92acefaaa852">The time <stem type="AsciiMath">t_90</stem> was estimated to be 18,2 min for this example.</p>
 </fn>
@@ -308,6 +311,7 @@ B</pre>
 
          <img src="rice_images/rice_image1.png" height="20" width="30"/>
          <img src="rice_images/rice_image1.png"/>
+         <img src="test_images/_.gif"/>
          <a href="#_" class="TableFootnoteRef">a</a><aside><div id="ftn_"><a id="_" class="TableFootnoteRef">a<span style="mso-tab-count:1">&#160; </span></a>
          <p id="_">The time <span class="stem">(#(t_90)#)</span> was estimated to be 18,2 min for this example.</p>
        </div></aside>
@@ -416,7 +420,7 @@ B</pre>
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <p id="samplecode" class="Sourcecode"><br/>&#160;&#160;&#160;&#160;<br/>&#160;&#160;puts&#160;x<br/><p class="FigureTitle" align="center">Ruby <i>code</i></p></p>
+                 <p id="samplecode" class="Sourcecode"><br/>&#160;&#160;&#160; <br/>&#160; puts x<br/><p class="FigureTitle" align="center">Ruby <i>code</i></p></p>
                </div>
                <p class="zzSTDTitle1"/>
              </div>
@@ -440,7 +444,7 @@ B</pre>
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <p id="samplecode" class="Sourcecode"><br/>&#160;&#160;&#160;&#160;<br/>&#160;&#160;&lt;xml&gt;<br/><p class="FigureTitle" align="center">XML code</p></p>
+                 <p id="samplecode" class="Sourcecode"><br/>&#160;&#160;&#160; <br/>&#160; &lt;xml&gt;<br/><p class="FigureTitle" align="center">XML code</p></p>
                </div>
                <p class="zzSTDTitle1"/>
              </div>
@@ -468,7 +472,7 @@ B</pre>
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <p id="_" class="Sourcecode">puts&#160;"Hello,&#160;world."&#160; &lt;1&gt;<br/>&#160;&#160;&#160;%w{a&#160;b&#160;c}.each&#160;do&#160;|x|<br/>&#160;&#160;&#160;&#160;&#160;puts&#160;x&#160; &lt;2&gt;<br/>&#160;&#160;&#160;end<span class="zzMoveToFollowing">&lt;1&gt; </span>
+                 <p id="_" class="Sourcecode">puts "Hello, world."  &lt;1&gt;<br/>&#160;&#160; %w{a b c}.each do |x|<br/>&#160;&#160;&#160;&#160; puts x  &lt;2&gt;<br/>&#160;&#160; end<span class="zzMoveToFollowing">&lt;1&gt; </span>
             <p class="Sourcecode" id="_">This is one callout</p>
           <span class="zzMoveToFollowing">&lt;2&gt; </span>
             <p class="Sourcecode" id="_">This is another callout</p>

data/spec/isodoc/inline_spec.rb

@@ -31,6 +31,32 @@ RSpec.describe IsoDoc do
     OUTPUT
   end
 
+  it "processes embedded inline formatting" do
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <p>
+    <em><strong>&lt;</strong></em> <tt><link target="B"/></tt> <xref target="_http_1_1">Requirement <tt>/req/core/http</tt></xref> <eref type="inline" bibitemid="ISO712" citeas="ISO 712">Requirement <tt>/req/core/http</tt></eref> <eref type="inline" bibitemid="ISO712" citeas="ISO 712"><locality type="section"><referenceFrom>3.1</referenceFrom></locality></eref>
+    </p>
+    </foreword></preface>
+    <sections>
+    </iso-standard>
+    INPUT
+    #{HTML_HDR}
+               <br/>
+               <div>
+                 <h1 class="ForewordTitle">Foreword</h1>
+                 <p>
+       <i><b>&lt;</b></i> <tt><a href="B">B</a></tt> <a href="#_http_1_1">Requirement <tt>/req/core/http</tt></a>  <a href="#ISO712">Requirement <tt>/req/core/http</tt></a> <a href="#ISO712">ISO 712, Section 3.1</a>
+       </p>
+               </div>
+               <p class="zzSTDTitle1"/>
+             </div>
+           </body>
+       </html>
+    OUTPUT
+  end
+
   it "processes links" do
     expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">

data/spec/spec_helper.rb

@@ -25,7 +25,8 @@ def strip_guid(x)
     gsub(%r( href="#[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{13}"), ' href="#_"').
     gsub(%r( id="[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{13}"), ' id="_"').
     gsub(%r( id="ftn[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{13}"), ' id="ftn_"').
-    gsub(%r( id="fn:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{13}"), ' id="fn:_"')
+    gsub(%r( id="fn:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{13}"), ' id="fn:_"').
+    gsub(%r[ src="([^/]+)/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\.], ' src="\\1/_.')
 end
 
 HTML_HDR = <<~END

metadata

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