isodoc 2.0.0.1 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cf2e2e18bcb28744fc2f4cf2525267935dc981281ab4642c7b0e57ea8b68b6d
-  data.tar.gz: 12f9afbb69bd5e9903dd15ace22e5a3357520dfc8c58e4a316bc8e92a42e34bb
+  metadata.gz: 1a9645f7c8069398010a6b360e94069382fec990f4d8c2563e2c35ccde801b45
+  data.tar.gz: 3209942625f1f64ba90e9de9dfd1780de61368d227830cbdc36e65046697eb06
 SHA512:
-  metadata.gz: b3996461e5a31740161f1bf08c0305b7e9faa229f263da26deaaf9fd50924c9cb39f2eaffacf4b6e69992a197d81c10b130a82b06d0c630917b3c22b34eca615
-  data.tar.gz: 7c3a9fe8073d10c915e56f06bf973b6e7dfbd2e6296604598d93b90267496f74ebf5cbb2bcfd970eafafc0c808dc69e9273b0a1e1975a459e32993bfe0f57de6
+  metadata.gz: cdee63b9b9d3e2b0b4b4fa7b1dea74f5faa50c07d5ed3637744f5f52521821554513f3f4812bd57e5de9c0f6c61c4e73005be0d46127f39347f0f19e5912915c
+  data.tar.gz: 4d01286691c228c29100d79f78bb7f819a832fe05a730f56a8416422a1e59eb70c6a900242fb41fd631a63592600f3950e8dbe8079f1731754738a0aed8d6d4c

data/isodoc.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_dependency "asciimath"
-  spec.add_dependency "html2doc", "~> 1.2.0"
+  spec.add_dependency "html2doc", "~> 1.3.0"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "liquid", "~> 4"
   # spec.add_dependency "metanorma", ">= 1.2.0"

data/lib/isodoc/function/references.rb

@@ -49,10 +49,14 @@ module IsoDoc
       end
 
       def pref_ref_code(bib)
-        bib.at(ns("./docidentifier[not(@type = 'DOI' or @type = 'metanorma' "\
-                  "or @type = 'metanorma-ordinal' or "\
-                  "@type = 'ISSN' or @type = 'ISBN' or "\
-                  "@type = 'rfc-anchor')]"))
+        ret = bib.xpath(ns("./docidentifier[@primary = 'true']"))
+        ret.empty? and
+          ret = bib.at(ns("./docidentifier[not(@type = 'DOI' or "\
+                          "@type = 'metanorma' "\
+                          "or @type = 'metanorma-ordinal' or "\
+                          "@type = 'ISSN' or @type = 'ISBN' or "\
+                          "@type = 'rfc-anchor')]"))
+        ret
       end
 
       # returns [metanorma, non-metanorma, DOI/ISSN/ISBN] identifiers
@@ -78,10 +82,18 @@ module IsoDoc
         num
       end
 
-      def unbracket(ident)
+      def unbracket1(ident)
         ident&.text&.sub(/^\[/, "")&.sub(/\]$/, "")
       end
 
