isodoc 1.6.2 → 1.6.7

data/spec/isodoc/postproc_spec.rb

@@ -3,7 +3,7 @@
 require "spec_helper"
 require "fileutils"
 
-OPTIONS = { wordstylesheet: "spec/assets/word.css",
+options = { wordstylesheet: "spec/assets/word.css",
             htmlstylesheet: "spec/assets/html.scss" }
 
 RSpec.describe IsoDoc do
@@ -191,6 +191,7 @@ RSpec.describe IsoDoc do
         htmlcoverpage: "spec/assets/htmlcover.html",
         htmlintropage: "spec/assets/htmlintro.html",
         scripts: "spec/assets/scripts.html",
+        scripts_override: "spec/assets/scripts_override.html",
         i18nyaml: "spec/assets/i18n.yaml",
         ulstyle: "l1",
         olstyle: "l2" },
@@ -215,6 +216,7 @@ RSpec.describe IsoDoc do
     expect(html).to match(/an empty html cover page/)
     expect(html).to match(/an empty html intro page/)
     expect(html).to match(/This is > a script/)
+    expect(html).to match(/This is > also a script/)
     expect(html).not_to match(/CDATA/)
     expect(html).to match(%r{Anta&#x16D;parolo</h1>})
     expect(html).to match(%r{html-override})
@@ -957,7 +959,9 @@ RSpec.describe IsoDoc do
   it "moves images in HTML, using relative file location" do
     FileUtils.rm_f "spec/test.html"
     FileUtils.rm_rf "spec/test_htmlimages"
-    IsoDoc::HtmlConvert.new({ wordstylesheet: "assets/word.css", htmlstylesheet: "assets/html.scss" })
+    IsoDoc::HtmlConvert
+      .new(wordstylesheet: "assets/word.css",
+           htmlstylesheet: "assets/html.scss")
       .convert("spec/test", <<~"INPUT", false)
          <iso-standard xmlns="http://riboseinc.com/isoxml">
          <preface><foreword>
@@ -996,14 +1000,15 @@ RSpec.describe IsoDoc do
   it "encodes images in HTML as data URIs" do
     FileUtils.rm_f "test.html"
     FileUtils.rm_rf "test_htmlimages"
-    IsoDoc::HtmlConvert.new({ htmlstylesheet: "spec/assets/html.scss", datauriimage: true })
+    IsoDoc::HtmlConvert
+      .new(htmlstylesheet: "spec/assets/html.scss", datauriimage: true)
       .convert("test", <<~"INPUT", false)
          <iso-standard xmlns="http://riboseinc.com/isoxml">
          <preface><foreword>
           <figure id="_">
           <name>Split-it-right sample divider</name>
-                   <image src="#{File.expand_path(File.join(File.dirname(__FILE__), '..', 'assets/rice_image1.png'))}" id="_" mimetype="image/png"/>
-                   <image src="spec/assets/rice_image1.png" id="_" mimetype="image/png"/>
+             <image src="#{File.expand_path(File.join(File.dirname(__FILE__), '..', 'assets/rice_image1.png'))}" id="_" mimetype="image/png"/>
+             <image src="spec/assets/rice_image1.png" id="_" mimetype="image/png"/>
         </figure>
         </foreword></preface>
          </iso-standard>
@@ -1011,7 +1016,8 @@ RSpec.describe IsoDoc do
     html = File.read("test.html")
       .sub(/^.*<main class="main-section">/m, '<main class="main-section">')
       .sub(%r{</main>.*$}m, "</main>")
-    expect(xmlpp(html.gsub(%r{src="data:image/png;base64,[^"]+"}, %{src="data:image/png;base64,_"})))
+    expect(xmlpp(html
+      .gsub(%r{src="data:image/png;base64,[^"]+"}, %{src="data:image/png;base64,_"})))
       .to be_equivalent_to xmlpp(<<~"OUTPUT")
             <main class="main-section"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
               <br />
@@ -1030,7 +1036,8 @@ RSpec.describe IsoDoc do
   it "encodes images in HTML as data URIs, using relative file location" do
     FileUtils.rm_f "spec/test.html"
     FileUtils.rm_rf "spec/test_htmlimages"
-    IsoDoc::HtmlConvert.new({ htmlstylesheet: "assets/html.scss", datauriimage: true })
+    IsoDoc::HtmlConvert
+      .new({ htmlstylesheet: "assets/html.scss", datauriimage: true })
       .convert("spec/test", <<~"INPUT", false)
          <iso-standard xmlns="http://riboseinc.com/isoxml">
          <preface><foreword>
@@ -1045,7 +1052,8 @@ RSpec.describe IsoDoc do
     html = File.read("spec/test.html")
       .sub(/^.*<main class="main-section">/m, '<main class="main-section">')
       .sub(%r{</main>.*$}m, "</main>")
-    expect(xmlpp(html.gsub(%r{src="data:image/png;base64,[^"]+"}, %{src="data:image/png;base64,_"})))
+    expect(xmlpp(html
+      .gsub(%r{src="data:image/png;base64,[^"]+"}, %{src="data:image/png;base64,_"})))
       .to be_equivalent_to xmlpp(<<~"OUTPUT")
             <main class="main-section"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
               <br />
@@ -1064,7 +1072,7 @@ RSpec.describe IsoDoc do
   it "processes IsoXML terms for HTML" do
     FileUtils.rm_f "test.html"
     FileUtils.rm_f "test.doc"
-    IsoDoc::HtmlConvert.new(OPTIONS)
+    IsoDoc::HtmlConvert.new(options)
       .convert("test", <<~"INPUT", false)
             <iso-standard xmlns="http://riboseinc.com/isoxml">
             <sections>
@@ -1121,7 +1129,7 @@ RSpec.describe IsoDoc do
   it "processes empty term modifications" do
     FileUtils.rm_f "test.html"
     FileUtils.rm_f "test.doc"
-    IsoDoc::HtmlConvert.new(OPTIONS)
+    IsoDoc::HtmlConvert.new(options)
       .convert("test", <<~"INPUT", false)
             <iso-standard xmlns="http://riboseinc.com/isoxml">
             <sections>
@@ -1158,7 +1166,7 @@ RSpec.describe IsoDoc do
   it "creates continuation styles for multiparagraph list items in Word" do
     FileUtils.rm_f "test.doc"
     FileUtils.rm_f "test.html"
-    IsoDoc::WordConvert.new(OPTIONS)
+    IsoDoc::WordConvert.new(options)
       .convert("test", <<~"INPUT", false)
             <iso-standard xmlns="http://riboseinc.com/isoxml">
             <preface><foreword>
@@ -1269,7 +1277,7 @@ RSpec.describe IsoDoc do
   it "does not lose HTML escapes in postprocessing" do
     FileUtils.rm_f "test.doc"
     FileUtils.rm_f "test.html"
-    IsoDoc::HtmlConvert.new(OPTIONS)
+    IsoDoc::HtmlConvert.new(options)
       .convert("test", <<~"INPUT", false)
             <iso-standard xmlns="http://riboseinc.com/isoxml">
             <preface><foreword>
@@ -1300,7 +1308,7 @@ RSpec.describe IsoDoc do
   it "does not lose HTML escapes in postprocessing (Word)" do
     FileUtils.rm_f "test.doc"
     FileUtils.rm_f "test.html"
-    IsoDoc::WordConvert.new(OPTIONS)
+    IsoDoc::WordConvert.new(options)
       .convert("test", <<~"INPUT", false)
             <iso-standard xmlns="http://riboseinc.com/isoxml">
             <preface><foreword>
@@ -1331,7 +1339,7 @@ RSpec.describe IsoDoc do
   it "propagates example style to paragraphs in postprocessing (Word)" do
     FileUtils.rm_f "test.doc"
     FileUtils.rm_f "test.html"
-    IsoDoc::WordConvert.new(OPTIONS).convert("test", <<~"INPUT", false)
+    IsoDoc::WordConvert.new(options).convert("test", <<~"INPUT", false)
           <iso-standard xmlns="http://riboseinc.com/isoxml">
           <preface><foreword>
           <example id="samplecode">
@@ -1362,7 +1370,7 @@ RSpec.describe IsoDoc do
   it "deals with image captions (Word)" do
     FileUtils.rm_f "test.doc"
     FileUtils.rm_f "test.html"
-    IsoDoc::WordConvert.new(OPTIONS)
+    IsoDoc::WordConvert.new(options)
       .convert("test", <<~"INPUT", false)
             <iso-standard xmlns="http://riboseinc.com/isoxml">
             <preface><foreword>
@@ -1396,7 +1404,7 @@ RSpec.describe IsoDoc do
   it "deals with empty table titles (Word)" do
     FileUtils.rm_f "test.doc"
     FileUtils.rm_f "test.html"
-    IsoDoc::WordConvert.new(OPTIONS)
+    IsoDoc::WordConvert.new(options)
       .convert("test", <<~"INPUT", false)
             <iso-standard xmlns="http://riboseinc.com/isoxml">
             <preface><foreword>
@@ -1457,22 +1465,21 @@ RSpec.describe IsoDoc do
   it "propagates alignment of table cells (Word)" do
     FileUtils.rm_f "test.doc"
     FileUtils.rm_f "test.html"
-    IsoDoc::WordConvert.new(OPTIONS)
+    IsoDoc::WordConvert.new(options)
       .convert("test", <<~"INPUT", false)
-        #{'                  '}
-                <iso-standard xmlns="http://riboseinc.com/isoxml">
-                          <preface><foreword>
-                      <table id="_fe12b8f8-6858-4cd6-af7d-d4b6f3ebd1a7" unnumbered="true"><thead><tr>
-                            <td rowspan="2" align="left">
-                              <p id="_c47d9b39-adb2-431d-9320-78cb148fdb56">Output wavelength</p>
-                              <p id="_c47d9b39-adb2-431d-9320-78cb148fdb57">Output wavelength</p>
-                            </td>
-                            <th colspan="3" align="right"><p id="_c47d9b39-adb2-431d-9320-78cb148fdb58">Predictive wavelengths</p></th>
-                          </tr>
-                          </thead>
-                          </table>
-                          </preface>
-                          </iso-standard>
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+                  <preface><foreword>
+              <table id="_fe12b8f8-6858-4cd6-af7d-d4b6f3ebd1a7" unnumbered="true"><thead><tr>
+                    <td rowspan="2" align="left">
+                      <p id="_c47d9b39-adb2-431d-9320-78cb148fdb56">Output wavelength</p>
+                      <p id="_c47d9b39-adb2-431d-9320-78cb148fdb57">Output wavelength</p>
+                    </td>
+                    <th colspan="3" align="right"><p id="_c47d9b39-adb2-431d-9320-78cb148fdb58">Predictive wavelengths</p></th>
+                  </tr>
+                  </thead>
+                  </table>
+                  </preface>
+                  </iso-standard>
       INPUT
     word = File.read("test.doc")
       .sub(/^.*<div class="WordSection2">/m, '<div class="WordSection2" xmlns:m="m">')
@@ -1517,7 +1524,7 @@ RSpec.describe IsoDoc do
   end
 
   it "cleans up boilerplate" do
-    expect(xmlpp(IsoDoc::HtmlConvert.new({ wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.scss", filename: "test" }).html_preface(Nokogiri::XML(<<~INPUT)).to_xml).sub(/^.*<main/m, "<main").sub(%r{</main>.*$}m, "</main>")).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       <html>
       <head/>
       <body>
@@ -1535,6 +1542,7 @@ RSpec.describe IsoDoc do
       </body>
       </html>
     INPUT
+    html = <<~OUTPUT
       <main class='main-section'>
         <button onclick='topFunction()' id='myBtn' title='Go to top'>Top</button>
         <hr/>
@@ -1552,27 +1560,7 @@ RSpec.describe IsoDoc do
         </div>
       </main>
     OUTPUT
-  end
-
-  it "cleans up boilerplate (Word)" do
-    expect(xmlpp(IsoDoc::WordConvert.new({ wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.scss", filename: "test" }).word_cleanup(Nokogiri::XML(<<~INPUT)).to_xml).sub(/^.*<main/m, "<main").sub(%r{</main>.*$}m, "</main>")).to be_equivalent_to xmlpp(<<~"OUTPUT")
-      <html>
-      <head/>
-      <body>
-      <div class="main-section">
-      <div id="boilerplate-copyright"> <h1>Copyright</h1> </div>
-      <div id="boilerplate-license"> <h1>License</h1> </div>
-      <div id="boilerplate-legal"> <h1>Legal</h1> </div>
-      <div id="boilerplate-feedback"> <h1>Feedback</h1> </div>
-      <hr/>
-      <div id="boilerplate-feedback-destination"/>
-      <div id="boilerplate-legal-destination"/>
-      <div id="boilerplate-license-destination"/>
-      <div id="boilerplate-copyright-destination"/>
-      </div>
-      </body>
-      </html>
-    INPUT
+    doc = <<~OUTPUT
           <html>
         <head/>
         <body>
@@ -1594,6 +1582,18 @@ RSpec.describe IsoDoc do
         </body>
       </html>
     OUTPUT
+    expect(xmlpp(IsoDoc::HtmlConvert
+      .new(wordstylesheet: "spec/assets/word.css",
+           htmlstylesheet: "spec/assets/html.scss", filename: "test")
+      .html_preface(Nokogiri::XML(input)).to_xml)
+      .sub(/^.*<main/m, "<main").sub(%r{</main>.*$}m, "</main>"))
+      .to be_equivalent_to xmlpp(html)
+    expect(xmlpp(IsoDoc::WordConvert
+      .new(wordstylesheet: "spec/assets/word.css",
+           htmlstylesheet: "spec/assets/html.scss", filename: "test")
+       .word_cleanup(Nokogiri::XML(input)).to_xml)
+       .sub(/^.*<main/m, "<main").sub(%r{</main>.*$}m, "</main>"))
+      .to be_equivalent_to xmlpp(doc)
   end
 
   it "deals with landscape and portrait pagebreaks (Word)" do
@@ -1796,7 +1796,7 @@ RSpec.describe IsoDoc do
   end
 
   it "expands out nested tables in Word" do
-    expect(xmlpp(IsoDoc::WordConvert.new({ wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.scss", filename: "test" }).word_cleanup(Nokogiri::XML(<<~INPUT)).to_xml).sub(/^.*<main/m, "<main").sub(%r{</main>.*$}m, "</main>")).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
           <html>
           <head/>
           <body>
@@ -1818,6 +1818,7 @@ RSpec.describe IsoDoc do
           </body>
           </html>
     INPUT
+    output = <<~OUTPUT
           <html>
         <head/>
         <body>
@@ -1913,10 +1914,16 @@ RSpec.describe IsoDoc do
         </body>
       </html>
     OUTPUT
+    expect(xmlpp(IsoDoc::WordConvert
+      .new(wordstylesheet: "spec/assets/word.css",
+           htmlstylesheet: "spec/assets/html.scss", filename: "test")
+      .word_cleanup(Nokogiri::XML(input)).to_xml)
+      .sub(/^.*<main/m, "<main").sub(%r{</main>.*$}m, "</main>"))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "allocate widths to tables (Word)" do
-    expect(xmlpp(IsoDoc::WordConvert.new({ wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.scss", filename: "test" }).word_cleanup(Nokogiri::XML(<<~INPUT)).to_xml).sub(/^.*<main/m, "<main").sub(%r{</main>.*$}m, "</main>")).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
              <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
                <head><style/></head>
                <body lang='EN-US' link='blue' vlink='#954F72'>
@@ -2050,6 +2057,7 @@ RSpec.describe IsoDoc do
                </body>
              </html>
     INPUT
+    output = <<~OUTPUT
       <html xmlns:epub='http://www.idpf.org/2007/ops' lang='en'>
                <head>
                  <style/>
@@ -2185,5 +2193,105 @@ RSpec.describe IsoDoc do
                </body>
              </html>
     OUTPUT
+    expect(xmlpp(IsoDoc::WordConvert
+      .new(wordstylesheet: "spec/assets/word.css",
+           htmlstylesheet: "spec/assets/html.scss", filename: "test")
+      .word_cleanup(Nokogiri::XML(input)).to_xml)
+      .sub(/^.*<main/m, "<main").sub(%r{</main>.*$}m, "</main>"))
+      .to be_equivalent_to xmlpp(output)
+  end
+
+  it "generates bare HTML file" do
+    FileUtils.rm_f "test.html"
+    IsoDoc::HtmlConvert.new(
+      { bare: true,
+        htmlstylesheet: "spec/assets/html.scss",
+        filename: "test" },
+    ).convert("test", <<~"INPUT", false)
+            <iso-standard xmlns="http://riboseinc.com/isoxml">
+              <bibdata>
+              <title language="en">test</title>
+              </bibdata>
+              <boilerplate>
+              <feedback-statement>
+              <clause><title>I am boilerplate</title></clause>
+              </feedback-statement>
+              </boilerplate>
+          <preface><foreword>
+          <note>
+        <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
+      </note>
+          </foreword></preface>
+          </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+      <body lang='en' xml:lang='en'>
+        <main class='main-section'>
+          <button onclick='topFunction()' id='myBtn' title='Go to top'>Top</button>
+          <br/>
+          <div>
+            <h1 class='ForewordTitle'>Foreword</h1>
+            <div class='Note'>
+              <p>
+                &#xA0; These results are based on a study carried out on three
+                different types of kernel.
+              </p>
+            </div>
+          </div>
+          <p class='zzSTDTitle1'>test</p>
+        </main>
+        <script/>
+      </body>
+    OUTPUT
+    expect(File.exist?("test.html")).to be true
+    html = File.read("test.html")
+      .sub(%r{^.*<body}m, "<body")
+      .sub(%r{</body>.*$}m, "</body>")
+      .gsub(%r{<script.+?</script>}m, "<script/>")
+      .sub(%r{(<script/>\s+)+}m, "<script/>")
+    expect(xmlpp(html)).to be_equivalent_to xmlpp(output)
+  end
+
+  it "cleans up lists (HTML)" do
+    input = <<~INPUT
+      <html xmlns:epub="http://www.idpf.org/2007/ops">
+      <head/>
+      <body>
+        <div class="main-section">
+        <ul>
+        <div>N1</div>
+        <li>A</li>
+        <li>B</li>
+        <div>N2</div>
+        <li>C</li>
+        <div>N3</div>
+        </div>
+      </body>
+      </html>
+    INPUT
+    output = <<~OUTPUT
+      <main class='main-section'>
+        <button onclick='topFunction()' id='myBtn' title='Go to top'>Top</button>
+        <ul>
+          <li>
+            A
+            <div>N1</div>
+          </li>
+          <li>
+            B
+            <div>N2</div>
+          </li>
+          <li>
+            C
+            <div>N3</div>
+          </li>
+        </ul>
+      </main>
+    OUTPUT
+    expect(xmlpp(IsoDoc::HtmlConvert
+  .new(htmlstylesheet: "spec/assets/html.scss", filename: "test")
+  .html_cleanup(Nokogiri::XML(input)).to_xml)
+  .sub(/^.*<main/m, "<main").sub(%r{</main>.*$}m, "</main>"))
+      .to be_equivalent_to xmlpp(output)
   end
 end

data/spec/isodoc/presentation_xml_spec.rb

@@ -20,36 +20,55 @@ RSpec.describe IsoDoc do
   end
 
   it "localises numbers in MathML" do
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
-      .convert("test", <<~INPUT, true)).sub(%r{<localized-strings>.*</localized-strings>}m, "")).to be_equivalent_to xmlpp(<<~OUTPUT)
-        <iso-standard xmlns="http://riboseinc.com/isoxml">
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <bibdata>
+           <title language="en">test</title>
+           </bibdata>
+           <preface>
+           <p>
+           <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>64212149677264515</mn></math></stem>
+           <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>642121496772645.15</mn></math></stem>
+           <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>30000</mn></math></stem>
+           <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>P</mi><mfenced open="(" close=")"><mrow><mi>X</mi><mo>≥</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mfenced><mo>=</mo><munderover><mrow><mo>∑</mo></mrow><mrow><mrow><mi>j</mi><mo>=</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mrow><mrow><mn>1000</mn></mrow></munderover><mfenced open="(" close=")"><mtable><mtr><mtd><mn>1000</mn></mtd></mtr><mtr><mtd><mi>j</mi></mtd></mtr></mtable></mfenced><msup><mrow><mi>p</mi></mrow><mrow><mi>j</mi></mrow></msup><msup><mrow><mfenced open="(" close=")"><mrow><mn>1</mn><mo>−</mo><mi>p</mi></mrow></mfenced></mrow><mrow><mrow><mn>1.003</mn><mo>−</mo><mi>j</mi></mrow></mrow></msup></math></stem></p>
+           </preface>
+      </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+        <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
         <bibdata>
-             <title language="en">test</title>
-             </bibdata>
-             <preface>
-             <p>
-             <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>64212149677264515</mn></math></stem>
-             <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>642121496772645.15</mn></math></stem>
-             <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>30000</mn></math></stem>
-             <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>P</mi><mfenced open="(" close=")"><mrow><mi>X</mi><mo>≥</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mfenced><mo>=</mo><munderover><mrow><mo>∑</mo></mrow><mrow><mrow><mi>j</mi><mo>=</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mrow><mrow><mn>1000</mn></mrow></munderover><mfenced open="(" close=")"><mtable><mtr><mtd><mn>1000</mn></mtd></mtr><mtr><mtd><mi>j</mi></mtd></mtr></mtable></mfenced><msup><mrow><mi>p</mi></mrow><mrow><mi>j</mi></mrow></msup><msup><mrow><mfenced open="(" close=")"><mrow><mn>1</mn><mo>−</mo><mi>p</mi></mrow></mfenced></mrow><mrow><mrow><mn>1.003</mn><mo>−</mo><mi>j</mi></mrow></mrow></msup></math></stem></p>
-             </preface>
-        </iso-standard>
-      INPUT
-          <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
-          <bibdata>
-            <title language='en'>test</title>
-          </bibdata>
-          <preface>
-            <p>
-              64,212,149,677,264,515
-              642,121,496,772,645.15 30,000
-              <stem type='MathML'>
-                <math xmlns='http://www.w3.org/1998/Math/MathML'>
-                  <mi>P</mi>
-                  <mfenced open='(' close=')'>
+          <title language='en'>test</title>
+        </bibdata>
+        <preface>
+          <p displayorder="1">
+            64,212,149,677,264,515
+            642,121,496,772,645.15 30,000
+            <stem type='MathML'>
+              <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                <mi>P</mi>
+                <mfenced open='(' close=')'>
+                  <mrow>
+                    <mi>X</mi>
+                    <mo>&#x2265;</mo>
+                    <msub>
+                      <mrow>
+                        <mi>X</mi>
+                      </mrow>
+                      <mrow>
+                        <mo>max</mo>
+                      </mrow>
+                    </msub>
+                  </mrow>
+                </mfenced>
+                <mo>=</mo>
+                <munderover>
+                  <mrow>
+                    <mo>&#x2211;</mo>
+                  </mrow>
+                  <mrow>
                     <mrow>
-                      <mi>X</mi>
-                      <mo>&#x2265;</mo>
+                      <mi>j</mi>
+                      <mo>=</mo>
                       <msub>
                         <mrow>
                           <mi>X</mi>
@@ -59,76 +78,61 @@ RSpec.describe IsoDoc do
                         </mrow>
                       </msub>
                     </mrow>
-                  </mfenced>
-                  <mo>=</mo>
-                  <munderover>
-                    <mrow>
-                      <mo>&#x2211;</mo>
-                    </mrow>
-                    <mrow>
-                      <mrow>
+                  </mrow>
+                  <mrow>
+                    <mn>1,000</mn>
+                  </mrow>
+                </munderover>
+                <mfenced open='(' close=')'>
+                  <mtable>
+                    <mtr>
+                      <mtd>
+                        <mn>1,000</mn>
+                      </mtd>
+                    </mtr>
+                    <mtr>
+                      <mtd>
                         <mi>j</mi>
-                        <mo>=</mo>
-                        <msub>
-                          <mrow>
-                            <mi>X</mi>
-                          </mrow>
-                          <mrow>
-                            <mo>max</mo>
-                          </mrow>
-                        </msub>
-                      </mrow>
-                    </mrow>
-                    <mrow>
-                      <mn>1,000</mn>
-                    </mrow>
-                  </munderover>
-                  <mfenced open='(' close=')'>
-                    <mtable>
-                      <mtr>
-                        <mtd>
-                          <mn>1,000</mn>
-                        </mtd>
-                      </mtr>
-                      <mtr>
-                        <mtd>
-                          <mi>j</mi>
-                        </mtd>
-                      </mtr>
-                    </mtable>
-                  </mfenced>
-                  <msup>
-                    <mrow>
-                      <mi>p</mi>
-                    </mrow>
-                    <mrow>
-                      <mi>j</mi>
-                    </mrow>
-                  </msup>
-                  <msup>
-                    <mrow>
-                      <mfenced open='(' close=')'>
-                        <mrow>
-                          <mn>1</mn>
-                          <mo>&#x2212;</mo>
-                          <mi>p</mi>
-                        </mrow>
-                      </mfenced>
-                    </mrow>
-                    <mrow>
+                      </mtd>
+                    </mtr>
+                  </mtable>
+                </mfenced>
+                <msup>
+                  <mrow>
+                    <mi>p</mi>
+                  </mrow>
+                  <mrow>
+                    <mi>j</mi>
+                  </mrow>
+                </msup>
+                <msup>
+                  <mrow>
+                    <mfenced open='(' close=')'>
                       <mrow>
-                        <mn>1.003</mn>
+                        <mn>1</mn>
                         <mo>&#x2212;</mo>
-                        <mi>j</mi>
+                        <mi>p</mi>
                       </mrow>
+                    </mfenced>
+                  </mrow>
+                  <mrow>
+                    <mrow>
+                      <mn>1.003</mn>
+                      <mo>&#x2212;</mo>
+                      <mi>j</mi>
                     </mrow>
-                  </msup>
-                </math>
-              </stem>
-            </p>
-          </preface>
-        </iso-standard>
-      OUTPUT
+                  </mrow>
+                </msup>
+              </math>
+            </stem>
+          </p>
+        </preface>
+      </iso-standard>
+    OUTPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))
+      .sub(%r{<localized-strings>.*</localized-strings>}m, ""))
+      .to be_equivalent_to xmlpp(output)
   end
 
   context "when twitter_cldr_localiser_symbols has additional options" do
@@ -252,7 +256,7 @@ RSpec.describe IsoDoc do
           </bibdata>
 
           <preface>
-            <p>
+            <p displayorder="1">
               30,000
               <stem type='MathML'>
                 <math xmlns='http://www.w3.org/1998/Math/MathML'>
@@ -369,7 +373,8 @@ RSpec.describe IsoDoc do
 
     before do
       allow_any_instance_of(IsoDoc::PresentationXMLConvert)
-        .to(receive(:twitter_cldr_localiser_symbols).and_return(additional_symbols))
+        .to(receive(:twitter_cldr_localiser_symbols)
+        .and_return(additional_symbols))
     end
 
     it "Supports twitter_cldr_localiser_symbols fraction options" do
@@ -381,34 +386,53 @@ RSpec.describe IsoDoc do
   end
 
   it "localises numbers in MathML in French" do
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
-      .convert("test", <<~INPUT, true)).sub(%r{<localized-strings>.*</localized-strings>}m, "")).to be_equivalent_to xmlpp(<<~OUTPUT)
-        <iso-standard xmlns="http://riboseinc.com/isoxml">
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <bibdata>
+           <title language="en">test</title>
+           <language>fr</language>
+           </bibdata>
+           <preface>
+           <p><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>30000</mn></math>
+           <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>P</mi><mfenced open="(" close=")"><mrow><mi>X</mi><mo>≥</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mfenced><mo>=</mo><munderover><mrow><mo>∑</mo></mrow><mrow><mrow><mi>j</mi><mo>=</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mrow><mrow><mn>1000</mn></mrow></munderover><mfenced open="(" close=")"><mtable><mtr><mtd><mn>1000</mn></mtd></mtr><mtr><mtd><mi>j</mi></mtd></mtr></mtable></mfenced><msup><mrow><mi>p</mi></mrow><mrow><mi>j</mi></mrow></msup><msup><mrow><mfenced open="(" close=")"><mrow><mn>1</mn><mo>−</mo><mi>p</mi></mrow></mfenced></mrow><mrow><mrow><mn>1.003</mn><mo>−</mo><mi>j</mi></mrow></mrow></msup></math></stem></p>
+           </preface>
+      </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+        <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
         <bibdata>
-             <title language="en">test</title>
-             <language>fr</language>
-             </bibdata>
-             <preface>
-             <p><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>30000</mn></math>
-             <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>P</mi><mfenced open="(" close=")"><mrow><mi>X</mi><mo>≥</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mfenced><mo>=</mo><munderover><mrow><mo>∑</mo></mrow><mrow><mrow><mi>j</mi><mo>=</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mrow><mrow><mn>1000</mn></mrow></munderover><mfenced open="(" close=")"><mtable><mtr><mtd><mn>1000</mn></mtd></mtr><mtr><mtd><mi>j</mi></mtd></mtr></mtable></mfenced><msup><mrow><mi>p</mi></mrow><mrow><mi>j</mi></mrow></msup><msup><mrow><mfenced open="(" close=")"><mrow><mn>1</mn><mo>−</mo><mi>p</mi></mrow></mfenced></mrow><mrow><mrow><mn>1.003</mn><mo>−</mo><mi>j</mi></mrow></mrow></msup></math></stem></p>
-             </preface>
-        </iso-standard>
-      INPUT
-          <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
-          <bibdata>
-            <title language='en'>test</title>
-            <language current='true'>fr</language>
-          </bibdata>
-          <preface>
-            <p>
-              30&#x202F;000
-              <stem type='MathML'>
-                <math xmlns='http://www.w3.org/1998/Math/MathML'>
-                  <mi>P</mi>
-                  <mfenced open='(' close=')'>
+          <title language='en'>test</title>
+          <language current='true'>fr</language>
+        </bibdata>
+        <preface>
+          <p displayorder="1">
+            30&#x202F;000
+            <stem type='MathML'>
+              <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                <mi>P</mi>
+                <mfenced open='(' close=')'>
+                  <mrow>
+                    <mi>X</mi>
+                    <mo>&#x2265;</mo>
+                    <msub>
+                      <mrow>
+                        <mi>X</mi>
+                      </mrow>
+                      <mrow>
+                        <mo>max</mo>
+                      </mrow>
+                    </msub>
+                  </mrow>
+                </mfenced>
+                <mo>=</mo>
+                <munderover>
+                  <mrow>
+                    <mo>&#x2211;</mo>
+                  </mrow>
+                  <mrow>
                     <mrow>
-                      <mi>X</mi>
-                      <mo>&#x2265;</mo>
+                      <mi>j</mi>
+                      <mo>=</mo>
                       <msub>
                         <mrow>
                           <mi>X</mi>
@@ -418,109 +442,113 @@ RSpec.describe IsoDoc do
                         </mrow>
                       </msub>
                     </mrow>
-                  </mfenced>
-                  <mo>=</mo>
-                  <munderover>
-                    <mrow>
-                      <mo>&#x2211;</mo>
-                    </mrow>
-                    <mrow>
-                      <mrow>
+                  </mrow>
+                  <mrow>
+                    <mn>1&#x202F;000</mn>
+                  </mrow>
+                </munderover>
+                <mfenced open='(' close=')'>
+                  <mtable>
+                    <mtr>
+                      <mtd>
+                        <mn>1&#x202F;000</mn>
+                      </mtd>
+                    </mtr>
+                    <mtr>
+                      <mtd>
                         <mi>j</mi>
-                        <mo>=</mo>
-                        <msub>
-                          <mrow>
-                            <mi>X</mi>
-                          </mrow>
-                          <mrow>
-                            <mo>max</mo>
-                          </mrow>
-                        </msub>
-                      </mrow>
-                    </mrow>
-                    <mrow>
-                      <mn>1&#x202F;000</mn>
-                    </mrow>
-                  </munderover>
-                  <mfenced open='(' close=')'>
-                    <mtable>
-                      <mtr>
-                        <mtd>
-                          <mn>1&#x202F;000</mn>
-                        </mtd>
-                      </mtr>
-                      <mtr>
-                        <mtd>
-                          <mi>j</mi>
-                        </mtd>
-                      </mtr>
-                    </mtable>
-                  </mfenced>
-                  <msup>
-                    <mrow>
-                      <mi>p</mi>
-                    </mrow>
-                    <mrow>
-                      <mi>j</mi>
-                    </mrow>
-                  </msup>
-                  <msup>
-                    <mrow>
-                      <mfenced open='(' close=')'>
-                        <mrow>
-                          <mn>1</mn>
-                          <mo>&#x2212;</mo>
-                          <mi>p</mi>
-                        </mrow>
-                      </mfenced>
-                    </mrow>
-                    <mrow>
+                      </mtd>
+                    </mtr>
+                  </mtable>
+                </mfenced>
+                <msup>
+                  <mrow>
+                    <mi>p</mi>
+                  </mrow>
+                  <mrow>
+                    <mi>j</mi>
+                  </mrow>
+                </msup>
+                <msup>
+                  <mrow>
+                    <mfenced open='(' close=')'>
                       <mrow>
-                        <mn>1,003</mn>
+                        <mn>1</mn>
                         <mo>&#x2212;</mo>
-                        <mi>j</mi>
+                        <mi>p</mi>
                       </mrow>
+                    </mfenced>
+                  </mrow>
+                  <mrow>
+                    <mrow>
+                      <mn>1,003</mn>
+                      <mo>&#x2212;</mo>
+                      <mi>j</mi>
                     </mrow>
-                  </msup>
-                </math>
-              </stem>
-            </p>
-          </preface>
-        </iso-standard>
-      OUTPUT
+                  </mrow>
+                </msup>
+              </math>
+            </stem>
+          </p>
+        </preface>
+      </iso-standard>
+    OUTPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))
+      .sub(%r{<localized-strings>.*</localized-strings>}m, ""))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "customises localisation of numbers" do
     mock_symbols
-    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>
-             <title language="en">test</title>
-             <language>fr</language>
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <bibdata>
+           <title language="en">test</title>
+           <language>fr</language>
+           </bibdata>
+           <preface>
+           <p><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>30000</mn></math></stem>
+           <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>P</mi><mfenced open="(" close=")"><mrow><mi>X</mi><mo>≥</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mfenced><mo>=</mo><munderover><mrow><mo>∑</mo></mrow><mrow><mrow><mi>j</mi><mo>=</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mrow><mrow><mn>1000</mn></mrow></munderover><mfenced open="(" close=")"><mtable><mtr><mtd><mn>1000</mn></mtd></mtr><mtr><mtd><mi>j</mi></mtd></mtr></mtable></mfenced><msup><mrow><mi>p</mi></mrow><mrow><mi>j</mi></mrow></msup><msup><mrow><mfenced open="(" close=")"><mrow><mn>0.0000032</mn><mo>−</mo><mi>p</mi></mrow></mfenced></mrow><mrow><mrow><mn>1.003</mn><mo>−</mo><mi>j</mi></mrow></mrow></msup></math></stem></p>
+           </preface>
+      </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+      <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+             <bibdata>
+               <title language='en'>test</title>
+               <language current='true'>fr</language>
              </bibdata>
-             <preface>
-             <p><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>30000</mn></math></stem>
-             <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>P</mi><mfenced open="(" close=")"><mrow><mi>X</mi><mo>≥</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mfenced><mo>=</mo><munderover><mrow><mo>∑</mo></mrow><mrow><mrow><mi>j</mi><mo>=</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mrow><mrow><mn>1000</mn></mrow></munderover><mfenced open="(" close=")"><mtable><mtr><mtd><mn>1000</mn></mtd></mtr><mtr><mtd><mi>j</mi></mtd></mtr></mtable></mfenced><msup><mrow><mi>p</mi></mrow><mrow><mi>j</mi></mrow></msup><msup><mrow><mfenced open="(" close=")"><mrow><mn>0.0000032</mn><mo>−</mo><mi>p</mi></mrow></mfenced></mrow><mrow><mrow><mn>1.003</mn><mo>−</mo><mi>j</mi></mrow></mrow></msup></math></stem></p>
-             </preface>
-        </iso-standard>
-      INPUT
-        <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
-               <bibdata>
-                 <title language='en'>test</title>
-                 <language current='true'>fr</language>
-               </bibdata>
 
-               <preface>
-                 <p>
-                   30'000
-                   <stem type='MathML'>
-                     <math xmlns='http://www.w3.org/1998/Math/MathML'>
-                       <mi>P</mi>
-                       <mfenced open='(' close=')'>
+             <preface>
+               <p displayorder="1">
+                 30'000
+                 <stem type='MathML'>
+                   <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                     <mi>P</mi>
+                     <mfenced open='(' close=')'>
+                       <mrow>
+                         <mi>X</mi>
+                         <mo>&#x2265;</mo>
+                         <msub>
+                           <mrow>
+                             <mi>X</mi>
+                           </mrow>
+                           <mrow>
+                             <mo>max</mo>
+                           </mrow>
+                         </msub>
+                       </mrow>
+                     </mfenced>
+                     <mo>=</mo>
+                     <munderover>
+                       <mrow>
+                         <mo>&#x2211;</mo>
+                       </mrow>
+                       <mrow>
                          <mrow>
-                           <mi>X</mi>
-                           <mo>&#x2265;</mo>
+                           <mi>j</mi>
+                           <mo>=</mo>
                            <msub>
                              <mrow>
                                <mi>X</mi>
@@ -530,81 +558,130 @@ RSpec.describe IsoDoc do
                              </mrow>
                            </msub>
                          </mrow>
-                       </mfenced>
-                       <mo>=</mo>
-                       <munderover>
-                         <mrow>
-                           <mo>&#x2211;</mo>
-                         </mrow>
-                         <mrow>
-                           <mrow>
+                       </mrow>
+                       <mrow>
+                         <mn>1'000</mn>
+                       </mrow>
+                     </munderover>
+                     <mfenced open='(' close=')'>
+                       <mtable>
+                         <mtr>
+                           <mtd>
+                             <mn>1'000</mn>
+                           </mtd>
+                         </mtr>
+                         <mtr>
+                           <mtd>
                              <mi>j</mi>
-                             <mo>=</mo>
-                             <msub>
-                               <mrow>
-                                 <mi>X</mi>
-                               </mrow>
-                               <mrow>
-                                 <mo>max</mo>
-                               </mrow>
-                             </msub>
-                           </mrow>
-                         </mrow>
-                         <mrow>
-                           <mn>1'000</mn>
-                         </mrow>
-                       </munderover>
-                       <mfenced open='(' close=')'>
-                         <mtable>
-                           <mtr>
-                             <mtd>
-                               <mn>1'000</mn>
-                             </mtd>
-                           </mtr>
-                           <mtr>
-                             <mtd>
-                               <mi>j</mi>
-                             </mtd>
-                           </mtr>
-                         </mtable>
-                       </mfenced>
-                       <msup>
-                         <mrow>
-                           <mi>p</mi>
-                         </mrow>
-                         <mrow>
-                           <mi>j</mi>
-                         </mrow>
-                       </msup>
-                       <msup>
-                         <mrow>
-                           <mfenced open='(' close=')'>
-                             <mrow>
-                               <mn>0,0000032</mn>
-                               <mo>&#x2212;</mo>
-                               <mi>p</mi>
-                             </mrow>
-                           </mfenced>
-                         </mrow>
-                         <mrow>
+                           </mtd>
+                         </mtr>
+                       </mtable>
+                     </mfenced>
+                     <msup>
+                       <mrow>
+                         <mi>p</mi>
+                       </mrow>
+                       <mrow>
+                         <mi>j</mi>
+                       </mrow>
+                     </msup>
+                     <msup>
+                       <mrow>
+                         <mfenced open='(' close=')'>
                            <mrow>
-                             <mn>1,003</mn>
+                             <mn>0,0000032</mn>
                              <mo>&#x2212;</mo>
-                             <mi>j</mi>
+                             <mi>p</mi>
                            </mrow>
+                         </mfenced>
+                       </mrow>
+                       <mrow>
+                         <mrow>
+                           <mn>1,003</mn>
+                           <mo>&#x2212;</mo>
+                           <mi>j</mi>
                          </mrow>
-                       </msup>
-                     </math>
-                   </stem>
-                 </p>
-               </preface>
-             </iso-standard>
-      OUTPUT
+                       </mrow>
+                     </msup>
+                   </math>
+                 </stem>
+               </p>
+             </preface>
+           </iso-standard>
+    OUTPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))
+      .sub(%r{<localized-strings>.*</localized-strings>}m, ""))
+      .to be_equivalent_to xmlpp(output)
+  end
+
+  it "resolve address components" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <bibdata>
+      <contributor>
+                 <role type='author'/>
+                 <person>
+                   <name>
+                     <completename>Fred Flintstone</completename>
+                   </name>
+                   <affiliation>
+                     <organization>
+                       <name>Slate Rock and Gravel Company</name>
+                       <address>
+                         <street>1 Infinity Loop</street>
+                         <city>Cupertino</city>
+                         <state>CA</state>
+                         <country>USA</country>
+                         <postcode>95014</postcode>
+                       </address>
+                     </organization>
+                   </affiliation>
+                 </person>
+               </contributor>
+      </bibdata>
+      </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+          <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+        <bibdata>
+          <contributor>
+            <role type='author'/>
+            <person>
+              <name>
+                <completename>Fred Flintstone</completename>
+              </name>
+              <affiliation>
+                <organization>
+                  <name>Slate Rock and Gravel Company</name>
+                  <address>
+                    <formattedAddress>
+                      1 Infinity Loop
+                      <br/>
+                      Cupertino
+                      <br/>
+                      CA
+                      <br/>
+                      USA 95014
+                    </formattedAddress>
+                  </address>
+                </organization>
+              </affiliation>
+            </person>
+          </contributor>
+        </bibdata>
+      </iso-standard>
+    OUTPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))
+      .sub(%r{<localized-strings>.*</localized-strings>}m, ""))
+      .to be_equivalent_to xmlpp(output)
   end
 
   private
 
   def mock_symbols
-    allow_any_instance_of(::IsoDoc::PresentationXMLConvert).to receive(:twitter_cldr_localiser_symbols).and_return(group: "'")
+    allow_any_instance_of(::IsoDoc::PresentationXMLConvert)
+      .to receive(:twitter_cldr_localiser_symbols).and_return(group: "'")
   end
 end