metanorma-iec 1.2.0 → 1.2.6

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "1.2.0"
+    VERSION = "1.2.6"
   end
 end
 

data/metanorma-iec.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "ruby-jing"
   spec.add_dependency "isodoc", "~> 1.2.0"
-  spec.add_dependency "metanorma-iso", "~> 1.5.0"
+  spec.add_dependency "metanorma-iso", "~> 1.5.10"
 
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "sassc", "2.4.0"

data/spec/asciidoctor-iec/base_spec.rb

@@ -89,7 +89,7 @@ RSpec.describe Asciidoctor::Iec do
       :library-ics: 1,2,3
     INPUT
            <?xml version="1.0" encoding="UTF-8"?>
-       <iec-standard xmlns="https://www.metanorma.org/ns/iec">
+       <iec-standard xmlns="https://www.metanorma.org/ns/iec" type="semantic" version="#{Metanorma::Iec::VERSION}">
        <bibdata type="standard">
    <title language="en" format="text/plain" type="main">Introduction — Main Title — Title — Title Part</title>
    <title language="en" format="text/plain" type="title-intro">Introduction</title>
@@ -188,7 +188,7 @@ RSpec.describe Asciidoctor::Iec do
       :doctype: technical-specification
     INPUT
            <?xml version="1.0" encoding="UTF-8"?>
-       <iec-standard xmlns="https://www.metanorma.org/ns/iec">
+       <iec-standard xmlns="https://www.metanorma.org/ns/iec" type="semantic" version="#{Metanorma::Iec::VERSION}">
        <bibdata type="standard">
          <docidentifier type="ISO">ISO/IEC/IETF/2CDTS 1000-1-1 ED 1</docidentifier>
          <docidentifier type="iso-tc">2000</docidentifier>
@@ -336,7 +336,7 @@ RSpec.describe Asciidoctor::Iec do
       :docnumber: 1000
       :docstage: 50
     INPUT
-    <iec-standard xmlns="https://www.metanorma.org/ns/iec">
+    <iec-standard xmlns="https://www.metanorma.org/ns/iec"  type="semantic" version="#{Metanorma::Iec::VERSION}">
 <bibdata type="standard">
   <docidentifier type="ISO">IEC/FDIS 1000 ED 1</docidentifier>
   <docnumber>1000</docnumber>
@@ -400,7 +400,7 @@ OUTPUT
       :docnumber: 1000
       :docstage: 60
     INPUT
-<iec-standard xmlns="https://www.metanorma.org/ns/iec">
+<iec-standard xmlns="https://www.metanorma.org/ns/iec" type="semantic" version="#{Metanorma::Iec::VERSION}">
 <bibdata type="standard">
   <docidentifier type="ISO">IEC 1000 ED 1</docidentifier>
   <docnumber>1000</docnumber>
@@ -465,7 +465,7 @@ OUTPUT
       :docstage: 60
       :docsubstage: 00
     INPUT
-<iec-standard xmlns="https://www.metanorma.org/ns/iec">
+<iec-standard xmlns="https://www.metanorma.org/ns/iec" type="semantic" version="#{Metanorma::Iec::VERSION}">
 <bibdata type="standard">
   <docidentifier type="ISO">IEC 1000 ED 1</docidentifier>
   <docnumber>1000</docnumber>

data/spec/asciidoctor-iec/cleanup_spec.rb

@@ -34,7 +34,19 @@ RSpec.describe Asciidoctor::Iec do
          <p id="_">For the purposes of this document, 
        the following terms and definitions apply.</p>
         #{TERMS_BOILERPLATE}
-         <term id="term-t90"><preferred><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>t</mi><mn>90</mn></msub></math></stem></preferred><admitted><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>t</mi><mn>91</mn></msub></math></stem></admitted>
+         <term id="term-t90"><preferred><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mrow>
+  <mi>t</mi>
+</mrow>
+<mrow>
+  <mn>90</mn>
+</mrow>
+</msub></math></stem></preferred><admitted><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mrow>
+  <mi>t</mi>
+</mrow>
+<mrow>
+  <mn>91</mn>
+</mrow>
+</msub></math></stem></admitted>
        <definition><p id="_">Time</p></definition></term>
        </terms>
        </sections>
