metanorma-iec 1.2.8 → 1.2.13

data/spec/asciidoctor-iec/inline_spec.rb

@@ -1,6 +1,10 @@
 require "spec_helper"
 
 RSpec.describe Asciidoctor::Iec do
+   before(:all) do
+  @blank_hdr = blank_hdr_gen
+end
+
   it "processes inline_quoted formatting" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
@@ -19,7 +23,7 @@ RSpec.describe Asciidoctor::Iec do
       [strike]#strike#
       [smallcap]#smallcap#
     INPUT
-            #{BLANK_HDR}
+            #{@blank_hdr}
        <sections>
          <em>emphasis</em>
        <strong>strong</strong>
@@ -56,7 +60,7 @@ RSpec.describe Asciidoctor::Iec do
 
       <<<
     INPUT
-            #{BLANK_HDR}
+            #{@blank_hdr}
        <sections><p id="_">Line break<br/>
        line break</p>
        <hr/>
@@ -72,7 +76,7 @@ RSpec.describe Asciidoctor::Iec do
       http://example.com[]
       http://example.com[Link]
     INPUT
-            #{BLANK_HDR}
+            #{@blank_hdr}
        <sections>
          <p id="_">mailto:fred@example.com
        <link target="http://example.com"/>
@@ -87,7 +91,7 @@ RSpec.describe Asciidoctor::Iec do
       #{ASCIIDOC_BLANK_HDR}
       Text [[bookmark]] Text
     INPUT
-            #{BLANK_HDR}
+            #{@blank_hdr}
        <sections>
          <p id="_">Text <bookmark id="bookmark"/> Text</p>
        </sections>
@@ -106,7 +110,7 @@ RSpec.describe Asciidoctor::Iec do
       Inline Reference with Text to <<reference,text>>
       Footnoted Reference with Text to <<reference,fn: text>>
     INPUT
-       #{BLANK_HDR}
+       #{@blank_hdr}
         <sections>
          <clause id="reference" inline-header="false" obligation="normative">
          <title>Section</title>
@@ -130,7 +134,7 @@ RSpec.describe Asciidoctor::Iec do
       * [[[ISO713]]] Reference
 
     INPUT
-            #{BLANK_HDR}
+            #{@blank_hdr}
        <sections>
 
        </sections><bibliography><references id="_" obligation="informative" normative="true">
@@ -156,7 +160,7 @@ RSpec.describe Asciidoctor::Iec do
       #{ASCIIDOC_BLANK_HDR}
       Hello!footnote:[Footnote text]
     INPUT
-            #{BLANK_HDR}
+            #{@blank_hdr}
        <sections>
          <p id="_">Hello!<fn reference="1">
          <p id="_">Footnote text</p>

data/spec/asciidoctor-iec/lists_spec.rb

@@ -1,6 +1,10 @@
 require "spec_helper"
 
 RSpec.describe Asciidoctor::Iec do
+   before(:all) do
+  @blank_hdr = blank_hdr_gen
+end
+
   it "processes simple lists" do
     output = Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)
       #{ASCIIDOC_BLANK_HDR}