+      def unbracket(ident)
+        if ident.respond_to?(:size)
+          ident.map { |x| unbracket1(x) }.join(" / ")
+        else
+          unbracket1(ident)
+        end
+      end
+
       def render_identifier(ident)
         { metanorma: bracket_if_num(ident[0]),
           sdo: unbracket(ident[1]),

data/lib/isodoc/function/section_titles.rb

@@ -54,11 +54,12 @@ module IsoDoc
         end
       end
 
+      # top level clause names
       def clause_name(_num, title, div, header_class)
+        preceding_floating_titles(title, div)
         header_class = {} if header_class.nil?
         div.h1 **attr_code(header_class) do |h1|
-          if title.is_a?(String)
-            h1 << title
+          if title.is_a?(String) then h1 << title
           else
             title&.children&.each { |c2| parse(c2, h1) }
             clause_parse_subtitle(title, h1)
@@ -68,6 +69,7 @@ module IsoDoc
       end
 
       def annex_name(_annex, name, div)
+        preceding_floating_titles(name, div)
         return if name.nil?
 
         div.h1 **{ class: "Annex" } do |t|
@@ -82,6 +84,18 @@ module IsoDoc
           node.children.each { |c| parse(c, p) }
         end
       end
+
+      def preceding_floating_titles(name, div)
+        return if name.nil? || name.is_a?(String)
+
+        out = name.parent.xpath("./preceding-sibling::*")
+          .reverse.each_with_object([]) do |p, m|
+          break m unless p.name == "p"
+
+          m << p
+        end or return
+        out.each { |c| parse(c, div) }
+      end
     end
   end
 end

data/lib/isodoc/html_function/html.rb

@@ -128,6 +128,12 @@ module IsoDoc
 
       def table_long_strings_cleanup(docxml); end
 
+      def table_attrs(node)
+        ret = super
+        node.at(ns("./colgroup")) and ret[:style] += "table-layout:fixed;"
+        ret
+      end
+
       def image_parse(node, out, caption)
         if svg = node.at("./m:svg", "m" => "http://www.w3.org/2000/svg")
           svg_parse(svg, out)

data/lib/isodoc/metadata.rb

@@ -69,7 +69,7 @@ module IsoDoc
     end
 
     def stage_abbr(docstatus)
-      status_print(docstatus).split(/ /).map { |s| s[0].upcase }.join("")
+      status_print(docstatus).split(/ /).map { |s| s[0].upcase }.join
     end
 
     def unpublished(status)

data/lib/isodoc/presentation_function/block.rb

@@ -135,5 +135,29 @@ module IsoDoc
       elem.xpath(ns("./description")).each { |a| a.replace(a.children) }
       elem.replace(elem.children)
     end
+
+    def ol(docxml)
+      docxml.xpath(ns("//ol")).each do |f|
+        ol1(f)
+      end
+      @xrefs.list_anchor_names(docxml.xpath(ns(@xrefs.sections_xpath)))
+    end
+
+    # We don't really want users to specify type of ordered list;
+    # we will use by default a fixed hierarchy as practiced by ISO (though not
+    # fully spelled out): a) 1) i) A) I)
+    def ol_depth(node)
+      depth = node.ancestors("ul, ol").size + 1
+      type = :alphabet
+      type = :arabic if [2, 7].include? depth
+      type = :roman if [3, 8].include? depth
+      type = :alphabet_upper if [4, 9].include? depth
+      type = :roman_upper if [5, 10].include? depth
+      type
+    end
+
+    def ol1(elem)
+      elem["type"] ||= ol_depth(elem).to_s
+    end
   end
 end

data/lib/isodoc/presentation_function/image.rb

@@ -65,15 +65,14 @@ module IsoDoc
       uri = svg_to_emf_uri(node)
       ret = svg_to_emf_filename(uri)
       File.exists?(ret) and return ret
-      exe = inkscape_installed? or return nil
+      exe = inkscape_installed? or raise "Inkscape missing in PATH, unable" \
+                                         "to convert EMF to SVG. Aborting."
       uri = Metanorma::Utils::external_path uri
       exe = Metanorma::Utils::external_path exe
       system(%(#{exe} --export-type="emf" #{uri})) and
         return Metanorma::Utils::datauri(ret)
 
-      warn %(Fail on #{exe} --export-type="emf" #{uri})
-
-      nil
+      raise %(Fail on #{exe} --export-type="emf" #{uri})
     end
 
     def svg_to_emf_uri(node)

data/lib/isodoc/presentation_function/inline.rb

@@ -69,7 +69,8 @@ module IsoDoc
       c1 = non_locality_elems(node).select { |c| !c.text? || /\S/.match(c) }
       return unless c1.empty?
 
-      link = anchor_linkend(node, docid_l10n(node["target"] || node["citeas"]))
+      link = anchor_linkend(node, docid_l10n(node["target"] ||
+                                             expand_citeas(node["citeas"])))
       link += eref_localities(node.xpath(ns("./locality | ./localityStack")),
                               link, node)
       non_locality_elems(node).each(&:remove)
@@ -78,6 +79,11 @@ module IsoDoc
     # so not <origin bibitemid="ISO7301" citeas="ISO 7301">
     # <locality type="section"><reference>3.1</reference></locality></origin>
 
+    def expand_citeas(text)
+      text.nil? and return text
+      HTMLEntities.new.decode(text.gsub(/&amp;#x/, "&#"))
+    end
+
     def eref_localities(refs, target, node)
       ret = ""
       refs.each_with_index do |r, i|

data/lib/isodoc/presentation_function/section.rb

@@ -26,6 +26,8 @@ module IsoDoc
         .each do |f|
         floattitle1(f)
       end
+      # top-level
+      docxml.xpath(ns("//sections | //preface")).each { |f| floattitle1(f) }
     end
 
     def floattitle1(elem)

data/lib/isodoc/presentation_xml_convert.rb

@@ -50,6 +50,7 @@ module IsoDoc
       formula docxml
       example docxml
       note docxml
+      ol docxml
       permission docxml
       requirement docxml
       recommendation docxml

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.0.0.1".freeze
+  VERSION = "2.0.4".freeze
 end

data/spec/isodoc/blocks_spec.rb

@@ -925,87 +925,23 @@ RSpec.describe IsoDoc do
         .to receive(:inkscape_installed?)
 
       input = <<~INPUT
-            <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"/>
-        </figure>
-            </foreword></preface>
-            </iso-standard>
-      INPUT
-      presxml = <<~OUTPUT
-              <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
           <preface>
-            <foreword displayorder='1'>
-              <figure id='figureA-1'>
-                <name>Figure 1</name>
-                <image src='spec/assets/odf.svg' mimetype='image/svg+xml'>
-                  <emf src='spec/assets/odf.emf'/>
-                </image>
-                <image src='spec/assets/odf1.svg' mimetype='image/svg+xml'/>
-                <image src='' id='_d3731866-1a07-435a-a6c2-1acd41023a4e' mimetype='image/svg+xml' height='auto' width='auto'>
-                  <svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100'>
-                    <circle fill='#009' r='45' cx='50' cy='50'/>
-                    <path d='M33,26H78A37,37,0,0,1,33,83V57H59V43H33Z' fill='#FFF'/>
-                  </svg>
-                </image>
+            <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"/>
               </figure>
             </foreword>
           </preface>
         </iso-standard>
-      OUTPUT
-      output = <<~OUTPUT
-         <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>
-                <div id='figureA-1' class='figure'>
-                  <img src='spec/assets/odf.emf'/>
-                  <img src='spec/assets/odf1.svg'/>
-                  <img src='' height='auto' width='auto'/>
-                  <p class='FigureTitle' style='text-align:center;'>Figure 1</p>
-                </div>
-              </div>
-              <p>&#160;</p>
-            </div>
-            <p>
-              <br clear='all' class='section'/>
-            </p>
-            <div class='WordSection3'>
-              <p class='zzSTDTitle1'/>
-            </div>
-          </body>
-        </html>
-      OUTPUT
-      expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
-       .convert("test", input, true)
-       .gsub(/&lt;/, "&#x3c;")
-        .gsub(%r{data:application/x-msmetafile[^"']+},
-              "data:application/x-msmetafile")))
-        .to be_equivalent_to xmlpp(presxml
-        .gsub(%r{data:application/x-msmetafile[^"']+},
-              "data:application/x-msmetafile"))
-      expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({})
-        .convert("test", presxml, true)
-        .gsub(/['"][^'".]+(?<!odf1)(?<!odf)\.svg['"]/, "'_.svg'")
-        .gsub(/mso-bookmark:_Ref\d+/, "mso-bookmark:_Ref"))))
-        .to be_equivalent_to xmlpp(output)
+      INPUT
+      expect do
+        IsoDoc::PresentationXMLConvert.new({})
+          .convert("test", input, true)
+      end.to raise_error("Inkscape missing in PATH, unable" \
+                         "to convert EMF to SVG. Aborting.")
     end
   end
 

data/spec/isodoc/inline_spec.rb

@@ -1782,4 +1782,41 @@ RSpec.describe IsoDoc do
     expect(xmlpp(IsoDoc::HtmlConvert.new({})
       .convert("test", input, true))).to be_equivalent_to xmlpp(output)
   end
+
+  it "processes formatting in eref/@citeas" do
+    input = <<~INPUT
+      <itu-standard xmlns="https://www.calconnect.org/standards/itu">
+               <preface>
+           <foreword id='_' obligation='informative'>
+             <title>Foreword</title>
+             <p id='_'>
+               <eref type='inline' bibitemid='iso124' citeas='[&amp;#x3c;strong&amp;#x3e;A&amp;#x3c;/strong&amp;#x3e;.&amp;#x3c;fn reference=&amp;#x22;1&amp;#x22;&amp;#x3e;&amp;#xa;  &amp;#x3c;p&amp;#x3e;hello&amp;#x3c;/p&amp;#x3e;&amp;#xa;&amp;#x3c;/fn&amp;#x3e;]'/>
+             </p>
+           </foreword>
+         </preface>
+      </itu-standard>
+    INPUT
+    output = <<~OUTPUT
+      <itu-standard xmlns='https://www.calconnect.org/standards/itu' type='presentation'>
+         <preface>
+           <foreword id='_' obligation='informative' displayorder='1'>
+             <title>Foreword</title>
+             <p id='_'>
+               <eref type='inline' bibitemid='iso124' citeas='[&amp;#x3c;strong&amp;#x3e;A&amp;#x3c;/strong&amp;#x3e;.&amp;#x3c;fn reference=&amp;#x22;1&amp;#x22;&amp;#x3e;&amp;#xa;  &amp;#x3c;p&amp;#x3e;hello&amp;#x3c;/p&amp;#x3e;&amp;#xa;&amp;#x3c;/fn&amp;#x3e;]'>
+                 [
+                 <strong>A</strong>
+                 .
+                 <fn reference='1'>
+                   <p>hello</p>
+                 </fn>
+                 ]
+               </eref>
+             </p>
+           </foreword>
+         </preface>
+       </itu-standard>
+    OUTPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
+  end
 end

data/spec/isodoc/presentation_xml_spec.rb

@@ -844,84 +844,84 @@ RSpec.describe IsoDoc do
       </html>
     OUTPUT
     doc = <<~OUTPUT
-           <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>&#160;</p>
-           </div>
-           <p>
-             <br clear='all' class='section'/>
-           </p>
-           <div class='WordSection3'>
-             <p class='zzSTDTitle1'/>
-             <div id='_'>
-               <h1>
-                 <b>Annex A</b>
-                 <br/>
-                  (normative).
-                 <span style='mso-tab-count:1'>&#160; </span>
-                  Clause
-               </h1>
-               <p id='_'>Text</p>
-               <div id='_'>
-                 <h1>
-                   <b>Annex A</b>
-                   <br/>
-                    (normative).
-                   <span style='mso-tab-count:1'>&#160; </span>
-                    Subclause
-                   <br/>
-                   <br/>
-                   &#8220;A&#8221; &#8216;B&#8217;
-                 </h1>
-                 <p style='display:none;' class='variant-title-toc'>
-                    Clause
-                   <i>A</i>
-                   <span class='stem'>
-                     <math xmlns='http://www.w3.org/1998/Math/MathML'>
-                       <mi>x</mi>
-                     </math>
-                   </span>
-                 </p>
-                 <p id='_'>Text</p>
-               </div>
-             </div>
-             <p>
-               <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
-             </p>
-             <div id='_' class='Section3'>
-               <h1 class='Annex'>
-                 <b>Annex A</b>
-                 <br/>
-                  (normative)
-                 <br/>
-                 <br/>
-                 <b>Clause</b>
-               </h1>
-               <p style='display:none;' class='variant-title-toc'>
-                  Clause
-                 <i>A</i>
-                 <span class='stem'>
-                   <math xmlns='http://www.w3.org/1998/Math/MathML'>
-                     <mi>x</mi>
-                   </math>
-                 </span>
-               </p>
-               <p id='_'>Text</p>
-             </div>
-           </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>&#160;</p>
+          </div>
+          <p>
+            <br clear='all' class='section'/>
+          </p>
+          <div class='WordSection3'>
+            <p class='zzSTDTitle1'/>
+            <div id='_'>
+              <h1>
+                <b>Annex A</b>
+                <br/>
+                 (normative).
+                <span style='mso-tab-count:1'>&#160; </span>
+                 Clause
+              </h1>
+              <p id='_'>Text</p>
+              <div id='_'>
+                <h1>
+                  <b>Annex A</b>
+                  <br/>
+                   (normative).
+                  <span style='mso-tab-count:1'>&#160; </span>
+                   Subclause
+                  <br/>
+                  <br/>
+                  &#8220;A&#8221; &#8216;B&#8217;
+                </h1>
+                <p style='display:none;' class='variant-title-toc'>
+                   Clause
+                  <i>A</i>
+                  <span class='stem'>
+                    <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                      <mi>x</mi>
+                    </math>
+                  </span>
+                </p>
+                <p id='_'>Text</p>
+              </div>
+            </div>
+            <p>
+              <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
+            </p>
+            <div id='_' class='Section3'>
+              <h1 class='Annex'>
+                <b>Annex A</b>
+                <br/>
+                 (normative)
+                <br/>
+                <br/>
+                <b>Clause</b>
+              </h1>
+              <p style='display:none;' class='variant-title-toc'>
+                 Clause
+                <i>A</i>
+                <span class='stem'>
+                  <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                    <mi>x</mi>
+                  </math>
+                </span>
+              </p>
+              <p id='_'>Text</p>
+            </div>
+          </div>
+        </body>
+      </html>
     OUTPUT
     expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
       .convert("test", input, true))
@@ -993,6 +993,169 @@ RSpec.describe IsoDoc do
       .to be_equivalent_to (output)
   end
 
+  it "adds types to ordered lists" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <bibdata/>
+        <sections>
+           <clause id='A' inline-header='false' obligation='normative'>
+             <title>Clause</title>
+             <ol id="B1">
+             <li>A1
+             <ol id="B2">
+             <li>A2
+             <ol id="B3">
+             <li>A3
+             <ol id="B4">
+             <li>A4
+             <ol id="B5">
+             <li>A5
+             <ol id="B6">
+             <li>A6
+             <ol id="B7">
+             <li>A7
+             <ol id="B8">
+             <li>A8
+             <ol id="B9">
+             <li>A9
+             <ol id="B0">
+             <li>A0</li>
+             </ol></li>
+             </ol></li>
+             </ol></li>
+             </ol></li>
+             </ol></li>
+             </ol></li>
+             </ol></li>
+             </ol></li>
+             </ol></li>
+             </ol>
+           </clause>
+         </sections>
+       </iso-standard>#{'  '}
+    INPUT
+    presxml = <<~OUTPUT
+      <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+        <bibdata/>
+        <sections>
+          <clause id='A' inline-header='false' obligation='normative' displayorder='1'>
+            <title depth='1'>
+              1.
+              <tab/>
+              Clause
+            </title>
+            <ol id='B1' type='alphabet'>
+              <li>
+                A1
+                <ol id='B2' type='arabic'>
+                  <li>
+                    A2
+                    <ol id='B3' type='roman'>
+                      <li>
+                        A3
+                        <ol id='B4' type='alphabet_upper'>
+                          <li>
+                            A4
+                            <ol id='B5' type='roman_upper'>
+                              <li>
+                                A5
+                                <ol id='B6' type='alphabet'>
+                                  <li>
+                                    A6
+                                    <ol id='B7' type='arabic'>
+                                      <li>
+                                        A7
+                                        <ol id='B8' type='roman'>
+                                          <li>
+                                            A8
+                                            <ol id='B9' type='alphabet_upper'>
+                                              <li>
+                                                A9
+                                                <ol id='B0' type='roman_upper'>
+                                                  <li>A0</li>
+                                                </ol>
+                                              </li>
+                                            </ol>
+                                          </li>
+                                        </ol>
+                                      </li>
+                                    </ol>
+                                  </li>
+                                </ol>
+                              </li>
+                            </ol>
+                          </li>
+                        </ol>
+                      </li>
+                    </ol>
+                  </li>
+                </ol>
+              </li>
+            </ol>
+          </clause>
+        </sections>
+      </iso-standard>
+    OUTPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))
+      .sub(%r{<localized-strings>.*</localized-strings>}m, ""))
+      .to be_equivalent_to xmlpp(presxml)
+  end
+
+  it "considers ul when adding types to ordered lists" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <bibdata/>
+        <sections>
+           <clause id='A' inline-header='false' obligation='normative'>
+             <title>Clause</title>
+             <ol id="B1">
+             <li>A1
+             <ul id="B2">
+             <li>A2
+             <ol id="B3">
+             <li>A3
+             </ol></li>
+             </ul></li>
+             </ol>
+           </clause>
+         </sections>
+       </iso-standard>
+    INPUT
+    presxml = <<~OUTPUT
+      <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+        <bibdata/>
+
+        <sections>
+          <clause id='A' inline-header='false' obligation='normative' displayorder='1'>
+            <title depth='1'>
+              1.
+              <tab/>
+              Clause
+            </title>
+            <ol id='B1' type='alphabet'>
+              <li>
+                A1
+                <ul id='B2'>
+                  <li>
+                    A2
+                    <ol id='B3' type='roman'>
+                      <li>A3 </li>
+                    </ol>
+                  </li>
+                </ul>
+              </li>
+            </ol>
+          </clause>
+        </sections>
+      </iso-standard>
+    OUTPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))
+      .sub(%r{<localized-strings>.*</localized-strings>}m, ""))
+      .to be_equivalent_to xmlpp(presxml)
+  end
+
   private
 
   def mock_symbols

