isodoc 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a81fec6b1ecfd841b735e5b0b36fca370a1928f7f7a79ee4a1348fd183eb087c
-  data.tar.gz: 82fe58f01f7b8315eb3a1d99863084e7f53c2dc1d30220b1a6940f9cc8a23b02
+  metadata.gz: acde5067685a87b3ab6d60d0db7d0d0bb41258ee9569248487fea64ad9bdc6bb
+  data.tar.gz: 8afea86b4d65ed1dc140d598e3e9bf84fe1f6025edfd6287e266e5f725d58044
 SHA512:
-  metadata.gz: 986f56381b796b2107885544234df9d0e5716953a59c6af9f3b706473f16eec46eb5abbf5132324c237a6f7749f75264be71c84c6e576aa302eeed89f10aa56f
-  data.tar.gz: b07f326e9ff729e8cc2b964cea990c4fb51524887690797d42cb4e87fa324e77a4c6d1130f365e55d3bc455aaa76d18409241f43b3af89586305d0a0282683d5
+  metadata.gz: c989302746ce89015f7dc719b5df66b2b3a8c27e498aa20471bf7e9631a1a80cc0914226b7e6d0778b4b792e9d91d0ea29eb84f07ec14fd646e6800999f5e1a3
+  data.tar.gz: ae33822c3445e57c08b2b0f8bc575e635c88cd7e071af6c93f04b039a1c5375de1deb7373984b9d7877c39a37542f9ef4a3e3f33dcbddf7316c71eb5bb55daaf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    isodoc (1.0.9)
+    isodoc (1.0.10)
       asciimath
       html2doc (~> 0.9.0)
       htmlentities (~> 4.3.4)
@@ -52,9 +52,9 @@ GEM
       uuidtools
     htmlentities (4.3.4)
     image_size (2.0.2)
-    json (2.2.0)
+    json (2.3.0)
     liquid (4.0.3)
-    listen (3.2.0)
+    listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.0.13)
@@ -67,7 +67,7 @@ GEM
     mime-types-data (3.2019.1009)
     mini_portile2 (2.4.0)
     nenv (0.3.0)
-    nokogiri (1.10.5)
+    nokogiri (1.10.7)
       mini_portile2 (~> 2.4.0)
     notiffany (0.1.3)
       nenv (~> 0.1)

data/lib/isodoc/convert.rb

@@ -6,7 +6,7 @@ require "tempfile"
 module IsoDoc
   class Convert < ::IsoDoc::Common
     attr_reader :options
-    attr_writer :labels
+    attr_accessor :labels
 
     # htmlstylesheet: Generic stylesheet for HTML
     # wordstylesheet: Generic stylesheet for Word
@@ -71,6 +71,8 @@ module IsoDoc
       @wordToClevels = 2 if @wordToClevels == 0
       @htmlToClevels = options[:htmltoclevels].to_i
       @htmlToClevels = 2 if @htmlToClevels == 0
+      @bookmarks_allocated = {"X" => true}
+      @fn_bookmarks = {}
     end
 
     # run this after @meta is populated
@@ -136,10 +138,10 @@ module IsoDoc
       #@files_to_delete << outname
       #outname
       Tempfile.open([File.basename(filename, ".*"), "css"],
-                      :encoding => "utf-8") do |f|
+                    :encoding => "utf-8") do |f|
         f.write(engine.render)
         f
-    end
+      end
     end
 
     def convert1(docxml, filename, dir)

data/lib/isodoc/function/blocks.rb

@@ -128,9 +128,14 @@ module IsoDoc::Function
       example_div_parse(node, out)
     end
 
-    def sourcecode_name_parse(_node, div, name)
+    def sourcecode_name_parse(node, div, name)
       div.p **{ class: "SourceTitle", style: "text-align:center;" } do |p|
-        name.children.each { |n| parse(n, p) }
+        if node.ancestors("example").empty?
+          lbl = anchor(node['id'], :label, false)
+          lbl.nil? or p << l10n("#{@figure_lbl} #{lbl}")
+          name and !lbl.nil? and p << "&nbsp;&mdash; "
+        end
+        name&.children&.each { |n| parse(n, p) }
       end
     end
 
