isodoc 1.2.2 → 1.2.7

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,9 +68,9 @@ RSpec.describe IsoDoc do
         INPUT
 
         presxml = <<~"PRESXML"
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <bibdata>
-           <language>en</language>
+           <language current="true">en</language>
          </bibdata>
          <preface>
            <foreword obligation='informative'>
@@ -226,12 +226,12 @@ PRESXML
            </body>
        </html>
     OUTPUT
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
   end
 
   it "defaults to English" do
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       <iso-standard xmlns="http://riboseinc.com/isoxml">
       <bibdata>
       <language>tlh</language>
@@ -296,9 +296,9 @@ PRESXML
        </iso-standard>
         INPUT
         <?xml version='1.0'?>
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <bibdata>
-           <language>tlh</language>
+           <language current="true">tlh</language>
          </bibdata>
          <preface>
            <foreword obligation='informative'>
@@ -449,9 +449,9 @@ PRESXML
         INPUT
 
         presxml = <<~"PRESXML"
-        <iso-standard xmlns='http://riboseinc.com/isoxml'>
+        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <bibdata>
-           <language>fr</language>
+           <language current="true">fr</language>
          </bibdata>
          <preface>
            <foreword obligation='informative'>
@@ -607,7 +607,7 @@ PRESXML
            </body>
        </html>
     OUTPUT
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
   end
 
@@ -689,10 +689,10 @@ PRESXML
         INPUT
 
         presxml = <<~"PRESXML"
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <bibdata>
-           <language>zh</language>
-           <script>Hans</script>
+           <language current="true">zh</language>
+           <script current="true">Hans</script>
          </bibdata>
          <preface>
            <foreword obligation='informative'>
@@ -862,16 +862,24 @@ PRESXML
            </body>
        </html>
     OUTPUT
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
   end
 
   it "processes i18n file" do
+    mock_i18n
     input = <<~"INPUT"
       <iso-standard xmlns="http://riboseinc.com/isoxml">
       <bibdata>
       <language>eo</language>
       <script>Latn</script>
+      <status>
+      <stage>published</stage>
+      <substage>withdrawn</substage>
+      </status>
+      <ext>
+      <doctype>brochure</doctype>
+      </ext>
       </bibdata>
       <preface>
       <foreword obligation="informative">
@@ -944,11 +952,48 @@ PRESXML
         INPUT
 
         presxml = <<~OUTPUT
-         <iso-standard xmlns="http://riboseinc.com/isoxml">
+         <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
              <bibdata>
-             <language>eo</language>
-             <script>Latn</script>
+             <language current="true">eo</language>
+             <script current="true">Latn</script>
+             <status>
+             <stage language=''>published</stage>
+<stage language='eo'>publikigita</stage>
+<substage language=''>withdrawn</substage>
+<substage language='eo'>fortirita</substage>
+</status>
+<ext>
+<doctype language=''>brochure</doctype>
+<doctype language='eo'>bro&#x15D;uro</doctype>
+</ext>
              </bibdata>
+  <localized-strings>
+  <localized-string key='foreword' language='eo'>Anta&#x16D;parolo</localized-string>
+<localized-string key='introduction' language='eo'>Enkonduko</localized-string>
+<localized-string key='clause' language='eo'>kla&#x16D;zo</localized-string>
+<localized-string key='table' language='eo'>Tabelo</localized-string>
+<localized-string key='source' language='eo'>SOURCE</localized-string>
+<localized-string key='modified' language='eo'>modified</localized-string>
+<localized-string key='scope' language='eo'>Amplekso</localized-string>
+<localized-string key='symbols' language='eo'>Simboloj kai mallongigitaj terminoj</localized-string>
+<localized-string key='annex' language='eo'>Aldono</localized-string>
+<localized-string key='normref' language='eo'>Normaj cita&#x135;oj</localized-string>
+<localized-string key='bibliography' language='eo'>Bibliografio</localized-string>
+<localized-string key='inform_annex' language='eo'>informa</localized-string>
+<localized-string key='all_parts' language='eo'>&#x109;iuj partoj</localized-string>
+<localized-string key='norm_annex' language='eo'>normative</localized-string>
+<localized-string key='locality.table' language='eo'>Tabelo</localized-string>
+<localized-string key='doctype_dict.brochure' language='eo'>bro&#x15D;uro</localized-string>
+<localized-string key='doctype_dict.conference_proceedings' language='eo'>konferencaktoj</localized-string>
+<localized-string key='stage_dict.published' language='eo'>publikigita</localized-string>
+<localized-string key='substage_dict.withdrawn' language='eo'>fortirita</localized-string>
+<localized-string key='array.0' language='eo'>elem1</localized-string>
+<localized-string key='array.1' language='eo'>elem2</localized-string>
+<localized-string key='array.2.elem3' language='eo'>elem4</localized-string>
+<localized-string key='array.2.elem5' language='eo'>elem6</localized-string>
+<localized-string key='language' language='eo'>eo</localized-string>
+<localized-string key='script' language='eo'>Latn</localized-string>
+</localized-strings>
              <preface>
              <foreword obligation="informative">
                 <title>Foreword</title>
@@ -1128,4 +1173,11 @@ PRESXML
         expect(xmlpp(IsoDoc::PresentationXMLConvert.new({i18nyaml: "spec/assets/i18n.yaml"}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::HtmlConvert.new({i18nyaml: "spec/assets/i18n.yaml"}).convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
   end
+
+  private
+
+  def mock_i18n
+    allow_any_instance_of(::IsoDoc::I18n).to receive(:load_yaml).with("eo", "Latn", "spec/assets/i18n.yaml").and_return(YAML.load_file("spec/assets/i18n.yaml"))
+  end
+
 end

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

@@ -7,7 +7,7 @@ RSpec.describe IsoDoc do
     arr = c.convert_init(<<~"INPUT", "test", false)
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     INPUT
-  expect(Hash[c.info(Nokogiri::XML(<<~"INPUT"), nil).sort]).to be_equivalent_to <<~"OUTPUT"
+  expect(metadata(c.info(Nokogiri::XML(<<~"INPUT"), nil))).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <bibdata type="standard">
   <title>The Incredible Mr Ripley</title>
@@ -18,6 +18,8 @@ RSpec.describe IsoDoc do
   <uri type="pdf">URL D</uri>
   <uri type="doc">URL E</uri>
   <docidentifier>17301-1</docidentifier>
+  <docidentifier type="ISBN">ISBN 13</docidentifier>
+  <docidentifier type="ISBN10">ISBN 10</docidentifier>
   <docnumber>17301</docnumber>
   <date type="published"><on>2011</on></date>
   <date type="accessed"><on>2012</on></date>
@@ -73,6 +75,9 @@ RSpec.describe IsoDoc do
       </name>
     </person>
   </contributor>
+  <note type="title-footnote"><p>A footnote</p></note>
+  <note type="iso"><p>A note</p></note>
+  <note type="title-footnote"><p>Another footnote</p></note>
   <language>en</language>
   <script>Latn</script>
   <status>
@@ -111,25 +116,32 @@ INPUT
 :docnumeric=>"17301",
 :doctitle=>"Cereals and pulses",
 :doctype=>"International Standard",
+:doctype_display=>"International Standard",
 :docyear=>"2016",
 :draft=>"0.4",
 :draftinfo=>" (draft 0.4, 2016-05-01)",
 :edition=>"2",
 :html=>"URL B",
 :implementeddate=>"XXX",
+:isbn=>"ISBN 13",
+:isbn10=>"ISBN 10",
 :issueddate=>"XXX",
 :iteration=>"2",
 :keywords=>["KW2", "KW1", "KW3"],
+:lang=>"en",
 :obsoleteddate=>"2014",
 :pdf=>"URL D",
 :publisheddate=>"2011",
-:publisher=>"",
 :receiveddate=>"XXX",
 :revdate=>"2016-05-01",
 :revdate_monthyear=>"May 2016",
-:stage=>"Committee draft",
+:script=>"Latn",
+:stage=>"Committee Draft",
+:stage_display=>"Committee Draft",
 :stageabbr=>"CD",
 :substage=>"Withdrawn",
+:substage_display=>"Withdrawn",
+:title_footnote=>["A footnote", "Another footnote"],
 :transmitteddate=>"2020",
 :unchangeddate=>"2019",
 :unpublished=>true,
@@ -146,7 +158,7 @@ OUTPUT
     arr = c.convert_init(<<~"INPUT", "test", false)
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     INPUT
-  expect(Hash[c.info(Nokogiri::XML(<<~"INPUT"), nil).sort]).to be_equivalent_to <<~"OUTPUT"
+  expect(metadata(c.info(Nokogiri::XML(<<~"INPUT"), nil))).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <bibdata type="standard">
   <title language="fr" format="text/plain">Céréales et légumineuses</ti>
@@ -167,7 +179,15 @@ OUTPUT
     <role type="publisher"/>
     <organization>
       <name>International Organization for Standardization</name>
+      <subdivision>Subdivision</subdivision>
       <abbreviation>ISO</abbreviation>
+      <address>
+  <formattedAddress>1 Infinity Loop + California</formattedAddress>
+</address>
+<phone>3333333</phone>
+<phone type='fax'>4444444</phone>
+<email>x@example.com</email>
+<uri>http://www.example.com</uri>
      </organization>
   </contributor>
   <contributor>
@@ -213,8 +233,6 @@ OUTPUT
 INPUT
 {:accesseddate=>"XXX",
 :agency=>"ISO/IEC/IEEE",
-:authors=>[],
-:authors_affiliations=>{},
 :circulateddate=>"XXX",
 :confirmeddate=>"XXX",
 :copieddate=>"XXX",
@@ -223,23 +241,31 @@ INPUT
 :docnumeric=>"17301",
 :doctitle=>"Cereals and pulses",
 :doctype=>"International Standard",
+:doctype_display=>"International Standard",
 :docyear=>"2016",
 :draft=>"12",
 :draftinfo=>" (draft 12, 2016-05)",
-:edition=>nil,
 :implementeddate=>"XXX",
 :issueddate=>"XXX",
-:keywords=>[],
+:lang=>"en",
 :obsoleteddate=>"XXX",
 :obsoletes=>"IEC 8121",
 :obsoletes_part=>"3.1",
 :partof=>"IEC 8122",
+:pub_address=>"1 Infinity Loop + California",
+:pub_email=>"x@example.com",
+:pub_fax=>"4444444",
+:pub_phone=>"3333333",
+:pub_uri=>"http://www.example.com",
 :publisheddate=>"2011-01",
 :publisher=>"International Organization for Standardization, International Electrotechnical Commission and Institute of Electrical and Electronics Engineers",
 :receiveddate=>"XXX",
 :revdate=>"2016-05",
 :revdate_monthyear=>"May 2016",
+:script=>"Latn",
 :stage=>"Published",
+:stage_display=>"Published",
+:subdivision=>"Subdivision",
 :transmitteddate=>"XXX",
 :unchangeddate=>"XXX",
 :unpublished=>false,
@@ -256,10 +282,21 @@ OUTPUT
     <bibdata type="standard">
   <language>fr</language>
   <script>Latn</script>
+  <status>
+    <stage lang="">Committee Draft</stage>
+    <stage lang=fr">Projet de comité</stage>
+    <substage lang="">Withdrawn</substage>
+    <substage lang="fr">Rétiré</substage>
+    <iteration>2</iteration>
+  </status>
+<ext>
+<doctype lang="">international-standard</doctype>
+<doctype lang="fr">Standard international</doctype>
+</ext>
   </bibdata>
   </iso-standard>
     INPUT
-  expect(Hash[c.info(Nokogiri::XML(<<~"INPUT"), nil).sort]).to be_equivalent_to <<~"OUTPUT"
+  expect(metadata(c.info(Nokogiri::XML(<<~"INPUT"), nil))).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <bibdata type="standard">
   <title language="fr" format="text/plain">Céréales et légumineuses</ti>
@@ -292,7 +329,13 @@ OUTPUT
   </contributor>
   <language>fr</language>
   <script>Latn</script>
-  <status><stage>Published</stage></status>
+  <status>
+    <stage language="">Committee Draft</stage>
+    <stage language="fr">Projet de comité</stage>
+    <substage language="">Withdrawn</substage>
+    <substage language="fr">Rétiré</substage>
+    <iteration>2</iteration>
+  </status>
   <copyright>
     <from>2016</from>
     <owner>
@@ -301,37 +344,44 @@ OUTPUT
       </organization>
     </owner>
   </copyright>
+<ext>
+<doctype language="">international-standard</doctype>
+<doctype language="fr">Standard international</doctype>
+</ext>
 </bibdata>
 </iso-standard>
 INPUT
 {:accesseddate=>"XXX",
 :agency=>"ISO/IEC",
-:authors=>[],
-:authors_affiliations=>{},
 :circulateddate=>"XXX",
 :confirmeddate=>"XXX",
 :copieddate=>"XXX",
 :createddate=>"XXX",
 :docnumber=>"17301-1-3",
 :docnumeric=>"17301",
-:doctitle=>"Cereals and pulses",
+:doctitle=>"Céréales et légumineuses",
+:doctype=>"International Standard",
+:doctype_display=>"Standard International",
 :docyear=>"2016",
-:draft=>nil,
-:draftinfo=>"",
-:edition=>nil,
 :implementeddate=>"XXX",
 :issueddate=>"XXX",
-:keywords=>[],
+:iteration=>"2",
+:lang=>"fr",
 :obsoleteddate=>"XXX",
 :publisheddate=>"2011-01",
 :publisher=>"International Organization for Standardization et International Electrotechnical Commission",
 :receiveddate=>"XXX",
 :revdate=>"2016-05",
 :revdate_monthyear=>"Mai 2016",
-:stage=>"Published",
+:script=>"Latn",
+:stage=>"Committee Draft",
+:stage_display=>"Projet De Comité",
+:stageabbr=>"CD",
+:substage=>"Withdrawn",
+:substage_display=>"Rétiré",
 :transmitteddate=>"XXX",
 :unchangeddate=>"XXX",
-:unpublished=>false,
+:unpublished=>true,
 :updateddate=>"XXX",
 :vote_endeddate=>"XXX",
 :vote_starteddate=>"XXX"}