metanorma-iec 1.1.2 → 1.2.4

data/lib/isodoc/iec/init.rb

@@ -0,0 +1,29 @@
+require "isodoc"
+require_relative "metadata"
+require_relative "xref"
+require_relative "i18n"
+
+module IsoDoc
+  module Iec
+    module Init
+      def metadata_init(lang, script, labels)
+        @meta = Metadata.new(lang, script, labels)
+      end
+
+      def xref_init(lang, script, klass, labels, options)
+        @xrefs = Xref.new(lang, script, HtmlConvert.new(language: lang, script: script), labels, options)
+      end
+
+       def i18n_init(lang, script, i18nyaml = nil)
+        @i18n = I18n.new(lang, script, i18nyaml || @i18nyaml)
+      end
+
+      def convert1(docxml, filename, dir)
+        id = docxml&.at(ns("//bibdata/docnumber"))&.text
+        @is_iev = id == "60050"
+        super
+      end
+    end
+  end
+end
+

data/lib/isodoc/iec/presentation_xml_convert.rb

@@ -1,9 +1,34 @@
-require_relative "base_convert"
+require_relative "init"
 require "isodoc"
 
 module IsoDoc
   module Iec
     class PresentationXMLConvert < IsoDoc::Iso::PresentationXMLConvert
+      def clause(docxml)
+        docxml.xpath(ns("//clause[not(ancestor::annex)] | "\
+                        "//definitions | //references | "\
+                        "//preface/introduction[clause]")).
+        each do |f|
+          clause1(f)
+        end
+        docxml.xpath(ns("//terms")).each do |f|
+          termclause1(f)
+        end
+      end
+
+      def termclause1(f)
+        return clause1(f) unless @is_iev
+        return if @suppressheadingnumbers || f["unnumbered"]
+        lbl = @xrefs.anchor(f['id'], :label, true) or return
+        prefix_name(f, " ", "#{lbl}#{clausedelim}", "title")
+      end
+
+      def clause1(f)
+        IsoDoc::PresentationXMLConvert.instance_method(:clause1).bind(self).
+          call(f)
+      end
+
+      include Init
     end
   end
 end

data/lib/isodoc/iec/word_convert.rb

@@ -1,6 +1,7 @@
 require "isodoc"
 require "metanorma-iso"
 require_relative "base_convert"
+require_relative "init"
 
 module IsoDoc
   module Iec
@@ -171,7 +172,7 @@ module IsoDoc
           div.p **attr_code(class: "formula") do |p|
             insert_tab(div, 1)
             parse(node.at(ns("./stem")), div)
-            lbl = @xrefs.anchor(node['id'], :label, false)
+            lbl = node&.at(ns("./name"))&.text
             unless lbl.nil?
               insert_tab(div, 1)
               div << "(#{lbl})"
@@ -181,6 +182,7 @@ module IsoDoc
       end
 
       include BaseConvert
+      include Init
     end
   end
 end

data/lib/isodoc/iec/xref.rb

@@ -38,7 +38,7 @@ module IsoDoc
       def annex_name_lbl(clause, num)
         obl = l10n("(#{@labels["inform_annex"]})")
         obl = l10n("(#{@labels["norm_annex"]})") if clause["obligation"] == "normative"
-        l10n("<b>#{@labels["annex"]} #{num}</b><br/><br/>#{obl}")
+        l10n("<strong>#{@labels["annex"]} #{num}</strong><br/>#{obl}")
       end
     end
   end

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "1.1.2"
+    VERSION = "1.2.4"
   end
 end
 

data/metanorma-iec.gemspec

@@ -28,8 +28,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "isodoc", "~> 1.1.0"
-  spec.add_dependency "metanorma-iso", "~> 1.4.0"
+  spec.add_dependency "isodoc", "~> 1.2.0"
+  spec.add_dependency "metanorma-iso", "~> 1.5.0"
 
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "sassc", "2.4.0"

data/spec/asciidoctor-iec/blocks_spec.rb

@@ -265,7 +265,7 @@ RSpec.describe Asciidoctor::Iec do
       INPUT
       #{BLANK_HDR}
              <preface><foreword id="_" obligation="informative">
-         <title>Foreword</title>
+         <title>FOREWORD</title>
          <p id="_">This is a preamble</p>
        </foreword></preface><sections>
        <clause id="_" inline-header="false" obligation="normative">

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>
@@ -121,7 +145,7 @@ RSpec.describe Asciidoctor::Iec do
        #{BLANK_HDR}
        <preface>
        <foreword id="_" obligation="informative">
-         <title>Foreword</title>
+         <title>FOREWORD</title>
          <p id="_">
          <eref type="inline" bibitemid="iso216" citeas="ISO 216"/>
        </p>
