metanorma-iec 1.0.8 → 1.1.3

data/lib/isodoc/iec/pdf_convert.rb

@@ -13,18 +13,8 @@ module IsoDoc
         super
       end
 
-      def convert(filename, file = nil, debug = false)
-        file = File.read(filename, encoding: "utf-8") if file.nil?
-        docxml, outname_html, dir = convert_init(file, filename, debug)
-        /\.xml$/.match(filename) or
-          filename = Tempfile.open([outname_html, ".xml"], encoding: "utf-8") do |f|
-          f.write file
-          f.path
-        end
-        FileUtils.rm_rf dir
-        ::Metanorma::Output::XslfoPdf.new.convert(
-          filename, outname_html + ".pdf",
-          File.join(@libdir, "iec.international-standard.xsl"))
+      def pdf_stylesheet(docxml)
+        "iec.international-standard.xsl"
       end
     end
   end

data/lib/isodoc/iec/presentation_xml_convert.rb

@@ -0,0 +1,10 @@
+require_relative "base_convert"
+require "isodoc"
+
+module IsoDoc
+  module Iec
+    class PresentationXMLConvert < IsoDoc::Iso::PresentationXMLConvert
+    end
+  end
+end
+

data/lib/isodoc/iec/word_convert.rb

@@ -47,7 +47,7 @@ module IsoDoc
                           <span lang="EN-GB"><span
         style='mso-element:field-begin'></span><span
         style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t &quot;TableTitle,1&quot; <span
+        \\h \\z \\t &quot;TableTitle,tabletitle&quot; <span
         style='mso-element:field-separator'></span></span>
       TOC
 
@@ -55,7 +55,7 @@ module IsoDoc
                                       <span lang="EN-GB"><span
         style='mso-element:field-begin'></span><span
         style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t &quot;FigureTitle,1&quot; <span
+        \\h \\z \\t &quot;FigureTitle,figuretitle&quot; <span
         style='mso-element:field-separator'></span></span>
       TOC
 
@@ -167,11 +167,11 @@ module IsoDoc
       end
 
       def formula_parse1(node, out)
-        out.div **attr_code(id: node["id"], class: "formula") do |div|
+        out.div **attr_code(class: "formula") do |div|
           div.p **attr_code(class: "formula") do |p|
             insert_tab(div, 1)
             parse(node.at(ns("./stem")), div)
-            lbl = anchor(node['id'], :label, false)
+            lbl = @xrefs.anchor(node['id'], :label, false)
             unless lbl.nil?
               insert_tab(div, 1)
               div << "(#{lbl})"

data/lib/isodoc/iec/xref.rb

@@ -0,0 +1,45 @@
+module IsoDoc
+  module Iec
+    class Xref < IsoDoc::Iso::Xref
+      def parse(docxml)
+        id = docxml&.at(ns("//bibdata/docnumber"))&.text
+        @is_iev = id == "60050"
+        id = docxml&.at(ns("//bibdata/docidentifier[@type = 'ISO']"))&.text
+        m = /60050-(\d+)/.match(id) and @iev_part = m[1]
+        super
+      end
+
+      def introduction_names(clause)
+        return super unless @is_iev
+      end
+
+      def initial_anchor_names(d)
+        super
+        return unless @is_iev
+        terms_iev_names(d)
+        middle_section_asset_names(d)
+        termnote_anchor_names(d)
+        termexample_anchor_names(d)
+      end
+
+      def terms_iev_names(d)
+        d.xpath(ns("//sections/clause/terms")).each_with_index do |t, i|
+          num = "#{@iev_part}-%02d" % [i+1]
+          @anchors[t["id"]] =
+            { label: num, xref: l10n("#{@labels["section_iev"]}-#{num}"), level: 2,
+              type: "clause" }
+          t.xpath(ns("./term")).each_with_index do |c, i|
+            num2 = "%02d" % [i+1]
+            section_names1(c, "#{num}-#{num2}", 3)
+          end
+        end
+      end
+
+      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}")
+      end
+    end
+  end
+end

data/lib/metanorma-iec.rb

