isodoc 1.3.0 → 1.5.0

data/lib/isodoc/xref/xref_gen.rb

@@ -66,6 +66,10 @@ module IsoDoc::XrefGen
       "//sections/clause | //sections/definitions | "\
       "//bibliography/references | //bibliography/clause".freeze
 
+    def sections_xpath
+      SECTIONS_XPATH
+    end
+
     CHILD_NOTES_XPATH =
       "./*[not(self::xmlns:clause) and not(self::xmlns:appendix) and "\
       "not(self::xmlns:terms) and not(self::xmlns:definitions)]//xmlns:note | "\
@@ -136,5 +140,19 @@ module IsoDoc::XrefGen
         end
       end
     end
+
+    def bookmark_anchor_names(sections)
+      sections.each do |s|
+        notes = s.xpath(ns(".//bookmark")) - s.xpath(ns(".//clause//bookmark")) -
+          s.xpath(ns(".//appendix//bookmark"))
+        notes.each do |n|
+          next if n["id"].nil? || n["id"].empty?
+          @anchors[n["id"]] = {
+            type: "bookmark", label: nil, value: nil,
+            xref: @anchors[s["id"]][:xref] }
+        end
+        bookmark_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
+      end
+    end
   end
 end

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -1,23 +1,25 @@
 module IsoDoc::XrefGen
   module Sections
     def back_anchor_names(docxml)
-      docxml.xpath(ns("//annex")).each_with_index do |c, i|
-        annex_names(c, (65 + i).chr.to_s)
+      i = Counter.new("@")
+      docxml.xpath(ns("//annex")).each do |c|
+        i.increment(c)
+        annex_names(c, i.print)
+      end
+      docxml.xpath(ns(@klass.bibliography_xpath)).each do |b|
+        preface_names(b)
+      end
+      docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |ref|
+        reference_names(ref)
       end
-      docxml.xpath(
-           ns(@klass.bibliography_xpath)).each do |b|
-            preface_names(b)
-          end
-          docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |ref|
-            reference_names(ref)
-          end
     end
 
     def initial_anchor_names(d)
       d.xpath(ns("//preface/*")).each { |c| c.element? and preface_names(c) }
       # potentially overridden in middle_section_asset_names()
       sequential_asset_names(d.xpath(ns("//preface/*")))
-      n = section_names(d.at(ns("//clause[@type = 'scope']")), 0, 1)
+      n = Counter.new
+      n = section_names(d.at(ns("//clause[@type = 'scope']")), n, 1)
       n = section_names(d.at(ns(@klass.norm_ref_xpath)), n, 1)
       n = section_names(d.at(ns("//sections/terms | "\
                                 "//sections/clause[descendant::terms]")), n, 1)
@@ -52,8 +54,7 @@ module IsoDoc::XrefGen
       label = title || parent_title
       @anchors[clause["id"]] =
         { label: nil, level: level, xref: label, type: "clause" }
-      clause.xpath(ns(SUBCLAUSES)).
-        each_with_index do |c, i|
+      clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
         preface_names1(c, c.at(ns("./title"))&.text, "#{label} #{i+1}",
                        level + 1)
       end
@@ -67,21 +68,22 @@ module IsoDoc::XrefGen
       sequential_asset_names(d.xpath(ns(middle_sections)))
     end
 
-    def clause_names(docxml, sect_num)
-      docxml.xpath(ns(@klass.middle_clause)).each_with_index do |c, i|
-        section_names(c, (i + sect_num), 1)
+    def clause_names(docxml, n)
+      docxml.xpath(ns(@klass.middle_clause(docxml))).each_with_index do |c, i|
+        section_names(c, n, 1)
       end
     end
 
     def section_names(clause, num, lvl)
       return num if clause.nil?
-      num = num + 1
+      num.increment(clause)
       @anchors[clause["id"]] =