data/spec/isodoc/ref_spec.rb

@@ -654,8 +654,9 @@ RSpec.describe IsoDoc do
                </body>
              </html>
     OUTPUT
-    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", presxml,
-                                                     true))).to be_equivalent_to xmlpp(html)
+    expect(xmlpp(IsoDoc::HtmlConvert.new({})
+      .convert("test", presxml, true)))
+      .to be_equivalent_to xmlpp(html)
   end
 
   it "processes hidden references sections in Relaton bibliographies" do
@@ -766,7 +767,91 @@ RSpec.describe IsoDoc do
                </body>
              </html>
     OUTPUT
-    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", presxml,
-                                                     true))).to be_equivalent_to xmlpp(html)
+    expect(xmlpp(IsoDoc::HtmlConvert.new({})
+      .convert("test", presxml, true)))
+      .to be_equivalent_to xmlpp(html)
+  end
+
+  it "selects the primary identifier" do
+    input = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <bibdata>
+          <language>en</language>
+          </bibdata>
+          <preface><foreword>
+        <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">
+        <eref bibitemid="ISO712"/>
+        </p>
+          </foreword></preface>
+          <bibliography><references id="_normative_references" obligation="informative" normative="true"><title>Normative References</title>
+          <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
+      <bibitem id="ISO712" type="standard">
+        <title format="text/plain">Cereals or cereal products</title>
+        <title type="main" format="text/plain">Cereals and cereal products</title>
+        <docidentifier type="ISO">ISO 712</docidentifier>
+        <docidentifier type="IEC" primary="true">IEC 217</docidentifier>
+        <contributor>
+          <role type="publisher"/>
+          <organization>
+            <name>International Organization for Standardization</name>
+          </organization>
+        </contributor>
+      </bibitem>
+      </references></bibliography></iso-standard>
+    INPUT
+    presxml = <<~PRESXML
+      <foreword displayorder='1'>
+        <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
+          <eref bibitemid='ISO712'>IEC 217</eref>
+        </p>
+      </foreword>
+    PRESXML
+    expect(xmlpp(Nokogiri::XML(
+      IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true),
+    ).at("//xmlns:foreword").to_xml))
+      .to be_equivalent_to xmlpp(presxml)
+  end
+
+  it "selects multiple primary identifiers" do
+    input = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <bibdata>
+          <language>en</language>
+          </bibdata>
+          <preface><foreword>
+        <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">
+        <eref bibitemid="ISO712"/>
+        </p>
+          </foreword></preface>
+          <bibliography><references id="_normative_references" obligation="informative" normative="true"><title>Normative References</title>
+          <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
+      <bibitem id="ISO712" type="standard">
+        <title format="text/plain">Cereals or cereal products</title>
+        <title type="main" format="text/plain">Cereals and cereal products</title>
+        <docidentifier type="ISO" primary="true">ISO 712</docidentifier>
+        <docidentifier type="IEC" primary="true">IEC 217</docidentifier>
+        <contributor>
+          <role type="publisher"/>
+          <organization>
+            <name>International Organization for Standardization</name>
+          </organization>
+        </contributor>
+      </bibitem>
+      </references></bibliography></iso-standard>
+    INPUT
+    presxml = <<~PRESXML
+      <foreword displayorder='1'>
+        <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
+          <eref bibitemid='ISO712'>ISO 712&#xA0;/ IEC 217</eref>
+        </p>
+      </foreword>
+    PRESXML
+    expect(xmlpp(Nokogiri::XML(
+      IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true),
+    ).at("//xmlns:foreword").to_xml))
+      .to be_equivalent_to xmlpp(presxml)
   end