@@ -189,7 +213,7 @@ RSpec.describe Asciidoctor::Iec do
     INPUT
       #{BLANK_HDR}
       <sections></sections>
-      <bibliography><references id="_" obligation="informative" normative="true"><title>Normative References</title>
+      <bibliography><references id="_" obligation="informative" normative="true"><title>Normative references</title>
       <p id="_">The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
              <bibitem id="iso216" type="standard">
          <title format="text/plain">Reference</title>
@@ -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

@@ -68,7 +68,7 @@ RSpec.describe Asciidoctor::Iec do
          <sections> </sections>
          <bibliography>
            <references id='_' obligation='informative' normative="true">
-             <title>Normative References</title>
+             <title>Normative references</title>
              <p id='_'>There are no normative references in this document.</p>
              <bibitem id='A'>
                <formattedref format='application/x-isodoc+xml'>
@@ -158,4 +158,77 @@ INPUT
 
 OUTPUT
   end
+
+      it "uses IEV introduction title" do
+     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :novalid:
+      :no-isobib:
+      :docnumber: 60050
+
+      == Introduction
+
+      Text
+    INPUT
+    <?xml version='1.0' encoding='UTF-8'?>
+    <iec-standard xmlns='https://www.metanorma.org/ns/iec'>
+         <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 abbreviation='PPUB'>60</stage>
+             <substage abbreviation='PPUB'>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>
+             <stagename>International standard</stagename>
+           </ext>
+         </bibdata>
+         #{BOILERPLATE}
+         <preface>
+           <introduction id='_' obligation='informative'>
+             <title>INTRODUCTION&lt;br/&gt;Principles and rules followed</title>
+             <p id='_'>Text</p>
+           </introduction>
+         </preface>
+         <sections> </sections>
+       </iec-standard>
+OUTPUT
+      end
 end

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>
@@ -128,7 +134,7 @@ RSpec.describe Asciidoctor::Iec do
        <sections>
 
        </sections><bibliography><references id="_" obligation="informative" normative="true">
-         <title>Normative References</title>
+         <title>Normative references</title>
          <p id="_">The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
          <bibitem id="ISO712">
          <formattedref format="application/x-isodoc+xml">Reference</formattedref>

data/spec/asciidoctor-iec/section_spec.rb

@@ -54,13 +54,14 @@ RSpec.describe Asciidoctor::Iec do
     INPUT
             #{BLANK_HDR}
        <preface><foreword id="_" obligation="informative">
-         <title>Foreword</title>
+         <title>FOREWORD</title>
          <p id="_">Text</p>
-       </foreword><introduction id="_" obligation="informative"><title>Introduction</title><clause id="_" inline-header="false" obligation="informative">
+       </foreword><introduction id="_" obligation="informative">
+<title>INTRODUCTION</title><clause id="_" inline-header="false" obligation="informative">
          <title>Introduction Subsection</title>
        </clause>
        </introduction></preface><sections>
-       <clause id="_" obligation="normative">
+       <clause id="_" obligation="normative" type="scope" inline-header='false'>
          <title>Scope</title>
          <p id="_">Text</p>
        </clause>
@@ -98,8 +99,8 @@ RSpec.describe Asciidoctor::Iec do
          <preferred>Term2</preferred>
        </term>
        </terms>
-       <definitions id="_"><title>Symbols and Abbreviated Terms</title></definitions></clause>
-       <definitions id="_"><title>Symbols and Abbreviated Terms</title></definitions>
+       <definitions id="_" obligation="normative"><title>Symbols and abbreviated terms</title></definitions></clause>
+       <definitions id="_" obligation="normative"><title>Symbols and abbreviated terms</title></definitions>
        <clause id="_" inline-header="false" obligation="normative"><title>Clause 4</title><clause id="_" inline-header="false" obligation="normative">
          <title>Introduction</title>
        </clause>
@@ -119,7 +120,7 @@ RSpec.describe Asciidoctor::Iec do
        <appendix id="_" inline-header="false" obligation="normative">
           <title>Appendix 1</title>
        </appendix></annex><bibliography><references id="_" obligation="informative" normative="true">
-         <title>Normative References</title><p id="_">There are no normative references in this document.</p>
+         <title>Normative references</title><p id="_">There are no normative references in this document.</p>
        </references><clause id="_" obligation="informative">
          <title>Bibliography</title>
          <references id="_" obligation="informative" normative="false">
@@ -191,16 +192,17 @@ RSpec.describe Asciidoctor::Iec do
             #{BLANK_HDR}
        <preface>     
        <foreword id="_" obligation="informative">
-         <title>Foreword</title>
+         <title>FOREWORD</title>
          <p id="_">Text</p>
        </foreword>
