RubyGems - isodoc - Versions diffs - 1.7.5 → 1.8.0 - Mend

isodoc 1.7.5 → 1.8.0

Files changed (45) hide show

checksums.yaml +4 -4
data/isodoc.gemspec +8 -7
data/lib/isodoc/class_utils.rb +25 -2
data/lib/isodoc/convert.rb +2 -0
data/lib/isodoc/function/cleanup.rb +4 -0
data/lib/isodoc/function/to_word_html.rb +2 -1
data/lib/isodoc/function/utils.rb +34 -14
data/lib/isodoc/html_function/comments.rb +107 -111
data/lib/isodoc/html_function/footnotes.rb +68 -67
data/lib/isodoc/html_function/html.rb +113 -103
data/lib/isodoc/presentation_function/block.rb +1 -69
data/lib/isodoc/presentation_function/image.rb +112 -0
data/lib/isodoc/presentation_function/inline.rb +16 -78
data/lib/isodoc/presentation_function/terms.rb +179 -0
data/lib/isodoc/presentation_xml_convert.rb +11 -4
data/lib/isodoc/version.rb +1 -1
data/lib/isodoc/word_function/body.rb +176 -174
data/lib/isodoc/word_function/comments.rb +117 -112
data/lib/isodoc/word_function/footnotes.rb +88 -86
data/lib/isodoc/word_function/inline.rb +42 -67
data/lib/isodoc/word_function/postprocess.rb +184 -176
data/lib/isodoc/word_function/postprocess_cover.rb +121 -110
data/lib/isodoc/xref/xref_gen.rb +153 -150
data/lib/isodoc/xref/xref_sect_gen.rb +134 -129
data/lib/isodoc/xslfo_convert.rb +11 -7
data/lib/isodoc-yaml/i18n-ar.yaml +22 -0
data/lib/isodoc-yaml/i18n-de.yaml +20 -0
data/lib/isodoc-yaml/i18n-en.yaml +20 -0
data/lib/isodoc-yaml/i18n-es.yaml +20 -0
data/lib/isodoc-yaml/i18n-fr.yaml +20 -0
data/lib/isodoc-yaml/i18n-ru.yaml +21 -1
data/lib/isodoc-yaml/i18n-zh-Hans.yaml +21 -0
data/lib/metanorma/output/xslfo.rb +4 -11
data/spec/assets/i18n.yaml +3 -1
data/spec/assets/odf.svg +1 -4
data/spec/isodoc/blocks_spec.rb +229 -157
data/spec/isodoc/i18n_spec.rb +8 -8
data/spec/isodoc/inline_spec.rb +285 -32
data/spec/isodoc/postproc_spec.rb +38 -0
data/spec/isodoc/presentation_xml_spec.rb +60 -0
data/spec/isodoc/section_spec.rb +11 -10
data/spec/isodoc/terms_spec.rb +354 -34
data/spec/isodoc/xref_spec.rb +4 -4
data/spec/isodoc/xslfo_convert_spec.rb +34 -9
metadata +49 -33

data/spec/isodoc/inline_spec.rb CHANGED Viewed

@@ -413,32 +413,32 @@ RSpec.describe IsoDoc do
   it "processes concept attributes" do
     input = <<~INPUT