-        { label: num.to_s, xref: l10n("#{@labels["clause"]} #{num}"), level: lvl,
+        { label: num.print, xref: l10n("#{@labels["clause"]} #{num.print}"), level: lvl,
           type: "clause" }
-      clause.xpath(ns(SUBCLAUSES)).
-        each_with_index do |c, i|
-        section_names1(c, "#{num}.#{i + 1}", lvl + 1)
+      i = Counter.new
+      clause.xpath(ns(SUBCLAUSES)).each do |c|
+        i.increment(c)
+        section_names1(c, "#{num.print}.#{i.print}", lvl + 1)
       end
       num
     end
@@ -90,9 +92,10 @@ module IsoDoc::XrefGen
       @anchors[clause["id"]] =
         { label: num, level: level, xref: l10n("#{@labels["clause"]} #{num}"),
           type: "clause" }
-      clause.xpath(ns(SUBCLAUSES)).
-        each_with_index do |c, i|
-        section_names1(c, "#{num}.#{i + 1}", level + 1)
+      i = Counter.new
+      clause.xpath(ns(SUBCLAUSES)).each do |c|
+        i.increment(c)
+        section_names1(c, "#{num}.#{i.print}", level + 1)
       end
     end
 
@@ -118,8 +121,10 @@ module IsoDoc::XrefGen
       if a = single_annex_special_section(clause)
         annex_names1(a, "#{num}", 1)
       else
-        clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
-          annex_names1(c, "#{num}.#{i + 1}", 2)
+        i = Counter.new
+        clause.xpath(ns(SUBCLAUSES)).each do |c|
+          i.increment(c)
+          annex_names1(c, "#{num}.#{i.print}", 2)
         end
       end
       hierarchical_asset_names(clause, num)
@@ -128,8 +133,10 @@ module IsoDoc::XrefGen
     def annex_names1(clause, num, level)
       @anchors[clause["id"]] = { label: num, xref: "#{@labels["annex"]} #{num}",
                                  level: level, type: "clause" }
-      clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
-        annex_names1(c, "#{num}.#{i + 1}", level + 1)
+      i = Counter.new
+      clause.xpath(ns(SUBCLAUSES)).each_with_index do |c|
+        i.increment(c)
+        annex_names1(c, "#{num}.#{i.print}", level + 1)
       end
     end
 

data/spec/isodoc/blocks_spec.rb

@@ -534,7 +534,7 @@ INPUT
       <div>
         <h1 class='ForewordTitle'>Foreword</h1>
         <p id='A'>
-          ABC 
+          ABC
           <div id='B' class='Note'>
             <p>
               <span class='note_label'>NOTE 1</span>
@@ -611,8 +611,8 @@ INPUT
 OUTPUT
   end
 
-      it "processes figures (Presentation XML)" do
-    expect(xmlpp((IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      it "processes figures" do
+input = <<~INPUT
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <figure id="figureA-1" keep-with-next="true" keep-lines-together="true">
@@ -620,6 +620,7 @@ OUTPUT
   <image src="rice_images/rice_image1.png" height="20" width="30" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png" alt="alttext" title="titletxt"/>
   <image src="rice_images/rice_image1.png" height="20" width="auto" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f1" mimetype="image/png"/>
   <image src="data:image/gif;base64,R0lGODlhEAAQAMQAAORHHOVSKudfOulrSOp3WOyDZu6QdvCchPGolfO0o/XBs/fNwfjZ0frl3/zy7////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkAABAALAAAAAAQABAAAAVVICSOZGlCQAosJ6mu7fiyZeKqNKToQGDsM8hBADgUXoGAiqhSvp5QAnQKGIgUhwFUYLCVDFCrKUE1lBavAViFIDlTImbKC5Gm2hB0SlBCBMQiB0UjIQA7" height="20" width="auto" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f2" mimetype="image/png"/>
+  <image src="data:application/xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIj8+Cjw/eG1sLXN0eWxlc2hlZXQgdHlwZT0idGV4dC94c2wiIGhyZWY9Ii4uLy4uLy4uL3hzbC9yZXNfZG9jL2ltZ2ZpbGUueHNsIj8+CjwhRE9DVFlQRSBpbWdmaWxlLmNvbnRlbnQgU1lTVEVNICIuLi8uLi8uLi9kdGQvdGV4dC5lbnQiPgo8aW1nZmlsZS5jb250ZW50IG1vZHVsZT0iZnVuZGFtZW50YWxzX29mX3Byb2R1Y3RfZGVzY3JpcHRpb25fYW5kX3N1cHBvcnQiIGZpbGU9ImFjdGlvbl9zY2hlbWFleHBnMS54bWwiPgo8aW1nIHNyYz0iYWN0aW9uX3NjaGVtYWV4cGcxLmdpZiI+CjxpbWcuYXJlYSBzaGFwZT0icmVjdCIgY29vcmRzPSIyMTAsMTg2LDM0MywyMjciIGhyZWY9Ii4uLy4uL3Jlc291cmNlcy9iYXNpY19hdHRyaWJ1dGVfc2NoZW1hL2Jhc2ljX2F0dHJpYnV0ZV9zY2hlbWEueG1sIiAvPgo8aW1nLmFyZWEgc2hhcGU9InJlY3QiIGNvb3Jkcz0iMTAsMTAsOTYsNTEiIGhyZWY9Ii4uLy4uL3Jlc291cmNlcy9hY3Rpb25fc2NoZW1hL2FjdGlvbl9zY2hlbWEueG1sIiAvPgo8aW1nLmFyZWEgc2hhcGU9InJlY3QiIGNvb3Jkcz0iMjEwLDI2NCwzNTgsMzA1IiBocmVmPSIuLi8uLi9yZXNvdXJjZXMvc3VwcG9ydF9yZXNvdXJjZV9zY2hlbWEvc3VwcG9ydF9yZXNvdXJjZV9zY2hlbWEueG1sIiAvPgo8L2ltZz4KPC9pbWdmaWxlLmNvbnRlbnQ+Cg==" height="20" width="auto" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f2" mimetype="application/xml"/>
   <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>
@@ -629,16 +630,18 @@ OUTPUT
   </dl>
 </figure>
 <figure id="figure-B">
-<pre alt="A B">A &lt;
+<pre alt="A B">A &#x3c;
 B</pre>
 </figure>
 <figure id="figure-C" unnumbered="true">
-<pre>A &lt;
+<pre>A &#x3c;
 B</pre>
 </figure>
     </foreword></preface>
     </iso-standard>
     INPUT
+
+    presxml = <<~OUTPUT
     <?xml version='1.0'?>
      <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
     <preface><foreword>
@@ -647,6 +650,7 @@ B</pre>
   <image src="rice_images/rice_image1.png" height="20" width="30" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png" alt="alttext" title="titletxt"/>
   <image src="rice_images/rice_image1.png" height="20" width="auto" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f1" mimetype="image/png"/>
   <image src="data:image/gif;base64,R0lGODlhEAAQAMQAAORHHOVSKudfOulrSOp3WOyDZu6QdvCchPGolfO0o/XBs/fNwfjZ0frl3/zy7////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkAABAALAAAAAAQABAAAAVVICSOZGlCQAosJ6mu7fiyZeKqNKToQGDsM8hBADgUXoGAiqhSvp5QAnQKGIgUhwFUYLCVDFCrKUE1lBavAViFIDlTImbKC5Gm2hB0SlBCBMQiB0UjIQA7" height="20" width="auto" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f2" mimetype="image/png"/>
+  <image src='data:application/xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIj8+Cjw/eG1sLXN0eWxlc2hlZXQgdHlwZT0idGV4dC94c2wiIGhyZWY9Ii4uLy4uLy4uL3hzbC9yZXNfZG9jL2ltZ2ZpbGUueHNsIj8+CjwhRE9DVFlQRSBpbWdmaWxlLmNvbnRlbnQgU1lTVEVNICIuLi8uLi8uLi9kdGQvdGV4dC5lbnQiPgo8aW1nZmlsZS5jb250ZW50IG1vZHVsZT0iZnVuZGFtZW50YWxzX29mX3Byb2R1Y3RfZGVzY3JpcHRpb25fYW5kX3N1cHBvcnQiIGZpbGU9ImFjdGlvbl9zY2hlbWFleHBnMS54bWwiPgo8aW1nIHNyYz0iYWN0aW9uX3NjaGVtYWV4cGcxLmdpZiI+CjxpbWcuYXJlYSBzaGFwZT0icmVjdCIgY29vcmRzPSIyMTAsMTg2LDM0MywyMjciIGhyZWY9Ii4uLy4uL3Jlc291cmNlcy9iYXNpY19hdHRyaWJ1dGVfc2NoZW1hL2Jhc2ljX2F0dHJpYnV0ZV9zY2hlbWEueG1sIiAvPgo8aW1nLmFyZWEgc2hhcGU9InJlY3QiIGNvb3Jkcz0iMTAsMTAsOTYsNTEiIGhyZWY9Ii4uLy4uL3Jlc291cmNlcy9hY3Rpb25fc2NoZW1hL2FjdGlvbl9zY2hlbWEueG1sIiAvPgo8aW1nLmFyZWEgc2hhcGU9InJlY3QiIGNvb3Jkcz0iMjEwLDI2NCwzNTgsMzA1IiBocmVmPSIuLi8uLi9yZXNvdXJjZXMvc3VwcG9ydF9yZXNvdXJjZV9zY2hlbWEvc3VwcG9ydF9yZXNvdXJjZV9zY2hlbWEueG1sIiAvPgo8L2ltZz4KPC9pbWdmaWxlLmNvbnRlbnQ+Cg==' height='20' width='auto' id='_8357ede4-6d44-4672-bac4-9a85e82ab7f2' mimetype='application/xml'/>
   <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>
@@ -657,47 +661,18 @@ B</pre>
 </figure>
 <figure id="figure-B">
 <name>Figure 2</name>
-<pre alt="A B">A &lt;
+<pre alt="A B">A &#x3c;
 B</pre>
 </figure>
 <figure id="figure-C" unnumbered="true">
-<pre>A &lt;
+<pre>A &#x3c;
 B</pre>
 </figure>
     </foreword></preface>
     </iso-standard>
 OUTPUT
-      end
 
-  it "processes figures (HTML)" do
-    expect(xmlpp(strip_guid(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-     <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <preface><foreword>
-    <figure id="figureA-1" keep-with-next="true" keep-lines-together="true">
-  <name>Figure 1&#xA0;&#x2014; Split-it-right <em>sample</em> divider<fn reference="1"><p>X</p></fn></name>
-  <image src="rice_images/rice_image1.png" height="20" width="30" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png" alt="alttext" title="titletxt"/>
-  <image src="rice_images/rice_image1.png" height="20" width="auto" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f1" mimetype="image/png"/>
-  <image src="data:image/gif;base64,R0lGODlhEAAQAMQAAORHHOVSKudfOulrSOp3WOyDZu6QdvCchPGolfO0o/XBs/fNwfjZ0frl3/zy7////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkAABAALAAAAAAQABAAAAVVICSOZGlCQAosJ6mu7fiyZeKqNKToQGDsM8hBADgUXoGAiqhSvp5QAnQKGIgUhwFUYLCVDFCrKUE1lBavAViFIDlTImbKC5Gm2hB0SlBCBMQiB0UjIQA7" height="20" width="auto" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f2" mimetype="image/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>
-  <dl>
-  <dt>A</dt>
-  <dd><p>B</p></dd>
-  </dl>
-</figure>
-<figure id="figure-B">
-<name>Figure 2</name>
-<pre alt="A B">A &lt;
-B</pre>
-</figure>
-<figure id="figure-C" unnumbered="true">
-<pre>A &lt;
-B</pre>
-</figure>
-    </foreword></preface>
-    </iso-standard>
-    INPUT
+html = <<~OUTPUT
         #{HTML_HDR}
                <br/>
                <div>
@@ -707,6 +682,7 @@ B</pre>
          <img src="rice_images/rice_image1.png" height="20" width="30" alt="alttext" title="titletxt"/>
          <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"/>
+         <img src='data:application/xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIj8+Cjw/eG1sLXN0eWxlc2hlZXQgdHlwZT0idGV4dC94c2wiIGhyZWY9Ii4uLy4uLy4uL3hzbC9yZXNfZG9jL2ltZ2ZpbGUueHNsIj8+CjwhRE9DVFlQRSBpbWdmaWxlLmNvbnRlbnQgU1lTVEVNICIuLi8uLi8uLi9kdGQvdGV4dC5lbnQiPgo8aW1nZmlsZS5jb250ZW50IG1vZHVsZT0iZnVuZGFtZW50YWxzX29mX3Byb2R1Y3RfZGVzY3JpcHRpb25fYW5kX3N1cHBvcnQiIGZpbGU9ImFjdGlvbl9zY2hlbWFleHBnMS54bWwiPgo8aW1nIHNyYz0iYWN0aW9uX3NjaGVtYWV4cGcxLmdpZiI+CjxpbWcuYXJlYSBzaGFwZT0icmVjdCIgY29vcmRzPSIyMTAsMTg2LDM0MywyMjciIGhyZWY9Ii4uLy4uL3Jlc291cmNlcy9iYXNpY19hdHRyaWJ1dGVfc2NoZW1hL2Jhc2ljX2F0dHJpYnV0ZV9zY2hlbWEueG1sIiAvPgo8aW1nLmFyZWEgc2hhcGU9InJlY3QiIGNvb3Jkcz0iMTAsMTAsOTYsNTEiIGhyZWY9Ii4uLy4uL3Jlc291cmNlcy9hY3Rpb25fc2NoZW1hL2FjdGlvbl9zY2hlbWEueG1sIiAvPgo8aW1nLmFyZWEgc2hhcGU9InJlY3QiIGNvb3Jkcz0iMjEwLDI2NCwzNTgsMzA1IiBocmVmPSIuLi8uLi9yZXNvdXJjZXMvc3VwcG9ydF9yZXNvdXJjZV9zY2hlbWEvc3VwcG9ydF9yZXNvdXJjZV9zY2hlbWEueG1sIiAvPgo8L2ltZz4KPC9pbWdmaWxlLmNvbnRlbnQ+Cg==' height='20' width='auto'/>
          <a href="#_" class="TableFootnoteRef">a</a><aside class="footnote"><div id="fn:_"><span><span id="_" class="TableFootnoteRef">a</span>&#160; </span>
          <p id="_">The time <span class="stem">(#(t_90)#)</span> was estimated to be 18,2 min for this example.</p>
        </div></aside>
@@ -717,12 +693,12 @@ B</pre>
 </a>
         </p></div>
                <div class="figure" id="figure-B">
-<pre>A &lt;
+<pre>A &#x3c;
 B</pre>
 <p class="FigureTitle" style="text-align:center;">Figure 2</p>
 </div>
                <div class="figure" id="figure-C">
-<pre>A &lt;
+<pre>A &#x3c;
 B</pre>
 </div>
                </div>
@@ -734,38 +710,8 @@ B</pre>
            </body>
        </html>
     OUTPUT
-  end
 
-  it "processes figures (Word)" do
-    FileUtils.rm_rf "spec/assets/odf1.emf"
-    expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true).sub(/['"][^'".]+\.gif['"]/, "'_.gif'").gsub(/mso-bookmark:_Ref\d+/, "mso-bookmark:_Ref")))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-     <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <preface><foreword>
-    <figure id="figureA-1" keep-with-next="true" keep-lines-together="true">
-  <name>Figure 1&#xA0;&#x2014; Split-it-right <em>sample</em> divider<fn reference="1"><p>X</p></fn></name>
-  <image src="rice_images/rice_image1.png" height="20" width="30" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png" alt="alttext" title="titletxt"/>
-  <image src="rice_images/rice_image1.png" height="20" width="auto" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f1" mimetype="image/png"/>
-  <image src="data:image/gif;base64,R0lGODlhEAAQAMQAAORHHOVSKudfOulrSOp3WOyDZu6QdvCchPGolfO0o/XBs/fNwfjZ0frl3/zy7////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkAABAALAAAAAAQABAAAAVVICSOZGlCQAosJ6mu7fiyZeKqNKToQGDsM8hBADgUXoGAiqhSvp5QAnQKGIgUhwFUYLCVDFCrKUE1lBavAViFIDlTImbKC5Gm2hB0SlBCBMQiB0UjIQA7" height="20" width="auto" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f2" mimetype="image/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>
-  <dl>
-  <dt>A</dt>
-  <dd><p>B</p></dd>
-  </dl>
-</figure>
-<figure id="figure-B">
-<name>Figure 2</name>
-<pre alt="A B">A &lt;
-B</pre>
-</figure>
-<figure id="figure-C" unnumbered="true">
-<pre>A &lt;
-B</pre>
-</figure>
-    </foreword></preface>
-    </iso-standard>
-    INPUT
+    word = <<~OUTPUT
            <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
          <head><style/></head>
          <body lang="EN-US" link="blue" vlink="#954F72">
@@ -781,6 +727,7 @@ B</pre>
          <img src="rice_images/rice_image1.png" height="20" width="30" alt="alttext" title="titletxt"/>
          <img src="rice_images/rice_image1.png" height='20' width='auto'/>
          <img src='_.gif' height='20' width='auto'/>
+         <img src='_.xml' height='20' width='auto'/>
          <a href="#_" class="TableFootnoteRef">a</a><aside><div id="ftn_"><span><span id="_" class="TableFootnoteRef">a</span><span style="mso-tab-count:1">&#160; </span></span>
          <p id="_">The time <span class="stem">(#(t_90)#)</span> was estimated to be 18,2 min for this example.</p>
        </div></aside>
@@ -795,12 +742,12 @@ B</pre>
  </p>
 </div>
                <div class="figure" id="figure-B">
-<pre>A &lt;
+<pre>A &#x3c;
 B</pre>
              <p class="FigureTitle" style="text-align:center;">Figure 2</p>
               </div>
  <div id='figure-C' class='figure'>
-   <pre>A &lt; B</pre>
+   <pre>A &#x3c; B</pre>
 </div>
              </div>
              <p>&#160;</p>
@@ -815,17 +762,22 @@ B</pre>
          </body>
        </html>
     OUTPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true).gsub(/\&lt;/, "&#x3c;"))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(strip_guid(IsoDoc::HtmlConvert.new({}).convert("test", presxml, true)))).to be_equivalent_to xmlpp(html)
+    FileUtils.rm_rf "spec/assets/odf1.emf"
+    expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({}).convert("test", presxml, true).gsub(/['"][^'".]+\.(gif|xml)['"]/, "'_.\\1'").gsub(/mso-bookmark:_Ref\d+/, "mso-bookmark:_Ref")))).to be_equivalent_to xmlpp(word)
   end
 
    it "converts SVG (Word)" do
     FileUtils.rm_rf "spec/assets/odf1.emf"