@@ -147,7 +152,8 @@ module IsoDoc::Function
         node.children.each { |n| parse(n, div) unless n.name == "name" }
         @sourcecode = false
       end
-      sourcecode_name_parse(node, out, name) if name
+      sourcecode_name_parse(node, out, name) if name ||
+        node.ancestors("example").empty? && anchor(node['id'], :label, false)
     end
 
     def pre_parse(node, out)

data/lib/isodoc/function/inline.rb

@@ -8,6 +8,17 @@ module IsoDoc::Function
       out.br
     end
 
+    def hr_parse(node, out)
+      out.hr
+    end
+
+    def br_parse(node, out)
+      out.br
+    end
+
+    def index_parse(node, out)
+    end
+
     def link_parse(node, out)
       out.a **attr_code(href: node["target"], title: node["alt"]) do |l|
         if node.text.empty?

data/lib/isodoc/function/to_word_html.rb

@@ -193,14 +193,13 @@ module IsoDoc::Function
         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
-        when "hr" then out.hr
+        when "br" then br_parse(node, out)
+        when "hr" then hr_parse(node, out)
         when "bookmark" then bookmark_parse(node, out)
         when "pagebreak" then page_break(out)
         when "callout" then callout_parse(node, out)
         when "stem" then stem_parse(node, out)
         when "clause" 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)
         when "origin" then eref_parse(node, out)
@@ -249,6 +248,7 @@ module IsoDoc::Function
         when "measurement-target" then requirement_component_parse(node, out)
         when "verification" then requirement_component_parse(node, out)
         when "import" then requirement_component_parse(node, out)
+        when "index" then index_parse(node, out)
         else
           error_parse(node, out)
         end

data/lib/isodoc/function/utils.rb

@@ -1,6 +1,5 @@
 module IsoDoc::Function
   module Utils
-
     def date_range(date)
       self.class.date_range(date)
     end
@@ -40,8 +39,8 @@ module IsoDoc::Function
       end.to_h
     end
 
-    DOCTYPE_HDR = '<!DOCTYPE html SYSTEM
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'.freeze
+    DOCTYPE_HDR = '<!DOCTYPE html SYSTEM '\
+      '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'.freeze
 
     def to_xhtml(xml)
       xml.gsub!(/<\?xml[^>]*>/, "")
@@ -115,6 +114,7 @@ module IsoDoc::Function
         x.replace(" ") if x.name == "span" && /mso-tab-count/.match(x["style"])
         x.remove if x.name == "span" && x["class"] == "MsoCommentReference"
         x.remove if x.name == "a" && x["epub:type"] == "footnote"
+        x.remove if x.name == "span" && /mso-bookmark/.match(x["style"])
         x.replace(x.children) if x.name == "a"
       end
       from_xhtml(h1)
@@ -164,7 +164,17 @@ module IsoDoc::Function
         f.write(Base64.strict_decode64(imgdata))
         @tempfile_cache << f #persist to the end
         f.path
+      end
     end
+
+    def image_localfile(i)
+      if /^data:image/.match i["src"]
+        save_dataimage(i["src"], false)
+      elsif %r{^([A-Z]:)?/}.match i["src"]
+        i["src"]
+      else
+        File.join(@localdir, i["src"])
+      end
     end
   end
 end

data/lib/isodoc/function/xref_gen.rb

@@ -127,7 +127,7 @@ module IsoDoc::Function
     def sequential_figure_names(clause)
       c = Counter.new
       j = 0
-      clause.xpath(ns(".//figure[not(@class = 'pseudocode')]")).each do |t|
+      clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]")).each do |t|
         if t.parent.name == "figure" then j += 1
         else
           j = 0
@@ -209,7 +209,7 @@ module IsoDoc::Function
     def hierarchical_figure_names(clause, num)
       c = Counter.new
       j = 0
-      clause.xpath(ns(".//figure[not(@class = 'pseudocode')]")).each do |t|
+      clause.xpath(ns(".//figure |  .//sourcecode[not(ancestor::example)]")).each do |t|
         if t.parent.name == "figure" then j += 1
         else
           j = 0

data/lib/isodoc/html_function/html.rb

@@ -257,16 +257,6 @@ module IsoDoc::HtmlFunction
       docxml
     end
 