-       <iso-standard xmlns="http://riboseinc.com/isoxml">
-       <preface><foreword>
-       <p>
-       <ul>
-       <li><concept ital="true"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
-       <li><concept ref="true"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
-       <li><concept ital="true" ref="true"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
-       <li><concept ital="false"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
-       <li><concept ref="false"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
-       <li><concept ital="false" ref="false"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
-       <li><concept ital="true" ref="true" linkmention="true" linkref="true"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
-       <li><concept ital="true" ref="true" linkmention="true" linkref="false"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
-       <li><concept ital="true" ref="true" linkmention="false" linkref="true"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
-       <li><concept ital="true" ref="true" linkmention="false" linkref="false"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
-       <li><concept ital="true" ref="true" linkmention="true" linkref="true"><strong>error!</strong></concept></li>
-       <li><concept ital="false" ref="false" linkmention="true">
-<refterm>CV_DiscreteCoverage</refterm>
-<renderterm>CV_DiscreteCoverage</renderterm>
-<xref target="term-cv_discretecoverage"/>
-</concept></li>
-        </ul></p>
-         </foreword></preface>
-       <sections>
-       <clause id="clause1"><title>Clause 1</title></clause>
-       </sections>
-      </iso-standard>
+             <iso-standard xmlns="http://riboseinc.com/isoxml">
+             <preface><foreword>
+             <p>
+             <ul>
+             <li><concept ital="true"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
+             <li><concept ref="true"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
+             <li><concept ital="true" ref="true"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
+             <li><concept ital="false"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
+             <li><concept ref="false"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
+             <li><concept ital="false" ref="false"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
+             <li><concept ital="true" ref="true" linkmention="true" linkref="true"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
+             <li><concept ital="true" ref="true" linkmention="true" linkref="false"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
+             <li><concept ital="true" ref="true" linkmention="false" linkref="true"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
+             <li><concept ital="true" ref="true" linkmention="false" linkref="false"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
+             <li><concept ital="true" ref="true" linkmention="true" linkref="true"><strong>error!</strong></concept></li>
+             <li><concept ital="false" ref="false" linkmention="true">
+      <refterm>CV_DiscreteCoverage</refterm>
+      <renderterm>CV_DiscreteCoverage</renderterm>
+      <xref target="term-cv_discretecoverage"/>
+      </concept></li>
+              </ul></p>
+               </foreword></preface>
+             <sections>
+             <clause id="clause1"><title>Clause 1</title></clause>
+             </sections>
+            </iso-standard>
     INPUT
     presxml = <<~OUTPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
@@ -625,6 +625,84 @@ RSpec.describe IsoDoc do
       .convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
   end
+  it "processes related terms" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <sections>
+      <terms id='A' obligation='normative'>
+            <title>Terms and definitions</title>
+            <term id='second'>
+        <preferred>
+          <expression>
+            <name>Second Term</name>
+          </expression>
+        </preferred>
+        <usageinfo>
+          <p id='B'>Usage Info 1.</p>
+        </usageinfo>
+        <definition><verbaldefinition>Definition 1</verbaldefinition></definition>
+      </term>
+      <term id="C">
+      <preferred language='fr' script='Latn' type='prefix'>
+                <expression>
+                  <name>First Designation</name>
+                  </expression></preferred>
+        <related type='contrast'>
+          <preferred>
+            <expression>
+              <name>Fifth Designation</name>
+              <grammar>
+                <gender>neuter</gender>
+              </grammar>
+            </expression>
+          </preferred>
+          <xref target='second'/>
+        </related>
+        <definition><verbaldefinition>Definition 2</verbaldefinition></definition>
+      </term>
+          </terms>
+        </sections>
+      </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+           <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+         <sections>
+           <terms id='A' obligation='normative' displayorder='1'>
+             <title depth='1'>
+               1.
+               <tab/>
+               Terms and definitions
+             </title>
+             <term id='second'>
+               <name>1.1.</name>
+               <preferred>Second Term</preferred>
+               <usageinfo>
+                 <p id='B'>Usage Info 1.</p>
+               </usageinfo>
+               <definition>Definition 1</definition>
+             </term>
+             <term id='C'>
+               <name>1.2.</name>
+               <preferred language='fr' script='Latn' type='prefix'>First Designation</preferred>
+               <p>
+                 <strong>CONTRAST:</strong>
+                 <em>
+                   <preferred>Fifth Designation neut</preferred>
+                 </em>
+                  (
+                 <xref target='second'>Clause 1.1</xref>
+                 )
+               </p>
+               <definition>Definition 2</definition>
+             </term>
+           </terms>
+         </sections>
+       </iso-standard>
+    OUTPUT
+   expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
+  end
   it "processes embedded inline formatting" do
     input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -1388,6 +1466,65 @@ RSpec.describe IsoDoc do
       .convert("test", presxml, true))).to be_equivalent_to xmlpp(word)
   end
