isodoc 1.2.0 → 1.2.5

data/spec/isodoc/cleanup_spec.rb

@@ -1084,6 +1084,7 @@ INPUT
            [MODIFICATION]The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
        [/TERMREF]</p>
        <p>[TERMREF] Termbase IEV, term ID xyz [/TERMREF]</p>
+<p>[TERMREF] Termbase IEV, term ID xyz [MODIFICATION] [/TERMREF]</p>
 <p>[TERMREF] Termbase IEV, term ID xyz [MODIFICATION]with adjustments [/TERMREF]</p>
 <p class="TermNum" id="paddy">1.2.</p><p class="Terms" style="text-align:left;">paddy</p><p class="AltTerms" style="text-align:left;">paddy rice</p>
        <p class="AltTerms" style="text-align:left;">rough rice</p>
@@ -1140,7 +1141,8 @@ INPUT
           <a href='#ISO7301'>ISO 7301:2011, Clause 3.1</a>
           , modified &mdash; The term "cargo rice" is shown as deprecated, and
           Note 1 to entry is not included here; Termbase IEV, term ID xyz;
-          Termbase IEV, term ID xyz, modified &mdash; with adjustments]
+          Termbase IEV, term ID xyz, modified; Termbase IEV, term ID xyz,
+modified &mdash; with adjustments]
         </p>
         <p class='TermNum' id='paddy'>1.2.</p>
         <p class='Terms' style='text-align:left;'>paddy</p>

data/spec/isodoc/i18n_spec.rb

@@ -68,10 +68,13 @@ 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>
          </bibdata>
+         <local_bibdata>
+  <language>en</language>
+</local_bibdata>
          <preface>
            <foreword obligation='informative'>
              <title>Foreword</title>
@@ -296,10 +299,13 @@ 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>
          </bibdata>
+         <local_bibdata>
+  <language>tlh</language>
+</local_bibdata>
          <preface>
            <foreword obligation='informative'>
              <title>Foreword</title>
@@ -449,10 +455,13 @@ PRESXML
         INPUT
 
         presxml = <<~"PRESXML"
-        <iso-standard xmlns='http://riboseinc.com/isoxml'>
+        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <bibdata>
            <language>fr</language>
          </bibdata>
+         <local_bibdata>
+  <language>fr</language>
+</local_bibdata>
          <preface>
            <foreword obligation='informative'>
              <title>Foreword</title>
@@ -689,11 +698,15 @@ 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>
          </bibdata>
+         <local_bibdata>
+  <language>zh</language>
+  <script>Hans</script>
+</local_bibdata>
          <preface>
            <foreword obligation='informative'>
              <title>Foreword</title>
@@ -872,6 +885,13 @@ PRESXML
       <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">
@@ -944,11 +964,29 @@ 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>
+             <status>
+  <stage>published</stage>
+  <substage>withdrawn</substage>
+</status>
+<ext>
+  <doctype>brochure</doctype>
+</ext>
              </bibdata>
+             <local_bibdata>
+  <language>eo</language>
+  <script>Latn</script>
+  <status>
+    <stage>publikigita</stage>
+    <substage>fortirita</substage>
+  </status>
+  <ext>
+    <doctype>bro&#x15D;uro</doctype>
+  </ext>
+</local_bibdata>
              <preface>
              <foreword obligation="informative">
                 <title>Foreword</title>

data/spec/isodoc/inline_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe IsoDoc 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>
@@ -57,6 +57,48 @@ INPUT
 OUTPUT
 end
 