@@ -17,7 +21,7 @@ RSpec.describe Asciidoctor::Iec do
 
     INPUT
     expect(xmlpp(strip_guid(output))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-            #{BLANK_HDR}
+            #{@blank_hdr}
        <sections>
          <ul id="_">
          <li>
@@ -28,7 +32,7 @@ RSpec.describe Asciidoctor::Iec do
          </li>
          <li>
            <p id="_">List 3</p>
-           <ol id="_" type="arabic">
+           <ol id="_">
          <li>
            <p id="_">List A</p>
          </li>
@@ -99,7 +103,7 @@ RSpec.describe Asciidoctor::Iec do
 
     INPUT
     expect(xmlpp(strip_guid(output))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-            #{BLANK_HDR}
+            #{@blank_hdr}
        <sections><ul id="id">
          <li>
            <p id="_">First</p>
@@ -107,13 +111,13 @@ RSpec.describe Asciidoctor::Iec do
          <li><p id="_">Second</p><p id="_">entry1</p>
        <p id="_">entry2</p></li>
        </ul>
-       <ol id="id1" type="alphabet">
+       <ol id="id1">
          <li>
            <p id="_">First</p>
          </li>
          <li>
            <p id="_">Second</p>
-           <ol id="_" type="alphabet_upper">
+           <ol id="_">
          <li>
            <p id="_">Third</p>
          </li>
@@ -129,19 +133,19 @@ RSpec.describe Asciidoctor::Iec do
            <p id="_">Sixth</p>
          </li>
        </ol>
-       <ol id="_" type="roman">
+       <ol id="_">
          <li>
            <p id="_">A</p>
          </li>
          <li>
            <p id="_">B</p>
-           <ol id="_" type="roman_upper">
+           <ol id="_">
          <li>
            <p id="_">C</p>
          </li>
          <li>
            <p id="_">D</p>
-           <ol id="_" type="arabic">
+           <ol id="_">
          <li>
            <p id="_">E</p>
          </li>
@@ -172,7 +176,7 @@ RSpec.describe Asciidoctor::Iec do
       * Hello [[id3]] List item
 
      INPUT
-             #{BLANK_HDR}
+             #{@blank_hdr}
              <sections>
               <ul id="id1">
          <li id="id2">

data/spec/asciidoctor-iec/section_spec.rb

@@ -1,6 +1,10 @@
 require "spec_helper"
 
 RSpec.describe Asciidoctor::Iec do
+   before(:all) do
+  @blank_hdr = blank_hdr_gen
+end
+
   it "processes sections" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
@@ -52,7 +56,7 @@ RSpec.describe Asciidoctor::Iec do
 
       === Bibliography Subsection
     INPUT
-            #{BLANK_HDR}
+            #{@blank_hdr}
        <preface><foreword id="_" obligation="informative">
          <title>FOREWORD</title>
          <p id="_">Text</p>
@@ -189,7 +193,7 @@ RSpec.describe Asciidoctor::Iec do
 
       === Bibliography Subsection
     INPUT
-            #{BLANK_HDR}
+            #{@blank_hdr}
        <preface>     
        <foreword id="_" obligation="informative">
          <title>FOREWORD</title>
@@ -298,7 +302,7 @@ RSpec.describe Asciidoctor::Iec do
       [appendix,obligation=informative]
       == Annex
      INPUT
-             #{BLANK_HDR}
+             #{@blank_hdr}
        <sections><clause id="_" inline-header="false" obligation="informative">
          <title>Clause 1</title>
          <clause id="_" inline-header="false" obligation="informative">
@@ -329,7 +333,7 @@ RSpec.describe Asciidoctor::Iec do
       [%inline-header]
       === Clause Aa
      INPUT
-             #{BLANK_HDR}
+             #{@blank_hdr}
        <sections><clause id="_" inline-header="false" obligation="normative">
          <title>Clause 1</title>
          <clause id="_" inline-header="true" obligation="normative">
@@ -354,7 +358,7 @@ RSpec.describe Asciidoctor::Iec do
       === {blank}
 
      INPUT
-             #{BLANK_HDR}
+             #{@blank_hdr}
        <sections>
          <clause id="_" inline-header="false" obligation="normative">
          <title>Clause 1</title>

data/spec/asciidoctor-iec/validate_spec.rb

@@ -17,7 +17,7 @@ RSpec.describe Asciidoctor::Iec do
       expect do
         Metanorma::Compile
           .new
-          .compile("spec/assets/xref_error.adoc", type: "iec")
+          .compile("spec/assets/xref_error.adoc", type: "iec", :"agree-to-terms" => true)
       end.to(change { File.exist?("spec/assets/xref_error.err") }
               .from(false).to(true))
     end
@@ -37,4 +37,19 @@ it "Warns of illegal doctype" do
   INPUT
     expect(File.read("test.err")).to include "pizza is not a recognised document type"
 end
+
+it "Warns of illegal function" do
+    FileUtils.rm_f "test.err"
+    Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :function: pizza
+
+  text
+  INPUT
+    expect(File.read("test.err")).to include "pizza is not a recognised document function"
+end
 end

data/spec/isodoc/i18n_spec.rb

@@ -7,6 +7,11 @@ RSpec.describe IsoDoc do
       <bibdata>
       <docnumber>1</docnumber>
       <language>en</language>
+      <ext>
+      <doctype>international-standard</doctype>
+      <horizontal>true</horizontal>
+      <function>emc</function>
+      </ext>
       </bibdata>
       <preface>
       <foreword obligation="informative">
@@ -77,6 +82,17 @@ RSpec.describe IsoDoc do
        <bibdata>
        <docnumber>1</docnumber>
        <language current="true">en</language>
+       <ext>
+  <doctype language=''>international-standard</doctype>
+  <doctype language='fr'>Norme international</doctype>
+  <doctype language='en'>International Standard</doctype>
+<horizontal language=''>true</horizontal>
+<horizontal language='fr'>Norme horizontale</horizontal>
+<horizontal language='en'>Horizontal Standard</horizontal>
+<function language=''>emc</function>
+<function language='fr'>Publication fondamentale en CEM</function>
+<function language='en'>Basic EMC Publication</function>
+</ext>
        </bibdata>
        <preface>
        <foreword obligation="informative">
@@ -432,6 +448,11 @@ RSpec.describe IsoDoc do
       <iso-standard xmlns="http://riboseinc.com/isoxml">
       <bibdata>
       <language>fr</language>
+      <ext>
+      <doctype>international-standard</doctype>
+      <horizontal>false</horizontal>
+      <function>emc</function>
+      </ext>
       </bibdata>
       <preface>
       <foreword obligation="informative">
@@ -501,6 +522,15 @@ RSpec.describe IsoDoc do
 <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
        <bibdata>
        <language current="true">fr</language>
+       <ext>
+  <doctype language=''>international-standard</doctype>
+  <doctype language='fr'>Norme international</doctype>
+  <doctype language='en'>International Standard</doctype>
+  <horizontal language=''>false</horizontal>
+  <function language=''>emc</function>
+  <function language='fr'>Publication fondamentale en CEM</function>
+  <function language='en'>Basic EMC Publication</function>
+</ext>
        </bibdata>
        <preface>
        <foreword obligation="informative">

data/spec/isodoc/iso_spec.rb

@@ -32,8 +32,8 @@ RSpec.describe IsoDoc::Iec do
     INPUT
     html = File.read("test.html", encoding: "utf-8")
     expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
-    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "SimSun", serif;]m)
-    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "SimHei", sans-serif;]m)
+    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "Source Han Sans", serif;]m)
+    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Source Han Sans", sans-serif;]m)
   end
 
   it "processes isodoc as ISO: user nominated fonts" do