-       <introduction id="_" obligation="informative"><title>Introduction</title><clause id="_" inline-header="false" obligation="informative">
+       <introduction id="_" obligation="informative">
+<title>INTRODUCTION</title><clause id="_" inline-header="false" obligation="informative">
          <title>Introduction Subsection</title>
        </clause>
        </introduction>
        </preface>
        <sections>
-       <clause id="_" obligation="normative">
+       <clause id="_" obligation="normative" type="scope" inline-header='false'>
          <title>Scope</title>
          <p id="_">Text</p>
        </clause>
@@ -214,7 +216,7 @@ RSpec.describe Asciidoctor::Iec do
        </term>
        </terms>
        <clause id='_' obligation='normative'>
-             <title>Terms and definitions</title>
+             <title>Terms, definitions, symbols and abbreviated terms</title>
              <terms id='_' obligation='normative'>
                <title>Normal Terms</title>
                 <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
@@ -240,12 +242,12 @@ RSpec.describe Asciidoctor::Iec do
                  <preferred>Term2</preferred>
                </term>
              </terms>
-             <definitions id='_'>
-               <title>Σύμβολα και Συντομογραφίες</title>
+             <definitions id='_' obligation="normative">
+               <title>Symbols and abbreviated terms</title>
              </definitions>
            </clause>
-           <definitions id='_'>
-             <title>Σύμβολα και Συντομογραφίες</title>
+           <definitions id='_' obligation="normative">
+             <title>Symbols and abbreviated terms</title>
            </definitions>
            <clause id='_' inline-header='false' obligation='normative'>
              <title>Clause 4</title>
@@ -268,7 +270,7 @@ RSpec.describe Asciidoctor::Iec do
          </annex>
          <bibliography>
            <references id='_' obligation='informative' normative="true">
-             <title>Normative References</title>
+             <title>Normative references</title>
              <p id="_">There are no normative references in this document.</p>
            </references>
            <clause id='_' obligation='informative'>

data/spec/isodoc/blocks_spec.rb

@@ -80,10 +80,11 @@ RSpec.describe IsoDoc::Iec do
   </dd>
 </dl>
     <note id="_83083c7a-6c85-43db-a9fa-4d8edd0c9fc0">
+    <name>NOTE</name>
   <p id="_511aaa98-4116-42af-8e5b-c87cdf5bfdc8">[durationUnits] is essentially a duration statement without the "P" prefix. "P" is unnecessary because between "G" and "U" duration is always expressed.</p>
 </note>
     </formula>
-    <formula id="_be9158af-7e93-4ee2-90c5-26d31c181935">
+    <formula id="_be9158af-7e93-4ee2-90c5-26d31c181935"><name>1</name>
   <stem type="AsciiMath">r = 1 %</stem>
   </formula>
     </foreword></preface>
@@ -151,4 +152,68 @@ RSpec.describe IsoDoc::Iec do
     OUTPUT
   end
 
+     it "cross-references formulae" do
+    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true).gsub(%r{^.*<body}m, "<body").gsub(%r{</body>.*}m, "</body>"))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+            <iso-standard xmlns="http://riboseinc.com/isoxml">
+            <preface>
+    <foreword>
+    <p>
+    <xref target="N1"/>
+    <xref target="N2"/>
+    </p>
+    </foreword>
+    </preface>
+    <sections>
+    <clause id="intro"><title>First</title>
+    <formula id="N1">
+  <stem type="AsciiMath">r = 1 %</stem>
+  </formula>
+  <clause id="xyz"><title>Preparatory</title>
+    <formula id="N2" inequality="true">
+  <stem type="AsciiMath">r = 1 %</stem>
+  </formula>
+    <xref target="N2"/>
+</clause>
+</sections>
+    </iso-standard>
+    INPUT
+    <iso-standard xmlns='http://riboseinc.com/isoxml'>
+         <preface>
+           <foreword>
+             <p>
+               <xref target='N1'>Clause 1, Equation (1)</xref>
+               <xref target='N2'>1.1, Inequality (2)</xref>
+             </p>
+           </foreword>
+         </preface>
+         <sections>
+           <clause id='intro'>
+             <title depth='1'>
+               1
+               <tab/>
+               First
+             </title>
+             <formula id='N1'>
+               <name>1</name>
+               <stem type='AsciiMath'>r = 1 %</stem>
+             </formula>
+             <clause id='xyz'>
+               <title depth='2'>
+                 1.1
+                 <tab/>
+                 Preparatory
+               </title>
+               <formula id='N2' inequality='true'>
+                 <name>2</name>
+                 <stem type='AsciiMath'>r = 1 %</stem>
+               </formula>
+               <xref target='N2'>Inequality (2)</xref>
+             </clause>
+           </clause>
+         </sections>
+       </iso-standard>
+    OUTPUT
+       end
+
+
 end