@@ -4,7 +4,9 @@ require_relative "metanorma/iec/version"
 require "isodoc/iec/html_convert"
 require "isodoc/iec/word_convert"
 require "isodoc/iec/pdf_convert"
+require "isodoc/iec/presentation_xml_convert"
 require "isodoc/iec/metadata"
+require "isodoc/iec/xref"
 
 if defined? Metanorma
   require_relative "metanorma/iec"

data/lib/metanorma/iec/processor.rb

@@ -30,18 +30,16 @@ module Metanorma
         "Metanorma::Iec #{Metanorma::Iec::VERSION}"
       end
 
-      def input_to_isodoc(file, filename)
-        Metanorma::Input::Asciidoc.new.process(file, filename, @asciidoctor_backend)
-      end
-
-      def output(isodoc_node, outname, format, options={})
+      def output(isodoc_node, inname, outname, format, options={})
         case format
         when :html
-          IsoDoc::Iec::HtmlConvert.new(options).convert(outname, isodoc_node)
+          IsoDoc::Iec::HtmlConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :doc
-          IsoDoc::Iec::WordConvert.new(options).convert(outname, isodoc_node)
+          IsoDoc::Iec::WordConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :pdf
-          IsoDoc::Iec::PdfConvert.new(options).convert(outname, isodoc_node)
+          IsoDoc::Iec::PdfConvert.new(options).convert(inname, isodoc_node, nil, outname)
+        when :presentation
+          IsoDoc::Iec::PresentationXMLConvert.new(options).convert(inname, isodoc_node, nil, outname)
         else
           super
         end

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "1.0.8"
+    VERSION = "1.1.3"
   end
 end
 

data/metanorma-iec.gemspec

@@ -28,10 +28,11 @@ 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.0.0"
-  spec.add_dependency "metanorma-iso", "~> 1.3.0"
+  spec.add_dependency "isodoc", "~> 1.1.0"
+  spec.add_dependency "metanorma-iso", "~> 1.4.0"
 
   spec.add_development_dependency "byebug"
+  spec.add_development_dependency "sassc", "2.4.0"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"

data/spec/asciidoctor-iec/base_spec.rb

@@ -99,7 +99,7 @@ RSpec.describe Asciidoctor::Iec do
    <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>
-         <docidentifier type="iso">IEC/3NWIP 1000-1 ED 2</docidentifier>
+         <docidentifier type="ISO">IEC/3NWIP 1000-1 ED 2</docidentifier>
 <docnumber>1000</docnumber>
          <contributor>
            <role type="author"/>
@@ -190,7 +190,7 @@ RSpec.describe Asciidoctor::Iec do
            <?xml version="1.0" encoding="UTF-8"?>
        <iec-standard xmlns="https://www.metanorma.org/ns/iec">
        <bibdata type="standard">
-         <docidentifier type="iso">ISO/IEC/IETF/2CDTS 1000-1-1 ED 1</docidentifier>
+         <docidentifier type="ISO">ISO/IEC/IETF/2CDTS 1000-1-1 ED 1</docidentifier>
          <docidentifier type="iso-tc">2000</docidentifier>
          <docnumber>1000</docnumber>
          <contributor>
@@ -338,7 +338,7 @@ RSpec.describe Asciidoctor::Iec do
     INPUT
     <iec-standard xmlns="https://www.metanorma.org/ns/iec">
 <bibdata type="standard">
-  <docidentifier type="iso">IEC/FDIS 1000 ED 1</docidentifier>
+  <docidentifier type="ISO">IEC/FDIS 1000 ED 1</docidentifier>
   <docnumber>1000</docnumber>
   <contributor>
     <role type="author"/>
@@ -402,7 +402,7 @@ OUTPUT
     INPUT
 <iec-standard xmlns="https://www.metanorma.org/ns/iec">
 <bibdata type="standard">
-  <docidentifier type="iso">IEC 1000 ED 1</docidentifier>
+  <docidentifier type="ISO">IEC 1000 ED 1</docidentifier>
   <docnumber>1000</docnumber>
   <contributor>
     <role type="author"/>
