metanorma-iso 1.5.8 → 1.5.13

data/spec/asciidoctor-iso/validate_spec.rb

@@ -2,6 +2,26 @@ require "spec_helper"
 require "fileutils"
 
 RSpec.describe Asciidoctor::ISO 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: "iso")
+      end.to(change { File.exist?("spec/assets/xref_error.err") }
+              .from(false).to(true))
+    end
+  end
 
 it "Warns of missing scope" do
     FileUtils.rm_f "test.err"
@@ -182,6 +202,23 @@ it "Warns of illegal script" do
     expect(File.read("test.err")).to include "pizza is not a recognised script"
 end
 
+it "warns that technical report may contain requirement" do
+    FileUtils.rm_f "test.err"
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :doctype: technical-report
+
+  == Random clause
+
+  The widget is required not to be larger than 15 cm.
+  INPUT
+    expect(File.read("test.err")).to include "Technical Report clause may contain requirement"
+end
+
 
 it "warns that introduction may contain requirement" do
     FileUtils.rm_f "test.err"
@@ -332,7 +369,7 @@ it "warns that undated reference has locality" do
     FileUtils.rm_f "test.err"
   Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
   #{VALIDATING_BLANK_HDR}
-  
+
   == Scope
   <<iso123,clause=1>>
 
@@ -417,7 +454,7 @@ it "warns that Scope contains subclauses" do
   #{VALIDATING_BLANK_HDR}
 
   == Scope
-  
+
   === Scope subclause
   INPUT
     expect(File.read("test.err")).to include "Scope contains subclauses: should be succinct"
@@ -427,7 +464,7 @@ end
 it "warns that Table should have title" do
     FileUtils.rm_f "test.err"
   Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
-  #{VALIDATING_BLANK_HDR}     
+  #{VALIDATING_BLANK_HDR}
 
   |===
   |a |b |c
@@ -439,7 +476,7 @@ end
 it "gives Style warning if number not broken up in threes" do
     FileUtils.rm_f "test.err"
   Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
-  #{VALIDATING_BLANK_HDR}     
+  #{VALIDATING_BLANK_HDR}
 
   == Clause
   12121
@@ -450,7 +487,7 @@ end
 it "gives No style warning if number not broken up in threes is ISO reference" do
     FileUtils.rm_f "test.err"
   Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
-  #{VALIDATING_BLANK_HDR}     
+  #{VALIDATING_BLANK_HDR}
 
   == Clause
   ISO 12121
@@ -461,7 +498,7 @@ end
 it "Style warning if decimal point" do
     FileUtils.rm_f "test.err"
   Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
-  #{VALIDATING_BLANK_HDR}     
+  #{VALIDATING_BLANK_HDR}
 
   == Clause
   8.1
@@ -472,7 +509,7 @@ end
 it "Style warning if billion used" do
     FileUtils.rm_f "test.err"
   Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
-  #{VALIDATING_BLANK_HDR}     
+  #{VALIDATING_BLANK_HDR}
 
   == Clause
   "Billions" are a term of art.
@@ -483,7 +520,7 @@ end
 it "Style warning if no space before percent sign" do
     FileUtils.rm_f "test.err"
   Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
-  #{VALIDATING_BLANK_HDR}     
+  #{VALIDATING_BLANK_HDR}
 
   == Clause
   95%
@@ -572,7 +609,7 @@ end
 # it "Style warning if foreword contains subclauses" do
   # expect { Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true) }.to output(%r{non-standard unit}).to_stderr
   #  #{VALIDATING_BLANK_HDR}
-# 
+#
   # INPUT
 # end
 
@@ -644,7 +681,7 @@ it "Warning if introduction not followed by scope" do
   Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
   #{VALIDATING_BLANK_HDR}
 
-  .Foreword 
+  .Foreword
   Foreword
 
   == Introduction
@@ -661,7 +698,7 @@ it "Warning if normative references not followed by terms and definitions" do
   Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
   #{VALIDATING_BLANK_HDR}
 
-  .Foreword 
+  .Foreword
   Foreword
 
   == Scope
@@ -681,7 +718,7 @@ it "Warning if there are no clauses in the document" do
   Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
   #{VALIDATING_BLANK_HDR}
 