-    expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true).gsub(/['"][^'".]+(?<!odf1)(?<!odf)\.emf['"]/, "'_.emf'").gsub(/mso-bookmark:_Ref\d+/, "mso-bookmark:_Ref")))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true).gsub(/['"][^'".]+(?<!odf1)(?<!odf)\.emf['"]/, "'_.emf'").gsub(/['"][^'".]+\.(gif|xml)['"]/, "'_.\\1'").gsub(/mso-bookmark:_Ref\d+/, "mso-bookmark:_Ref")))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <figure id="figureA-1">
   <image src="spec/assets/odf.svg" mimetype="image/svg+xml"/>
   <image src="spec/assets/odf1.svg" mimetype="image/svg+xml"/>
   <image src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDAgMTAwIj4KICA8Y2lyY2xlIGZpbGw9IiMwMDkiIHI9IjQ1IiBjeD0iNTAiIGN5PSI1MCIvPgogIDxwYXRoIGQ9Ik0zMywyNkg3OEEzNywzNywwLDAsMSwzMyw4M1Y1N0g1OVY0M0gzM1oiIGZpbGw9IiNGRkYiLz4KPC9zdmc+Cg==" id="_d3731866-1a07-435a-a6c2-1acd41023a4e" mimetype="image/svg+xml" height="auto" width="auto"/>