@@ -467,7 +467,7 @@ OUTPUT
     INPUT
 <iec-standard xmlns="https://www.metanorma.org/ns/iec">
 <bibdata type="standard">
-  <docidentifier type="iso">IEC 1000 ED 1</docidentifier>
+  <docidentifier type="ISO">IEC 1000 ED 1</docidentifier>
   <docnumber>1000</docnumber>
   <contributor>
     <role type="author"/>

data/spec/asciidoctor-iec/cleanup_spec.rb

@@ -288,7 +288,7 @@ RSpec.describe Asciidoctor::Iec do
     INPUT
        #{BLANK_HDR}
        <sections><formula id="_">
-          <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>F</mi><mtext>or</mtext><mi>μ</mi><mi>l</mi><mi>a</mi></math></stem>
+          <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>F</mi><mi>or</mi><mi>μ</mi><mi>l</mi><mi>a</mi></math></stem>
        <dl id="_">
          <dt>a</dt>
          <dd>

data/spec/asciidoctor-iec/iev_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe Asciidoctor::Iec do
 <?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>
+           <docidentifier type='ISO'>IEC 60050 ED 1</docidentifier>
            <docnumber>60050</docnumber>
            <contributor>
              <role type='author'/>
@@ -98,7 +98,7 @@ RSpec.describe Asciidoctor::Iec do
 INPUT
 <iec-standard xmlns='https://www.metanorma.org/ns/iec'>
   <bibdata type='standard'>
-    <docidentifier type='iso'>IEC 60050 ED 1</docidentifier>
+    <docidentifier type='ISO'>IEC 60050 ED 1</docidentifier>
     <docnumber>60050</docnumber>
     <contributor>
       <role type='author'/>

data/spec/isodoc/blocks_spec.rb

@@ -25,7 +25,7 @@ RSpec.describe IsoDoc::Iec do
                  <p id='_e94663cc-2473-4ccc-9a72-983a74d989f3'>Para 2.</p>
                </div>
              </div>
-             #{IEC_TITLE}
+             #{IEC_TITLE1}
            </div>
          </body>
        </html>
@@ -58,7 +58,7 @@ RSpec.describe IsoDoc::Iec do
                  <p id='_e94663cc-2473-4ccc-9a72-983a74d989f2'>Only use paddy or parboiled rice for the determination of husked rice yield.</p>
                </div>
              </div>
-             #{IEC_TITLE}
+             #{IEC_TITLE1}
            </div>
          </body>
        </html>
@@ -105,25 +105,17 @@ RSpec.describe IsoDoc::Iec do
              <div>
                <h1 class='ForewordTitle'>FOREWORD</h1>
                <div class='boilerplate_legal'/>