+
 end

data/spec/isodoc/section_spec.rb

@@ -1,6 +1,7 @@
 require "spec_helper"
 
 RSpec.describe IsoDoc do
+=begin
   it "processes prefatory blocks" do
     input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -1495,11 +1496,12 @@ RSpec.describe IsoDoc do
       .new({ suppressheadingnumbers: true })
       .convert("test", input, true))).to be_equivalent_to xmlpp(output)
   end
-
+=end
   it "processes floating titles" do
     input = <<~INPUT
           <iso-standard xmlns="http://riboseinc.com/isoxml">
       <preface>
+        <floating-title depth="1">A0</p>
         <introduction id="B" obligation="informative">
         <title>Introduction</title>
         <floating-title depth="1">A</p>
@@ -1513,18 +1515,35 @@ RSpec.describe IsoDoc do
        </clause>
        </introduction>
        </preface>
+       <sections>
+        <clause id="C" obligation="informative">
+        <title>Introduction</title>
+        <floating-title depth="1">A</p>
+        <clause id="C1" obligation="informative">
+         <title>Introduction Subsection</title>
+        <floating-title depth="2">B</p>
+        <clause id="C2" obligation="informative">
+         <title>Introduction Sub-subsection</title>
+        <floating-title depth="1">C</p>
+       </clause>
+       </clause>
+       </clause>
+        <floating-title depth="1">D</p>
+       <clause id="C4"><title>Clause 2</title></clause>
+       </sections>
        </iso-standard>
     INPUT
 
     presxml = <<~PRESXML
