isodoc 1.2.7 → 1.4.1

data/lib/isodoc/word_function/postprocess_cover.rb

@@ -75,5 +75,60 @@ module IsoDoc::WordFunction
       toc.sub(/(<p class="MsoToc1">)/,
               %{\\1#{word_toc_preface(level)}}) +  WORD_TOC_SUFFIX1
     end
+
+    def authority_cleanup1(docxml, klass)
+      dest = docxml.at("//div[@id = 'boilerplate-#{klass}-destination']")
+      auth = docxml.at("//div[@id = 'boilerplate-#{klass}' or @class = 'boilerplate-#{klass}']")
+      auth&.xpath(".//h1[not(text())] | .//h2[not(text())]")&.each { |h| h.remove }
+      auth&.xpath(".//h1 | .//h2")&.each do |h|
+        h.name = "p"
+        h["class"] = "TitlePageSubhead"
+      end
+      dest and auth and dest.replace(auth.remove)
+    end
+
+    def authority_cleanup(docxml)
+      %w(copyright license legal feedback).each do |t|
+        authority_cleanup1(docxml, t)
+      end
+    end
+
+    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[:filename] = filename
+      params = meta.map { |k, v| [k.to_s, v] }.to_h
+      Tempfile.open(%w(header html), :encoding => "utf-8") do |f|
+        f.write(template.render(params))
+        f
+      end
+    end
+
+    def word_section_breaks(docxml)
+      @landscapestyle = ""
+      word_section_breaks1(docxml, "WordSection2")
+      word_section_breaks1(docxml, "WordSection3")
+      word_remove_pb_before_annex(docxml)
+      docxml.xpath("//br[@orientation]").each { |br| br.delete("orientation") }
+    end
+
+    def word_section_breaks1(docxml, sect)
+      docxml.xpath("//div[@class = '#{sect}']//br[@orientation]").reverse.
+        each_with_index do |br, i|
+        @landscapestyle += "\ndiv.#{sect}_#{i} {page:#{sect}#{br["orientation"] == "landscape" ? "L" : "P"};}\n"
+        split_at_section_break(docxml, sect, br, i)
+      end
+    end
+
+    def split_at_section_break(docxml, sect, br, i)
+      move = br.parent.xpath("following::node()") &
+        br.document.xpath("//div[@class = '#{sect}']//*")
+      ins = docxml.at("//div[@class = '#{sect}']").after("<div class='#{sect}_#{i}'/>").next_element
+      move.each do |m|
+        next if m.at("./ancestor::div[@class = '#{sect}_#{i}']")
+        ins << m.remove
+      end
+    end
   end
 end

data/lib/isodoc/word_function/table.rb

@@ -43,11 +43,21 @@ module IsoDoc::WordFunction
       }))
     end
 
+    def colgroup(node, t)
+      colgroup = node.at(ns("./colgroup")) or return
+      t.colgroup do |cg|
+        colgroup.xpath(ns("./col")).each do |c|
+          cg.col **{ width: c["width"] }
+        end
+      end
+    end
+
     def table_parse(node, out)
       @in_table = true
       table_title_parse(node, out)
       out.div **{ align: "center", class: "table_container" } do |div|
         div.table **table_attrs(node) do |t|
+          colgroup(node, t)
           thead_parse(node, t)
           tbody_parse(node, t)
           tfoot_parse(node, t)

data/lib/isodoc/xref.rb

@@ -49,6 +49,7 @@ module IsoDoc
       note_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
       example_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
       list_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
+      bookmark_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
     end
 
     def ns(xpath)

data/lib/isodoc/xref/xref_counter.rb

@@ -2,8 +2,8 @@ require "roman-numerals"
 
 module IsoDoc::XrefGen
   class Counter
-    def initialize
-      @num = 0
+    def initialize(num = 0)
+      @num = num
       @letter = ""
       @subseq = ""
       @letter_override = nil