+  <image src="data:application/xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIj8+Cjw/eG1sLXN0eWxlc2hlZXQgdHlwZT0idGV4dC94c2wiIGhyZWY9Ii4uLy4uLy4uL3hzbC9yZXNfZG9jL2ltZ2ZpbGUueHNsIj8+CjwhRE9DVFlQRSBpbWdmaWxlLmNvbnRlbnQgU1lTVEVNICIuLi8uLi8uLi9kdGQvdGV4dC5lbnQiPgo8aW1nZmlsZS5jb250ZW50IG1vZHVsZT0iZnVuZGFtZW50YWxzX29mX3Byb2R1Y3RfZGVzY3JpcHRpb25fYW5kX3N1cHBvcnQiIGZpbGU9ImFjdGlvbl9zY2hlbWFleHBnMS54bWwiPgo8aW1nIHNyYz0iYWN0aW9uX3NjaGVtYWV4cGcxLmdpZiI+CjxpbWcuYXJlYSBzaGFwZT0icmVjdCIgY29vcmRzPSIyMTAsMTg2LDM0MywyMjciIGhyZWY9Ii4uLy4uL3Jlc291cmNlcy9iYXNpY19hdHRyaWJ1dGVfc2NoZW1hL2Jhc2ljX2F0dHJpYnV0ZV9zY2hlbWEueG1sIiAvPgo8aW1nLmFyZWEgc2hhcGU9InJlY3QiIGNvb3Jkcz0iMTAsMTAsOTYsNTEiIGhyZWY9Ii4uLy4uL3Jlc291cmNlcy9hY3Rpb25fc2NoZW1hL2FjdGlvbl9zY2hlbWEueG1sIiAvPgo8aW1nLmFyZWEgc2hhcGU9InJlY3QiIGNvb3Jkcz0iMjEwLDI2NCwzNTgsMzA1IiBocmVmPSIuLi8uLi9yZXNvdXJjZXMvc3VwcG9ydF9yZXNvdXJjZV9zY2hlbWEvc3VwcG9ydF9yZXNvdXJjZV9zY2hlbWEueG1sIiAvPgo8L2ltZz4KPC9pbWdmaWxlLmNvbnRlbnQ+Cg==" height="20" width="auto" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f2" mimetype="application/xml"/>
 </figure>
     </foreword></preface>
     </iso-standard>