-         <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+           <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
          <preface>
-           <introduction id='B' obligation='informative' displayorder='1'>
+           <p depth='1' type='floating-title' displayorder='1'>A0</p>
+           <introduction id='B' obligation='informative' displayorder='2'>
              <title>Introduction</title>
              <p depth='1' type='floating-title'>A</p>
              <clause id='B1' obligation='informative'>
                <title depth='2'>Introduction Subsection</title>
-               <p type='floating-title' depth="2">B</p>
+               <p depth='2' type='floating-title'>B</p>
                <clause id='B2' obligation='informative'>
                  <title depth='3'>Introduction Sub-subsection</title>
                  <p depth='1' type='floating-title'>C</p>
@@ -1532,13 +1551,49 @@ RSpec.describe IsoDoc do
              </clause>
            </introduction>
          </preface>
+         <sections>
+           <clause id='C' obligation='informative' displayorder='3'>
+             <title depth='1'>
+               1.
+               <tab/>
+               Introduction
+             </title>
+             <p depth='1' type='floating-title'>A</p>
+             <clause id='C1' obligation='informative'>
+               <title depth='2'>
+                 1.1.
+                 <tab/>
+                 Introduction Subsection
+               </title>
+               <p depth='2' type='floating-title'>B</p>
+               <clause id='C2' obligation='informative'>
+                 <title depth='3'>
+                   1.1.1.
+                   <tab/>
+                   Introduction Sub-subsection
+                 </title>
+                 <p depth='1' type='floating-title'>C</p>
+               </clause>
+             </clause>
+           </clause>
+           <p depth='1' type='floating-title'>D</p>
+           <clause id='C4' displayorder='4'>
+             <title depth='1'>
+               2.
+               <tab/>
+               Clause 2
+             </title>
+           </clause>
+         </sections>
        </iso-standard>
     PRESXML
 
     html = <<~OUTPUT
       #{HTML_HDR}