-               <div id='_be9158af-7e93-4ee2-90c5-26d31c181934' class='formula'>
+               <div id='_be9158af-7e93-4ee2-90c5-26d31c181934'><div class='formula'>
                  <p class='formula'>
                    <span style='mso-tab-count:1'>&#160; </span>
                    <span class='stem'>(#(r = 1 %)#)</span>
                  </p>
                </div>
-               <p>where</p>
-               <table class='formula_dl'>
-                 <tr>
-                   <td valign='top' align='left'>
-                     <p align='left' style='margin-left:0pt;text-align:left;'>
-                       <span class='stem'>(#(r)#)</span>
-                     </p>
-                   </td>
-                   <td valign='top'>
-                     <p id='_1b99995d-ff03-40f5-8f2e-ab9665a69b77'>is the repeatability limit.</p>
-                   </td>
-                 </tr>
-               </table>
+               <span class='zzMoveToFollowing'>
+  where 
+  <span class='stem'>(#(r)#)</span>
+</span>
+<p id='_1b99995d-ff03-40f5-8f2e-ab9665a69b77'>is the repeatability limit.</p>
                <div id='_83083c7a-6c85-43db-a9fa-4d8edd0c9fc0' class='Note'>
                  <p class='Note'>
                    <span class='note_label'>NOTE</span>
@@ -133,7 +125,8 @@ RSpec.describe IsoDoc::Iec do
                    always expressed.
                  </p>
                </div>
-               <div id='_be9158af-7e93-4ee2-90c5-26d31c181935' class='formula'>
+               </div>
+               <div id='_be9158af-7e93-4ee2-90c5-26d31c181935'><div class='formula'>
                  <p class='formula'>
                    <span style='mso-tab-count:1'>&#160; </span>
                    <span class='stem'>(#(r = 1 %)#)</span>
@@ -141,6 +134,7 @@ RSpec.describe IsoDoc::Iec do
                    (1)
                  </p>
                </div>
+               </div>
              </div>
              <p>&#160;</p>
            </div>
@@ -148,7 +142,7 @@ RSpec.describe IsoDoc::Iec do
              <br clear='all' class='section'/>
            </p>
            <div class='WordSection3'>
-             #{IEC_TITLE}
+             #{IEC_TITLE1}
            </div>
            <br clear='all' style='page-break-before:left;mso-break-type:section-break'/>
            <div class='colophon'/>

data/spec/isodoc/i18n_spec.rb

@@ -85,7 +85,7 @@ RSpec.describe IsoDoc do
         </div>
                <p>This is patent boilerplate</p>
              </div>
-             #{IEC_TITLE}
+             #{IEC_TITLE1}
              <div id="D">
                <h1>1&#160; Scope</h1>
                <p id="E">Text</p>
@@ -229,7 +229,7 @@ RSpec.describe IsoDoc do
         </div>
                <p>This is patent boilerplate</p>
              </div>
-             #{IEC_TITLE}
+             #{IEC_TITLE1}
              <div id="D">
                <h1>1&#160; Scope</h1>
                <p id="E">Text</p>
@@ -374,7 +374,7 @@ RSpec.describe IsoDoc do
         </div>
                <p>This is patent boilerplate</p>
              </div>
-             #{IEC_TITLE.sub(/INTERNATIONAL ELECTROTECHNICAL COMMISSION/, "COMMISSION ELECTROTECHNIQUE INTERNATIONALE")}
+             #{IEC_TITLE1}
              <div id="D">
                <h1>1&#160; Domaine d'application</h1>
                <p id="E">Text</p>
@@ -529,7 +529,7 @@ RSpec.describe IsoDoc do
               </div>
                <p>This is patent boilerplate</p>
              </div>
-    #{IEC_TITLE.sub(/INTERNATIONAL ELECTROTECHNICAL COMMISSION/, "&#22269;&#38469;&#30005;&#24037;&#22996;&#21592;&#20250;")}
+    #{IEC_TITLE1}
              <div id="D">
                <h1>1&#160; &#33539;&#22260;</h1>
                <p id="E">

data/spec/isodoc/iev_spec.rb

@@ -37,7 +37,7 @@ RSpec.describe IsoDoc do
           <h2>Introduction Subsection</h2>
         </div>
       </div>
-      #{IEC_TITLE}
+      #{IEC_TITLE1}
     </div>
   </body>
 </html>
@@ -122,7 +122,7 @@ INPUT
   <h1 class='ForewordTitle'>FOREWORD</h1>
   <div class='boilerplate_legal'/>
 </div>
-      #{IEC_TITLE}
+      #{IEC_TITLE1}
       <div>
   <h1>1&#160; Normative references</h1>
   <p id='_'>There are no normative references in this document.</p>
@@ -141,7 +141,7 @@ OUTPUT
     expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
      <bibdata type='standard'>
-           <docidentifier type='iso'>IEC 60050-192 ED 1</docidentifier>
+           <docidentifier type='ISO'>IEC 60050-192 ED 1</docidentifier>
            <docnumber>60050</docnumber>
     </bibdata>
     <sections>
@@ -198,7 +198,7 @@ INPUT
         <h1 class='ForewordTitle'>FOREWORD</h1>
         <div class='boilerplate_legal'/>
       </div>
-            #{IEC_TITLE}
+            #{IEC_TITLE1}
       <div id='_terms_and_definitions'>
         <h1>1&#160; Terms and definitions</h1>
         <br/>
@@ -248,14 +248,14 @@ INPUT
               <li>A</li>
             </ul>
           </div>
-          <div class='Note'>
+          <div class='Note' id='_671a1994-4783-40d0-bc81-987d06ffb74e'>
             <p>
               Note 1 to entry: The starch of waxy rice consists almost entirely
               of amylopectin. The kernels have a tendency to stick together
               after cooking.
             </p>
           </div>
-          <div class='Note'>
+          <div class='Note' id='_671a1994-4783-40d0-bc81-987d06ffb74f'>
             <p>
               Note 2 to entry:
               <ul>
@@ -286,7 +286,7 @@ end
     IsoDoc::Iec::WordConvert.new({}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
         <bibdata type='standard'>
-           <docidentifier type='iso'>IEC 60050-192 ED 1</docidentifier>
+           <docidentifier type='ISO'>IEC 60050-192 ED 1</docidentifier>
            <docnumber>60050</docnumber>
     </bibdata>
     <sections>
@@ -312,9 +312,6 @@ end
       sub(%r{<br clear="all" style="page-break-before:left;mso-break-type:section-break"/>.*$}m, "")
     expect(xmlpp(word)).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <div class='WordSection3'>
-         <p class='zzSTDTitle1'>INTERNATIONAL ELECTROTECHNICAL COMMISSION</p>
-         <p class='zzSTDTitle1'>____________</p>
-         <p class='zzSTDTitle1'>&#xA0;</p>
          <p class='zzSTDTitle1'>
            <b/>
          </p>

data/spec/isodoc/inline_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe IsoDoc do
        <a id="H"/> <br/>
        </p>
                </div>
-               #{IEC_TITLE}
+               #{IEC_TITLE1}
              </div>
            </body>
        </html>
@@ -56,7 +56,7 @@ RSpec.describe IsoDoc do
        <a href="mailto:fred@example.com">mailto:fred@example.com</a>
        </p>
                </div>
-               #{IEC_TITLE}
+               #{IEC_TITLE1}
              </div>
            </body>
        </html>
@@ -82,7 +82,7 @@ RSpec.describe IsoDoc do
        <para><b role="strong">&lt;barry fred="http://example.com"&gt;example&lt;/barry&gt;</b></para>
        </p>
                </div>
-               #{IEC_TITLE}
+               #{IEC_TITLE1}
              </div>
            </body>
        </html>
@@ -114,7 +114,7 @@ RSpec.describe IsoDoc do
        <span class="stem">Latex?</span>
        </p>
                </div>
-               #{IEC_TITLE}
+               #{IEC_TITLE1}
              </div>
            </body>
        </html>
@@ -142,7 +142,7 @@ RSpec.describe IsoDoc do
        (#((Hello))#)
        </p>
                </div>
-               #{IEC_TITLE}
+               #{IEC_TITLE1}
              </div>
            </body>
        </html>
@@ -182,7 +182,7 @@ RSpec.describe IsoDoc do
            <a href="#ISO712">A</a>
            </p>
                </div>
-               #{IEC_TITLE}
+               #{IEC_TITLE1}
                <div>
                  <h1>1&#160; Normative references</h1>
                  <p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products</i></p>
@@ -243,15 +243,15 @@ RSpec.describe IsoDoc do
            <a href="#ISO712">ISO 712, Clause 1</a>
            <a href="#ISO712">ISO 712, 1.5</a>
            <a href="#ISO712">A</a>
-           <a href="#ISO712">ISO 712, </a>
+           <a href="#ISO712">ISO 712, Whole of text</a>
            <a href="#ISO712">ISO 712, Prelude 7</a>
            <a href="#ISO712">A</a>
            </p>
                </div>
-               #{IEC_TITLE}
+               #{IEC_TITLE1}
                <div>
                  <h1>1&#160; Normative references</h1>
-                 <p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products</i></p>
+                 <p id="ISO712" class="NormRef">ISO 712, <i>Cereals and cereal products</i></p>
                </div>
              </div>
            </body>