isodoc 1.2.4 → 1.3.0

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

@@ -68,9 +68,9 @@ RSpec.describe IsoDoc do
         INPUT
 
         presxml = <<~"PRESXML"
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <bibdata>
-           <language>en</language>
+           <language current="true">en</language>
          </bibdata>
          <preface>
            <foreword obligation='informative'>
@@ -226,12 +226,12 @@ PRESXML
            </body>
        </html>
     OUTPUT
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
   end
 
   it "defaults to English" do
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.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>tlh</language>
@@ -296,9 +296,9 @@ PRESXML
        </iso-standard>
         INPUT
         <?xml version='1.0'?>
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <bibdata>
-           <language>tlh</language>
+           <language current="true">tlh</language>
          </bibdata>
          <preface>
            <foreword obligation='informative'>
@@ -449,9 +449,9 @@ PRESXML
         INPUT
 
         presxml = <<~"PRESXML"
-        <iso-standard xmlns='http://riboseinc.com/isoxml'>
+        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <bibdata>
-           <language>fr</language>
+           <language current="true">fr</language>
          </bibdata>
          <preface>
            <foreword obligation='informative'>
@@ -607,7 +607,7 @@ PRESXML
            </body>
        </html>
     OUTPUT
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
   end
 
@@ -689,10 +689,10 @@ PRESXML
         INPUT
 
         presxml = <<~"PRESXML"
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <bibdata>
-           <language>zh</language>
-           <script>Hans</script>
+           <language current="true">zh</language>
+           <script current="true">Hans</script>
          </bibdata>
          <preface>
            <foreword obligation='informative'>
@@ -862,21 +862,31 @@ PRESXML
            </body>
        </html>
     OUTPUT
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
   end
 
   it "processes i18n file" do
+    mock_i18n
     input = <<~"INPUT"
       <iso-standard xmlns="http://riboseinc.com/isoxml">
       <bibdata>
       <language>eo</language>
       <script>Latn</script>
+      <status>
+      <stage>published</stage>
+      <substage>withdrawn</substage>
+      </status>
+      <ext>
+      <doctype>brochure</doctype>
+      </ext>
       </bibdata>
       <preface>
       <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>
@@ -908,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>
@@ -944,15 +955,57 @@ PRESXML
         INPUT
 
         presxml = <<~OUTPUT
-         <iso-standard xmlns="http://riboseinc.com/isoxml">
+         <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
              <bibdata>
-             <language>eo</language>
-             <script>Latn</script>
+             <language current="true">eo</language>
+             <script current="true">Latn</script>
+             <status>
+             <stage language=''>published</stage>
+<stage language='eo'>publikigita</stage>
+<substage language=''>withdrawn</substage>
+<substage language='eo'>fortirita</substage>
+</status>
+<ext>
+<doctype language=''>brochure</doctype>
+<doctype language='eo'>bro&#x15D;uro</doctype>
+</ext>
              </bibdata>
+  <localized-strings>
+  <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='source' language='eo'>SOURCE</localized-string>
+<localized-string key='modified' language='eo'>modified</localized-string>
+<localized-string key='scope' language='eo'>Amplekso</localized-string>
+<localized-string key='symbols' language='eo'>Simboloj kai mallongigitaj terminoj</localized-string>
+<localized-string key='annex' language='eo'>Aldono</localized-string>
+<localized-string key='normref' language='eo'>Normaj cita&#x135;oj</localized-string>
+<localized-string key='bibliography' language='eo'>Bibliografio</localized-string>
+<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>
+<localized-string key='stage_dict.published' language='eo'>publikigita</localized-string>
+<localized-string key='substage_dict.withdrawn' language='eo'>fortirita</localized-string>
+<localized-string key='array.0' language='eo'>elem1</localized-string>
+<localized-string key='array.1' language='eo'>elem2</localized-string>
+<localized-string key='array.2.elem3' language='eo'>elem4</localized-string>
+<localized-string key='array.2.elem5' language='eo'>elem6</localized-string>
+<localized-string key='language' language='eo'>eo</localized-string>
+<localized-string key='script' language='eo'>Latn</localized-string>
+</localized-strings>
              <preface>
              <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>
@@ -984,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>
@@ -1039,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'>
@@ -1091,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>
@@ -1128,4 +1194,11 @@ PRESXML
         expect(xmlpp(IsoDoc::PresentationXMLConvert.new({i18nyaml: "spec/assets/i18n.yaml"}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::HtmlConvert.new({i18nyaml: "spec/assets/i18n.yaml"}).convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
   end
+
+  private
+
+  def mock_i18n
+    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,61 +1,47 @@
 require "spec_helper"
 
 RSpec.describe IsoDoc do
-  it "cases xrefs" do
+   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">
     <sections>
     <clause id="A">
-    <table id="B">
-    </table>
+    <formula id="B">
+    </formula>
     </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>
+    This is <xref target="A" droploc="true"/> and <xref target="B" droploc="true"/>.</p>
 </clause>
 </sections>
 </iso-standard>
 INPUT
-<?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <sections>
     <clause id='A'>
-    <title>1.</title>
-      <table id='B'>
-        <name>Tabelo 1</name>
-      </table>
+      <title>1.</title>
+      <formula id='B'>
+        <name>1</name>
+      </formula>
     </clause>
     <clause id='C'>
-    <title>2.</title>
+      <title>2.</title>
       <p>
         This is
         <xref target='A'>kla&#x16D;zo 1</xref>
          and
-        <xref target='B'>Tabelo 1</xref>
+        <xref target='B'>kla&#x16D;zo 1, Formula (1)</xref>
         . This is
-        <xref target='A' case='capital'>Kla&#x16D;zo 1</xref>
+        <xref target='A' droploc='true'>1</xref>
          and
-        <xref target='B' case='lowercase'>tabelo 1</xref>
+        <xref target='B' droploc='true'>(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
+   end
 
   it "processes inline formatting" do
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
@@ -238,119 +224,132 @@ end
     </iso-standard>
     INPUT
     presxml = <<~OUTPUT
-       <iso-standard xmlns="http://riboseinc.com/isoxml">
-           <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
@@ -606,7 +605,7 @@ OUTPUT
     </iso-standard>
     INPUT
     presxml = <<~OUTPUT
-       <iso-standard xmlns="http://riboseinc.com/isoxml">
+       <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
            <preface><foreword>
            <p>
            <eref type="inline" bibitemid="ISO712" citeas="ISO 712">ISO 712</eref>
@@ -728,7 +727,7 @@ html = <<~OUTPUT
     </iso-standard>
     INPUT
     presxml = <<~OUTPUT
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <preface>
            <foreword>
              <p>
@@ -903,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>
@@ -911,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
 
@@ -947,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>
@@ -955,7 +973,7 @@ it "cases xrefs" do
 </iso-standard>
 INPUT
 <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <sections>
     <clause id='A'>
     <title>1.</title>
@@ -969,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