+  it "processes eref content with Unicode characters" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <preface><foreword>
+      <p>
+      <eref type="inline" bibitemid="ISO712" citeas="BSI BS EN ISO 19011:2018&#8201;&#8212;&#8201;TC"/>
+      </foreword></preface>
+              <bibliography>
+          <references id='_normative_references' obligation='informative' normative='true' displayorder="2">
+          <title>Normative References</title>
+            <bibitem id='ISO712' type='standard'>
+              <title format='text/plain'>Cereals and cereal products</title>
+              <uri type='citation'>http://www.example.com</uri>
+              <docidentifier>ISO 712</docidentifier>
+              <contributor>
+                <role type='publisher'/>
+                <organization>
+                  <abbreviation>ISO</abbreviation>
+                </organization>
+              </contributor>
+            </bibitem>
+           </references></bibliography>
+      </iso-standard>
+    INPUT
+    presxml = <<~OUTPUT
+      <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+        <preface>
+          <foreword displayorder='1'>
+            <p>
+              <eref type='inline' bibitemid='ISO712' citeas='BSI BS EN ISO 19011:2018&#x2009;&#x2014;&#x2009;TC'>BSI BS EN ISO 19011:2018&#x2009;&#x2014;&#x2009;TC</eref>
+            </p>
+          </foreword>
+          <bibliography displayorder='2'>
+            <references id='_normative_references' obligation='informative' normative='true' displayorder='3'>
+              <title depth='1'>
+                1.
+                <tab/>
+                Normative References
+              </title>
+              <bibitem id='ISO712' type='standard'>
+                <title format='text/plain'>Cereals and cereal products</title>
+                <uri type='citation'>http://www.example.com</uri>
+                <docidentifier>ISO 712</docidentifier>
+                <contributor>
+                  <role type='publisher'/>
+                  <organization>
+                    <abbreviation>ISO</abbreviation>
+                  </organization>
+                </contributor>
+              </bibitem>
+            </references>
+          </bibliography>
+        </preface>
+      </iso-standard>
+    OUTPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+  end
   it "processes variant" do
     input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -1446,6 +1583,122 @@ RSpec.describe IsoDoc do
   end
   it "cases xrefs" do
+    input = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface>
+          <clause id="CC"><title>Introduction</title></clause>
+          <sections>
+          <clause id="A">
+          <table id="B">
+          </table>
+          <figure id="B1"/>
+          <example id="B2"/>
+          </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"/>.
+          This is <xref target="A" case="lowercase"/> and <xref target="B" case="capital"/>.
+          Downcasing an xref affects only the first letter: <xref target="B2" case="lowercase"/>.
+          Capitalising an xref affects only the first letter: <xref target="B1" case="capital"/>.
+          <xref target="A"/> is clause <em>initial.</em><br/>
+          <xref target="A"/> is too.  </p>
+          <p><xref target="A"/> is also.</p>
+          <p>Annex has formatting, and crossreferences ignore it when determining casing. <xref target="AA"/>.</p>
+          <p>Labels are not subject to casing: <xref target="CC" case="lowercase"/>
+      </clause>
+      <annex id="AA">
+      <clause id="AA1"/>
+      </annex>
+      </sections>
+      </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+      <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+        <preface>
+          <clause id='CC' displayorder='1'>
+            <title depth='1'>Introduction</title>
+          </clause>
+          <sections displayorder='2'>
+            <clause id='A' displayorder='3'>
+              <title>1.</title>
+              <table id='B'>
+                <name>Tabelo 1</name>
+              </table>
+              <figure id='B1'>
+                <name>Figur-etikedo duvorta 1</name>
+              </figure>
+              <example id='B2'>
+                <name>Ekzempl-etikedo Duvorta</name>
+              </example>
+            </clause>
+            <clause id='C' displayorder='4'>
+              <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>
+                . This is
+                <xref target='A' case='lowercase'>kla&#x16D;zo 1</xref>
+                 and
+                <xref target='B' case='capital'>Tabelo 1</xref>
+                . Downcasing an xref affects only the first letter:
+                <xref target='B2' case='lowercase'>kla&#x16D;zo 1, Example</xref>
+                . Capitalising an xref affects only the first letter:
+                <xref target='B1' case='capital'>Figur-etikedo duvorta 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>
+              <p>
+                Annex has formatting, and crossreferences ignore it when determining
+                casing.
+                <xref target='AA'>
+                  <strong>Aldono</strong>
+                   A
+                </xref>
+                .
+              </p>
+              <p>
+                Labels are not subject to casing:
+                <xref target='CC' case='lowercase'>Introduction</xref>
+              </p>
+              <annex id='AA' displayorder='5'>
+                <title>
+                  <strong>
+                    <strong>Aldono</strong>
+                     A
+                  </strong>
+                  <br/>
+                  (informa)
+                </title>
+                <clause id='AA1'>
+                  <title>A.1.</title>
+                </clause>
+              </annex>
+            </clause>
+          </sections>
+        </preface>
+      </iso-standard>
+    OUTPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert
+      .new({ i18nyaml: "spec/assets/i18n.yaml" })
+      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
+  end
+  it "ignores casing of xrefs in unicameral scripts" do
     input = <<~INPUT
           <iso-standard xmlns="http://riboseinc.com/isoxml">
           <sections>