-  .Foreword 
+  .Foreword
   Foreword
 
   == Scope
@@ -1089,7 +1126,7 @@ it "Warning if term definition starts with article" do
   Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
   #{VALIDATING_BLANK_HDR}
   == Terms and Definitions
-  
+
   === Term
 
   The definition of a term is a part of the specialized vocabulary of a particular field
@@ -1102,7 +1139,7 @@ it "Warning if term definition ends with period" do
   Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
   #{VALIDATING_BLANK_HDR}
   == Terms and Definitions
-  
+
   === Term
 
   Part of the specialized vocabulary of a particular field.
@@ -1202,7 +1239,7 @@ it "Warn if an undated reference has no associated footnote" do
     FileUtils.rm_f "test.err"
     Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
   #{VALIDATING_BLANK_HDR}
-  
+
   [bibliography]
   == Bibliography
   * [[[ISO8,ISO 8:--]]], _Title_

data/spec/assets/xref_error.adoc

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

data/spec/isodoc/amd_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 RSpec.describe IsoDoc do
   it "cross-references notes in amendments" do
-    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(IsoDoc::Iso::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> <ext> <doctype>amendment</doctype> </ext> </bibdata>
     <preface>
@@ -57,10 +57,10 @@ 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>
+      <doctype language="">amendment</doctype>
     </ext>
   </bibdata>
   <preface>
@@ -153,7 +153,7 @@ RSpec.describe IsoDoc do
   end
 
   it "cross-references sections" do
-    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(IsoDoc::Iso::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> <ext> <doctype>amendment</doctype> </ext> </bibdata>
       <preface>
@@ -218,10 +218,10 @@ 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>
+             <doctype language="">amendment</doctype>
            </ext>
          </bibdata>
          <preface>
@@ -396,10 +396,10 @@ 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>
+             <doctype language="">amendment</doctype>
            </ext>
          </bibdata>
          <boilerplate>
@@ -618,7 +618,7 @@ RSpec.describe IsoDoc do
   </body>
 </html>
 OUTPUT
-    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", input, true)).sub(%r{<localized-strings>.*</localized-strings>}m, "")).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
     end
 
@@ -627,7 +627,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
@@ -719,9 +719,11 @@ OUTPUT
   <sections/>
 </iso-standard>
 INPUT
-{:agency=>"ISO",
-:authors=>[],
-:authors_affiliations=>{},
+{:accesseddate=>"XXX",
+:agency=>"ISO",
+:circulateddate=>"XXX",
+:confirmeddate=>"XXX",
+:copieddate=>"XXX",
 :createddate=>"2016-05-01",
 :docnumber=>"ISO/PreNWIP3 17301-1:2016/Amd.1",
 :docnumber_lang=>"ISO/PreNWIP3 17301-1:2016/Amd.1(E)",
@@ -744,31 +746,203 @@ INPUT
 :doctitlepart=>"Title Part",
 :doctitlepartlabel=>"Part&nbsp;1",
 :doctype=>"Amendment",
+:doctype_display=>"Amendment",
 :docyear=>"2017",
 :draft=>"0.3.4",
 :draftinfo=>" (draft 0.3.4, 2000-01-01)",
 :edition=>"2",
 :editorialgroup=>["A 1", "B 2", "C 3"],
 :ics=>"1, 2, 3",
-:keywords=>[],
-:obsoletes=>nil,
-:obsoletes_part=>nil,
+:implementeddate=>"XXX",
+:issueddate=>"XXX",
+:lang=>"en",
+:obsoleteddate=>"XXX",
+:publisheddate=>"XXX",
 :publisher=>"International Organization for Standardization",
+:receiveddate=>"XXX",
 :revdate=>"2000-01-01",
 :revdate_monthyear=>"January 2000",
 :sc=>"B 2",
+:script=>"Latn",
 :secretariat=>"SECRETARIAT",
 :stage=>"10",
 :stage_int=>10,
 :stageabbr=>"NWIP",
 :statusabbr=>"PreNWIP3",
 :tc=>"A 1",
-:tc_docnumber=>[],
+:transmitteddate=>"XXX",
+:unchangeddate=>"XXX",
 :unpublished=>true,
+:updateddate=>"XXX",
+:vote_endeddate=>"XXX",
+:vote_starteddate=>"XXX",
 :wg=>"C 3"}
 OUTPUT
   end
 
+     it "processes IsoXML metadata in French" do
+    c = IsoDoc::Iso::HtmlConvert.new({})
+    arr = c.convert_init(<<~"INPUT", "test", false)
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <bibdata>
+    <language>fr</language>
+    </bibdata>
+    </iso-standard>
+    INPUT
+  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
+       extraneous matter, milled rice (nonglutinous), sample dividers and
+       recommendations relating to storage and transport conditions</title>
+    <title language='en' format='text/plain' type='title-intro'>Introduction</title>
+    <title language='en' format='text/plain' type='title-main'>Main Title — Title</title>
+    <title language='en' format='text/plain' type='title-part'>Title Part</title>
+    <title language='en' format='text/plain' type='title-amd'>Mass fraction of extraneous matter, milled rice (nonglutinous), sample dividers and recommendations relating to storage and transport conditions</title>
+<title language='fr' format='text/plain' type='main'>
+  Introduction Française — Titre Principal — Part du Titre — Fraction
+  massique de matière étrangère, riz usiné (non gluant), diviseurs
+  d’échantillon et recommandations relatives aux conditions d’entreposage et
+  de transport
+</title>
+    <title language='fr' format='text/plain' type='title-intro'>Introduction Française</title>
+    <title language='fr' format='text/plain' type='title-main'>Titre Principal</title>
+    <title language='fr' format='text/plain' type='title-part'>Part du Titre</title>
+    <title language='fr' format='text/plain' type='title-amd'>Fraction massique de matière étrangère, riz usiné (non gluant), diviseurs d’échantillon et recommandations relatives aux conditions d’entreposage et de transport</title>
+    <docidentifier type='ISO'>ISO/PreNWIP3 17301-1:2016/Amd.1</docidentifier>
+    <docidentifier type='iso-with-lang'>ISO/PreNWIP3 17301-1:2016/Amd.1(E)</docidentifier>
+    <docidentifier type='iso-reference'>ISO/PreNWIP3 17301-1:2016/Amd.1:2017(E)</docidentifier>
+    <docnumber>17301</docnumber>
+    <date type='created'>
+      <on>2016-05-01</on>
+    </date>
+    <contributor>
+      <role type='author'/>
+      <organization>
+        <name>International Organization for Standardization</name>
+        <abbreviation>ISO</abbreviation>
+      </organization>
+    </contributor>
+    <contributor>
+      <role type='publisher'/>
+      <organization>
+        <name>International Organization for Standardization</name>
+        <abbreviation>ISO</abbreviation>
+      </organization>
+    </contributor>
+    <edition>2</edition>
+    <version>
+      <revision-date>2000-01-01</revision-date>
+      <draft>0.3.4</draft>
+    </version>
+    <language>fr</language>
+    <script>Latn</script>
+    <status>
+      <stage abbreviation='NWIP'>10</stage>
+      <substage>20</substage>
+      <iteration>3</iteration>
+    </status>
+    <copyright>
+      <from>2017</from>
+      <owner>
+        <organization>
+          <name>International Organization for Standardization</name>
+          <abbreviation>ISO</abbreviation>
+        </organization>
+      </owner>
+    </copyright>
+    <ext>
+      <doctype language="">amendment</doctype>
+      <doctype language="fr">Amendment</doctype>
+      <editorialgroup>
+        <technical-committee number='1' type='A'>TC</technical-committee>
+        <technical-committee number='11' type='A1'>TC1</technical-committee>
+        <subcommittee number='2' type='B'>SC</subcommittee>
+        <subcommittee number='21' type='B1'>SC1</subcommittee>
+        <workgroup number='3' type='C'>WG</workgroup>
+        <workgroup number='31' type='C1'>WG1</workgroup>
+        <secretariat>SECRETARIAT</secretariat>
+      </editorialgroup>
+      <ics>
+        <code>1</code>
+      </ics>
+      <ics>
+        <code>2</code>
+      </ics>
+      <ics>
+        <code>3</code>
+      </ics>
+      <structuredidentifier>
+        <project-number part='1' amendment='1' corrigendum='2' origyr='2016-05-01'>17301</project-number>
+      </structuredidentifier>
+      <stagename>New work item proposal</stagename>
+      <updates-document-type>international-standard</updates-document-type>
+    </ext>
+  </bibdata>
+  <sections/>
+</iso-standard>
+INPUT
+{:accesseddate=>"XXX",
+:agency=>"ISO",
+:circulateddate=>"XXX",
+:confirmeddate=>"XXX",
+:copieddate=>"XXX",
+:createddate=>"2016-05-01",
+:docnumber=>"ISO/PreNWIP3 17301-1:2016/Amd.1",
+:docnumber_lang=>"ISO/PreNWIP3 17301-1:2016/Amd.1(E)",
+:docnumber_reference=>"ISO/PreNWIP3 17301-1:2016/Amd.1:2017(E)",
+:docnumeric=>"17301",
+:docsubtitle=>"Introduction&nbsp;&mdash; Main Title&#x2009;&#x2014;&#x2009;Title&nbsp;&mdash; Part&nbsp;1: Title Part",
+:docsubtitleamd=>"Mass fraction of extraneous matter, milled rice (nonglutinous), sample dividers and recommendations relating to storage and transport conditions",
+:docsubtitleamdlabel=>"AMENDMENT&nbsp;1",
+:docsubtitlecorrlabel=>"TECHNICAL CORRIGENDUM&nbsp;2",
+:docsubtitleintro=>"Introduction",
+:docsubtitlemain=>"Main Title&#x2009;&#x2014;&#x2009;Title",
+:docsubtitlepart=>"Title Part",
+:docsubtitlepartlabel=>"Part&nbsp;1",
+:doctitle=>"Introduction Fran&#xe7;aise&nbsp;&mdash; Titre Principal&nbsp;&mdash; Partie&nbsp;1: Part du Titre",
+:doctitleamd=>"Fraction massique de mati&#xe8;re &#xe9;trang&#xe8;re, riz usin&#xe9; (non gluant), diviseurs d&#x2019;&#xe9;chantillon et recommandations relatives aux conditions d&#x2019;entreposage et de transport",
+:doctitleamdlabel=>"AMENDMENT&nbsp;1",
+:doctitlecorrlabel=>"RECTIFICATIF TECHNIQUE&nbsp;2",
+:doctitleintro=>"Introduction Fran&#xe7;aise",
+:doctitlemain=>"Titre Principal",
+:doctitlepart=>"Part du Titre",
+:doctitlepartlabel=>"Partie&nbsp;1",
+:doctype=>"Amendment",
+:doctype_display=>"Amendment",
+:docyear=>"2017",
+:draft=>"0.3.4",
+:draftinfo=>" (brouillon 0.3.4, 2000-01-01)",
+:edition=>"2",
+:editorialgroup=>["A 1", "B 2", "C 3"],
+:ics=>"1, 2, 3",
+:implementeddate=>"XXX",
+:issueddate=>"XXX",
+:lang=>"fr",
+:obsoleteddate=>"XXX",
+:publisheddate=>"XXX",
+:publisher=>"International Organization for Standardization",
+:receiveddate=>"XXX",
+:revdate=>"2000-01-01",
+:revdate_monthyear=>"Janvier 2000",
+:sc=>"B 2",
+:script=>"Latn",
+:secretariat=>"SECRETARIAT",
+:stage=>"10",
+:stage_int=>10,
+:stageabbr=>"NWIP",
+:statusabbr=>"PreNWIP3",
+:tc=>"A 1",
+:transmitteddate=>"XXX",
+:unchangeddate=>"XXX",
+:unpublished=>true,
+:updateddate=>"XXX",
+:vote_endeddate=>"XXX",
+:vote_starteddate=>"XXX",
+:wg=>"C 3"}
+OUTPUT
+     end
+
   it "processes middle title" do
          expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       <iso-standard xmlns="http://riboseinc.com/isoxml">