-    def image_localfile(i)
-      if /^data:image/.match i["src"]
-        save_dataimage(i["src"], false)
-      elsif %r{^([A-Z]:)?/}.match i["src"]
-        i["src"]
-      else
-        File.join(@localdir, i["src"])
-      end
-    end
-
     def datauri(i)
       type = i["src"].split(".")[-1]
       bin = IO.binread(image_localfile(i))

data/lib/isodoc/version.rb

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

data/lib/isodoc/word_function/body.rb

@@ -10,6 +10,7 @@ module IsoDoc::WordFunction
       super
     end
 
+=begin
     def anchor_names(docxml)
       super
       renumber_footnotes(docxml)
@@ -22,6 +23,7 @@ module IsoDoc::WordFunction
         f["reference"] = (i + 1).to_s
       end
     end
+=end
 
     def body_attr
       { lang: "EN-US", link: "blue", vlink: "#954F72" }

data/lib/isodoc/word_function/footnotes.rb

@@ -1,5 +1,13 @@
 module IsoDoc::WordFunction
   module Footnotes
+    def bookmarkid
+      ret = "X"
+      until !@bookmarks_allocated[ret] do
+        ret = Random.rand(1000000000)
+      end
+      @bookmarks_allocated[ret] = true
+      sprintf "%09d", ret
+    end
 
     def footnotes(div)
       return if @footnotes.empty?
@@ -59,13 +67,26 @@ module IsoDoc::WordFunction
       @seen_footnote << (tid + fn)
     end
 
+    def seen_footnote_parse(node, out, fn)
+      out.span **{style: "mso-element:field-begin"}
+      out << " NOTEREF _Ref#{@fn_bookmarks[fn]} \\f \\h"
+      out.span **{style: "mso-element:field-separator"}
+      out.span **{class: "MsoFootnoteReference"} do |s|
+        s << fn
+      end
+      out.span **{style: "mso-element:field-end"}
+    end
+
     def footnote_parse(node, out)
       return table_footnote_parse(node, out) if @in_table || @in_figure
       fn = node["reference"]
-      out.a **{ "epub:type": "footnote", href: "#ftn#{fn}" } do |a|
-        a.sup { |sup| sup << fn }
+      return seen_footnote_parse(node, out, fn) if @seen_footnote.include?(fn)
+      @fn_bookmarks[fn] = bookmarkid
+      out.span **{style: "mso-bookmark:_Ref#{@fn_bookmarks[fn]}"} do |s|
+        s.a **{ "epub:type": "footnote", href: "#ftn#{fn}" } do |a|
+          a.sup { |sup| sup << fn }
+        end
       end
-      return if @seen_footnote.include?(fn)
       @in_footnote = true
       @footnotes << make_generic_footnote_text(node, fn)
       @in_footnote = false

data/lib/isodoc/word_function/postprocess.rb

@@ -51,8 +51,7 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
     def word_admonition_images(docxml)
       docxml.xpath("//div[@class = 'Admonition']//img").each do |i|
         i["width"], i["height"] =
-          Html2Doc.image_resize(i, File.join(@localdir, i["src"]),
-                                @maxheight, 300)
+          Html2Doc.image_resize(i, image_localfile(i), @maxheight, 300)
       end
     end
 
@@ -70,17 +69,18 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
     end
 
     def style_update(node, css)
+      return unless node
       node["style"] = node["style"] ?  node["style"].sub(/;?$/, ";#{css}") : css
     end
 
     def word_image_caption(docxml)
       docxml.xpath("//p[@class = 'FigureTitle' or @class = 'SourceTitle']").
         each do |t|
-        if t.previous_element.name == "img"
+        if t&.previous_element&.name == "img"
           img = t.previous_element
           t.previous_element.swap("<p class=\'figure\'>#{img.to_xml}</p>")
         end
-        style_update(t.previous_element, "page-break-after:avoid;")
+        style_update(t&.previous_element, "page-break-after:avoid;")
       end
     end
 
@@ -177,10 +177,6 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
       meta = @meta.get
       meta[:filename] = filename
       params = meta.map { |k, v| [k.to_s, v] }.to_h
-      #headerfile = "header.html"
-      #File.open(headerfile, "w:UTF-8") { |f| f.write(template.render(params)) }
-      #@files_to_delete << headerfile
-      #headerfile
       Tempfile.open(%w(header html), :encoding => "utf-8") do |f|
         f.write(template.render(params))
         f