@@ -1482,23 +1735,23 @@ RSpec.describe IsoDoc do
                and
               <xref target='B'>tabelo 1</xref>
               . This is
-              <xref target='A' case='capital'>Kla&#x16D;zo 1</xref>
+              <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='B' case='capital'>tabelo 1</xref>
               .
-              <xref target='A'>Kla&#x16D;zo 1</xref>
+              <xref target='A'>kla&#x16D;zo 1</xref>
                is clause
               <em>initial.</em>
               <br/>
-              <xref target='A'>Kla&#x16D;zo 1</xref>
+              <xref target='A'>kla&#x16D;zo 1</xref>
                is too.
             </p>
             <p>
-              <xref target='A'>Kla&#x16D;zo 1</xref>
+              <xref target='A'>kla&#x16D;zo 1</xref>
                is also.
             </p>
           </clause>
@@ -1506,7 +1759,7 @@ RSpec.describe IsoDoc do
       </iso-standard>
     OUTPUT
     expect(xmlpp(IsoDoc::PresentationXMLConvert
-      .new({ i18nyaml: "spec/assets/i18n.yaml" })
+      .new({ i18nyaml: "spec/assets/i18n.yaml", script: "Hans" })
       .convert("test", input, true))).to be_equivalent_to xmlpp(output)
   end

data/spec/isodoc/postproc_spec.rb CHANGED Viewed

@@ -807,6 +807,44 @@ RSpec.describe IsoDoc do
       OUTPUT
   end
+  it "moves images in HTML" do
+    FileUtils.rm_f "test.html"
+    FileUtils.rm_rf "test_htmlimages"
+    IsoDoc::HtmlConvert.new(
+      { baseassetpath: "spec/assets",
+        wordstylesheet: "word.css",
+        htmlstylesheet: "html.scss" },
+    ).convert("test", <<~"INPUT", false)
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <preface><foreword>
+       <figure id="_">
+       <name>Split-it-right sample divider</name>
+       <image src="rice_image1.png" id="_" mimetype="image/png"/>
+       </figure>
+      </foreword></preface>
+      </iso-standard>
+    INPUT
+    html = File.read("test.html")
+      .sub(/^.*<main class="main-section">/m, '<main class="main-section">')
+      .sub(%r{</main>.*$}m, "</main>")
+    expect(`ls test_htmlimages`).to match(/\.png$/)
+    expect(xmlpp(html.gsub(/\/[0-9a-f-]+\.png/, "/_.png")))
+      .to be_equivalent_to xmlpp(<<~"OUTPUT")
+            <main class='main-section'>
+          <button onclick='topFunction()' id='myBtn' title='Go to top'>Top</button>
+          <br/>
+          <div>
+            <h1 class='ForewordTitle'>Foreword</h1>
+            <div id='_' class='figure'>
+              <img src='test_htmlimages/_.png' height='776' width='922'/>
+              <p class='FigureTitle' style='text-align:center;'>Split-it-right sample divider</p>
+            </div>
+          </div>
+          <p class='zzSTDTitle1'/>
+        </main>
+      OUTPUT
+  end
   describe "mathvariant to plain" do
     context "when `mathvariant` attr equal to `script`" do
       it "converts mathvariant text chars into associated plain chars" do