@@ -70,8 +82,20 @@ RSpec.describe Asciidoctor::Iec do
          <p id="_">For the purposes of this document, 
        the following terms and definitions apply.</p>
         #{TERMS_BOILERPLATE}
-         <term id="term-t90"><preferred><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>t</mi><mn>90</mn></msub></math></stem></preferred><definition><formula id="_">
-         <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>t</mi><mi>A</mi></msub></math></stem>
+         <term id="term-t90"><preferred><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mrow>
+  <mi>t</mi>
+</mrow>
+<mrow>
+  <mn>90</mn>
+</mrow>
+</msub></math></stem></preferred><definition><formula id="_">
+         <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mrow>
+  <mi>t</mi>
+</mrow>
+<mrow>
+  <mi>A</mi>
+</mrow>
+</msub></math></stem>
        </formula><p id="_">This paragraph is extraneous</p></definition>
        </term>
        </terms>
@@ -257,9 +281,9 @@ RSpec.describe Asciidoctor::Iec do
        <sections><table id="_">
          <tbody>
            <tr>
-             <td align="left">a</td>
-             <td align="left">b</td>
-             <td align="left">c</td>
+             <td valign="top" align="left">a</td>
+             <td valign="top" align="left">b</td>
+             <td valign="top" align="left">c</td>
            </tr>
          </tbody>
        <dl id="_">

data/spec/asciidoctor-iec/iev_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe Asciidoctor::Iec do
       * [[[A,B]]], _TITLE_
     INPUT
 <?xml version='1.0' encoding='UTF-8'?>
-       <iec-standard xmlns='https://www.metanorma.org/ns/iec'>
+       <iec-standard xmlns='https://www.metanorma.org/ns/iec' type="semantic" version="#{Metanorma::Iec::VERSION}">
          <bibdata type='standard'>
            <docidentifier type='ISO'>IEC 60050 ED 1</docidentifier>
            <docnumber>60050</docnumber>
@@ -96,7 +96,7 @@ RSpec.describe Asciidoctor::Iec do
       === General
       ==== Term 1
 INPUT
-<iec-standard xmlns='https://www.metanorma.org/ns/iec'>
+<iec-standard xmlns='https://www.metanorma.org/ns/iec' type="semantic" version="#{Metanorma::Iec::VERSION}">
   <bibdata type='standard'>
     <docidentifier type='ISO'>IEC 60050 ED 1</docidentifier>
     <docnumber>60050</docnumber>
@@ -174,7 +174,7 @@ OUTPUT
       Text
     INPUT
     <?xml version='1.0' encoding='UTF-8'?>
-    <iec-standard xmlns='https://www.metanorma.org/ns/iec'>
+    <iec-standard xmlns='https://www.metanorma.org/ns/iec' type="semantic" version="#{Metanorma::Iec::VERSION}">
          <bibdata type='standard'>
            <docidentifier type='ISO'>IEC 60050 ED 1</docidentifier>
            <docnumber>60050</docnumber>

data/spec/asciidoctor-iec/inline_spec.rb

@@ -28,7 +28,13 @@ RSpec.describe Asciidoctor::Iec do
        ‘single quote’
        super<sup>script</sup>
        sub<sub>script</sub>
-       <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>a</mi><mn>90</mn></msub></math></stem>
+       <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mrow>
+  <mi>a</mi>
+</mrow>
+<mrow>
+  <mn>90</mn>
+</mrow>
+</msub></math></stem>
        <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub> <mrow> <mrow> <mi mathvariant="bold-italic">F</mi> </mrow> </mrow> <mrow> <mrow> <mi mathvariant="bold-italic">Α</mi> </mrow> </mrow> </msub> </math></stem>
        <admitted>alt</admitted>
        <deprecates>deprecated</deprecates>

data/spec/asciidoctor-iec/validate_spec.rb

@@ -2,10 +2,30 @@ require "spec_helper"
 require "fileutils"
 
 RSpec.describe Asciidoctor::Iec do