@@ -76,13 +76,24 @@ module IsoDoc::XrefGen
       "#{@base}#{@number_override || @num}#{@letter_override || @letter}"
     end
 
-    def listlabel(depth)
-      return @num.to_s if [2, 7].include? depth
-      return (96 + @num).chr.to_s if [1, 6].include? depth
-      return (64 + @num).chr.to_s if [4, 9].include? depth
-      return RomanNumerals.to_roman(@num).downcase if [3, 8].include? depth
-      return RomanNumerals.to_roman(@num).upcase if [5, 10].include? depth
-      return @num.to_s
+    def ol_type(list, depth)
+      return list["type"].to_sym if list["type"]
+      return :arabic if [2, 7].include? depth
+      return :alphabet if [1, 6].include? depth
+      return :alphabet_upper if [4, 9].include? depth
+      return :roman if [3, 8].include? depth
+      return :roman_upper if [5, 10].include? depth
+      return :arabic
+    end
+
+    def listlabel(list, depth)
+      case ol_type(list, depth)
+      when :arabic then @num.to_s
+      when :alphabet then (96 + @num).chr.to_s
+      when :alphabet_upper then (64 + @num).chr.to_s
+      when :roman then RomanNumerals.to_roman(@num).downcase
+      when :roman_upper then RomanNumerals.to_roman(@num).upcase
+      end
     end
   end
 end

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 | "\
@@ -123,9 +127,9 @@ module IsoDoc::XrefGen
     end
 
     def list_item_anchor_names(list, list_anchor, depth, prev_label, refer_list)
-      c = Counter.new
+      c = Counter.new(list["start"] ? list["start"].to_i - 1 : 0)
       list.xpath(ns("./li")).each do |li|
-        label = c.increment(li).listlabel(depth)
+        label = c.increment(li).listlabel(list, depth)
         label = "#{prev_label}.#{label}" unless prev_label.empty?
         label = "#{list_anchor[:xref]} #{label}" if refer_list
         li["id"] and @anchors[li["id"]] =
@@ -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

@@ -68,7 +68,7 @@ module IsoDoc::XrefGen
     end
 
     def clause_names(docxml, sect_num)
-      docxml.xpath(ns(@klass.middle_clause)).each_with_index do |c, i|
+      docxml.xpath(ns(@klass.middle_clause(docxml))).each_with_index do |c, i|
         section_names(c, (i + sect_num), 1)
       end
     end

data/spec/assets/html.scss

@@ -3,4 +3,18 @@
 
 p {
   font-family: $bodyfont;
+  font-size: $normalfontsize;
+}
+code {
+  font-family: $monospacefont;
+  font-size: $monospacefontsize;
+}
+aside {
+  font-size: $footnotefontsize;
+}
+h1 {
+  font-family: $headerfont;
+}
+p.note {
+  font-size: $smallerfontsize;
 }

data/spec/assets/i18n.yaml

@@ -1,22 +1,23 @@
-foreword: Antaŭparolo
+foreword: Antaŭparolo
 introduction: Enkonduko
-clause: klaŭzo
-table: Tabelo
+clause: klaŭzo
+table: tabelo
 source: SOURCE
 modified: modified
 scope: Amplekso
 symbols: Simboloj kai mallongigitaj terminoj
 annex: Aldono
-normref: Normaj citaĵoj
+normref: Normaj citaĵoj
 bibliography: Bibliografio
 inform_annex: informa
-all_parts: ĉiuj partoj
+all_parts: ĉiuj partoj
 norm_annex: normative