data/spec/isodoc/presentation_xml_spec.rb CHANGED Viewed

@@ -762,6 +762,66 @@ RSpec.describe IsoDoc do
       .to be_equivalent_to xmlpp(output)
   end
+  it "duplicates EMF and SVG files" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <bibdata/>
+        <sections>
+           <clause id='A' inline-header='false' obligation='normative'>
+             <title>Clause</title>
+             <figure id="B">
+               <image src="spec/assets/odf.svg" mimetype="image/svg+xml" alt="1"/>
+               <image src="spec/assets/odf.emf" mimetype="image/x-emf" alt="2"/>
+               <image src="data:image/svg+xml;charset=utf-8;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDAgMTAwIj48Y2lyY2xlIGZpbGw9IiMwMDkiIHI9IjQ1IiBjeD0iNTAiIGN5PSI1MCIvPjxwYXRoIGQ9Ik0zMywyNkg3OEEzNywzNywwLDAsMSwzMyw4M1Y1N0g1OVY0M0gzM1oiIGZpbGw9IiNGRkYiLz48L3N2Zz4=" mimetype="image/svg+xml" alt="3"/>
+               <image src="data:application/x-msmetafile;base64,AQAAAMgAAAAAAAAAAAAAAPsEAAD7BAAAAAAAAAAAAACLCgAAiwoAACBFTUYAAAEAJAQAACgAAAACAAAALgAAAGwAAAAAAAAA3ScAAH0zAADYAAAAFwEAAAAAAAAAAAAAAAAAAMBLAwDYQQQASQBuAGsAcwBjAGEAcABlACAAMQAuADAAIAAoADQAMAAzADUAYQA0AGYALAAgADIAMAAyADAALQAwADUALQAwADEAKQAgAAAAbwBkAGYALgBlAG0AZgAAAAAAAAARAAAADAAAAAEAAAAkAAAAJAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAIAAABGAAAALAAAACAAAABTY3JlZW49MTAyMDV4MTMxODFweCwgMjE2eDI3OW1tAEYAAAAwAAAAIwAAAERyYXdpbmc9MTAwLjB4MTAwLjBweCwgMjYuNXgyNi41bW0AABIAAAAMAAAAAQAAABMAAAAMAAAAAgAAABYAAAAMAAAAGAAAABgAAAAMAAAAAAAAABQAAAAMAAAADQAAACcAAAAYAAAAAQAAAAAAAAAAAJkABgAAACUAAAAMAAAAAQAAADsAAAAIAAAAGwAAABAAAACkBAAAcQIAAAUAAAA0AAAAAAAAAAAAAAD//////////wMAAACkBAAAqAMAAKgDAACkBAAAcQIAAKQEAAAFAAAANAAAAAAAAAAAAAAA//////////8DAAAAOgEAAKQEAAA/AAAAqAMAAD8AAABxAgAABQAAADQAAAAAAAAAAAAAAP//////////AwAAAD8AAAA6AQAAOgEAAD8AAABxAgAAPwAAAAUAAAA0AAAAAAAAAAAAAAD//////////wMAAACoAwAAPwAAAKQEAAA6AQAApAQAAHECAAA9AAAACAAAADwAAAAIAAAAPgAAABgAAAAAAAAAAAAAAP//////////JQAAAAwAAAAFAACAKAAAAAwAAAABAAAAJwAAABgAAAABAAAAAAAAAP///wAGAAAAJQAAAAwAAAABAAAAOwAAAAgAAAAbAAAAEAAAAJ0BAABFAQAANgAAABAAAADPAwAARQEAAAUAAAA0AAAAAAAAAAAAAAD//////////wMAAABfBAAA7QEAAGQEAADjAgAA2wMAAJEDAAAFAAAANAAAAAAAAAAAAAAA//////////8DAAAAUgMAAD4EAABhAgAAcwQAAJ0BAAAOBAAANgAAABAAAACdAQAAyQIAADYAAAAQAAAA4gIAAMkCAAA2AAAAEAAAAOICAAAaAgAANgAAABAAAACdAQAAGgIAAD0AAAAIAAAAPAAAAAgAAAA+AAAAGAAAAAAAAAAAAAAA//////////8lAAAADAAAAAUAAIAoAAAADAAAAAEAAAAOAAAAFAAAAAAAAAAAAAAAJAQAAA==" mimetype="image/x-emf" alt="4"/>
+             </figure>
+           </clause>
+         </sections>
+      </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+      <?xml version="1.0"?>
+      <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
+      <bibdata/>
+        <sections>
+           <clause id="A" inline-header="false" obligation="normative" displayorder="1">
+             <title depth="1">1.<tab/>Clause</title>
+             <figure id="B"><name>Figure 1</name>
+               <image src="spec/assets/odf.svg" mimetype="image/svg+xml" alt="1"><emf src="spec/assets/odf.emf"/></image>
+               <image src="" mimetype="image/svg+xml" alt="2">
+      <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="1275.0000" height="1275.0000">
+      <g transform="translate(-0.0000, -0.0000)">
+      <g transform="matrix(1.0000 0.0000 0.0000 1.0000 0.0000 0.0000)">
+      <path d="M 1188.0000,625.0000 C 1188.0000,936.0000 936.0000,1188.0000 625.0000,1188.0000 C 314.0000,1188.0000 63.0000,936.0000 63.0000,625.0000 C 63.0000,314.0000 314.0000,63.0000 625.0000,63.0000 C 936.0000,63.0000 1188.0000,314.0000 1188.0000,625.0000 Z " fill="#000099" stroke="none"/>
+      <path d="M 413.0000,325.0000 L 975.0000,325.0000 C 1119.0000,493.0000 1124.0000,739.0000 987.0000,913.0000 C 850.0000,1086.0000 609.0000,1139.0000 413.0000,1038.0000 L 413.0000,713.0000 L 738.0000,713.0000 L 738.0000,538.0000 L 413.0000,538.0000 Z " fill="#FFFFFF" stroke="none"/>
+      </g>
+      </g>
+      </svg>
+      <emf src="data:application/x-msmetafile;base64"/></image>
+      <image src="" mimetype="image/svg+xml" alt="3"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><circle fill="#009" r="45" cx="50" cy="50"/><path d="M33,26H78A37,37,0,0,1,33,83V57H59V43H33Z" fill="#FFF"/></svg><emf src="data:application/x-msmetafile;base64"/></image>
+               <image src="" mimetype="image/svg+xml" alt="4">
+      <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="1275.0000" height="1275.0000">
+      <g transform="translate(-0.0000, -0.0000)">
+      <g transform="matrix(1.0000 0.0000 0.0000 1.0000 0.0000 0.0000)">
+      <path d="M 1188.0000,625.0000 C 1188.0000,936.0000 936.0000,1188.0000 625.0000,1188.0000 C 314.0000,1188.0000 63.0000,936.0000 63.0000,625.0000 C 63.0000,314.0000 314.0000,63.0000 625.0000,63.0000 C 936.0000,63.0000 1188.0000,314.0000 1188.0000,625.0000 Z " fill="#000099" stroke="none"/>
+      <path d="M 413.0000,325.0000 L 975.0000,325.0000 C 1119.0000,493.0000 1124.0000,739.0000 987.0000,913.0000 C 850.0000,1086.0000 609.0000,1139.0000 413.0000,1038.0000 L 413.0000,713.0000 L 738.0000,713.0000 L 738.0000,538.0000 L 413.0000,538.0000 Z " fill="#FFFFFF" stroke="none"/>
+      </g>
+      </g>
+      </svg>
+      <emf src="data:application/x-msmetafile;base64"/></image>
+             </figure>
+           </clause>
+         </sections>
+      </iso-standard>
+    OUTPUT
+    expect(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true)
+      .sub(%r{<localized-strings>.*</localized-strings>}m, "")
+      .gsub(%r{"data:application/x-msmetafile;base64,[^"]+"},
+            '"data:application/x-msmetafile;base64"'))
+      .to be_equivalent_to (output)
+  end
   private
   def mock_symbols