+  context "when xref_error.adoc compilation" do
+    around do |example|
+      FileUtils.rm_f "spec/assets/xref_error.err"
+      example.run
+      Dir["spec/assets/xref_error*"].each do |file|
+        next if file.match?(/adoc$/)
+
+        FileUtils.rm_f(file)
+      end
+    end
+
+    it "generates error file" do
+      expect do
+        Metanorma::Compile
+          .new
+          .compile("spec/assets/xref_error.adoc", type: "iec")
+      end.to(change { File.exist?("spec/assets/xref_error.err") }
+              .from(false).to(true))
+    end
+  end
 
 it "Warns of illegal doctype" do
     FileUtils.rm_f "test.err"
-    Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true) 
+    Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)
   = Document title
   Author
   :docfile: test.adoc

data/spec/assets/xref_error.adoc

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

data/spec/isodoc/blocks_spec.rb

@@ -177,7 +177,7 @@ RSpec.describe IsoDoc::Iec do
 </sections>
     </iso-standard>
     INPUT
-    <iso-standard xmlns='http://riboseinc.com/isoxml'>
+    <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <preface>
            <foreword>
              <p>

data/spec/isodoc/i18n_spec.rb

@@ -73,11 +73,15 @@ RSpec.describe IsoDoc do
         INPUT
 
         presxml = <<~OUTPUT
-        <iso-standard xmlns="http://riboseinc.com/isoxml">
+        <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
        <bibdata>
        <docnumber>1</docnumber>
        <language>en</language>
        </bibdata>
+       <local_bibdata>
+       <docnumber>1</docnumber>
+       <language>en</language>
+       </local_bibdata>
        <preface>
        <foreword obligation="informative">
           <title>Foreword</title>
@@ -289,10 +293,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>
@@ -498,10 +505,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>

data/spec/isodoc/iev_spec.rb

@@ -22,11 +22,15 @@ RSpec.describe IsoDoc do
        INPUT
 
        presxml = <<~OUTPUT
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <bibdata>
     <docidentifier type='iso'>IEC/PWI 60050-871 ED 2</docidentifier>
     <docnumber>60050</docnumber>
   </bibdata>
+  <local_bibdata>
+    <docidentifier type='iso'>IEC/PWI 60050-871 ED 2</docidentifier>
+    <docnumber>60050</docnumber>
+  </local_bibdata>
   <preface>
     <foreword obligation='informative'>
       <title>Foreword</title>
@@ -142,7 +146,7 @@ OUTPUT
        </iec-standard>
        INPUT
        presxml = <<~OUTPUT
-       <iec-standard xmlns='https://www.metanorma.org/ns/iec'>
+       <iec-standard xmlns='https://www.metanorma.org/ns/iec' type="presentation">
          <bibdata type='standard'>
            <docidentifier type='iso'>IEC 60050 ED 1</docidentifier>
            <docnumber>60050</docnumber>
@@ -187,6 +191,50 @@ OUTPUT
              </structuredidentifier>
            </ext>
          </bibdata>
+         <local_bibdata type='standard'>
+           <docidentifier type='iso'>IEC 60050 ED 1</docidentifier>
+           <docnumber>60050</docnumber>
+           <contributor>
+             <role type='author'/>
+             <organization>
+               <name>International Electrotechnical Commission</name>
+               <abbreviation>IEC</abbreviation>
+             </organization>
+           </contributor>
+           <contributor>
+             <role type='publisher'/>
+             <organization>
+               <name>International Electrotechnical Commission</name>
+               <abbreviation>IEC</abbreviation>
+             </organization>
+           </contributor>
+           <language>en</language>
+           <script>Latn</script>
+           <status>
+             <stage>60</stage>
+             <substage>60</substage>
+           </status>
+           <copyright>
+             <from>2020</from>
+             <owner>
+               <organization>
+                 <name>International Electrotechnical Commission</name>
+                 <abbreviation>IEC</abbreviation>
+               </organization>
+             </owner>
+           </copyright>
+           <ext>
+             <doctype>article</doctype>
+             <editorialgroup>
+               <technical-committee/>
+               <subcommittee/>
+               <workgroup/>
+             </editorialgroup>
+             <structuredidentifier>
+               <project-number>IEC 60050</project-number>
+             </structuredidentifier>
+           </ext>
+         </local_bibdata>
          <sections> </sections>
          <bibliography>
            <references obligation='informative' normative='true' id="X">