@@ -188,7 +184,7 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
     end
 
     def word_toc_entry(toclevel, heading)
-      bookmark = Random.rand(1000000000)
+      bookmark = bookmarkid # Random.rand(1000000000)
       <<~TOC
         <p class="MsoToc#{toclevel}"><span class="MsoHyperlink"><span
         lang="EN-GB" style='mso-no-proof:yes'>

data/spec/isodoc/blocks_spec.rb

@@ -240,7 +240,7 @@ INPUT
   </dl>
 </figure>
 <figure id="figure-B">
-<pre>A &lt;
+<pre alt="A B">A &lt;
 B</pre>
 </figure>
 <figure id="figure-C" unnumbered="true">
@@ -351,6 +351,9 @@ B</pre>
     <example id="samplecode">
     <name>Title</name>
   <p>Hello</p>
+  <sourcecode id="X">
+  <name>Sample</name>
+  </sourcecode>
 </example>
     </foreword></preface>
     </iso-standard>
@@ -362,6 +365,13 @@ B</pre>
                  <div id="samplecode" class="example">
                  <p class="example-title">EXAMPLE&#160;&#8212; Title</p>
          <p>Hello</p>
+         <pre id='X' class='prettyprint '>
+  <br/>
+  &#160; 
+  <br/>
+  &#160; 
+  <p class='SourceTitle' style='text-align:center;'>Sample</p>
+</pre>
                  </div>
                </div>
                <p class="zzSTDTitle1"/>
@@ -428,7 +438,7 @@ B</pre>
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <pre id="samplecode" class="prettyprint lang-rb"><br/>&#160;&#160;&#160; <br/>&#160; puts x<br/><p class="SourceTitle" style="text-align:center;">Ruby <i>code</i></p></pre>
+                 <pre id="samplecode" class="prettyprint lang-rb"><br/>&#160;&#160;&#160; <br/>&#160; puts x<br/><p class="SourceTitle" style="text-align:center;">Figure 1&#160;&#8212; Ruby <i>code</i></p></pre>
                </div>
                <p class="zzSTDTitle1"/>
              </div>
@@ -463,7 +473,7 @@ B</pre>
              </p>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <p id="samplecode" class="Sourcecode"><br/>&#160;&#160;&#160; <br/>&#160; puts x<br/></p><p class="SourceTitle" style="text-align:center;">Ruby <i>code</i></p>
+                 <p id="samplecode" class="Sourcecode"><br/>&#160;&#160;&#160; <br/>&#160; puts x<br/></p><p class="SourceTitle" style="text-align:center;">Figure 1&#160;&#8212; Ruby <i>code</i></p>
                </div>
                   <p>&#160;</p>
  </div>
@@ -493,7 +503,7 @@ B</pre>
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <pre id="samplecode" class="prettyprint "><br/>&#160;&#160;&#160; <br/>&#160; &lt;xml&gt;<br/><p class="SourceTitle" style="text-align:center;">XML code</p></pre>
+                 <pre id="samplecode" class="prettyprint "><br/>&#160;&#160;&#160; <br/>&#160; &lt;xml&gt;<br/><p class="SourceTitle" style="text-align:center;">Figure 1&#160;&#8212; XML code</p></pre>
                </div>
                <p class="zzSTDTitle1"/>
              </div>
@@ -1027,7 +1037,7 @@ INPUT
                <h1 class="ForewordTitle">Foreword</h1>
                <div id="_" class="pseudocode"><p id="_">&#160;&#160;<b>A</b><br/>
        &#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;<span style="font-variant:small-caps;">B</span></p>
-       <p id="_">&#160;&#160;<i>C</i></p><p class="SourceTitle" style="text-align:center;">Label</p></div>
+       <p id="_">&#160;&#160;<i>C</i></p><p class="SourceTitle" style="text-align:center;">Figure 1&#xA0;&#x2014; Label</p></div>
              </div>
              <p class="zzSTDTitle1"/>
            </div>
