RubyGems - metanorma-iec - Versions diffs - 0.0.3 → 0.0.4 - Mend

metanorma-iec 0.0.3 → 0.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (23) hide show

checksums.yaml +4 -4
data/README.adoc +87 -0
data/lib/asciidoctor/iec/converter.rb +97 -0
data/lib/isodoc/iec/base_convert.rb +4 -0
data/lib/isodoc/iec/html/isodoc.scss +4 -0
data/lib/isodoc/iec/metadata.rb +56 -10
data/lib/isodoc/iec/word_convert.rb +3 -3
data/lib/metanorma/iec/version.rb +1 -1
data/spec/asciidoctor-iec/base_spec.rb +19 -10
data/spec/asciidoctor-iec/blocks_spec.rb +8 -0
data/spec/asciidoctor-iec/cleanup_spec.rb +18 -0
data/spec/asciidoctor-iec/inline_spec.rb +1 -0
data/spec/asciidoctor-iec/section_spec.rb +6 -28
data/spec/isodoc/i18n_spec.rb +10 -50
data/spec/isodoc/inline_spec.rb +0 -2
data/spec/isodoc/iso_spec.rb +0 -1
data/spec/isodoc/metadata_spec.rb +7 -7
data/spec/isodoc/postproc_spec.rb +3 -12
data/spec/isodoc/section_spec.rb +4 -179
data/spec/isodoc/terms_spec.rb +2 -22
data/spec/metanorma/processor_spec.rb +1 -11
data/spec/spec_helper.rb +13 -1
metadata +3 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aeea3a9fe1769d11cf8dd35270a1a45cad54ad976c94bf8ab871bbbef3509e09
-  data.tar.gz: 36628127433147b77fcf6537c22f3c07667367a5a4b83529e5b6f446180a5b4a
+  metadata.gz: 489e431cdb476cb3d5526c645e6a41b7f163ae0abc8c903f48a0a99a36b7b6b4
+  data.tar.gz: fd8b9c6b5c2aa79f1c1453027532d211ac2308f85d0b1d0e30f03d3f641ee7d6
 SHA512:
-  metadata.gz: 58fee559bbde5f882118b6eda4032f4d0134e3413dcf1b8eff29fc190674133816ebcd2f3dc48173ceb9c4f7b7a19afb96c97096cc5d09e44457e4877b5dc933
-  data.tar.gz: 10375e49683e94979c6c0b70c2840ea5cab8d1ffeaf1cf53d7815286f6d01dc5ee00f3b84cce2402f37294c238cb1e7f1dea3ae0e8380809f256868de1e1a182
+  metadata.gz: 0011dbc5a6261195f51f58766adc0635d71f4981be53024770ba8ecbfca1367949fc69db7b84a02492bd1dd4718adad44cdcfe5c385781a0143d09e9b0df16e6
+  data.tar.gz: f7703c90cb73b42240b236267c00b0e27b0ecf1f1c5dbffeaf980fb33cf068db73c269dc05bafe9ba07148677dd4518e8ecdc9b472bb6d73c323072ecd07fa17

data/README.adoc ADDED Viewed

