isodoc 1.3.1 → 1.5.1

data/lib/isodoc/metadata_contributor.rb

@@ -17,9 +17,10 @@ module IsoDoc
     def extract_person_affiliations(authors)
       authors.reduce([]) do |m, a|
         name = a&.at(ns('./affiliation/organization/name'))&.text
-        location = a&.at(ns('./affiliation/organization/address/'\
-                            'formattedAddress'))&.text
-        m << (!name.nil? && !location.nil? ? "#{name}, #{location}" :
+        subdivs = a&.xpath(ns('./affiliation/organization/subdivision'))&.map(&:text)&.join(", ")
+        name and subdivs and !subdivs.empty? and name = l10n("#{name}, #{subdivs}", @lang, @script)
+        location = a&.at(ns('./affiliation/organization/address/formattedAddress'))&.text
+        m << (!name.nil? && !location.nil? ? l10n("#{name}, #{location}", @lang, @script) :
           (name || location || ''))
         m
       end

data/lib/isodoc/presentation_function/block.rb

@@ -9,6 +9,12 @@ module IsoDoc
       docxml.xpath(ns("//figure")).each do |f|
         figure1(f)
       end
+      docxml.xpath(ns("//svgmap")).each do |s|
+        if f = s.at(ns("./figure")) then s.replace(f)
+        else
+          s.remove
+        end
+      end
     end
 
     def figure1(f)

data/lib/isodoc/presentation_function/inline.rb

@@ -211,7 +211,11 @@ module IsoDoc
     def mathml1(f, locale)
       localize_maths(f, locale)
       return unless f.elements.size == 1 && f.elements.first.name == "mn"
-      f.replace(f.at("./m:mn", MATHML).children)
+      if f.parent.name == "stem"
+        f.parent.replace(f.at("./m:mn", MATHML).children)
+      else
+        f.replace(f.at("./m:mn", MATHML).children)
+      end
     end
 
     def variant(docxml)

data/lib/isodoc/presentation_function/section.rb

@@ -43,6 +43,9 @@ module IsoDoc
       prefix_name(f, "", "#{lbl}#{clausedelim}", "name")
     end
 
+    def references(docxml)
+    end
+
     def index(docxml)
       docxml.xpath(ns("//index | //index-xref")).each do |f|
         f.remove

data/lib/isodoc/presentation_xml_convert.rb

@@ -30,6 +30,7 @@ module IsoDoc
       clause docxml
       annex docxml
       term docxml
+      references docxml
       index docxml
     end
 

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.3.1".freeze
+  VERSION = "1.5.1".freeze
 end

data/lib/isodoc/word_function/inline.rb

@@ -24,7 +24,7 @@ module IsoDoc::WordFunction
 
     def imgsrc(node)
       ret = svg_to_emf(node) and return ret
-      return node["src"] unless %r{^data:image/}.match node["src"]
+      return node["src"] unless %r{^data:}.match node["src"]
       save_dataimage(node["src"])
     end
 
@@ -45,7 +45,7 @@ module IsoDoc::WordFunction
     def svg_to_emf(node)
       return unless node["mimetype"] == "image/svg+xml"
       uri = node["src"]
-      %r{^data:image/}.match(uri) and uri = save_dataimage(uri)
+      %r{^data:}.match(uri) and uri = save_dataimage(uri)
       ret = svg_to_emf_filename(uri)
       File.exists?(ret) and return ret
       exe = inkscape_installed? or return nil

data/lib/isodoc/word_function/postprocess_cover.rb

@@ -96,7 +96,7 @@ module IsoDoc::WordFunction
     def generate_header(filename, _dir)
       return nil unless @header
       template = IsoDoc::Common.liquid(File.read(@header, encoding: "UTF-8"))
-      meta = @meta.get.merge(@labels || {}).merge(@meta.labels || {})
+      meta = @meta.get.merge(@labels ? { labels: @labels } : {}).merge(@meta.labels ? { labels: @meta.labels } : {})
       meta[:filename] = filename
       params = meta.map { |k, v| [k.to_s, v] }.to_h
       Tempfile.open(%w(header html), :encoding => "utf-8") do |f|

data/lib/isodoc/xref/xref_counter.rb

@@ -2,41 +2,56 @@ require "roman-numerals"
 
 module IsoDoc::XrefGen
   class Counter
-    def initialize(num = 0)
+    def initialize(num = 0, opts = {numerals: :arabic})
       @num = num
       @letter = ""
       @subseq = ""
       @letter_override = nil
       @number_override = nil
+      @style = opts[:numerals]
       @base = ""
+      if num.is_a? String
+        if /^\d+$/.match(num)
+          @num = num.to_i
+        else
+          @num = nil
+          @base = num[0..-2]
+          @letter = num[-1]
+        end
+      end
     end
 
     def new_subseq_increment(node)
       @subseq = node["subsequence"]
-      @num += 1
+      @num += 1 unless @num.nil?
       @letter = node["subsequence"] ? "a" : ""
       @base = ""
       if node["number"]
-        /^(?<b>.*?)(?<n>\d*)(?<a>[a-z]*)$/ =~ node["number"]
+        /^(?<b>.*?)(?<n>\d*)(?<a>[a-zA-Z]*)$/ =~ node["number"]
         if !n.empty? || !a.empty?
           @letter_override = @letter = a unless a.empty?
           @number_override = @num = n.to_i unless n.empty?
           @base = b
         else
           @letter_override = node["number"]
-          @letter = @letter_override if /^[a-z]$/.match(@letter_override)
+          @letter = @letter_override if /^[a-zA-Z]$/.match(@letter_override)
         end
       end
     end
 
     def sequence_increment(node)
       if node["number"]
-        @base = ""
-        @number_override = node["number"]
+        @base = @letter_override = @number_override = ""
         /^(?<b>.*?)(?<n>\d+)$/ =~ node["number"]
-        unless n.nil? || n.empty?
+        if blank?(n)
+          @num = nil
+          @base = node["number"][0..-2]
+          @letter = @letter_override = node["number"][-1]
+        else
+          @number_override = node["number"]
           @num = n.to_i
           @base = b
+          @letter = ""
         end
       else
         @num += 1
@@ -47,9 +62,20 @@ module IsoDoc::XrefGen
       if node["number"]
         @base = ""
         @letter_override = node["number"]
-        /^(?<b>.*?)(?<n>\d*)(?<a>[a-z]+)$/ =~ node["number"]
-        unless a.empty?
-          @letter = a
+        /^(?<b>.*?)(?<n>\d*)(?<a>[a-zA-Z])$/ =~ node["number"]
+        if blank?(a)
+          if /^\d+$/.match(node["number"])
+            @letter_override = @letter = ""
+            @number_override = @num = node["number"].to_i
+          else
+            /^(?<b>.*)(?<a>[a-zA-Z])$/ =~ node["number"]
+            unless blank?(a)
+              @letter = @letter_override = a
+              @base = b
+            end
+          end
+        else
+          @letter_override = @letter = a
           @base = b
           @number_override = @num = n.to_i unless n.empty?
         end
@@ -58,11 +84,15 @@ module IsoDoc::XrefGen
       end
     end
 
+    def blank?(x)
+      x.nil? || x.empty?
+    end
+
     def increment(node)
       return self if node["unnumbered"]
       @letter_override = nil
       @number_override = nil
-      if node["subsequence"] != @subseq
+      if node["subsequence"] != @subseq && !(blank?(node["subsequence"]) && blank?(@subseq))
         new_subseq_increment(node)
       elsif @letter.empty?
         sequence_increment(node)
@@ -73,7 +103,9 @@ module IsoDoc::XrefGen
     end
 
     def print
-      "#{@base}#{@number_override || @num}#{@letter_override || @letter}"
+      num = @number_override || @num
+      num_out = @style == :roman && !num.nil? ? RomanNumerals.to_roman(num) : num
+      "#{@base}#{num_out}#{@letter_override || @letter}"
     end
 
     def ol_type(list, depth)

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>
@@ -2734,7 +2687,7 @@ expect(( File.read("test.html").gsub(%r{^.*<h1 class="ForewordTitle">Foreword</h
     expect(File.exist?("test.html.err")).to be true
   end
 
-     it "ignore passthrough with incompatible format" do
+     it "ignores passthrough with incompatible format" 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>
@@ -2754,6 +2707,62 @@ expect(( File.read("test.html").gsub(%r{^.*<h1 class="ForewordTitle">Foreword</h
     OUTPUT
   end
 
+it "processes svgmap" do
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~INPUT, true)).sub(%r{<localized-strings>.*</localized-strings>}m, "")).to be_equivalent_to xmlpp(<<~OUTPUT)
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <sections>
+  <svgmap id='_'>
+    <target href='http://www.example.com'>
+      <xref target='ref1'>Computer</xref>
+    </target>
+  </svgmap>
+  <figure id='_'>
+  <image src='action_schemaexpg1.svg' id='_' mimetype='image/svg+xml' height='auto' width='auto'/>
+</figure>
+<svgmap id='_'>
+  <figure id='_'>
+    <image src='action_schemaexpg2.svg' id='_' mimetype='image/svg+xml' height='auto' width='auto' alt='Workmap'/>
+  </figure>
+    <target href='mn://support_resource_schema'>
+      <eref bibitemid='express_action_schema' citeas=''>
+        <localityStack>
+          <locality type='anchor'>
+            <referenceFrom>action_schema.basic</referenceFrom>
+          </locality>
+        </localityStack>
+        Coffee
+      </eref>
+    </target>
+  </svgmap>
+</sections>
+<bibliography>
+  <references hidden='true' normative='false'>
+    <bibitem id='express_action_schema' type='internal'>
+      <docidentifier type='repository'>express/action_schema</docidentifier>
+    </bibitem>
+  </references>
+</bibliography>
+</iso-standard>
+INPUT
+<iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+         <sections>
+           <figure id='_'>
+             <image src='action_schemaexpg1.svg' id='_' mimetype='image/svg+xml' height='auto' width='auto'/>
+           </figure>
+           <figure id='_'>
+             <image src='action_schemaexpg2.svg' id='_' mimetype='image/svg+xml' height='auto' width='auto' alt='Workmap'/>
+           </figure>
+         </sections>
+         <bibliography>
+           <references hidden='true' normative='false'>
+             <bibitem id='express_action_schema' type='internal'>
+               <docidentifier type='repository'>express/action_schema</docidentifier>
+             </bibitem>
+           </references>
+         </bibliography>
+       </iso-standard>
+OUTPUT
 
+end
 
 end