data/spec/isodoc/section_spec.rb CHANGED Viewed

@@ -209,7 +209,7 @@ RSpec.describe IsoDoc do
        <clause id="H" obligation="normative"><title>Terms, Definitions, Symbols and Abbreviated Terms</title><terms id="I" obligation="normative">
          <title>Normal Terms</title>
          <term id="J">
-         <preferred>Term2</preferred>
+         <preferred><expression><name>Term2</name></expression></preferred>
        </term>
        </terms>
        <definitions id="K">
@@ -745,7 +745,7 @@ RSpec.describe IsoDoc do
          <title>Normal Terms</title>
          <variant-title type="sub">Variant 1</variant-title>
          <term id="J">
-         <preferred>Term2</preferred>
+         <preferred><expression><name>Term2</name></expression></preferred>
        </term>
        </terms>
        <definitions id="K">
@@ -1361,7 +1361,7 @@ RSpec.describe IsoDoc do
        <clause id="H" obligation="normative"><title>Terms, Definitions, Symbols and Abbreviated Terms</title><terms id="I" obligation="normative">
          <title>Normal Terms</title>
          <term id="J">
-         <preferred>Term2</preferred>
+         <preferred><expression><name>Term2</name></expression></preferred>
        </term>
        </terms>
        <definitions id="K">