@@ -0,0 +1,87 @@
+= metanorma-iec: Metanorma processor for the International Electrotechnical Commission
+image:https://img.shields.io/gem/v/metanorma-iec.svg["Gem Version", link="https://rubygems.org/gems/metanorma-iec"]
+image:https://img.shields.io/travis/metanorma/metanorma-iec/master.svg["Build Status", link="https://travis-ci.com/metanorma/metanorma-iec"]
+image:https://ci.appveyor.com/api/projects/status/odgc3ltblokvd6e7?svg=true["Appveyor Build Status", link="https://ci.appveyor.com/project/ribose/metanorma-iec"]
+image:https://codeclimate.com/github/metanorma/metanorma-iec/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-iec"]
+WARNING: This gem is still under development.
+== Functionality
+This gem processes Metanorma documents into the IEC document class.
+The gem is basically the https://github.com/metanorma/metanorma-iso gem, with some tweaking of rendering to meet the particular requirements of the IEC.
+It provides the following functions:
+. Compiles Metanorma input into the Metanorma-IEC XML format (which is identical to Metanorma-ISO, since the two standards share the same document model)
+. Validates XML output against the Metanorma-IEC document model
+** Errors are reported to console against the XML, and are intended for users to
+check that they have provided all necessary components of the
+document.
+. Metanorma-IEC XML is then converted into desired output formats.
+The following outputs are supported:
+* Primary: the canonical Metanorma-IEC XML representation (`.xml`).
+* Secondary: the Metanorma-IEC XML representation is processed to generate the following outputs
+as end deliverable IEC documents.
+** HTML (`.html`)
+** Word (`.doc`)
+== Structure
+This gem inherits from the https://github.com/metanorma/metanorma-iso
+gem, and aligns closely to it.
+=== Quickstart
+Please see https://www.metanorma.com for instructions to get started.
+If you are using a Mac, the https://github.com/metanorma/metanorma-macos-setup
+repository has instructions on setting up your machine to run Metanorma
+scripts such as this one. You need only run the following in a Terminal console:
+[source,console]
+----
+$ bash <(curl -s https://raw.githubusercontent.com/metanorma/metanorma-macos-setup/master/metanorma-setup)
+$ gem install metanorma-cli
+$ gem install metanorma-iec
+----
+== Usage
+Using the `metanorma` CLI:
+[source,console]
+----
+$ metanorma --type iec a.adoc                   # output HTML
+$ metanorma --type iec --extensions html a.adoc # output just HTML
+$ metanorma --type iec --extensions xml a.adoc  # output Metanorma XML
+----
+== Authoring
+Please refer to the Metanorma-ISO documentation for general documentation.
+* Metanorma-ISO general documentation: https://www.metanorma.com/software/metanorma-iso/
+* Metanorma-ISO guidance: https://www.metanorma.com/software/metanorma-iso/docs/guidance/
+== Documentation
+See https://www.metanorma.com/author/iso/[Write ISO documents with Metanorma]
+////
+== Examples
+* link:spec/examples/rfc6350.adoc[] is an Metanorma AsciiDoc version of https://tools.ietf.org/html/rfc6350[RFC 6350].
+* link:spec/examples/rfc6350.html[] is an HTML file generated from the Asciidoctor.
+* link:spec/examples/rfc6350.doc[] is a Word document generated from the Asciidoctor.
+////

data/lib/asciidoctor/iec/converter.rb CHANGED Viewed

@@ -54,6 +54,103 @@ module Asciidoctor
         File.read(file, encoding: "UTF-8")
       end
+      def relaton_relations
+        super + %w(translated-from)
+      end
+      def doctype_validate(xmldoc)
+        doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
+        %w(international-standard technical-specification technical-report
+        publicly-available-specification international-workshop-agreement
+        guide interpretation-sheet).include? doctype or
+        warn "IEC Document Attributes: #{doctype} is not a recognised document type"
+      end
+      STAGE_CODES = {
+        "PNW" => "1000",
+        "ANW" => "2000",
+        "CAN" => "2098",
+        "ACD" => "2099",
+        "CD" => "3020",
+        "BWG" => "3092",
+        "A2CD" => "3099",
+        "2CD" => "3520",
+        "3CD" => "3520",
+        "4CD" => "3520",
+        "5CD" => "3520",
+        "6CD" => "3520",
+        "7CD" => "3520",
+        "8CD" => "3520",
+        "9CD" => "3520",
+        "CDM" => "3591",
+        "A3CD" => "3592",
+        "A4CD" => "3592",
+        "A5CD" => "3592",
+        "A6CD" => "3592",
+        "A7CD" => "3592",
+        "A8CD" => "3592",
+        "A9CD" => "3592",
+        "ACDV" => "3599",
+        "CCDV" => "4020",
+        "CDVM" => "4091",
+        "NCDV" => "4092",
+        "NADIS" => "4093",
+        "ADIS" => "4099",
+        "ADTR" => "4099",
+        "ADTS" => "4099",
+        "RDISH" => "5000",
+        "RFDIS" => "5000",
+        "CDISH" => "5020",
+        "CDPAS" => "5020",
+        "CDTR" => "5020",
+        "CDTS" => "5020",
+        "CFDIS" => "5020",
+        "DTRM" => "5092",
+        "DTSM" => "5092",
+        "NDTR" => "5092",
+        "NDTS" => "5092",
+        "NFDIS" => "5092",
+        "APUB" => "5099",
+        "BPUB" => "6000",
+        "PPUB" => "6060",
+        "RR" => "9092",
+        "AMW" => "9220",
+        "WPUB" => "9599",
+        "DELPUB" => "9960",
+      }.freeze
+      DOC_STAGE = {
+        "00": "PWI",
+        "10": "NWIP",
+        "20": "WD",
+        "30": "CD",
+        "40": "CDV",
+        "50": "FDIS",
+      }.freeze
+      def get_stage(node)
+        stage = node.attr("status") || node.attr("docstage") || "60"
+        m = /([0-9])CD$/.match(stage) and
+          node.set_attr("iteration", m[1])
+        STAGE_CODES[stage] and stage = STAGE_CODES[stage][0..1]
+        stage
+      end
+      def get_substage(node)
+        st = node.attr("status") || node.attr("docstage")
+        stage = get_stage(node)
+        node.attr("docsubstage") ||
+          ( stage == "60" ? "60" :
+           STAGE_CODES[st] ? STAGE_CODES[st][2..3] :
+           "00" )
+      end
+      def id_stage_abbr(stage, substage, node)
+        abbr = DOC_STAGE[stage.to_sym] || ""
+        abbr = node.attr("iteration") + abbr if node.attr("iteration")
+        abbr
+      end
       def html_converter(node)
         node.nil? ? IsoDoc::Iec::HtmlConvert.new({}) :
           IsoDoc::Iec::HtmlConvert.new(html_extract_attributes(node))

data/lib/isodoc/iec/base_convert.rb CHANGED Viewed

@@ -4,6 +4,10 @@ require "metanorma-iso"
 module IsoDoc
   module Iec
     module BaseConvert
+       def metadata_init(lang, script, labels)
+        @meta = Metadata.new(lang, script, labels)
+      end
       def foreword(isoxml, out)
         f = isoxml.at(ns("//foreword"))
         b = isoxml.at(ns("//boilerplate/legal-statement"))

data/lib/isodoc/iec/html/isodoc.scss CHANGED Viewed

@@ -777,6 +777,10 @@ td.example p.MsoListParagraph {
   font-size: 10.0pt;
 }
+div.example p.MsoListParagraph {
+  font-size: 10.0pt;
+}
 span.note_label, span.example_label, td.example_label, td.note_label
 {
 font-size: 10.0pt;

data/lib/isodoc/iec/metadata.rb CHANGED Viewed

@@ -1,20 +1,66 @@
 require "isodoc"
 require "metanorma-iso"
 module IsoDoc
   module Iec
     class  Metadata < IsoDoc::Iso::Metadata
       STAGE_ABBRS = {
-        "00": "PWI",
-        "10": "NWIP",
-        "20": "WD",
-        "30": "CD",
-        "40": "CDV",
-        "50": "FDIS",
-        "60": "IS",
-        "90": "(Review)",
-        "95": "(Withdrawal)",
+        "00" => {"00" => "PWI"},
+        "10" => {"00" => "PNW"},
+        "20" => {"00" => "ANW", "98" => "CAN", "99" => "ACD"},
+        "30" => {"00" => "CD", "20" => "CD", "92" => "BWG", "97" => "MERGED", "98" => "DREJ", "99" => "A2CD"},
+        "35" => {"00" => "CD", "20" => "CD", "91" => "CDM", "92" => "ACD", "99" => "ACDV"},
+        "40" => {"00" => "CCDV", "20" => "CCDV", "91" => "CDVM", "92" => "NCDV", "93" => "NADIS", "95" => "ADISSB", "99" => "ADIS"},
+        "50" => {"00" => "RFDIS", "20" => "CFDIS", "92" => "NFDIS", "95" => "APUBSB", "99" => "APUB"},
+        "60" => {"00" => "BPUB", "60" => "PPUB"},
+        "90" => {"00" => "RR", "92" => "RR"},
+        "92" => {"00" => "AMW", "20" => "AMW"},
+        "95" => {"00" => "WPUB", "99" => "WPUB"},
+        "99" => {"00" => "DELPUB", "60" => "DELPUB"},
       }.freeze
+      def stage_abbrev1(stage, substage, iter, doctype, draft)
+        return "" unless stage
+        abbr = STAGE_ABBRS.dig(stage, substage) || "??"
+        if stage == "35" && substage == "92"
+          iter = (iter.to_i + 1) % "02"
+        end
+        case doctype
+        when "technical-report"
+          stage = "ADTR" if stage == "40" && substage == "99"
+          stage = "CDTR" if stage == "50" && substage == "20"
+          stage = "DTRM" if stage == "50" && substage == "92"
+        when "technical-specification"
+          stage = "ADTS" if stage == "40" && substage == "99"
+          stage = "CDTS" if stage == "50" && substage == "20"
+          stage = "DTSM" if stage == "50" && substage == "92"
+        when "interpretation-sheet"
+          stage = "RDISH" if stage == "50" && substage == "00"
+          stage = "CDISH" if stage == "50" && substage == "20"
+        when "publicly-available-specification"
+          stage = "CDPAS" if stage == "50" && substage == "20"
+        end
+        abbr = abbr.sub(/CD$/, "#{iter}CD") if iter
+        abbr
+      end
+      def docstatus(isoxml, _out)
+        docstatus = isoxml.at(ns("//bibdata/status/stage"))
+        set(:unpublished, false)
+        if docstatus
+          set(:stage, docstatus.text)
+          set(:stage_int, docstatus.text.to_i)
+          set(:unpublished, docstatus.text.to_i > 0 && docstatus.text.to_i < 60)
+          abbr = stage_abbrev1(docstatus.text,
+                               isoxml&.at(ns("//bibdata/status/substage"))&.text,
+                               isoxml&.at(ns("//bibdata/status/iteration"))&.text,
+                               isoxml&.at(ns("//bibdata/ext/doctype"))&.text,
+                               isoxml&.at(ns("//version/draft"))&.text)
+          set(:stageabbr, abbr)
+        end
+        revdate = isoxml.at(ns("//version/revision-date"))
+        set(:revdate, revdate&.text)
+      end
     end
   end
 end

data/lib/isodoc/iec/word_convert.rb CHANGED Viewed

@@ -90,16 +90,16 @@ module IsoDoc
         super
       end
-      def make_tr_attr(td, row, totalrows)
+      def make_tr_attr(td, row, totalrows, header)
         ret = super
-        css_class = td.name == "th" ? "TABLE-col-heading" : "TABLE-cell"
+        css_class = (td.name == "th" || header) ? "TABLE-col-heading" : "TABLE-cell"
         ret.merge( "class": css_class )
       end
       def tr_parse(node, out, ord, totalrows, header)
         out.tr do |r|
           node.elements.each do |td|
-            attrs = make_tr_attr(td, ord, totalrows - 1)
+            attrs = make_tr_attr(td, ord, totalrows - 1, header)
             attrs[:class] = "TABLE-col-heading" if header
             r.send td.name, **attr_code(attrs) do |entry|
               td.children.each { |n| parse(n, entry) }

data/lib/metanorma/iec/version.rb CHANGED Viewed

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/spec/asciidoctor-iec/base_spec.rb CHANGED Viewed

@@ -87,6 +87,7 @@ RSpec.describe Asciidoctor::Iec do
       :title-main-fr: Titre Principal
       :title-part-fr: Part du Titre
       :library-ics: 1,2,3
+      :translated-from: ABC 123
     INPUT
            <?xml version="1.0" encoding="UTF-8"?>
        <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -99,13 +100,8 @@ 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/PreNWIP3 1000-1</docidentifier>
+         <docidentifier type="iso">IEC/3NWIP 1000-1</docidentifier>
 <docnumber>1000</docnumber>
-         <edition>2</edition>
-<version>
-         <revision-date>2000-01-01</revision-date>
-         <draft>0.3.4</draft>
-       </version>
          <contributor>
            <role type="author"/>
            <organization>
@@ -120,6 +116,11 @@ RSpec.describe Asciidoctor::Iec do
              <abbreviation>IEC</abbreviation>
            </organization>
          </contributor>
+         <edition>2</edition>
+<version>
+         <revision-date>2000-01-01</revision-date>
+         <draft>0.3.4</draft>
+       </version>
          <language>en</language>
          <script>Latn</script>
          <status>
@@ -136,6 +137,12 @@ RSpec.describe Asciidoctor::Iec do
              </organization>
            </owner>
          </copyright>
+         <relation type="translatedFrom">
+<bibitem>
+<title>--</title>
+<docidentifier>ABC 123</docidentifier>
+</bibitem>
+</relation>
          <ext>
          <doctype>article</doctype>
          <editorialgroup>
@@ -183,11 +190,12 @@ RSpec.describe Asciidoctor::Iec do
       :script: Grek
       :publisher: IEC,IETF,ISO
       :copyright-year: 2001
+      :docstage: A2CD
     INPUT
            <?xml version="1.0" encoding="UTF-8"?>
        <iso-standard xmlns="http://riboseinc.com/isoxml">
        <bibdata type="standard">
-         <docidentifier type="iso">ISO/IEC/IETF 1000-1-1:2001</docidentifier>
+         <docidentifier type="iso">ISO/IEC/IETF/2CD 1000-1-1</docidentifier>
          <docidentifier type="iso-tc">2000</docidentifier>
          <docnumber>1000</docnumber>
          <contributor>
@@ -233,8 +241,9 @@ RSpec.describe Asciidoctor::Iec do
          <language>el</language>
          <script>Grek</script>
          <status>
-           <stage>60</stage>
-           <substage>60</substage>
+           <stage>30</stage>
+           <substage>99</substage>
+           <iteration>2</iteration>
          </status>
          <copyright>
            <from>2001</from>
@@ -460,7 +469,7 @@ OUTPUT
     INPUT
 <iso-standard xmlns="http://riboseinc.com/isoxml">
 <bibdata type="standard">
-  <docidentifier type="iso">IEC/PRF 1000</docidentifier>
+  <docidentifier type="iso">IEC 1000</docidentifier>
   <docnumber>1000</docnumber>
   <contributor>
     <role type="author"/>

data/spec/asciidoctor-iec/blocks_spec.rb CHANGED Viewed

@@ -113,6 +113,8 @@ RSpec.describe Asciidoctor::Iec do
        <sections>
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
+         <p>For the purposes of this document, the following terms and definitions apply.</p>
+         #{TERMS_BOILERPLATE}
          <term id="_">
          <preferred>Term1</preferred>
          <termnote id="_">
@@ -222,6 +224,8 @@ RSpec.describe Asciidoctor::Iec do
               <sections>
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
+         <p>For the purposes of this document, the following terms and definitions apply.</p>
+         #{TERMS_BOILERPLATE}
          <term id="_">
          <preferred>Term1</preferred>
          <termexample id="_">
@@ -422,6 +426,8 @@ RSpec.describe Asciidoctor::Iec do
        <sections>
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
+         <p>For the purposes of this document, the following terms and definitions apply.</p>
+         #{TERMS_BOILERPLATE}
          <term id="_">
          <preferred>Term1</preferred>
          <termsource status="identical">
@@ -448,6 +454,8 @@ RSpec.describe Asciidoctor::Iec do
             <sections>
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
+         <p>For the purposes of this document, the following terms and definitions apply.</p>
+         #{TERMS_BOILERPLATE}
          <term id="_">
          <preferred>Term1</preferred>
          <termsource status="modified">

data/spec/asciidoctor-iec/cleanup_spec.rb CHANGED Viewed

@@ -31,6 +31,9 @@ RSpec.describe Asciidoctor::Iec do
               <sections>
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
+         <p>For the purposes of this document,
+       the following terms and definitions apply.</p>
+        #{TERMS_BOILERPLATE}
          <term id="_"><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>
        <definition><p id="_">Time</p></definition></term>
        </terms>
@@ -52,6 +55,9 @@ RSpec.describe Asciidoctor::Iec do
               <sections>
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
+         <p>For the purposes of this document,
+       the following terms and definitions apply.</p>
+        #{TERMS_BOILERPLATE}
          <term id="_">
          <preferred>Tempus</preferred>
          <domain>relativity</domain><definition><p id="_"> Time</p></definition>
@@ -87,6 +93,9 @@ RSpec.describe Asciidoctor::Iec do
               <sections>
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
+         <p>For the purposes of this document,
+       the following terms and definitions apply.</p>
+        #{TERMS_BOILERPLATE}
          <term id="_"><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>
        </formula><p id="_">This paragraph is extraneous</p></definition>
@@ -113,6 +122,9 @@ RSpec.describe Asciidoctor::Iec do
        #{BLANK_HDR}
               <sections>
          <terms id="_" obligation="normative"><title>Terms and definitions</title>
+         <p>For the purposes of this document,
+       the following terms and definitions apply.</p>
+        #{TERMS_BOILERPLATE}
        <term id="_">
        <preferred>Time</preferred>
@@ -188,6 +200,7 @@ r = 1 %</stem>
       </foreword></preface><sections>
       </sections><bibliography><references id="_" obligation="informative">
         <title>Normative References</title>
+        <p>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>
          <docidentifier>ISO 216:2001</docidentifier>
@@ -226,6 +239,7 @@ r = 1 %</stem>
       </foreword></preface><sections>
       </sections><bibliography><references id="_" obligation="informative">
         <title>Normative References</title>
+        <p>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>
          <docidentifier>ISO 216</docidentifier>
@@ -293,6 +307,8 @@ r = 1 %</stem>
        <sections>
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
+         <p>For the purposes of this document, the following terms and definitions apply.</p>
+         #{TERMS_BOILERPLATE}
          <term id="_">
          <preferred>Term1</preferred>
          <termsource status="identical">
@@ -318,6 +334,7 @@ r = 1 %</stem>
       #{BLANK_HDR}
       <sections></sections>
       <bibliography><references id="_" obligation="informative"><title>Normative References</title>
+      <p>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>
          <docidentifier>ISO 216</docidentifier>
@@ -655,6 +672,7 @@ r = 1 %</stem>
       </p>
       </clause></sections><bibliography><references id="_" obligation="informative">
         <title>Normative References</title>
+        <p>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="iso123" type="standard">
          <title format="text/plain">Standard</title>
          <docidentifier>ISO 123:—</docidentifier>

data/spec/asciidoctor-iec/inline_spec.rb CHANGED Viewed

@@ -129,6 +129,7 @@ RSpec.describe Asciidoctor::Iec do
        </sections><bibliography><references id="_" obligation="informative">
          <title>Normative References</title>
+         <p>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>
          <docidentifier>x</docidentifier>

data/spec/asciidoctor-iec/section_spec.rb CHANGED Viewed

@@ -67,6 +67,8 @@ RSpec.describe Asciidoctor::Iec do
        <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
+         <p>For the purposes of this document, the following terms and definitions apply.</p>
+         #{TERMS_BOILERPLATE}
          <term id="_">
          <preferred>Term1</preferred>
        </term>
@@ -98,7 +100,7 @@ RSpec.describe Asciidoctor::Iec do
        <appendix id="_" inline-header="false" obligation="normative">
           <title>Appendix 1</title>
        </appendix></annex><bibliography><references id="_" obligation="informative">
-         <title>Normative References</title>
+         <title>Normative References</title><p>There are no normative references in this document.</p>
        </references><clause id="_" obligation="informative">
          <title>Bibliography</title>
          <references id="_" obligation="informative">
@@ -186,6 +188,8 @@ RSpec.describe Asciidoctor::Iec do
        <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
+         <p>For the purposes of this document, the following terms and definitions apply.</p>
+         #{TERMS_BOILERPLATE}
          <term id="_">
          <preferred>Term1</preferred>
        </term>
@@ -218,7 +222,7 @@ RSpec.describe Asciidoctor::Iec do
        <appendix id="_" inline-header="false" obligation="normative">
          <title>Appendx 1</title>
        </appendix></annex><bibliography><references id="_" obligation="informative">
-         <title>Normative References</title>
+         <title>Normative References</title><p>There are no normative references in this document.</p>
        </references><clause id="_" obligation="informative">
          <title>Bibliography</title>
          <references id="_" obligation="informative">
@@ -312,30 +316,4 @@ RSpec.describe Asciidoctor::Iec do
      OUTPUT
   end
-    it "processes term document sources" do
-     expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
-      #{ASCIIDOC_BLANK_HDR}
-      Foreword
-      [source="iso1234,iso5678"]
-      == Terms and Definitions
-     INPUT
-             #{BLANK_HDR}
-             <termdocsource bibitemid="iso1234"/><termdocsource bibitemid="iso5678"/>
-        <preface><foreword obligation="informative">
-         <title>Foreword</title>
-         <p id="_">Foreword</p>
-       </foreword></preface><sections>
-       <terms id="_" obligation="normative">
-         <title>Terms and definitions</title>
-       </terms></sections>
-       </iso-standard>
-     OUTPUT
-    end
 end

data/spec/isodoc/i18n_spec.rb CHANGED Viewed

@@ -93,19 +93,8 @@ RSpec.describe IsoDoc do
              </div>
              <div>
                <h1>2&#160; Normative references</h1>
-               <p>There are no normative references in this document.</p>
-             </div>
-             <div id="H"><h1>3&#160; Terms, definitions, symbols and abbreviated terms</h1><p>For the purposes of this document,
-           the following terms and definitions apply.</p>
-       <p>ISO and IEC maintain terminological databases for use in
-       standardization at the following addresses:</p>
-       <ul>
-       <li> <p>ISO Online browsing platform: available at
-         <a href="http://www.iso.org/obp">http://www.iso.org/obp</a></p> </li>
-       <li> <p>IEC Electropedia: available at
-         <a href="http://www.electropedia.org">http://www.electropedia.org</a>
-       </p> </li> </ul>
+             </div>
+             <div id="H"><h1>3&#160; Terms, definitions, symbols and abbreviated terms</h1>
        <div id="I"><h2>3.1 Normal Terms</h2>
           <p class="TermNum" id="J">3.1.1</p>
@@ -229,7 +218,7 @@ RSpec.describe IsoDoc do
        </bibliography>
        </iso-standard>
         INPUT
-    #{HTML_HDR.sub(/"en"/, '"tlh"')}
+    #{HTML_HDR.gsub(/"en"/, '"tlh"')}
              <div>
                <h1 class="ForewordTitle">FOREWORD</h1>
                <div class="boilerplate_legal"/>
@@ -250,19 +239,8 @@ RSpec.describe IsoDoc do
              </div>
              <div>
                <h1>2&#160; Normative references</h1>
-               <p>There are no normative references in this document.</p>
-             </div>
-             <div id="H"><h1>3&#160; Terms, definitions, symbols and abbreviated terms</h1><p>For the purposes of this document,
-           the following terms and definitions apply.</p>
-       <p>ISO and IEC maintain terminological databases for use in
-       standardization at the following addresses:</p>
-       <ul>
-       <li> <p>ISO Online browsing platform: available at
-         <a href="http://www.iso.org/obp">http://www.iso.org/obp</a></p> </li>
-       <li> <p>IEC Electropedia: available at
-         <a href="http://www.electropedia.org">http://www.electropedia.org</a>
-       </p> </li> </ul>
+             </div>
+             <div id="H"><h1>3&#160; Terms, definitions, symbols and abbreviated terms</h1>
        <div id="I"><h2>3.1 Normal Terms</h2>
           <p class="TermNum" id="J">3.1.1</p>
@@ -387,7 +365,7 @@ RSpec.describe IsoDoc do
        </iso-standard>
         INPUT
     #{HTML_HDR.sub(/INTERNATIONAL ELECTROTECHNICAL COMMISSION/, "COMMISSION ELECTROTECHNIQUE INTERNATIONALE").
-    sub(/"en"/, '"fr"')}
+    gsub(/"en"/, '"fr"')}
              <div>
                <h1 class="ForewordTitle">AVANT-PROPOS</h1>
                <div class="boilerplate_legal"/>