@@ -852,6 +804,7 @@ B</pre>
           <img src='spec/assets/odf.emf'/>
           <img src='spec/assets/odf1.emf'/>
           <img src='_.emf' height='auto' width='auto'/>
+           <img src='_.xml' height='20' width='auto'/>
         </div>
       </div>
       <p>&#160;</p>

data/spec/isodoc/cleanup_spec.rb

@@ -1186,5 +1186,4 @@ modified — with adjustments]
 </html>
 OUTPUT
    end
-
 end

data/spec/isodoc/inline_spec.rb

@@ -43,14 +43,14 @@ INPUT
 OUTPUT
    end
 
-  it "processes inline formatting" do
+  it "processes inline formatting (HTML)" 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>
     <em>A</em> <strong>B</strong> <sup>C</sup> <sub>D</sub> <tt>E</tt>
     <strike>F</strike> <smallcap>G</smallcap> <keyword>I</keyword> <br/> <hr/>
-    <bookmark id="H"/> <pagebreak/> <pagebreak orientation="landscape"/>
+    <bookmark id="H"/> <pagebreak/> <pagebreak orientation="landscape"/> <underline>J</underline>
     </p>
     </foreword></preface>
     <sections>
@@ -64,6 +64,7 @@ OUTPUT
        <i>A</i> <b>B</b> <sup>C</sup> <sub>D</sub> <tt>E</tt>
        <s>F</s> <span style="font-variant:small-caps;">G</span> <span class="keyword">I</span> <br/> <hr/>
        <a id="H"/> <br/> <br/>