@@ -222,10 +270,6 @@ OUTPUT
       <div>
   <h1>1&#160; Normative References</h1>
   <p id='_'>There are no normative references in this document.</p>
-  <p id='A' class='NormRef'>
-  B,
-  <i>TITLE</i>
-</p>
 </div>
     </div>
   </body>
@@ -294,11 +338,15 @@ OUTPUT
 INPUT
 
 presxml = <<~INPUT
-    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
      <bibdata type='standard'>
            <docidentifier type='ISO'>IEC 60050-192 ED 1</docidentifier>
            <docnumber>60050</docnumber>
     </bibdata>
+     <local_bibdata type='standard'>
+           <docidentifier type='ISO'>IEC 60050-192 ED 1</docidentifier>
+           <docnumber>60050</docnumber>
+    </local_bibdata>
     <sections>
     <clause id="_terms_and_definitions" obligation="normative"><title depth="1">1<tab/>Terms and definitions</title>
     <terms id="_general" obligation="normative"><title>192-01 General</title>
@@ -477,11 +525,15 @@ end
 </iso-standard>
     INPUT
     presxml = <<~OUTPUT
-    <iso-standard xmlns='http://riboseinc.com/isoxml'>
+    <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <bibdata type='standard'>
     <docidentifier type='ISO'>IEC 60050-192 ED 1</docidentifier>
     <docnumber>60050</docnumber>
   </bibdata>
+  <local_bibdata type='standard'>
+    <docidentifier type='ISO'>IEC 60050-192 ED 1</docidentifier>
+    <docnumber>60050</docnumber>
+  </local_bibdata>
   <sections>
     <clause id='_terms_and_definitions' obligation='normative'>
       <title depth='1'>1<tab/>Terms and definitions</title>

data/spec/isodoc/inline_spec.rb

@@ -185,7 +185,7 @@ expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", <<~"INP
     </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/metadata_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe IsoDoc::Iec::Metadata do
     arr = c.convert_init(<<~"INPUT", "test", false)
     <iec-standard xmlns="http://riboseinc.com/isoxml">
     INPUT
-    expect(Hash[c.info(Nokogiri::XML(<<~"INPUT"), nil).sort].to_s.gsub(/, :/, ",\n:")).to be_equivalent_to <<~"OUTPUT"
+    expect(metadata(c.info(Nokogiri::XML(<<~"INPUT"), nil)).to_s.gsub(/, :/, ",\n:")).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>
@@ -76,12 +76,8 @@ INPUT
 {:accesseddate=>"2012",
 :activateddate=>"2013",
 :agency=>"ISO",
-:authors=>[],
-:authors_affiliations=>{},
 :createddate=>"2010&ndash;2011",
 :docnumber=>"ISO/PreCD3 17301-1",
-:docnumber_lang=>nil,
-:docnumber_reference=>nil,
 :docnumeric=>"1730",
 :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: Riz",
 :docsubtitleintro=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses",
@@ -99,11 +95,7 @@ INPUT
 :draftinfo=>" (draft 0.4, 2016-05-01)",
 :edition=>"2",
 :editorialgroup=>["TC 34", "SC 4", "WG 3"],
-:ics=>nil,
-:keywords=>[],
 :obsoleteddate=>"2014",
-:obsoletes=>nil,
-:obsoletes_part=>nil,
 :publisheddate=>"2011",
 :publisher=>"International Organization for Standardization",
 :revdate=>"2016-05-01",
@@ -126,7 +118,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_s.gsub(/, :/, ",\n:")).to be_equivalent_to <<~"OUTPUT"
+    expect(metadata(c.info(Nokogiri::XML(<<~"INPUT"), nil)).to_s.gsub(/, :/, ",\n:")).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <bibdata type="standard">
   <title>
@@ -197,12 +189,7 @@ OUTPUT
 </iso-standard>
 INPUT
 {:agency=>"ISO/IEC",
-:authors=>[],
-:authors_affiliations=>{},
 :docnumber=>"ISO/IEC/CD 17301-1-3",
-:docnumber_lang=>nil,
-:docnumber_reference=>nil,
-: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",
@@ -215,17 +202,11 @@ INPUT
 :doctitlepartlabel=>"Part&nbsp;1&ndash;3",
 :doctype=>"Technical Report",
 :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=>"50",