@@ -408,18 +386,8 @@ RSpec.describe IsoDoc do
              </div>
              <div>
                <h1>2&#160; R&#233;f&#233;rences normatives</h1>
-               <p>Le pr&#233;sent document ne contient aucune r&#233;f&#233;rence normative.</p>
-             </div>
-             <div id="H"><h1>3&#160; Terms, d&#233;finitions, symboles et termes abr&#233;g&#233;s</h1><p>Pour les besoins du pr&#233;sent document, les termes et d&#233;finitions suivants s'appliquent.</p>
-       <p>L'ISO et l'IEC tiennent &#224; jour des bases de donn&#233;es terminologiques
-       destin&#233;es &#224; &#234;tre utilis&#233;es en normalisation, consultables aux adresses
-       suivantes:</p>
-       <ul>
-       <li> <p>ISO Online browsing platform: disponible &#224; l'adresse
-         <a href="http://www.iso.org/obp">http://www.iso.org/obp</a></p> </li>
-       <li> <p>IEC Electropedia: disponible &#224; l'adresse
-         <a href="http://www.electropedia.org">http://www.electropedia.org</a>
-       </p> </li> </ul>
+             </div>
+             <div id="H"><h1>3&#160; Terms, d&#233;finitions, symboles et termes abr&#233;g&#233;s</h1>
        <div id="I"><h2>3.1 Normal Terms</h2>
           <p class="TermNum" id="J">3.1.1</p>