+       <span style='text-decoration: underline;'>J</span>
        </p>
                </div>
                <p class="zzSTDTitle1"/>
@@ -80,7 +81,7 @@ OUTPUT
     <p>
     <em>A</em> <strong>B</strong> <sup>C</sup> <sub>D</sub> <tt>E</tt>
     <strike>F</strike> <smallcap>G</smallcap> <keyword>I</keyword> <br/> <hr/>
-    <bookmark id="H"/> <pagebreak/> <pagebreak orientation="landscape"/>
+    <bookmark id="H"/> <pagebreak/> <pagebreak orientation="landscape"/> <underline>J</underline>
     </p>
     </clause></sections>
     </iso-standard>
@@ -107,6 +108,7 @@ OUTPUT
           <p>
             <br clear='all' class='section' orientation='landscape'/>
           </p>
+          <u>J</u>
         </p>
       </div>
     </div>
@@ -117,7 +119,7 @@ OUTPUT
   end
 
     it "ignores index entries" do
-    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.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>
@@ -125,16 +127,14 @@ OUTPUT
     <sections>
     </iso-standard>
     INPUT
-        #{HTML_HDR}
-             <br/>
-             <div>
-               <h1 class='ForewordTitle'>Foreword</h1>
-               <p/>
-             </div>
-             <p class='zzSTDTitle1'/>
-           </div>
-         </body>
-       </html>
+    <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+  <preface>
+    <foreword>
+      <p/>
+    </foreword>
+  </preface>
+  <sections> </sections>
+</iso-standard>
     OUTPUT
     end
 

data/spec/isodoc/metadata_spec.rb

@@ -60,6 +60,8 @@ RSpec.describe IsoDoc do
       </name>
       <affiliation>
       <organization><name>Slate Inc.</name>
+      <subdivision>Hermeneutics Unit</subdivision>
+      <subdivision>Exegesis Subunit</subdivision>
       <address>
       <formattedAddress>Bedrock</formattedAddress>
       </address>
@@ -106,7 +108,7 @@ INPUT
 :activateddate=>"2013",
 :agency=>"ISO",
 :authors=>["Barney Rubble", "Fred Flintstone"],
-:authors_affiliations=>{"Slate Inc., Bedrock"=>["Barney Rubble"], ""=>["Fred Flintstone"]},
+:authors_affiliations=>{"Slate Inc., Hermeneutics Unit, Exegesis Subunit, Bedrock"=>["Barney Rubble"], ""=>["Fred Flintstone"]},
 :circulateddate=>"2015",
 :confirmeddate=>"2017",
 :copieddate=>"2016",