+             <p class='h1'>A0</p>
              <br/>
              <div class='Section3' id='B'>
+              <p class='h1'>A0</p>
                <h1 class='IntroTitle'>Introduction</h1>
                <p class='h1'>A</p>
                <div id='B1'>
@@ -1551,6 +1606,22 @@ RSpec.describe IsoDoc do
                </div>
              </div>
              <p class='zzSTDTitle1'/>
+                   <div id='C'>
+        <h1> 1. &#160; Introduction </h1>
+        <p class='h1'>A</p>
+        <div id='C1'>
+          <h2> 1.1. &#160; Introduction Subsection </h2>
+          <p class='h2'>B</p>
+          <div id='C2'>
+            <h3> 1.1.1. &#160; Introduction Sub-subsection </h3>
+            <p class='h1'>C</p>
+          </div>
+        </div>
+      </div>
+      <div id='C4'>
+      <p class='h1'>D</p>
+        <h1> 2. &#160; Clause 2 </h1>
+      </div>
            </div>
          </body>
        </html>
@@ -1569,10 +1640,12 @@ RSpec.describe IsoDoc do
              <br clear='all' class='section'/>
            </p>
            <div class='WordSection2'>
+            <p>A0</p>
              <p>
                <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
              </p>
              <div class='Section3' id='B'>