@@ -554,7 +522,7 @@ RSpec.describe IsoDoc do
        </bibliography>
        </iso-standard>
         INPUT
-    #{HTML_HDR.sub(/"en"/, '"zh"').sub(/INTERNATIONAL ELECTROTECHNICAL COMMISSION/, "国际电工委员会")}
+    #{HTML_HDR.gsub(/"en"/, '"zh"').sub(/INTERNATIONAL ELECTROTECHNICAL COMMISSION/, "国际电工委员会")}
              <div>
                <h1 class="ForewordTitle">&#21069;&#35328;</h1>
                <div class="boilerplate_legal"/>
@@ -577,17 +545,9 @@ RSpec.describe IsoDoc do
              </div>
              <div>
                <h1>2&#160; &#35268;&#33539;&#24615;&#24341;&#29992;&#25991;&#20214;</h1>
-               <p>&#19979;&#21015;&#25991;&#20214;&#23545;&#20110;&#26412;&#25991;&#20214;&#30340;&#24212;&#29992;&#26159;&#24517;&#19981;&#21487;&#23569;&#30340;&#12290; &#20961;&#26159;&#27880;&#26085;&#26399;&#30340;&#24341;&#29992;&#25991;&#20214;&#65292;&#20165;&#27880;&#26085;&#26399;&#30340;&#29256;&#26412;&#36866;&#29992;&#20110;&#26412;&#25991;&#20214;&#12290; &#20961;&#26159;&#19981;&#27880;&#26085;&#26399;&#30340;&#24341;&#29992;&#25991;&#20214;&#65292;&#20854;&#26368;&#26032;&#29256;&#26412;&#65288;&#21253;&#25324;&#25152;&#26377;&#30340;&#20462;&#25913;&#21333;&#65289;&#36866;&#29992;&#20110;&#26412;&#25991;&#20214;&#12290;</p>
                <p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products</i></p>
              </div>