@@ -1052,7 +1062,7 @@ INPUT
     expect(xmlpp( File.read("test.doc").gsub(%r{^.*<h1 class="ForewordTitle">Foreword</h1>}m, "").gsub(%r{</div>.*}m, "</div>"))).to be_equivalent_to xmlpp(<<~"OUTPUT")
             <div class="pseudocode"><a name="_" id="_"></a><p class="pseudocode"><a name="_" id="_"></a>&#xA0;&#xA0;<b>A</b><br/>
        &#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;<span style="font-variant:small-caps;">B</span></p>
-       <p class="pseudocode" style="page-break-after:avoid;"><a name="_" id="_"></a>&#xA0;&#xA0;<i>C</i></p><p class="SourceTitle" style="text-align:center;">Label</p></div>
+       <p class="pseudocode" style="page-break-after:avoid;"><a name="_" id="_"></a>&#xA0;&#xA0;<i>C</i></p><p class="SourceTitle" style="text-align:center;">Figure 1&#xA0;&#x2014; Label</p></div>
 OUTPUT
   end
 

data/spec/isodoc/footnotes_spec.rb

@@ -42,7 +42,7 @@ RSpec.describe IsoDoc do
   end
 
   it "processes IsoXML footnotes (Word)" do
-    expect(xmlpp(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true).gsub(/_Ref\d+/, "_Ref"))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface>
     <foreword>
@@ -59,38 +59,65 @@ RSpec.describe IsoDoc do
     </preface>
     </iso-standard>
     INPUT
-           <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
-         <head><style/></head>
-           <body lang="EN-US" link="blue" vlink="#954F72">
-             <div class="WordSection1">
-               <p>&#160;</p>
-             </div>
-             <p><br clear="all" class="section"/></p>
-             <div class="WordSection2">
-               <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
-               <div>
-                 <h1 class="ForewordTitle">Foreword</h1>
-                 <p>A.<a href="#ftn1" epub:type="footnote"><sup>1</sup></a></p>
-                 <p>B.<a href="#ftn2" epub:type="footnote"><sup>2</sup></a></p>
-                 <p>C.<a href="#ftn3" epub:type="footnote"><sup>3</sup></a></p>
-               </div>
-               <p>&#160;</p>
-             </div>
-             <p><br clear="all" class="section"/></p>
-             <div class="WordSection3">
-               <p class="zzSTDTitle1"/>
-               <aside id="ftn1">
-         <p id="_1e228e29-baef-4f38-b048-b05a051747e4">Formerly denoted as 15 % (m/m).</p>
-       </aside>
-               <aside id="ftn2">
-         <p id="_1e228e29-baef-4f38-b048-b05a051747e4">Formerly denoted as 15 % (m/m).</p>
-       </aside>
-               <aside id="ftn3">
-         <p id="_1e228e29-baef-4f38-b048-b05a051747e4">Hello! denoted as 15 % (m/m).</p>
-       </aside>
-             </div>
-           </body>
-       </html>
+    <html xmlns:epub='http://www.idpf.org/2007/ops' lang='en'>
+  <head>
+    <style>
+    </style>
+  </head>
+  <body lang='EN-US' link='blue' vlink='#954F72'>
+    <div class='WordSection1'>
+      <p>&#160;</p>
+    </div>
+    <p>
+      <br clear='all' class='section'/>
+    </p>
+    <div class='WordSection2'>
+      <p>
+        <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
+      </p>
+      <div>
+        <h1 class='ForewordTitle'>Foreword</h1>
+        <p>
+          A.
+          <span style='mso-bookmark:_Ref'>
+            <a href='#ftn2' epub:type='footnote'>
+              <sup>2</sup>
+            </a>
+          </span>
+        </p>
+        <p>
+          B.
+          <span style='mso-element:field-begin'/>
+           NOTEREF _Ref \\f \\h
+          <span style='mso-element:field-separator'/>
+          <span class='MsoFootnoteReference'>2</span>
+          <span style='mso-element:field-end'/>
+        </p>
+        <p>
+          C.
+          <span style='mso-bookmark:_Ref'>
+            <a href='#ftn1' epub:type='footnote'>
+              <sup>1</sup>
+            </a>
+          </span>
+        </p>
+      </div>
+      <p>&#160;</p>
+    </div>
+    <p>
+      <br clear='all' class='section'/>
+    </p>
+    <div class='WordSection3'>
+      <p class='zzSTDTitle1'/>
+      <aside id='ftn2'>
+        <p id='_1e228e29-baef-4f38-b048-b05a051747e4'>Formerly denoted as 15 % (m/m).</p>
+      </aside>
+      <aside id='ftn1'>
+        <p id='_1e228e29-baef-4f38-b048-b05a051747e4'>Hello! denoted as 15 % (m/m).</p>
+      </aside>
+    </div>
+  </body>
+</html>
     OUTPUT
   end
 