+   it "droplocs xrefs" do
+  expect(xmlpp(IsoDoc::PresentationXMLConvert.new({i18nyaml: "spec/assets/i18n.yaml"}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <sections>
+    <clause id="A">
+    <formula id="B">
+    </formula>
+    </clause>
+    <clause id="C">
+    <p>This is <xref target="A"/> and <xref target="B"/>.
+    This is <xref target="A" droploc="true"/> and <xref target="B" droploc="true"/>.</p>
+</clause>
+</sections>
+</iso-standard>
+INPUT
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
+  <sections>
+    <clause id='A'>
+      <title>1.</title>
+      <formula id='B'>
+        <name>1</name>
+      </formula>
+    </clause>
+    <clause id='C'>
+      <title>2.</title>
+      <p>
+        This is
+        <xref target='A'>kla&#x16D;zo 1</xref>
+         and
+        <xref target='B'>kla&#x16D;zo 1, Formula (1)</xref>
+        . This is
+        <xref target='A' droploc='true'>1</xref>
+         and
+        <xref target='B' droploc='true'>(1)</xref>
+        .
+      </p>
+    </clause>
+  </sections>
+</iso-standard>
+OUTPUT
+   end
+
   it "processes inline formatting" do
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -238,7 +280,7 @@ end
     </iso-standard>
     INPUT
     presxml = <<~OUTPUT
-       <iso-standard xmlns="http://riboseinc.com/isoxml">
+       <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
            <preface><foreword>
            <p>
            <ul>
@@ -606,7 +648,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 +770,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>
@@ -955,7 +997,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>

data/spec/isodoc/metadata_spec.rb

@@ -95,6 +95,8 @@ RSpec.describe IsoDoc do
   <doctype>international-standard</doctype>
   </ext>
 </bibdata>
+    <local_bibdata type="standard">
+    </local_bibdata>
 </iso-standard>
 INPUT
 {:accesseddate=>"2012",
@@ -127,7 +129,7 @@ INPUT
 :receiveddate=>"XXX",
 :revdate=>"2016-05-01",
 :revdate_monthyear=>"May 2016",
-:stage=>"Committee draft",
+:stage=>"Committee Draft",
 :stageabbr=>"CD",
 :substage=>"Withdrawn",
 :transmitteddate=>"2020",

data/spec/isodoc/postproc_spec.rb

@@ -846,6 +846,14 @@ TOCLEVEL
     <formula id="_5fc1ef0f-75d2-4b54-802c-b1bad4a53b62">
     <stem type="AsciiMath">D1</stem>
     </formula>
+    <dl id="_f8fb7ed7-7874-44a8-933f-06e0e86fb264">
+<dt>
+<em>n</em>
+</dt>
+<dd>
+<p id="_a27281a4-b20e-4d0b-a780-bab9e851b03e">is the number of coating layers</p>
+</dd>
+</dl>
     </ul></li>
     </ol>
     </foreword></preface>
@@ -901,6 +909,23 @@ TOCLEVEL
                  </div>
                </div>
              </div>
+             <div class='ListContLevel2'>
+  <table class='dl'>
+    <tr>
+      <td valign='top' align='left'>
+        <p align='left' style='margin-left:0pt;text-align:left;' class='MsoNormal'>
+          <i>n</i>
+        </p>
+      </td>
+      <td valign='top'>
+        <p class='MsoNormal'>
+          <a name='_a27281a4-b20e-4d0b-a780-bab9e851b03e' id='_a27281a4-b20e-4d0b-a780-bab9e851b03e'/>
+          is the number of coating layers
+        </p>
+      </td>
+    </tr>
+  </table>
+</div>
            </p>
          </div>
          <p class='MsoNormal'>&#xA0;</p>
@@ -1062,9 +1087,20 @@ word = File.read("test.doc").sub(/^.*<div class="WordSection2">/m, '<div class="
                    <thead>
                      <tr>
                        <td rowspan="2" style="border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;">
-               <p class="MsoNormal"><a name="_c47d9b39-adb2-431d-9320-78cb148fdb56" id="_c47d9b39-adb2-431d-9320-78cb148fdb56"></a>Output wavelength <span class="stem"><m:oMath>
-           <m:r><m:t>(&#x3BC;m)</m:t></m:r>
-       </m:oMath>
+               <p class="MsoNormal"><a name="_c47d9b39-adb2-431d-9320-78cb148fdb56" id="_c47d9b39-adb2-431d-9320-78cb148fdb56"></a>Output wavelength <span class="stem">
+               <m:oMath>
+                           <span style='font-style:normal;'>
+                             <m:r>
+                               <m:rPr>
+                                 <m:sty m:val='p'/>
+                               </m:rPr>
+                               <m:t>(</m:t>
+                             </m:r>
+                           </span>
+                           <m:r>
+                             <m:t>&#x3BC;m)</m:t>
+                           </m:r>
+                         </m:oMath>
        </span></p>
              </td>
                        <th colspan="3" align="left" style="font-weight:bold;border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;">Predictive wavelengths</th>

data/spec/isodoc/ref_spec.rb

@@ -125,10 +125,13 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
     presxml = <<~PRESXML
-        <iso-standard xmlns='http://riboseinc.com/isoxml'>
+        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
           <bibdata>
             <language>en</language>
           </bibdata>
+          <local_bibdata>
+  <language>en</language>
+</local_bibdata>
           <preface>
             <foreword>
               <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>

data/spec/isodoc/section_spec.rb

@@ -1,6 +1,131 @@
 require "spec_helper"
 
 RSpec.describe IsoDoc do
+         it "processes prefatory blocks" do
+           input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <preface>
+      <abstract id="A"><title>abstract</title></abstract>
+      <introduction id="B"><title>introduction</title></introduction>
+      <note id="C">note</note>
+      </preface>
+      <sections>
+       <clause id="M" inline-header="false" obligation="normative"><title>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
+         <title>Introduction</title>
+       </clause>
+       <clause id="O" inline-header="true" obligation="normative">
+         <title>Clause 4.2</title>
+       </clause></clause>
+       <admonition id="L" type="caution"><p>admonition</p></admonition>
+       </sections>
+      </iso-standard>
+    INPUT
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    <html lang='en'>
+  <head/>
+  <body lang='en'>
+    <div class='title-section'>
+      <p>&#160;</p>
+    </div>
+    <br/>
+    <div class='prefatory-section'>
+      <p>&#160;</p>
+    </div>
+    <br/>
+    <div class='main-section'>
+      <div id='C' class='Note'>note</div>
+      <br/>
+      <div id='A'>
+        <h1 class='AbstractTitle'>abstract</h1>
+      </div>
+      <br/>
+      <div class='Section3' id='B'>
+        <h1 class='IntroTitle'>introduction</h1>
+      </div>
+      <p class='zzSTDTitle1'/>
+      <div id='L' class='Admonition'>
+        <p class='AdmonitionTitle' style='text-align:center;'>CAUTION</p>
+        <p>admonition</p>
+      </div>
+      <div id='M'>
+        <h1>Clause 4</h1>
+        <div id='N'>
+          <h2>Introduction</h2>
+        </div>
+        <div id='O'>
+          <span class='zzMoveToFollowing'>
+            <b>Clause 4.2&#160; </b>
+          </span>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+OUTPUT
+    expect(xmlpp(IsoDoc::WordConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    <html xmlns:epub='http://www.idpf.org/2007/ops' lang='en'>
+  <head>
+    <style>
+    </style>
+  </head>
+  <body lang='EN-US' link='blue' vlink='#954F72'>
+    <div class='WordSection1'>
+      <p>&#160;</p>
+    </div>
+    <p>
+      <br clear='all' class='section'/>
+    </p>
+    <div class='WordSection2'>
+      <div id='C' class='Note'>
+        <p class='Note'>
+          <span class='note_label'/>
+          <span style='mso-tab-count:1'>&#160; </span>
+        </p>
+        note
+      </div>
+      <p>
+        <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
+      </p>
+      <div id='A'>
+        <h1 class='AbstractTitle'>abstract</h1>
+      </div>
+      <p>
+        <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
+      </p>
+      <div class='Section3' id='B'>
+        <h1 class='IntroTitle'>introduction</h1>
+      </div>
+      <p>&#160;</p>
+    </div>
+    <p>
+      <br clear='all' class='section'/>
+    </p>
+    <div class='WordSection3'>
+      <p class='zzSTDTitle1'/>
+      <div id='L' class='Admonition'>
+        <p class='AdmonitionTitle' style='text-align:center;'>CAUTION</p>
+        <p>admonition</p>
+      </div>
+      <div id='M'>
+        <h1>Clause 4</h1>
+        <div id='N'>
+          <h2>Introduction</h2>
+        </div>
+        <div id='O'>
+          <span class='zzMoveToFollowing'>
+            <b>
+              Clause 4.2
+              <span style='mso-tab-count:1'>&#160; </span>
+            </b>
+          </span>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+    OUTPUT
+    end
+
   it "processes document with no content" do
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -135,7 +260,7 @@ RSpec.describe IsoDoc do
     INPUT
 
     presxml = <<~"PRESXML"
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <boilerplate>
     <copyright-statement>
       <clause>
@@ -630,7 +755,7 @@ OUTPUT
        </iso-standard>
     INPUT
     <?xml version='1.0'?>
-        <iso-standard xmlns='http://riboseinc.com/isoxml'>
+        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
           <preface>
             <foreword obligation='informative'>
               <title>Foreword</title>
@@ -724,7 +849,7 @@ OUTPUT
        </iso-standard>
        INPUT
        <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <introduction id='B' obligation='informative'>
       <title>Introduction</title>
@@ -751,7 +876,7 @@ OUTPUT
     INPUT
 
     presxml = <<~"OUTPUT"
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <sections>
     <terms id='H' obligation='normative'>
     <title depth='1'>1.<tab/>Terms, Definitions, Symbols and Abbreviated Terms</title>
@@ -796,7 +921,7 @@ OUTPUT
     INPUT
 
     presxml = <<~"PRESXML"
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <sections>
     <clause id='M' inline-header='false' obligation='normative'>
     <title depth='1'>1.<tab/>Clause 4</title>
@@ -848,7 +973,7 @@ OUTPUT
       </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='M' inline-header='false' obligation='normative'>
       <title depth="1">Clause 4</title>
@@ -866,7 +991,7 @@ OUTPUT
 
         it "processes sections without titles" do
     expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
       <preface>
        <introduction id="M" inline-header="false" obligation="normative"><clause id="N" inline-header="false" obligation="normative">
          <title>Intro</title>
@@ -884,7 +1009,7 @@ OUTPUT
       </iso-standard>
     INPUT
     <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <introduction id='M' inline-header='false' obligation='normative'>
       <clause id='N' inline-header='false' obligation='normative'>
@@ -934,7 +1059,7 @@ OUTPUT
        </iso-standard>
 INPUT
 presxml = <<~OUTPUT
-<iso-standard xmlns="http://riboseinc.com/isoxml">
+<iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
             <bibliography>
         <clause id="D" obligation="informative">
          <title depth="1">Bibliography</title>
@@ -989,5 +1114,4 @@ OUTPUT
             expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
             end
 
-
 end