-             <div id="H"><h1>3&#160; &#26415;&#35821;&#12289;&#23450;&#20041;&#12289;&#31526;&#21495;&#12289;&#20195;&#21495;&#21644;&#32553;&#30053;&#35821;</h1><p>&#19979;&#21015;&#26415;&#35821;&#21644;&#23450;&#20041;&#36866;&#29992;&#20110;&#26412;&#25991;&#20214;&#12290;</p>
-       <p>ISO&#21644;IEC&#29992;&#20110;&#26631;&#20934;&#21270;&#30340;&#26415;&#35821;&#25968;&#25454;&#24211;&#22320;&#22336;&#22914;&#19979;&#65306;</p>
-       <ul>
-       <li> <p>ISO&#22312;&#32447;&#27983;&#35272;&#24179;&#21488;:
-         &#20301;&#20110;<a href="http://www.iso.org/obp">http://www.iso.org/obp</a></p> </li>
-       <li> <p>IEC Electropedia:
-         &#20301;&#20110;<a href="http://www.electropedia.org">http://www.electropedia.org</a>
-       </p> </li> </ul>
+             <div id="H"><h1>3&#160; &#26415;&#35821;&#12289;&#23450;&#20041;&#12289;&#31526;&#21495;&#12289;&#20195;&#21495;&#21644;&#32553;&#30053;&#35821;</h1>
        <div id="I"><h2>3.1 Normal Terms</h2>
                 <p class="TermNum" id="J">3.1.1</p>

data/spec/isodoc/inline_spec.rb CHANGED Viewed

@@ -185,7 +185,6 @@ RSpec.describe IsoDoc do
                #{IEC_TITLE}
                <div>
                  <h1>1&#160; Normative references</h1>
-                 <p>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>
                  <p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products</i></p>
                </div>
              </div>
@@ -252,7 +251,6 @@ RSpec.describe IsoDoc do
                #{IEC_TITLE}
                <div>
                  <h1>1&#160; Normative references</h1>
-                 <p>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>
                  <p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products</i></p>
                </div>
              </div>

data/spec/isodoc/iso_spec.rb CHANGED Viewed

@@ -154,7 +154,6 @@ RSpec.describe IsoDoc::Iec do
              #{IEC_TITLE}
              <div>
                <h1>1&#160; Normative references</h1>
-               <p>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>
                <p id="ISO20483" class="NormRef">ISO 20483, <i> Cereals and pulses</i></p>
              </div>
            </div>

data/spec/isodoc/metadata_spec.rb CHANGED Viewed

@@ -43,8 +43,8 @@ RSpec.describe IsoDoc::Iec::Metadata do
   <language>en</language>
   <script>Latn</script>
   <status>
-    <stage>40</stage>
-    <substage>92</substage>
+    <stage>35</stage>
+    <substage>20</substage>
     <iteration>3</iteration>
   </status>
   <copyright>
@@ -70,7 +70,7 @@ RSpec.describe IsoDoc::Iec::Metadata do
 </bibdata>
 </iso-standard>
 INPUT