data/spec/isodoc/inline_spec.rb

@@ -31,6 +31,28 @@ RSpec.describe IsoDoc do
     OUTPUT
   end
 
+    it "ignores index entries" do
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <p><index primary="A" secondary="B" tertiary="C"/></p>
+    </foreword></preface>
+    <sections>
+    </iso-standard>
+    INPUT
+        #{HTML_HDR}
+             <br/>
+             <div>
+               <h1 class='ForewordTitle'>Foreword</h1>
+               <p/>
+             </div>
+             <p class='zzSTDTitle1'/>
+           </div>
+         </body>
+       </html>
+    OUTPUT
+    end
+
   it "processes embedded inline formatting" do
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -57,6 +79,31 @@ RSpec.describe IsoDoc do
     OUTPUT
   end
 
+  it "processes inline images" do
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <p>
+  <image src="rice_images/rice_image1.png" height="20" width="30" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png" alt="alttext" title="titletxt"/>
+  </p>
+  </foreword></preface>
+  </iso-standard>
+  INPUT
+    #{HTML_HDR}
+      <br/>
+      <div>
+        <h1 class='ForewordTitle'>Foreword</h1>
+        <p>
+          <img src='rice_images/rice_image1.png' height='20' width='30' title='titletxt' alt='alttext'/>
+        </p>
+      </div>
+      <p class='zzSTDTitle1'/>
+    </div>
+  </body>
+</html>
+  OUTPUT
+  end
+
   it "processes links" do
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">

data/spec/isodoc/postproc_spec.rb

@@ -925,7 +925,7 @@ TOCLEVEL
       <br />
       <div>
         <h1 class="ForewordTitle">Foreword</h1>
-        <pre id="samplecode" class="prettyprint "><br />&#xA0;&#xA0;&#xA0; <br />&#xA0; &lt;xml&gt; &amp;<br /><p class="SourceTitle" style="text-align:center;">XML code</p></pre>
+        <pre id="samplecode" class="prettyprint "><br />&#xA0;&#xA0;&#xA0; <br />&#xA0; &lt;xml&gt; &amp;<br /><p class="SourceTitle" style="text-align:center;">Figure 1&#xA0;&#x2014; XML code</p></pre>
       </div>
       <p class="zzSTDTitle1"></p>
     </main>
@@ -955,7 +955,7 @@ TOCLEVEL
       </p>
       <div>
         <h1 class="ForewordTitle">Foreword</h1>
-        <p class="Sourcecode" style="page-break-after:avoid;"><a name="samplecode" id="samplecode"></a><br/>&#xA0;&#xA0;&#xA0; <br/>&#xA0; &lt;xml&gt; &amp;<br/></p><p class="SourceTitle" style="text-align:center;">XML code</p>
+        <p class="Sourcecode" style="page-break-after:avoid;"><a name="samplecode" id="samplecode"></a><br/>&#xA0;&#xA0;&#xA0; <br/>&#xA0; &lt;xml&gt; &amp;<br/></p><p class="SourceTitle" style="text-align:center;">Figure 1&#xA0;&#x2014; XML code</p>
       </div>
       <p class="MsoNormal">&#xA0;</p>
     </div>

data/spec/isodoc/xref_spec.rb

@@ -203,10 +203,13 @@ RSpec.describe IsoDoc do
     <xref target="N"/>
     <xref target="note1"/>
     <xref target="note3"/>
+    <xref target="note4"/>
     <xref target="note2"/>
+    <xref target="note51"/>
     <xref target="AN"/>
     <xref target="Anote1"/>
     <xref target="Anote2"/>
+    <xref target="Anote3"/>
     </p>
     </foreword>
         <introduction id="intro">