+note: NOTO
 locality: {
   table: Tabelo
 }
 doctype_dict: {
-  brochure: broŝuro,
+  brochure: broŝuro,
   conference proceedings: konferencaktoj
 }
 stage_dict: {

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>
@@ -1455,6 +1455,7 @@ end
                <div id='_be9158af-7e93-4ee2-90c5-26d31c181934' style='page-break-after: avoid;page-break-inside: avoid;'><div class='formula'>
                  <p>
                    <span class='stem'>(#(r = 1 %)#)</span>
+                   <span style='mso-tab-count:1'>&#160; </span>
                  </p>
                </div>
                <p>where</p>

data/spec/isodoc/cleanup_spec.rb

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

data/spec/isodoc/footnotes_spec.rb

@@ -180,11 +180,10 @@ RSpec.describe IsoDoc do
              </div>
              <p class="zzSTDTitle1"></p>
            </main>
-         <script type="text/x-mathjax-config">
-         MathJax.Hub.Config({
-           asciimath2jax: { delimiters: [['(#(', ')#)']] }
-        });
-       </script>
+           <script type='text/x-mathjax-config'>
+   MathJax.Hub.Config({ "HTML-CSS": { preferredFont: "STIX" }, asciimath2jax:
+  { delimiters: [['(#(', ')#)']] } });
+</script>
        <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/latest.js?config=MML_HTMLorMML-full" async="async"></script>
        <script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script></body>
     OUTPUT

data/spec/isodoc/i18n_spec.rb

@@ -885,6 +885,8 @@ PRESXML
       <foreword obligation="informative">
          <title>Foreword</title>
          <p id="A">See <xref target="M"/></p>
+         <p id="A">See <xref target="tab"/></p>
+         <table id="tab"/>
        </foreword>
         <introduction id="B" obligation="informative"><title>Introduction</title><clause id="C" inline-header="false" obligation="informative">
          <title>Introduction Subsection</title>
@@ -916,6 +918,7 @@ PRESXML
        </definitions>
        <clause id="M" inline-header="false" obligation="normative"><title>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
          <title>Introduction</title>
+         <note id="M-n1"/>
        </clause>
        <clause id="O" inline-header="false" obligation="normative">
          <title>Clause 4.2</title>
@@ -971,7 +974,7 @@ PRESXML
   <localized-string key='foreword' language='eo'>Anta&#x16D;parolo</localized-string>
 <localized-string key='introduction' language='eo'>Enkonduko</localized-string>
 <localized-string key='clause' language='eo'>kla&#x16D;zo</localized-string>
-<localized-string key='table' language='eo'>Tabelo</localized-string>
+<localized-string key='table' language='eo'>tabelo</localized-string>
 <localized-string key='source' language='eo'>SOURCE</localized-string>
 <localized-string key='modified' language='eo'>modified</localized-string>
 <localized-string key='scope' language='eo'>Amplekso</localized-string>
@@ -982,6 +985,7 @@ PRESXML
 <localized-string key='inform_annex' language='eo'>informa</localized-string>
 <localized-string key='all_parts' language='eo'>&#x109;iuj partoj</localized-string>
 <localized-string key='norm_annex' language='eo'>normative</localized-string>
+<localized-string key='note' language='eo'>NOTO</localized-string>
 <localized-string key='locality.table' language='eo'>Tabelo</localized-string>
 <localized-string key='doctype_dict.brochure' language='eo'>bro&#x15D;uro</localized-string>
 <localized-string key='doctype_dict.conference_proceedings' language='eo'>konferencaktoj</localized-string>
@@ -998,6 +1002,10 @@ PRESXML
              <foreword obligation="informative">
                 <title>Foreword</title>
                 <p id='A'>See <xref target='M'>kla&#x16D;zo 5</xref></p>
+                <p id='A'>See <xref target='tab'>tabelo 1</xref></p>
+<table id='tab'>
+  <name>Tabelo 1</name>
+</table>
               </foreword>
                <introduction id="B" obligation="informative"><title>Introduction</title><clause id="C" inline-header="false" obligation="informative">
                 <title depth="2">Introduction Subsection</title>
@@ -1029,6 +1037,7 @@ PRESXML
               </definitions>
               <clause id="M" inline-header="false" obligation="normative"><title depth="1">5.<tab/>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
                 <title depth="2">5.1.<tab/>Introduction</title>
+                <note id='M-n1'><name>NOTO </name></note>
               </clause>
               <clause id="O" inline-header="false" obligation="normative">
                 <title depth="2">5.2.<tab/>Clause 4.2</title>
@@ -1084,6 +1093,12 @@ PRESXML
   See
   <a href='#M'>kla&#365;zo 5</a>
 </p>
+<p id='A'>
+  See
+  <a href='#tab'>tabelo 1</a>
+</p>
+<p class='TableTitle' style='text-align:center;'>Tabelo 1</p>
+<table id='tab' class='MsoISOTable' style='border-width:1px;border-spacing:0;'/>
              </div>
              <br/>
              <div class='Section3' id='B'>
@@ -1136,6 +1151,12 @@ PRESXML
                <h1>5.&#160; Clause 4</h1>
                <div id='N'>
                  <h2>5.1.&#160; Introduction</h2>
+                 <div id='M-n1' class='Note'>
+  <p>
+    <span class='note_label'>NOTO </span>
+    &#160;
+  </p>
+</div>
                </div>
                <div id='O'>
                  <h2>5.2.&#160; Clause 4.2</h2>
@@ -1177,7 +1198,7 @@ PRESXML
   private
 
   def mock_i18n
-    allow_any_instance_of(::IsoDoc::I18n).to receive(:load_yaml).with("eo", "Latn", "spec/assets/i18n.yaml").and_return(YAML.load_file("spec/assets/i18n.yaml"))
+    allow_any_instance_of(::IsoDoc::I18n).to receive(:load_yaml).with("eo", "Latn", "spec/assets/i18n.yaml").and_return(IsoDoc::I18n.new("eo", "Latn").normalise_hash(YAML.load_file("spec/assets/i18n.yaml")))
   end
 
 end

data/spec/isodoc/inline_spec.rb

@@ -1,62 +1,6 @@
 require "spec_helper"
 
 RSpec.describe IsoDoc do
-  it "cases xrefs" do
-  expect(xmlpp(IsoDoc::PresentationXMLConvert.new({i18nyaml: "spec/assets/i18n.yaml"}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-    <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <sections>
-    <clause id="A">
-    <table id="B">
-    </table>
-    </clause>
-    <clause id="C">
-    <p>This is <xref target="A"/> and <xref target="B"/>.
-    This is <xref target="A" case="capital"/> and <xref target="B" case="lowercase"/>.
-    <xref target="A"/> is clause <em>initial.</em><br/>
-    <xref target="A"/> is too.  </p>
-    <p><xref target="A"/> is also.</p>
-</clause>
-</sections>
-</iso-standard>
-INPUT
-<?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
-  <sections>
-    <clause id='A'>
-    <title>1.</title>
-      <table id='B'>
-        <name>Tabelo 1</name>
-      </table>
-    </clause>
-    <clause id='C'>
-    <title>2.</title>
-      <p>
-        This is
-        <xref target='A'>kla&#x16D;zo 1</xref>
-         and
-        <xref target='B'>Tabelo 1</xref>
-        . This is
-        <xref target='A' case='capital'>Kla&#x16D;zo 1</xref>
-         and
-        <xref target='B' case='lowercase'>tabelo 1</xref>
-        .
-        <xref target='A'>Kla&#x16D;zo 1</xref>
-         is clause
-        <em>initial.</em>
-        <br/>
-        <xref target='A'>Kla&#x16D;zo 1</xref>
-         is too.
-      </p>
-      <p>
-        <xref target='A'>Kla&#x16D;zo 1</xref>
-         is also.
-      </p>
-    </clause>
-  </sections>
-</iso-standard>
-OUTPUT
-end
-
    it "droplocs xrefs" do
   expect(xmlpp(IsoDoc::PresentationXMLConvert.new({i18nyaml: "spec/assets/i18n.yaml"}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -99,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>
@@ -120,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"/>
@@ -136,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>
@@ -163,6 +108,7 @@ OUTPUT
           <p>
             <br clear='all' class='section' orientation='landscape'/>
           </p>
+          <u>J</u>
         </p>
       </div>
     </div>
@@ -173,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>
@@ -181,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
 
@@ -280,119 +224,132 @@ OUTPUT
     </iso-standard>
     INPUT
     presxml = <<~OUTPUT
-       <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
-           <preface><foreword>
-           <p>
-           <ul>
-           <li><concept term="term">
-               <xref target="clause1">Clause 2</xref>
-             </concept></li>
-           <li><concept term="term">
-               <xref target="clause1">w[o]rd</xref>
-             </concept></li>
-             <li><concept term="term">
-               <eref bibitemid="ISO712" type="inline" citeas="ISO 712">ISO 712</eref>
-             </concept></li>
-             <li><concept term="term">
-               <eref bibitemid="ISO712" type="inline" citeas="ISO 712">word</eref>
-             </concept></li>
-             <li><concept>
-               <eref bibitemid="ISO712" type="inline" citeas="ISO 712"><locality type="clause">
-                   <referenceFrom>3.1</referenceFrom>
-                 </locality><locality type="figure">
-                   <referenceFrom>a</referenceFrom>
-                 </locality>ISO 712, Clause 3.1, Figure a</eref>
-             </concept></li>
-             <li><concept>
-               <eref bibitemid="ISO712" type="inline" citeas="ISO 712"><localityStack>
-                 <locality type="clause">
-                   <referenceFrom>3.1</referenceFrom>
-                 </locality>
-               </localityStack><localityStack>
-                 <locality type="figure">
-                   <referenceFrom>b</referenceFrom>
-                 </locality>
-               </localityStack>ISO 712, Clause 3.1; Figure b</eref>
-             </concept></li>
-             <li><concept>
-               <eref bibitemid="ISO712" type="inline" citeas="ISO 712">
-               <localityStack>
-                 <locality type="clause">
-                   <referenceFrom>3.1</referenceFrom>
-                 </locality>
-               </localityStack>
-               <localityStack>
-                 <locality type="figure">
-                   <referenceFrom>b</referenceFrom>
-                 </locality>
-               </localityStack>
-               <em>word</em>
-               </eref>
-             </concept></li>
-             <li><concept term="term">
-               <termref base="IEV" target="135-13-13"/>
-             </concept></li>
-             <li><concept term="term">
-               <termref base="IEV" target="135-13-13"><em>word</em> word</termref>
-             </concept></li>
-             </ul>
-           </p>
-           </foreword></preface>
-           <sections>
-           <clause id="clause1"><title depth='1'>2.<tab/>Clause 1</title>
-        </clause>
-           </sections>
-           <bibliography><references id="_normative_references" obligation="informative" normative="true">
-            <title depth='1'>1.<tab/>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>
-         <contributor>
-           <role type="publisher"/>
-           <organization>
-             <name>International Organization for Standardization</name>
-           </organization>
-         </contributor>
-       </bibitem>
-       </references></bibliography>
-           </iso-standard>
-OUTPUT
-
-    html = <<~OUTPUT
-        #{HTML_HDR}
-        <br/>
-       <div>
-               <h1 class="ForewordTitle">Foreword</h1>
-               <p>
-              <ul>
-              <li>Clause 2</li>
-              <li>w[o]rd</li>
-                <li>ISO 712</li>
-                <li>word</li>
-                <li>ISO 712, Clause 3.1, Figure a</li>
-                <li>ISO 712, Clause 3.1; Figure b</li>
-                <li><i>word</i></li>
-                <li>[Term defined in Termbase IEV, term ID 135-13-13]</li>
-                <li><i>word</i> word</li>
-                </ul>
-              </p>
-             </div>
-             <p class="zzSTDTitle1"/>
-             <div><h1>1.&#160; Normative References</h1>
-              <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>
-          <p id="ISO712" class="NormRef">ISO 712, <i>Cereals and cereal products</i></p>
-          </div>
-             <div id="clause1">
-               <h1>2.&#160; Clause 1</h1>
-             </div>
-           </div>
-         </body>
-       </html>
-OUTPUT
-      expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
-      expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
+     <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+         <preface>
+           <foreword>
+             <p>
+               <ul>
+                 <li>
+                   <em>
+                     <xref target='clause1'>Clause 2</xref>
+                   </em>
+                 </li>
+                 <li>
+                   <em>
+                     <xref target='clause1'>w[o]rd</xref>
+                   </em>
+                 </li>
+                 <li>
+                   <em>
+                     <eref bibitemid='ISO712' type='inline' citeas='ISO 712'>ISO 712</eref>
+                   </em>
+                 </li>
+                 <li>
+                   <em>
+                     <eref bibitemid='ISO712' type='inline' citeas='ISO 712'>word</eref>
+                   </em>
+                 </li>
+                 <li>
+                   <em>
+                     <eref bibitemid='ISO712' type='inline' citeas='ISO 712'>
+                       <locality type='clause'>
+                         <referenceFrom>3.1</referenceFrom>
+                       </locality>
+                       <locality type='figure'>
+                         <referenceFrom>a</referenceFrom>
+                       </locality>
+                       ISO 712, Clause 3.1, Figure a
+                     </eref>
+                   </em>
+                 </li>
+                 <li>
+                   <em>
+                     <eref bibitemid='ISO712' type='inline' citeas='ISO 712'>
+                       <localityStack>
+                         <locality type='clause'>
+                           <referenceFrom>3.1</referenceFrom>
+                         </locality>
+                       </localityStack>
+                       <localityStack>
+                         <locality type='figure'>
+                           <referenceFrom>b</referenceFrom>
+                         </locality>
+                       </localityStack>
+                       ISO 712, Clause 3.1; Figure b
+                     </eref>
+                   </em>
+                 </li>
+                 <li>
+                   <em>
+                     <eref bibitemid='ISO712' type='inline' citeas='ISO 712'>
+                       <localityStack>
+                         <locality type='clause'>
+                           <referenceFrom>3.1</referenceFrom>
+                         </locality>
+                       </localityStack>
+                       <localityStack>
+                         <locality type='figure'>
+                           <referenceFrom>b</referenceFrom>
+                         </locality>
+                       </localityStack>
+                       <em>word</em>
+                     </eref>
+                   </em>
+                 </li>
+                 <li>
+                   [term defined in
+                   <termref base='IEV' target='135-13-13'/>
+                   ]
+                 </li>
+                 <li>
+                   <em>
+                     <termref base='IEV' target='135-13-13'>
+                       <em>word</em>
+                        word
+                     </termref>
+                   </em>
+                 </li>
+               </ul>
+             </p>
+           </foreword>
+         </preface>
+         <sections>
+           <clause id='clause1'>
+             <title depth='1'>
+               2.
+               <tab/>
+               Clause 1
+             </title>
+           </clause>
+         </sections>
+         <bibliography>
+           <references id='_normative_references' obligation='informative' normative='true'>
+             <title depth='1'>
+               1.
+               <tab/>
+               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>
+               <contributor>
+                 <role type='publisher'/>
+                 <organization>
+                   <name>International Organization for Standardization</name>
+                 </organization>
+               </contributor>
+             </bibitem>
+           </references>
+         </bibliography>
+       </iso-standard>
     end
 
   it "processes embedded inline formatting" do
@@ -945,7 +902,7 @@ OUTPUT
       end
 
     it "processes variant" 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).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <bibdata>
     <language>en</language>
@@ -953,28 +910,46 @@ OUTPUT
     </bibdata>
     <preface>
         <clause id="A"><title><variant lang="en" script="Latn">ABC</variant><variant lang="fr" script="Latn">DEF</variant></title></clause>
+        <clause id="A1"><title><variant lang="en" script="Grek">ABC</variant><variant lang="fr" script="Grek">DEF</variant></title></clause>
+        <clause id="A2"><title><variant lang="en">ABC</variant><variant lang="fr">DEF</variant></title></clause>
         <clause id="B"><title><variant lang="de" script="Latn">GHI</variant><variant lang="es" script="Latn">JKL</variant></title></clause>
         <clause id="C"><title><variant lang="fr" script="Latn">ABC</variant><variant lang="en" script="Latn">DEF</variant></title></clause>
+        <clause id="C1"><title><variant lang="fr" script="Grek">ABC</variant><variant lang="en" script="Grek">DEF</variant></title></clause>
+        <clause id="C2"><title><variant lang="fr">ABC</variant><variant lang="en">DEF</variant></title></clause>
+        <p>A <variant><variant lang="en">B</variant><variant lang="fr">C</variant></variant> D <variant><variant lang="en" script="Latn">E</variant><variant lang="fr" script="Latn">F</variant></variant></p>
     </preface>
     </iso-standard>
     INPUT
-        #{HTML_HDR}
-        <br/>
-      <div class='Section3' id='A'>
-        <h1 class='IntroTitle'>ABC</h1>
-          </div>
-  <br/>
-  <div class='Section3' id='B'>
-    <h1 class='IntroTitle'>GHI</h1>
-  </div>
-  <br/>
-  <div class='Section3' id='C'>
-    <h1 class='IntroTitle'>DEF</h1>
-  </div>
-      <p class='zzSTDTitle1'/>
-    </div>
-  </body>
-</html>
+    <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+  <bibdata>
+    <language current='true'>en</language>
+    <script current='true'>Latn</script>
+  </bibdata>
+  <preface>
+    <clause id='A'>
+      <title depth='1'>ABC</title>
+    </clause>
+    <clause id='A1'>
+      <title depth='1'>ABC/DEF</title>
+    </clause>
+    <clause id='A2'>
+      <title depth='1'>ABC</title>
+    </clause>
+    <clause id='B'>
+      <title depth='1'>GHI/JKL</title>
+    </clause>
+    <clause id='C'>
+      <title depth='1'>DEF</title>
+    </clause>
+    <clause id='C1'>
+      <title depth='1'>ABC/DEF</title>
+    </clause>
+    <clause id='C2'>
+      <title depth='1'>DEF</title>
+    </clause>
+    <p>A B D E</p>
+  </preface>
+</iso-standard>
     OUTPUT
     end
 
@@ -989,6 +964,7 @@ it "cases xrefs" do
     <clause id="C">
     <p>This is <xref target="A"/> and <xref target="B"/>.
     This is <xref target="A" case="capital"/> and <xref target="B" case="lowercase"/>.
+    This is <xref target="A" case="lowercase"/> and <xref target="B" case="capital"/>.
     <xref target="A"/> is clause <em>initial.</em><br/>
     <xref target="A"/> is too.  </p>
     <p><xref target="A"/> is also.</p>
@@ -1011,11 +987,15 @@ INPUT
         This is 
         <xref target='A'>kla&#x16D;zo 1</xref>
          and 
-        <xref target='B'>Tabelo 1</xref>
+        <xref target='B'>tabelo 1</xref>
         . This is 
         <xref target='A' case='capital'>Kla&#x16D;zo 1</xref>
          and 
         <xref target='B' case='lowercase'>tabelo 1</xref>
+        . This is 
+        <xref target='A' case='lowercase'>kla&#x16D;zo 1</xref>
+         and 
+        <xref target='B' case='capital'>Tabelo 1</xref>
         . 
         <xref target='A'>Kla&#x16D;zo 1</xref>
          is clause