+             <p>A0</p>
                <h1 class='IntroTitle'>Introduction</h1>
                <p>A</p>
                <div id='B1'>
@@ -1591,6 +1664,38 @@ RSpec.describe IsoDoc do
            </p>
            <div class='WordSection3'>
              <p class='zzSTDTitle1'/>
+                  <div id='C'>
+       <h1>
+          1.
+         <span style='mso-tab-count:1'>&#160; </span>
+          Introduction
+       </h1>
+       <p>A</p>
+       <div id='C1'>
+         <h2>
+            1.1.
+           <span style='mso-tab-count:1'>&#160; </span>
+            Introduction Subsection
+         </h2>
+         <p>B</p>
+         <div id='C2'>
+           <h3>
+              1.1.1.
+             <span style='mso-tab-count:1'>&#160; </span>
+              Introduction Sub-subsection
+           </h3>
+           <p>C</p>
+         </div>
+       </div>
+     </div>
+     <div id='C4'>
+       <p>D</p>
+       <h1>
+          2.
+         <span style='mso-tab-count:1'>&#160; </span>
+          Clause 2
+       </h1>
+     </div>
            </div>
          </body>
        </html>

data/spec/isodoc/table_spec.rb

@@ -174,7 +174,7 @@ RSpec.describe IsoDoc do
         <sup>1</sup>
       </a>
                       </p>