@@ -240,6 +243,14 @@ RSpec.describe IsoDoc do
   <figure id="note3" class="pseudocode">
   <p>pseudocode</p>
   </figure>
+  <sourcecode id="note4"><name>Source! Code!</name>
+  A B C
+  </sourcecode>
+  <example id="note5">
+  <sourcecode id="note51">
+  A B C
+  </sourcecode>
+  </example>
     <figure id="note2">
   <name>Split-it-right sample divider</name>
   <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
@@ -264,6 +275,9 @@ RSpec.describe IsoDoc do
   <name>Split-it-right sample divider</name>
   <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
   </figure>
+  <sourcecode id="Anote3"><name>Source! Code!</name>
+  A B C
+  </sourcecode>
     </clause>
     </annex>
     </iso-standard>
@@ -277,11 +291,14 @@ RSpec.describe IsoDoc do
            <a href="#N2">Figure (??)</a>
            <a href="#N">Figure 2</a>
            <a href="#note1">Figure 3</a>
-           <a href="#note3">[note3]</a>
-           <a href="#note2">Figure 4</a>
+           <a href="#note3">Figure 4</a>
+           <a href="#note4">Figure 5</a>
+           <a href="#note2">Figure 6</a>
+           <a href="#note51">[note51]</a>
            <a href="#AN">Figure A.1</a>
            <a href="#Anote1">Figure (??)</a>
            <a href="#Anote2">Figure A.2</a>
+           <a href="#Anote3">Figure A.3</a>
            </p>
                </div>
                <br/>
@@ -313,7 +330,7 @@ RSpec.describe IsoDoc do
        </div>
                <div id="widgets">
                  <h1>3.&#160; Widgets</h1>
-                 <div id="widgets1"><h2>3.1.&#160;</h2>
+                 <div id="widgets1"><h2>3.1.&#160; </h2>
                <div id="note1" class="figure">
 
          <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
@@ -321,22 +338,39 @@ RSpec.describe IsoDoc do
          <div id="note3" class="pseudocode">
 <p>pseudocode</p>
 </div>
+<pre id='note4' class='prettyprint '>
+  <br/>
+  &#160; A B C
+  <br/>
+  &#160; 
+  <p class='SourceTitle' style='text-align:center;'>Figure 5&#160;&#8212; Source! Code!</p>
+</pre>
+<div id='note5' class='example'>
+  <p class='example-title'>EXAMPLE</p>
+  <pre id='note51' class='prettyprint '>
+    <br/>
+    &#160; A B C
+    <br/>
+    &#160; 
+  </pre>
+</div>
+
            <div id="note2" class="figure">
 
          <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
-         <p class="FigureTitle" style="text-align:center;">Figure 4&#160;&#8212; Split-it-right sample divider</p></div>
-         <p>    <a href="#note1">Figure 3</a> <a href="#note2">Figure 4</a> </p>
+         <p class="FigureTitle" style="text-align:center;">Figure 6&#160;&#8212; Split-it-right sample divider</p></div>
+         <p>    <a href="#note1">Figure 3</a> <a href="#note2">Figure 6</a> </p>
            </div>
                </div>
                <br/>
                <div id="annex1" class="Section3">
-                 <div id="annex1a"><h2>A.1.&#160;</h2>
+                 <div id="annex1a"><h2>A.1.&#160; </h2>
                <div id="AN" class="figure">
 
          <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
          <p class="FigureTitle" style="text-align:center;">Figure A.1&#160;&#8212; Split-it-right sample divider</p></div>
            </div>
-                 <div id="annex1b"><h2>A.2.&#160;</h2>
+                 <div id="annex1b"><h2>A.2.&#160; </h2>
                <div id="Anote1" class="figure">
 
          <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
@@ -345,7 +379,14 @@ RSpec.describe IsoDoc do
 
          <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
          <p class="FigureTitle" style="text-align:center;">Figure A.2&#160;&#8212; Split-it-right sample divider</p></div>
-           </div>
+           <pre id='Anote3' class='prettyprint '>
+  <br/>
+  &#160; A B C
+  <br/>
+  &#160;
+  <p class='SourceTitle' style='text-align:center;'>Figure A.3&#160;&#8212; Source! Code!</p>
+</pre>
+</div>
                </div>
              </div>
            </body>

metadata

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