-{:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :authors=>[], :authors_affiliations=>{}, :createddate=>"2010&ndash;2011", :docnumber=>"ISO/PreCD3 17301-1", :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", :docsubtitlemain=>"Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai", :docsubtitlepart=>"Riz", :docsubtitlepartlabel=>"Partie&nbsp;1", :doctitle=>"Cereals and pulses&nbsp;&mdash; Specifications and test methods&nbsp;&mdash; Part&nbsp;1: Rice", :doctitleintro=>"Cereals and pulses", :doctitlemain=>"Specifications and test methods", :doctitlepart=>"Rice", :doctitlepartlabel=>"Part&nbsp;1", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" (draft 0.4, 2016-05-01)", :edition=>"2", :editorialgroup=>["TC 34", "SC 4", "WG 3"], :ics=>"XXX", :obsoleteddate=>"2014", :obsoletes=>nil, :obsoletes_part=>nil, :publisheddate=>"2011", :revdate=>"2016-05-01", :sc=>"SC 4", :secretariat=>"GB", :stage=>"40", :stage_int=>40, :stageabbr=>"PreDIS3", :tc=>"TC 34", :tc_docnumber=>"17301", :unpublished=>true, :wg=>"WG 3"}
+{:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :authors=>[], :authors_affiliations=>{}, :createddate=>"2010&ndash;2011", :docnumber=>"ISO/PreCD3 17301-1", :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", :docsubtitlemain=>"Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai", :docsubtitlepart=>"Riz", :docsubtitlepartlabel=>"Partie&nbsp;1", :doctitle=>"Cereals and pulses&nbsp;&mdash; Specifications and test methods&nbsp;&mdash; Part&nbsp;1: Rice", :doctitleintro=>"Cereals and pulses", :doctitlemain=>"Specifications and test methods", :doctitlepart=>"Rice", :doctitlepartlabel=>"Part&nbsp;1", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" (draft 0.4, 2016-05-01)", :edition=>"2", :editorialgroup=>["TC 34", "SC 4", "WG 3"], :ics=>"XXX", :obsoleteddate=>"2014", :obsoletes=>nil, :obsoletes_part=>nil, :publisheddate=>"2011", :revdate=>"2016-05-01", :sc=>"SC 4", :secretariat=>"GB", :stage=>"35", :stage_int=>35, :stageabbr=>"3CD", :tc=>"TC 34", :tc_docnumber=>["17301"], :unpublished=>true, :wg=>"WG 3"}
 OUTPUT
   end
@@ -115,8 +115,8 @@ OUTPUT
   <language>en</language>
   <script>Latn</script>
   <status>
-    <stage>60</stage>
-    <substage>92</substage>
+    <stage>50</stage>
+    <substage>20</substage>
   </status>
   <copyright>
     <from>2016</from>
@@ -131,7 +131,7 @@ OUTPUT
     <docidentifier>IEC 8121</docidentifier>
   </relation>
   <ext>
-  <doctype>international-standard</doctype>
+  <doctype>technical-report</doctype>
   <editorialgroup>
     <technical-committee number="34" type="ABC">Food products</technical-committee>
     <subcommittee number="4" type="DEF">Cereals and pulses</subcommittee>
@@ -146,7 +146,7 @@ OUTPUT
 </bibdata>
 </iso-standard>
 INPUT
-{:agency=>"ISO/IEC", :authors=>[], :authors_affiliations=>{}, :docnumber=>"ISO/IEC/CD 17301-1-3", :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", :docsubtitlepart=>"Riz", :docsubtitlepartlabel=>"Partie&nbsp;1&ndash;3", :doctitle=>"Cereals and pulses&nbsp;&mdash; Specifications and test methods&nbsp;&mdash; Part&nbsp;1&ndash;3: Rice", :doctitleintro=>"Cereals and pulses", :doctitlemain=>"Specifications and test methods", :doctitlepart=>"Rice", :doctitlepartlabel=>"Part&nbsp;1&ndash;3", :doctype=>"International Standard", :docyear=>"2016", :draft=>nil, :draftinfo=>"", :edition=>nil, :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"], :ics=>"1.2.3, 1.2.3", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :revdate=>nil, :sc=>"DEF 4", :secretariat=>"XXXX", :stage=>"60", :stage_int=>60, :stageabbr=>"IS", :tc=>"ABC 34", :tc_docnumber=>"17301", :unpublished=>false, :wg=>"GHI 3"}
+{:agency=>"ISO/IEC", :authors=>[], :authors_affiliations=>{}, :docnumber=>"ISO/IEC/CD 17301-1-3", :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", :docsubtitlepart=>"Riz", :docsubtitlepartlabel=>"Partie&nbsp;1&ndash;3", :doctitle=>"Cereals and pulses&nbsp;&mdash; Specifications and test methods&nbsp;&mdash; Part&nbsp;1&ndash;3: Rice", :doctitleintro=>"Cereals and pulses", :doctitlemain=>"Specifications and test methods", :doctitlepart=>"Rice", :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", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :revdate=>nil, :sc=>"DEF 4", :secretariat=>"XXXX", :stage=>"50", :stage_int=>50, :stageabbr=>"CFDIS", :tc=>"ABC 34", :tc_docnumber=>["17301"], :unpublished=>true, :wg=>"GHI 3"}
 OUTPUT
   end

data/spec/isodoc/postproc_spec.rb CHANGED Viewed

@@ -155,16 +155,7 @@ RSpec.describe IsoDoc do
     expect(word).to be_equivalent_to <<~"OUTPUT"
            <div class="WordSection3">
                #{IEC_TITLE}
-               <div><a name="_terms_and_definitions" id="_terms_and_definitions"></a><h1 class="main">1<span style="mso-tab-count:1">&#xA0; </span>Terms and definitions</h1><p class="MsoNormal">For the purposes of this document,
-           the following terms and definitions apply.</p>
-       <p class="MsoNormal">ISO and IEC maintain terminological databases for use in
-       standardization at the following addresses:</p>
-       <p style="mso-list:l22 level1 lfo1;" class="MsoListParagraphCxSpFirst"> ISO Online browsing platform: available at
-          <a href="http://www.iso.org/obp">http://www.iso.org/obp</a> </p>
-        <p style="mso-list:l22 level1 lfo1;" class="MsoListParagraphCxSpLast"> IEC Electropedia: available at
-         <a href="http://www.electropedia.org">http://www.electropedia.org</a>
-       </p>
+               <div><a name="_terms_and_definitions" id="_terms_and_definitions"></a><h1 class="main">1<span style="mso-tab-count:1">&#xA0; </span>Terms and definitions</h1>
        <p class="TermNum"><a name="paddy1" id="paddy1"></a>1.1</p><p class="Terms" style="text-align:left;">paddy</p>
        <p class="MsoNormal"><a name="_eb29b35e-123e-4d1c-b50b-2714d41e747f" id="_eb29b35e-123e-4d1c-b50b-2714d41e747f"></a>rice retaining its husk after threshing</p>
        <p class="MsoNormal">[SOURCE: <a href="#ISO7301">ISO 7301:2011, 3.1</a>, modified &mdash; The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here]</p></div>
@@ -331,12 +322,12 @@ RSpec.describe IsoDoc do
               </div>
              </div>
              <aside id="fn:3" class="footnote">
-         <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6"><a rel="footnote" href="#fn:3" epub:type="footnote" id="fnref:1">
+         <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6"><a rel="footnote" href="#fn:3" epub:type="footnote">
                  <sup>1</sup>
                </a>This is a footnote.</p>
        <a href="#fnref:1">&#x21A9;</a></aside>
              <aside id="fn:2" class="footnote">
-         <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6"><a rel="footnote" href="#fn:2" epub:type="footnote" id="fnref:2"><sup>2</sup></a>Formerly denoted as 15 % (m/m).</p>
+         <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6"><a rel="footnote" href="#fn:2" epub:type="footnote"><sup>2</sup></a>Formerly denoted as 15 % (m/m).</p>
        <a href="#fnref:2">&#x21A9;</a></aside>
            </main>

data/spec/isodoc/section_spec.rb CHANGED Viewed

@@ -69,7 +69,7 @@ RSpec.describe IsoDoc do
        </bibliography>
        </iso-standard>
     INPUT
-    <html xmlns:epub="http://www.idpf.org/2007/ops">
+    <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
          <head/>
          <body lang="en">
            <div class="title-section">
@@ -103,19 +103,8 @@ RSpec.describe IsoDoc do
                 </div>
                 <div>
                   <h1>2&#160; Normative references</h1>
-                  <p>There are no normative references in this document.</p>
                 </div>
-                <div id="H"><h1>3&#160; Terms, definitions, symbols and abbreviated terms</h1><p>For the purposes of this document,
-            the following terms and definitions apply.</p>
-        <p>ISO and IEC maintain terminological databases for use in
-        standardization at the following addresses:</p>
-        <ul>
-        <li> <p>ISO Online browsing platform: available at
-          <a href="http://www.iso.org/obp">http://www.iso.org/obp</a></p> </li>
-        <li> <p>IEC Electropedia: available at
-          <a href="http://www.electropedia.org">http://www.electropedia.org</a>
-        </p> </li> </ul>
+                <div id="H"><h1>3&#160; Terms, definitions, symbols and abbreviated terms</h1>
         <div id="I">
            <h2>3.1 Normal Terms</h2>
            <p class="TermNum" id="J">3.1.1</p>
@@ -269,19 +258,8 @@ OUTPUT
                </div>
                <div>
                  <h1>2<span style="mso-tab-count:1">&#160; </span>Normative references</h1>
-                 <p>There are no normative references in this document.</p>
                </div>
-               <div id="H"><h1>3<span style="mso-tab-count:1">&#160; </span>Terms, definitions, symbols and abbreviated terms</h1><p>For the purposes of this document,
-           the following terms and definitions apply.</p>
-       <p>ISO and IEC maintain terminological databases for use in
-       standardization at the following addresses:</p>
-       <ul>
-       <li> <p>ISO Online browsing platform: available at
-         <a href="http://www.iso.org/obp">http://www.iso.org/obp</a></p> </li>
-       <li> <p>IEC Electropedia: available at
-         <a href="http://www.electropedia.org">http://www.electropedia.org</a>
-       </p> </li> </ul>
+               <div id="H"><h1>3<span style="mso-tab-count:1">&#160; </span>Terms, definitions, symbols and abbreviated terms</h1>
        <div id="I">
           <h2>3.1 Normal Terms</h2>
           <p class="TermNum" id="J">3.1.1</p>
@@ -356,17 +334,7 @@ OUTPUT
    <div class="boilerplate_legal"/>
  </div>
 #{IEC_TITLE}
-               <div id="H"><h1>1&#160; Terms and definitions</h1><p>For the purposes of this document,
-           the following terms and definitions apply.</p>
-       <p>ISO and IEC maintain terminological databases for use in
-       standardization at the following addresses:</p>
-       <ul>
-       <li> <p>ISO Online browsing platform: available at
-         <a href="http://www.iso.org/obp">http://www.iso.org/obp</a></p> </li>
-       <li> <p>IEC Electropedia: available at
-         <a href="http://www.electropedia.org">http://www.electropedia.org</a>
-       </p> </li> </ul>
+               <div id="H"><h1>1&#160; Terms and definitions</h1>
        <p class="TermNum" id="J">1.1</p>
          <p class="Terms" style="text-align:left;">Term2</p>
        </div>
@@ -376,149 +344,6 @@ OUTPUT
     OUTPUT
   end
-  it "processes terms & definitions with external source" do
-        expect(IsoDoc::Iec::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
-               <iso-standard xmlns="http://riboseinc.com/isoxml">
-         <termdocsource type="inline" bibitemid="ISO712"/>
-       <sections>
-       <terms id="H" obligation="normative"><title>Terms, Definitions, Symbols and Abbreviated Terms</title>
-         <term id="J">
-         <preferred>Term2</preferred>
-       </term>
-       </terms>
-        </sections>
-        <bibliography>
-        <references id="_normative_references" obligation="informative"><title>Normative References</title>
-<bibitem id="ISO712" type="standard">
-  <title format="text/plain">Cereals and cereal products?~@~I?~@~T?~@~IDetermination of moisture content?~@~I?~@~T?~@~IReference method</title>
-  <docidentifier>ISO 712</docidentifier>
-  <contributor>
-    <role type="publisher"/>
-    <organization>
-      <name>International Organization for Standardization</name>
-    </organization>
-  </contributor>
-</bibitem></references>
-</bibliography>
-        </iso-standard>
-    INPUT
-    #{HTML_HDR}
-     <div id="">
-   <h1 class="ForewordTitle">FOREWORD</h1>
-   <div class="boilerplate_legal"/>
- </div>
-               #{IEC_TITLE}
-               <div>
-                 <h1>1&#160; Normative references</h1>
-                 <p>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>
-                 <p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products?~@~I?~@~T?~@~IDetermination of moisture content?~@~I?~@~T?~@~IReference method</i></p>
-               </div>
-               <div id="H"><h1>2&#160; Terms and definitions</h1><p>For the purposes of this document, the terms and definitions
-         given in <a href="#ISO712">ISO 712</a> and the following apply.</p>
-       <p>ISO and IEC maintain terminological databases for use in
-       standardization at the following addresses:</p>
-       <ul>
-       <li> <p>ISO Online browsing platform: available at
-         <a href="http://www.iso.org/obp">http://www.iso.org/obp</a></p> </li>
-       <li> <p>IEC Electropedia: available at
-         <a href="http://www.electropedia.org">http://www.electropedia.org</a>
-       </p> </li> </ul>
-       <p class="TermNum" id="J">2.1</p>
-                <p class="Terms" style="text-align:left;">Term2</p>
-              </div>
-             </div>
-           </body>
-       </html>
-    OUTPUT
-  end
-  it "processes empty terms & definitions with external source" do
-        expect(IsoDoc::Iec::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
-               <iso-standard xmlns="http://riboseinc.com/isoxml">
-         <termdocsource type="inline" bibitemid="ISO712"/>
-         <termdocsource type="inline" bibitemid="ISO712"/>
-         <termdocsource type="inline" bibitemid="ISO712"/>
-       <sections>
-       <terms id="H" obligation="normative"><title>Terms, Definitions, Symbols and Abbreviated Terms</title>
-       </terms>
-        </sections>
-        <bibliography>
-        <references id="_normative_references" obligation="informative"><title>Normative References</title>
-<bibitem id="ISO712" type="standard">
-  <title format="text/plain">Cereals and cereal products?~@~I?~@~T?~@~IDetermination of moisture content?~@~I?~@~T?~@~IReference method</title>
-  <docidentifier>ISO 712</docidentifier>
-  <contributor>
-    <role type="publisher"/>
-    <organization>
-      <abbreviation>ISO</abbreviation>
-    </organization>
-  </contributor>
-</bibitem></references>
-</bibliography>
-        </iso-standard>
-    INPUT
-    #{HTML_HDR}
-    <div id="">
-   <h1 class="ForewordTitle">FOREWORD</h1>
-   <div class="boilerplate_legal"/>
- </div>
-               #{IEC_TITLE}
-               <div>
-                 <h1>1&#160; Normative references</h1>
-                 <p>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>
-                 <p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products?~@~I?~@~T?~@~IDetermination of moisture content?~@~I?~@~T?~@~IReference method</i></p>
-               </div>
-               <div id="H"><h1>2&#160; Terms and definitions</h1><p>For the purposes of this document,
-         the terms and definitions given in <a href="#ISO712">ISO 712</a>, <a href="#ISO712">ISO 712</a> and <a href="#ISO712">ISO 712</a> apply.</p>
-       <p>ISO and IEC maintain terminological databases for use in
-       standardization at the following addresses:</p>
-       <ul>
-       <li> <p>ISO Online browsing platform: available at
-         <a href="http://www.iso.org/obp">http://www.iso.org/obp</a></p> </li>
-       <li> <p>IEC Electropedia: available at
-         <a href="http://www.electropedia.org">http://www.electropedia.org</a>
-       </p> </li> </ul>
-       </div>
-             </div>
-           </body>
-       </html>
-    OUTPUT
-  end
-  it "processes empty terms & definitions" do
-        expect(IsoDoc::Iec::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
-               <iso-standard xmlns="http://riboseinc.com/isoxml">
-       <sections>
-       <terms id="H" obligation="normative"><title>Terms, Definitions, Symbols and Abbreviated Terms</title>
-       </terms>
-        </sections>
-        </iso-standard>
-    INPUT
-    #{HTML_HDR}
-     <div id="">
-   <h1 class="ForewordTitle">FOREWORD</h1>
-   <div class="boilerplate_legal"/>
- </div>
-#{IEC_TITLE}
-               <div id="H"><h1>1&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
-       <p>ISO and IEC maintain terminological databases for use in
-       standardization at the following addresses:</p>
-       <ul>
-       <li> <p>ISO Online browsing platform: available at
-         <a href="http://www.iso.org/obp">http://www.iso.org/obp</a></p> </li>
-       <li> <p>IEC Electropedia: available at
-         <a href="http://www.electropedia.org">http://www.electropedia.org</a>
-       </p> </li> </ul>
-       </div>
-             </div>
-           </body>
-       </html>
-    OUTPUT
-  end
     it "processes inline section headers" do
     expect(IsoDoc::Iec::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
       <iso-standard xmlns="http://riboseinc.com/isoxml">

data/spec/isodoc/terms_spec.rb CHANGED Viewed

@@ -58,17 +58,7 @@ RSpec.describe IsoDoc do
         <div class="boilerplate_legal"/>
         </div>
         #{IEC_TITLE}
-             <div id="_terms_and_definitions"><h1>1&#160; Terms and definitions</h1><p>For the purposes of this document,
-           the following terms and definitions apply.</p>
-       <p>ISO and IEC maintain terminological databases for use in
-       standardization at the following addresses:</p>
-       <ul>
-       <li> <p>ISO Online browsing platform: available at
-         <a href="http://www.iso.org/obp">http://www.iso.org/obp</a></p> </li>
-       <li> <p>IEC Electropedia: available at
-         <a href="http://www.electropedia.org">http://www.electropedia.org</a>
-       </p> </li> </ul>
+             <div id="_terms_and_definitions"><h1>1&#160; Terms and definitions</h1>
        <p class="TermNum" id="paddy1">1.1</p><p class="Terms" style="text-align:left;">paddy</p>
        <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">&lt;rice&gt; rice retaining its husk after threshing</p>
@@ -155,17 +145,7 @@ OUTPUT
 </sections>
 </iso-standard>
     INPUT
-                 <div id="_terms_and_definitions"><h1>1<span style="mso-tab-count:1">&#160; </span>Terms and definitions</h1><p>For the purposes of this document,
-           the following terms and definitions apply.</p>
-       <p>ISO and IEC maintain terminological databases for use in
-       standardization at the following addresses:</p>
-       <ul>
-       <li> <p>ISO Online browsing platform: available at
-         <a href="http://www.iso.org/obp">http://www.iso.org/obp</a></p> </li>
-       <li> <p>IEC Electropedia: available at
-         <a href="http://www.electropedia.org">http://www.electropedia.org</a>
-       </p> </li> </ul>
+                 <div id="_terms_and_definitions"><h1>1<span style="mso-tab-count:1">&#160; </span>Terms and definitions</h1>
        <p class="TermNum" id="paddy1">1.1</p><p class="Terms" style="text-align:left;">paddy</p>
        <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">&lt;rice&gt; rice retaining its husk after threshing</p>

data/spec/metanorma/processor_spec.rb CHANGED Viewed

@@ -67,17 +67,7 @@ RSpec.describe Metanorma::Iec::Processor do
    <b></b>
  </p>
  <p class="zzSTDTitle1">&#xA0;</p>
-             <div id="H"><h1>1&#xA0; Terms and definitions</h1><p>For the purposes of this document,
-           the following terms and definitions apply.</p>
-       <p>ISO and IEC maintain terminological databases for use in
-       standardization at the following addresses:</p>
-       <ul>
-       <li> <p>ISO Online browsing platform: available at
-         <a href="http://www.iso.org/obp">http://www.iso.org/obp</a></p> </li>
-       <li> <p>IEC Electropedia: available at
-         <a href="http://www.electropedia.org">http://www.electropedia.org</a>
-       </p> </li> </ul>
+             <div id="H"><h1>1&#xA0; Terms and definitions</h1>
        <h2 class="TermNum" id="J">1.1</h2>
          <p class="Terms" style="text-align:left;">Term2</p>
        </div>

data/spec/spec_helper.rb CHANGED Viewed

@@ -86,6 +86,18 @@ VALIDATING_BLANK_HDR = <<~"HDR"
 HDR
+TERMS_BOILERPLATE = <<~"BOILERPLATE"
+       <p>ISO and IEC maintain terminological databases for use in
+       standardization at the following addresses:</p>
+        <ul>
+        <li> <p>ISO Online browsing platform: available at
+          <link target="http://www.iso.org/obp"/></p> </li>
+        <li> <p>IEC Electropedia: available at
+        <link target="http://www.electropedia.org"/>
+        </p> </li> </ul>
+BOILERPLATE
 BOILERPLATE = <<~"BOILERPLATE"
          <boilerplate>
            <legal-statement>
@@ -160,7 +172,7 @@ IEC_TITLE = <<~END
 END
 HTML_HDR = <<~END
-        <html xmlns:epub="http://www.idpf.org/2007/ops">
+        <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
           <head/>
           <body lang="en">
             <div class="title-section">

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-20 00:00:00.000000000 Z
+date: 2019-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -245,6 +245,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
+- README.adoc
 - bin/rspec
 - lib/asciidoctor/iec/basicdoc.rng
 - lib/asciidoctor/iec/biblio.rng