-                     <table id="tableD-1" class="MsoISOTable" style="border-width:1px;border-spacing:0;width:70%;page-break-after: avoid;page-break-inside: avoid;" title="tool tip" >
+                     <table id="tableD-1" class="MsoISOTable" style="border-width:1px;border-spacing:0;width:70%;page-break-after: avoid;page-break-inside: avoid;table-layout:fixed;" title="tool tip" >
                      <caption>
                      <span style="display:none">long desc</span>
                      </caption>

data/spec/isodoc/xref_spec.rb

@@ -2504,6 +2504,8 @@ RSpec.describe IsoDoc do
           <foreword>
           <p>
           <xref target="N1"/>
+          <xref target="N11"/>
+          <xref target="N12"/>
           <xref target="N2"/>
           <xref target="N"/>
           <xref target="note1"/>
@@ -2515,8 +2517,13 @@ RSpec.describe IsoDoc do
           </foreword>
           <introduction id="intro">
           <ol id="N01">
-        <li id="N1"><p>A</p></li>
-      </ol>
+        <li id="N1"><p>A</p>
+          <ol id="N011">
+        <li id="N11"><p>A</p>
+          <ol id="N012">
+        <li id="N12"><p>A</p>
+         </li>
+      </ol></li></ol></li></ol>
         <clause id="xyz"><title>Preparatory</title>
            <ol id="N02" type="arabic">
         <li id="N2"><p>A</p></li>
@@ -2563,6 +2570,8 @@ RSpec.describe IsoDoc do
       <foreword displayorder='1'>
         <p>
           <xref target='N1'>Introduction, a)</xref>
+          <xref target='N11'>Introduction, a.1)</xref>
+          <xref target='N12'>Introduction, a.1.i)</xref>
           <xref target='N2'>Preparatory, 1)</xref>
           <xref target='N'>Clause 1, i)</xref>
           <xref target='note1'>Clause 3.1, List 1 a)</xref>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.0.0.1
+  version: 2.0.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-10 00:00:00.000000000 Z
+date: 2022-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement