metanorma-iso 1.5.5 → 1.5.10

data/spec/assets/xref_error.adoc

@@ -0,0 +1,7 @@
+= X
+A
+
+== Clause
+
+<<a,b>>
+

data/spec/isodoc/amd_spec.rb

@@ -57,18 +57,23 @@ 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">
   <bibdata>
     <ext>
       <doctype>amendment</doctype>
     </ext>
   </bibdata>
+  <local_bibdata>
+    <ext>
+      <doctype>amendment</doctype>
+    </ext>
+  </local_bibdata>
   <preface>
     <foreword>
       <p>
-        <xref target='N'>[N]</xref>
-<xref target='note1'>[note1]</xref>
-<xref target='note2'>[note2]</xref>
+        <xref target='N'>[scope], Note</xref>
+<xref target='note1'>[widgets1], Note 1</xref>
+<xref target='note2'>[widgets1], Note 2</xref>
 <xref target='AN'>A.1, Note</xref>
 <xref target='Anote1'>A.2, Note 1</xref>
 <xref target='Anote2'>A.2, Note 2</xref>
@@ -86,7 +91,7 @@ RSpec.describe IsoDoc do
         </p>
       </note>
       <p>
-       <xref target='N'>[n]</xref>
+       <xref target='N'>Note</xref>
       </p>
     </clause>
     <terms id='terms'/>
@@ -94,22 +99,22 @@ RSpec.describe IsoDoc do
       <title depth="1">Widgets</title>
       <clause id='widgets1' inline-header="true">
         <note id='note1'>
-          <name>NOTE</name>
+          <name>NOTE 1</name>
           <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
             These results are based on a study carried out on three different
             types of kernel.
           </p>
         </note>
         <note id='note2'>
-          <name>NOTE</name>
+          <name>NOTE 2</name>
           <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a'>
             These results are based on a study carried out on three different
             types of kernel.
           </p>
         </note>
         <p>
-        <xref target='note1'>[note1]</xref>
-<xref target='note2'>[note2]</xref>
+        <xref target='note1'>Note 1</xref>
+<xref target='note2'>Note 2</xref>
         </p>
       </clause>
     </clause>
@@ -218,19 +223,24 @@ 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">
          <bibdata>
            <ext>
              <doctype>amendment</doctype>
            </ext>
          </bibdata>
+         <local_bibdata>
+           <ext>
+             <doctype>amendment</doctype>
+           </ext>
+         </local_bibdata>
          <preface>
            <foreword obligation='informative'>
              <title>Foreword</title>
              <p id='A'>
                This is a preamble
-               <xref target='C'>[C]</xref>
-               <xref target='C1'>[C1]</xref>
+               <xref target='C'>0.1</xref>
+               <xref target='C1'>0.2</xref>
                <xref target='D'>[D]</xref>
                <xref target='H'>[H]</xref>
                <xref target='I'>[I]</xref>
@@ -250,7 +260,7 @@ RSpec.describe IsoDoc do
            <introduction id='B' obligation='informative'>
              <title depth="1">Introduction</title>
              <clause id='C' inline-header='false' obligation='informative'>
-               <title depth="1">Introduction Subsection</title>
+               <title depth="2">Introduction Subsection</title>
              </clause>
              <clause id='C1' inline-header='true' obligation='informative'>Text</clause>
            </introduction>
@@ -396,12 +406,17 @@ RSpec.describe IsoDoc do
        </iso-standard>
     INPUT
     presxml = <<~OUTPUT
-    <iso-standard xmlns='http://riboseinc.com/isoxml'>
+    <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <bibdata>
            <ext>
              <doctype>amendment</doctype>
            </ext>
          </bibdata>
+         <local_bibdata>
+           <ext>
+             <doctype>amendment</doctype>
+           </ext>
+         </local_bibdata>
          <boilerplate>
            <copyright-statement>
              <clause>
@@ -435,7 +450,7 @@ RSpec.describe IsoDoc do
            <introduction id='B' obligation='informative'>
              <title depth='1'>Introduction</title>
              <clause id='C' inline-header='false' obligation='informative'>
-               <title depth='1'>Introduction Subsection</title>
+               <title depth='2'>Introduction Subsection</title>
              </clause>
            </introduction>
            <clause id='B1'>
@@ -548,7 +563,7 @@ RSpec.describe IsoDoc do
       <div class='Section3' id='B'>
         <h1 class='IntroTitle'>Introduction</h1>
         <div id='C'>
-          <h1>Introduction Subsection</h1>
+          <h2>Introduction Subsection</h2>
         </div>
       </div>
       <br/>
@@ -627,7 +642,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='https://www.metanorma.org/ns/iso'>
   <bibdata type='standard'>
     <title language='en' format='text/plain' type='main'>Introduction — Main Title — Title — Title Part  — Mass fraction of
@@ -720,8 +735,6 @@ OUTPUT
 </iso-standard>
 INPUT
 {:agency=>"ISO",
-:authors=>[],
-:authors_affiliations=>{},
 :createddate=>"2016-05-01",
 :docnumber=>"ISO/PreNWIP3 17301-1:2016/Amd.1",
 :docnumber_lang=>"ISO/PreNWIP3 17301-1:2016/Amd.1(E)",
@@ -750,9 +763,6 @@ INPUT
 :edition=>"2",
 :editorialgroup=>["A 1", "B 2", "C 3"],
 :ics=>"1, 2, 3",
-:keywords=>[],
-:obsoletes=>nil,
-:obsoletes_part=>nil,
 :publisher=>"International Organization for Standardization",
 :revdate=>"2000-01-01",
 :revdate_monthyear=>"January 2000",
@@ -763,7 +773,6 @@ INPUT
 :stageabbr=>"NWIP",
 :statusabbr=>"PreNWIP3",
 :tc=>"A 1",
-:tc_docnumber=>[],
 :unpublished=>true,
 :wg=>"C 3"}
 OUTPUT

data/spec/isodoc/blocks_spec.rb

@@ -272,7 +272,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">
   <preface>
     <foreword>
       <formula id='_be9158af-7e93-4ee2-90c5-26d31c181934' unnumbered='true'>

data/spec/isodoc/i18n_spec.rb

@@ -72,10 +72,13 @@ RSpec.describe IsoDoc do
         INPUT
 
         presxml = <<~OUTPUT
-         <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>
@@ -311,10 +314,13 @@ RSpec.describe IsoDoc do
        </bibliography>
        </iso-standard>
         INPUT
-        <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>
@@ -520,10 +526,13 @@ RSpec.describe IsoDoc do
        INPUT
 
        presxml = <<~OUTPUT
-       <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>
@@ -770,11 +779,15 @@ OUTPUT
        </iso-standard>
         INPUT
         presxml = <<~OUTPUT
-       <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>

data/spec/isodoc/inline_spec.rb

@@ -229,7 +229,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">
          <preface>
            <foreword>
              <p>

data/spec/isodoc/iso_spec.rb

@@ -175,7 +175,7 @@ end
     </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>
       <example id='samplecode'>
@@ -231,7 +231,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>
       <example id='samplecode'>
@@ -271,7 +271,7 @@ end
                <h1 class="ForewordTitle">Foreword</h1>
                <div id="samplecode" class="example">
                  <p><span class="example_label">EXAMPLE  1</span>&#160; </p>
-                  <div class="Quote">Hello<p class="QuoteAttribution"/></div>
+                  <div class="Quote">Hello</div>
                </div>
                <div id="samplecode2" class="example">
                  <p><span class="example_label">EXAMPLE  2&#160;&#8212; Title</span>&#160; Hello</p>
@@ -330,7 +330,7 @@ end
 
 
   it "processes sequences of examples (Word)" do
-    expect(IsoDoc::Iso::WordConvert.new({}).convert("test", <<~"INPUT", true).sub(/^.*<body/m, "<body").sub(%r{</body>.*$}m, "</body>")).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(IsoDoc::Iso::WordConvert.new({}).convert("test", <<~"INPUT", true).sub(/^.*<body/m, "<body").sub(%r{</body>.*$}m, "</body>"))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns='http://riboseinc.com/isoxml'>
   <preface>
     <foreword>
@@ -361,7 +361,7 @@ end
                <h1 class="ForewordTitle">Foreword</h1>
                <div id="samplecode" class="example">
                  <p><span class="example_label">EXAMPLE  1</span><span style="mso-tab-count:1">&#160; </span></p>
-                 <div class="Quote">Hello<p class="QuoteAttribution"/></div>
+                 <div class="Quote">Hello</div>
                </div>
                <div id="samplecode2" class="example">
                  <p><span class="example_label">EXAMPLE  2&#160;&#8212; Title</span><span style="mso-tab-count:1">&#160; </span>Hello</p>

data/spec/isodoc/metadata_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe IsoDoc::Iso::Metadata 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 type="title-intro" language="en" format="text/plain">Cereals and pulses</title>
@@ -81,8 +81,6 @@ INPUT
 {:accesseddate=>"2012",
 :activateddate=>"2013",
 :agency=>"ISO",
-:authors=>[],
-:authors_affiliations=>{},
 :createddate=>"2010&ndash;2011",
 :docnumber=>"ISO/PreCD3 17301-1",
 :docnumber_lang=>"ISO/PreCD3 17301-1 (E)",
@@ -104,11 +102,8 @@ INPUT
 :draftinfo=>" (draft 0.4, 2016-05-01)",
 :edition=>"2",
 :editorialgroup=>["TC 34", "SC 4", "WG 3"],
-:ics=>nil,
 :keywords=>["kw2", "kw1"],
 :obsoleteddate=>"2014",
-:obsoletes=>nil,
-:obsoletes_part=>nil,
 :publisheddate=>"2011",
 :publisher=>"International Organization for Standardization",
 :revdate=>"2016-05-01",
@@ -131,7 +126,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>
@@ -204,12 +199,9 @@ OUTPUT
 </iso-standard>
 INPUT
 {:agency=>"ISO/IEC",
-:authors=>[],
-:authors_affiliations=>{},
 :docnumber=>"ISO/IEC/CD 17301-1-3",
 :docnumber_lang=>"ISO/IEC/CD 17301-1-3 (E)",
 :docnumber_reference=>"ISO/IEC/CD 17301-1-3 (E)",
-:docnumeric=>nil,
 :docsubtitle=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses&nbsp;&mdash; Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai&nbsp;&mdash; Partie&nbsp;1&ndash;3: Riz",
 :docsubtitleintro=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses",
 :docsubtitlemain=>"Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai",
@@ -222,17 +214,11 @@ INPUT
 :doctitlepartlabel=>"Part&nbsp;1&ndash;3",
 :doctype=>"International Standard",
 :docyear=>"2016",
-:draft=>nil,
-:draftinfo=>"",
-:edition=>nil,
 :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"],
 :ics=>"1.2.3, 1.2.3",
-:keywords=>[],
 :obsoletes=>"IEC 8121",
 :obsoletes_part=>"3.1",
 :publisher=>"International Organization for Standardization and International Electrotechnical Commission",
-:revdate=>nil,
-:revdate_monthyear=>nil,
 :sc=>"DEF 4",
 :secretariat=>"XXXX",
 :stage=>"60",

data/spec/isodoc/postproc_spec.rb

@@ -611,10 +611,13 @@ documentation.</p>
     INPUT
 
     presxml = <<~OUTPUT
-    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
                <bibdata type="standard">
                <status><stage>30</stage></status>
                </bibdata>
+               <local_bibdata type="standard">
+               <status><stage>30</stage></status>
+               </local_bibdata>
            <boilerplate>
          <copyright-statement>
            <clause inline-header="true">

data/spec/isodoc/ref_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 RSpec.describe IsoDoc do
-   it "processes IsoXML bibliographies (Presentation XML)" do
+   it "processes IsoXML bibliographies" do
      input = <<~INPUT
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <bibdata>
@@ -121,10 +121,13 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
     presxml = <<~OUTPUT
-       <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

@@ -70,7 +70,7 @@ RSpec.describe IsoDoc do
     INPUT
 
     presxml = <<~OUTPUT
-     <iso-standard xmlns='http://riboseinc.com/isoxml'>
+     <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
    <preface>
      <foreword obligation='informative'>
        <title>Foreword</title>
@@ -361,7 +361,7 @@ OUTPUT
 INPUT
 
 presxml = <<~OUTPUT
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <sections>
     <clause id='D' obligation='normative'>
       <title depth='1'>1<tab/>Scope</title>

data/spec/isodoc/table_spec.rb

@@ -61,7 +61,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">
          <preface>
            <foreword>
              <table id='tableD-1' alt='tool tip' summary='long desc'>

data/spec/isodoc/terms_spec.rb

@@ -53,7 +53,7 @@ RSpec.describe IsoDoc do
 </iso-standard>
     INPUT
     presxml = <<~OUTPUT
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <sections>
     <terms id='_terms_and_definitions' obligation='normative'>
     <title depth='1'>1<tab/>Terms and Definitions</title>

data/spec/isodoc/xref_spec.rb

@@ -56,7 +56,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">
           <preface>
             <foreword>
               <p>
@@ -202,7 +202,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">
    <preface>
      <foreword id='fwd'>
        <p>
@@ -322,7 +322,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">
     <preface>
       <foreword id='fwd'>
         <p>
@@ -435,7 +435,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">
   <preface>
     <foreword>
       <p>
@@ -568,7 +568,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">
   <preface>
     <foreword>
       <p>
@@ -729,7 +729,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">
           <preface>
             <foreword>
               <p>
@@ -863,7 +863,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">
   <preface>
     <foreword>
       <p>
@@ -998,7 +998,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">
           <preface>
             <foreword obligation='informative'>
               <title>Foreword</title>
@@ -1198,7 +1198,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">
           <preface>
             <foreword>
               <p>
@@ -1318,7 +1318,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">
           <preface>
             <foreword>
               <p>
@@ -1422,7 +1422,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">
   <preface>
     <foreword>
       <p>