@@ -1515,8 +1515,9 @@ RSpec.describe IsoDoc do
         </preface>
       </iso-standard>
     OUTPUT
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({ suppressheadingnumbers: true })
-.convert("test", input, true))).to be_equivalent_to xmlpp(output)
+    expect(xmlpp(IsoDoc::PresentationXMLConvert
+      .new({ suppressheadingnumbers: true })
+      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
   end
   it "processes simple terms & definitions" do
@@ -1525,7 +1526,7 @@ RSpec.describe IsoDoc do
       <sections>
       <terms id="H" obligation="normative"><title>Terms, Definitions, Symbols and Abbreviated Terms</title>
         <term id="J">
-        <preferred>Term2</preferred>
+        <preferred><expression><name>Term2</name></expression></preferred>
       </term>
        </terms>
        </sections>
@@ -1786,7 +1787,7 @@ RSpec.describe IsoDoc do
         <title>Glossary</title>
         <terms id='PP1' obligation='normative'>
           <term id='term-glossary'>
-            <preferred>Glossary</preferred>
+            <preferred><expression><name>Glossary</name></expression></preferred>
           </term>
         </terms>
       </annex>
@@ -1795,13 +1796,13 @@ RSpec.describe IsoDoc do
                    <terms id='QQ1' obligation='normative'>
                      <title>Term Collection</title>
                      <term id='term-term-1'>
-                       <preferred>Term</preferred>
+                       <preferred><expression><name>Term</name></expression></preferred>
                      </term>
                    </terms>
                    <terms id='QQ2' obligation='normative'>
                      <title>Term Collection 2</title>
                      <term id='term-term-2'>
-                       <preferred>Term</preferred>
+                       <preferred><expression><name>Term</name></expression></preferred>
                      </term>
                    </terms>
                </annex>
@@ -1810,7 +1811,7 @@ RSpec.describe IsoDoc do
                    <terms id='RR1' obligation='normative'>
                      <title>Term Collection</title>
                      <term id='term-term-3'>
-                       <preferred>Term</preferred>
+                       <preferred><expression><name>Term</name></expression></preferred>
                      </term>
                    </terms>
                    <references id='RR2' obligation='normative'>