@@ -65,9 +65,9 @@ RSpec.describe IsoDoc::Iec do
     </iso-standard>
     INPUT
     html = File.read("test.doc", encoding: "utf-8")
-    expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New",monospace;]m)
+    expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
     expect(html).to match(%r[Quote[^{]+\{[^{]+font-family: "Arial", sans-serif;]m)
-    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Arial",sans-serif;]m)
+    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Arial", sans-serif;]m)
   end
 
   it "processes examples" do

data/spec/isodoc/metadata_spec.rb

@@ -59,7 +59,15 @@ RSpec.describe IsoDoc::Iec::Metadata do
     </owner>
   </copyright>
   <ext>
-  <doctype>international-standard</doctype>
+  <doctype language=''>international-standard</doctype>
+  <doctype language='fr'>Norme international</doctype>
+  <doctype language='en'>International Standard</doctype>
+<horizontal language=''>true</horizontal>
+<horizontal language='fr'>Norme horizontale</horizontal>
+<horizontal language='en'>Horizontal Standard</horizontal>
+<function language=''>emc</function>
+<function language='fr'>Publication fondamentale en CEM</function>
+<function language='en'>Basic EMC Publication</function>
   <editorialgroup>
     <technical-committee number="34">Food products</technical-committee>
     <subcommittee number="4">Cereals and pulses</subcommittee>
@@ -94,11 +102,21 @@ INPUT
 :doctitlepartlabel=>"Part&nbsp;1",
 :doctype=>"International Standard",
 :doctype_display=>"International Standard",
+:doctype_en=>"International Standard",
+:doctype_fr=>"Norme International",
 :docyear=>"2016",
 :draft=>"0.4",
 :draftinfo=>" (draft 0.4, 2016-05-01)",
 :edition=>"2",
 :editorialgroup=>["TC 34", "SC 4", "WG 3"],
+:function=>"Emc",
+:function_display=>"Basic Emc Publication",
+:function_en=>"Basic Emc Publication",
+:function_fr=>"Publication Fondamentale En Cem",
+:horizontal=>"True",
+:horizontal_display=>"Horizontal Standard",
+:horizontal_en=>"Horizontal Standard",
+:horizontal_fr=>"Norme Horizontale",
 :implementeddate=>"XXX",
 :issueddate=>"XXX",
 :lang=>"en",
@@ -188,6 +206,7 @@ OUTPUT
   </relation>
   <ext>
   <doctype>technical-report</doctype>
+  <horizontal>false</horizontal>
   <editorialgroup>
     <technical-committee number="34" type="ABC">Food products</technical-committee>
     <subcommittee number="4" type="DEF">Cereals and pulses</subcommittee>
@@ -221,8 +240,11 @@ INPUT
 :doctitlepartlabel=>"Part&nbsp;1&ndash;3",
 :doctype=>"Technical Report",
 :doctype_display=>"Technical Report",
+:doctype_en=>"Technical Report",
+:doctype_fr=>"Technical Report",
 :docyear=>"2016",
 :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"],
+:horizontal=>"False",
 :ics=>"1.2.3, 1.2.3",
 :implementeddate=>"XXX",
 :issueddate=>"XXX",

data/spec/metanorma/processor_spec.rb

@@ -27,7 +27,7 @@ RSpec.describe Metanorma::Iec::Processor do
     expect(xmlpp(strip_guid(processor.input_to_isodoc(<<~"INPUT", nil)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     #{ASCIIDOC_BLANK_HDR}
     INPUT
-    #{BLANK_HDR}
+    #{blank_hdr_gen}
 <sections/>
 </iec-standard>
     OUTPUT

data/spec/spec_helper.rb

@@ -112,36 +112,17 @@ TERMS_BOILERPLATE = <<~"BOILERPLATE"
 </ul>
 BOILERPLATE
 
-BOILERPLATE =
-  HTMLEntities.new.decode(
-  File.read(File.join(File.dirname(__FILE__), "..", "lib", "asciidoctor", "iec", "iec_intro_en.xml"), encoding: "utf-8").
-  gsub(/\{\{ agency \}\}/, "IEC").gsub(/\{\{ docyear \}\}/, Date.today.year.to_s).
-  gsub(/\{% if unpublished %\}.*\{% endif %\}/m, "").
-  gsub(/(?<=\p{Alnum})'(?=\p{Alpha})/, "’").
-  gsub(/<p>/, "<p id='_'>").
-  gsub(/<ol>/, "<ol id='_'>")
-)
-
-BOILERPLATE_LICENSE = <<~END
-<license-statement>
-  <clause>
-    <title>Warning for CDs, CDVs and FDISs</title>
-    <p id='_'>
-      This document is not an IEC International Standard. It is distributed
-      for review and comment. It is subject to change without notice and may
-      not be referred to as an International Standard.
-    </p>
-    <p id='_'>
-      Recipients of this draft are invited to submit, with their comments,
-      notification of any relevant patent rights of which they are aware and
-      to provide supporting documentation.
-    </p>
-  </clause>
-</license-statement>
-END
-
-UNPUBLISHED_BOILERPLATE = BOILERPLATE.sub(/<\/boilerplate>/, "#{BOILERPLATE_LICENSE}</boilerplate>")
-
+def boilerplate(xmldoc)
+  file = File.read(File.join(File.dirname(__FILE__), "..", "lib", "asciidoctor", "iec", "iec_intro_en.xml"), encoding: "utf-8")
+  conv = Asciidoctor::Iec::Converter.new(nil, backend: :iec, header_footer: true)
+  conv.init(Asciidoctor::Document.new [])
+  ret = Nokogiri::XML(
+    conv.boilerplate_isodoc(xmldoc).populate_template(file, nil).
+    gsub(/<p>/, "<p id='_'>").
+    gsub(/<ol>/, "<ol id='_'>"))
+  conv.smartquotes_cleanup(ret)
+  HTMLEntities.new.decode(ret.to_xml)
+end
 
 BLANK_HDR = <<~"HDR"
 <?xml version="1.0" encoding="UTF-8"?>
@@ -178,6 +159,7 @@ BLANK_HDR = <<~"HDR"
   </copyright>
   <ext>
     <doctype>article</doctype>
+    <horizontal>false</horizontal>
   <editorialgroup>
     <technical-committee/>
     <subcommittee/>
@@ -186,9 +168,16 @@ BLANK_HDR = <<~"HDR"
   <stagename>International standard</stagename>
   </ext>
 </bibdata>
-#{BOILERPLATE}
 HDR
 
+def blank_hdr_gen
+<<~"HDR"
+#{BLANK_HDR}
+#{boilerplate(Nokogiri::XML(BLANK_HDR + "</iec-standard>"))}
+HDR
+end
+
+
 IEC_TITLE = <<~END
  <p class="zzSTDTitle1">INTERNATIONAL ELECTROTECHNICAL COMMISSION</p>
              <p class="zzSTDTitle1">____________</p>