metanorma-iec 2.0.8 → 2.1.2

data/lib/isodoc/iec/init.rb

@@ -10,12 +10,14 @@ module IsoDoc
         @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)
+      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)
+      def i18n_init(lang, script, i18nyaml = nil)
+        @i18n = I18n.new(lang, script, i18nyaml: i18nyaml || @i18nyaml)
       end
 
       def convert1(docxml, filename, dir)
@@ -26,4 +28,3 @@ module IsoDoc
     end
   end
 end
-

data/lib/isodoc/iec/metadata.rb

@@ -3,7 +3,7 @@ require "metanorma-iso"
 
 module IsoDoc
   module Iec
-    class  Metadata < IsoDoc::Iso::Metadata
+    class Metadata < IsoDoc::Iso::Metadata
       def docstatus(isoxml, _out)
         docstatus = isoxml.at(ns("//bibdata/status/stage"))
         substage = isoxml.at(ns("//bibdata/status/substage"))
@@ -22,7 +22,7 @@ module IsoDoc
 
       def doctype(isoxml, _out)
         super
-        b = isoxml&.at(ns("//bibdata/ext/doctype#{NOLANG}"))&.text 
+        b = isoxml&.at(ns("//bibdata/ext/doctype#{NOLANG}"))&.text
         b1 = isoxml&.at(ns("//bibdata/ext/doctype[@language = 'en']"))&.text || b
         b1 and set(:doctype_en, status_print(b1))
         b1 = isoxml&.at(ns("//bibdata/ext/doctype[@language = 'fr']"))&.text || b

data/lib/isodoc/iec/presentation_xml_convert.rb

@@ -7,8 +7,8 @@ module IsoDoc
       def i18n_init(lang, script, i18nyaml = nil)
         super
         @i18n_lg = {}
-        @i18n_lg["en"] = I18n.new("en", "Latn", i18nyaml || @i18nyaml)
-        @i18n_lg["fr"] = I18n.new("fr", "Latn", i18nyaml || @i18nyaml)
+        @i18n_lg["en"] = I18n.new("en", "Latn", i18nyaml: i18nyaml || @i18nyaml)
+        @i18n_lg["fr"] = I18n.new("fr", "Latn", i18nyaml: i18nyaml || @i18nyaml)
         @i18n_lg["default"] = @i18n
       end
 
@@ -37,18 +37,20 @@ module IsoDoc
           .call(elem)
       end
 
-      DICT_PATHS = { doctype_dict: "./ext/doctype", stage_dict: "./status/stage",
+      DICT_PATHS = { doctype_dict: "./ext/doctype",
                      substage_dict: "./status/substage",
                      function_dict: "./ext/function",
                      horizontal_dict: "./ext/horizontal" }.freeze
 
       def bibdata_i18n(bib)
-        fr = IsoDoc::Iec::I18n.new("fr", "Latn")
-        en = IsoDoc::Iec::I18n.new("en", "Latn")
-        [{ lang: "en", i18n: en }, { lang: "fr", i18n: fr }].each do |v|
+        [{ lang: "en", i18n: IsoDoc::Iec::I18n.new("en", "Latn") },
+         { lang: "fr", i18n: IsoDoc::Iec::I18n.new("fr", "Latn") }].each do |v|
           DICT_PATHS.each do |lbl, xpath|
             hash_translate(bib, v[:i18n].get[lbl.to_s], xpath, v[:lang])
           end
+          bibdata_i18n_stage(bib, bib.at(ns("./status/stage")),
+                             bib.at(ns("./ext/doctype")),
+                             lang: v[:lang], i18n: v[:i18n])
         end
       end
 
@@ -89,7 +91,7 @@ module IsoDoc
           fr = docxml.at(ns("//term[@language = 'fr'][@tag = '#{en['tag']}']"))
           merge_fr_into_en_term1(en, fr) if fr
         end
-        @xrefs.parse docxml
+        @xrefs.parse_inclusions(clauses: true).parse docxml
         docxml.xpath(ns("//term/name")).each(&:remove)
         term(docxml)
       end

data/lib/isodoc/iec/word_convert.rb

@@ -58,7 +58,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,tabletitle&quot; <span
+        \\h \\z \\t "TableTitle,tabletitle" <span
         style='mso-element:field-separator'></span></span>
       TOC
 
@@ -66,7 +66,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,figuretitle&quot; <span
+        \\h \\z \\t "FigureTitle,figuretitle" <span
         style='mso-element:field-separator'></span></span>
       TOC
 
@@ -93,7 +93,7 @@ module IsoDoc
           <span lang="EN-GB"><span
             style='mso-element:field-begin'></span><span
             style='mso-spacerun:yes'>&#xA0;</span>TOC
-            \\o &quot;1-#{level}&quot; \\h \\z \\u <span
+            \\o "1-#{level}" \\h \\z \\u <span
             style='mso-element:field-separator'></span></span>
         TOC
       end
@@ -113,7 +113,7 @@ module IsoDoc
         ret = super
         css_class =
           cell.name == "th" || header ? "TABLE-col-heading" : "TABLE-cell"
-        ret.merge("class": css_class)
+        ret.merge(class: css_class)
       end
 
       def tr_parse(node, out, ord, totalrows, header)

data/lib/isodoc/iec/xref.rb

@@ -17,10 +17,14 @@ module IsoDoc
         super
         return unless @is_iev
 
+        if @parse_settings.empty? || @parse_settings[:clauses]
         terms_iev_names(docxml)
+        end
+        if @parse_settings.empty?
         middle_section_asset_names(docxml)
         termnote_anchor_names(docxml)
         termexample_anchor_names(docxml)
+        end
       end
 
       def terms_iev_names(docxml)

data/lib/metanorma/iec/biblio.rng

@@ -614,12 +614,12 @@
     <optional>
       <ref name="fetched"/>
     </optional>
-    <choice>
-      <oneOrMore>
-        <ref name="btitle"/>
-      </oneOrMore>
+    <optional>
       <ref name="formattedref"/>
-    </choice>
+    </optional>
+    <oneOrMore>
+      <ref name="btitle"/>
+    </oneOrMore>
     <zeroOrMore>
       <ref name="bsource"/>
     </zeroOrMore>
@@ -851,17 +851,46 @@
   </define>
   <define name="bplace">
     <element name="place">
-      <optional>
-        <attribute name="uri">
-          <data type="anyURI"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="region"/>
-      </optional>
+      <choice>
+        <text/>
+        <group>
+          <ref name="bibliocity"/>
+          <zeroOrMore>
+            <ref name="biblioregion"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="bibliocountry"/>
+          </zeroOrMore>
+        </group>
+      </choice>
+    </element>
+  </define>
+  <define name="bibliocity">
+    <element name="city">
       <text/>
     </element>
   </define>
+  <define name="biblioregion">
+    <element name="region">
+      <ref name="RegionType"/>
+    </element>
+  </define>
+  <define name="bibliocountry">
+    <element name="country">
+      <ref name="RegionType"/>
+    </element>
+  </define>
+  <define name="RegionType">
+    <optional>
+      <attribute name="iso"/>
+    </optional>
+    <optional>
+      <attribute name="recommended">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <text/>
+  </define>
   <define name="bprice">
     <element name="price">
       <attribute name="currency"/>
@@ -957,36 +986,34 @@
           <ref name="SeriesType"/>
         </attribute>
       </optional>
-      <choice>
+      <optional>
         <ref name="formattedref"/>
-        <group>
-          <ref name="btitle"/>
-          <optional>
-            <ref name="bplace"/>
-          </optional>
-          <optional>
-            <ref name="seriesorganization"/>
-          </optional>
-          <optional>
-            <ref name="abbreviation"/>
-          </optional>
-          <optional>
-            <ref name="seriesfrom"/>
-          </optional>
-          <optional>
-            <ref name="seriesto"/>
-          </optional>
-          <optional>
-            <ref name="seriesnumber"/>
-          </optional>
-          <optional>
-            <ref name="seriespartnumber"/>
-          </optional>
-          <optional>
-            <ref name="seriesrun"/>
-          </optional>
-        </group>
-      </choice>
+      </optional>
+      <ref name="btitle"/>
+      <optional>
+        <ref name="bplace"/>
+      </optional>
+      <optional>
+        <ref name="seriesorganization"/>
+      </optional>
+      <optional>
+        <ref name="abbreviation"/>
+      </optional>
+      <optional>
+        <ref name="seriesfrom"/>
+      </optional>
+      <optional>
+        <ref name="seriesto"/>
+      </optional>
+      <optional>
+        <ref name="seriesnumber"/>
+      </optional>
+      <optional>
+        <ref name="seriespartnumber"/>
+      </optional>
+      <optional>
+        <ref name="seriesrun"/>
+      </optional>
     </element>
   </define>
   <define name="SeriesType">

data/lib/metanorma/iec/converter.rb

@@ -131,6 +131,11 @@ module Metanorma
                    "#{t.children.to_xml}</variant-title>"
         end
       end
+
+      def ol_attrs(node)
+        attr_code(keep_attrs(node)
+                  .merge(id: ::Metanorma::Utils::anchor_or_uuid(node)))
+      end
     end
   end
 end

data/lib/metanorma/iec/front.rb

@@ -213,6 +213,8 @@ module Metanorma
         a = node.attr("secretary") and xml.secretary a
         a = node.attr("interest-to-committees") and xml.interest_to_committees a
       end
+
+      def metadata_approval_committee(node, xml); end
     end
   end
 end

data/lib/metanorma/iec/iec.rng

@@ -14,6 +14,7 @@
         <value>international-workshop-agreement</value>
         <value>guide</value>
         <value>industry-technical-agreement</value>
+        <value>system-reference-delivrabble</value>
       </choice>
     </define>
     <define name="BibDataExtensionType">

data/lib/metanorma/iec/isodoc.rng

@@ -32,6 +32,43 @@
         <ref name="DocumentType"/>
       </element>
     </define>
+    <define name="admonition">
+      <element name="admonition">
+        <attribute name="type">
+          <ref name="AdmonitionType"/>
+        </attribute>
+        <optional>
+          <attribute name="class"/>
+        </optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <attribute name="uri">
+            <data type="anyURI"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="coverpage">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="notag">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
+        <zeroOrMore>
+          <ref name="paragraph-with-footnote"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="note"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="index">
       <element name="index">
         <optional>
@@ -245,6 +282,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="ul_li"/>
         </oneOrMore>
@@ -287,6 +327,9 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="li"/>
         </oneOrMore>
@@ -323,6 +366,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>
@@ -851,6 +897,16 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="coverpage">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="notag">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <oneOrMore>
           <choice>
             <ref name="paragraph"/>
@@ -1178,6 +1234,7 @@
       <ref name="concept"/>
       <ref name="add"/>
       <ref name="del"/>
+      <ref name="span"/>
     </choice>
   </define>
   <define name="add">
@@ -1204,6 +1261,14 @@
       </choice>
     </element>
   </define>
+  <define name="span">
+    <element name="span">
+      <attribute name="class"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="concept">
     <element name="concept">
       <optional>

data/lib/metanorma/iec/isostandard.rng

@@ -45,6 +45,7 @@
         <ref name="horizontal"/>
       </optional>
       <ref name="editorialgroup"/>
+      <ref name="approvalgroup"/>
       <zeroOrMore>
         <ref name="ics"/>
       </zeroOrMore>
@@ -249,6 +250,7 @@
         <value>warning</value>
         <value>important</value>
         <value>safety precautions</value>
+        <value>editorial</value>
       </choice>
     </define>
     <define name="preface">
@@ -308,18 +310,7 @@
     </define>
     <define name="editorialgroup">
       <element name="editorialgroup">
-        <oneOrMore>
-          <ref name="technical-committee"/>
-        </oneOrMore>
-        <zeroOrMore>
-          <ref name="subcommittee"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="workgroup"/>
-        </zeroOrMore>
-        <optional>
-          <ref name="secretariat"/>
-        </optional>
+        <ref name="ISOProjectGroup"/>
       </element>
     </define>
     <define name="Content-Section">
@@ -367,6 +358,33 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="ISOProjectGroup">
+    <zeroOrMore>
+      <ref name="agency"/>
+    </zeroOrMore>
+    <oneOrMore>
+      <ref name="technical-committee"/>
+    </oneOrMore>
+    <zeroOrMore>
+      <ref name="subcommittee"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="workgroup"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="secretariat"/>
+    </optional>
+  </define>
+  <define name="approvalgroup">
+    <element name="approvalgroup">
+      <ref name="ISOProjectGroup"/>
+    </element>
+  </define>
+  <define name="agency">
+    <element name="agency">
+      <text/>
+    </element>
+  </define>
   <!--
     We display the Normative References between scope and terms; but to keep the
     grammar simple, we keep the references together
@@ -428,6 +446,11 @@
       <data type="int"/>
     </element>
   </define>
+  <define name="approvalgroup">
+    <element name="approvalgroup">
+      <ref name="IsoWorkgroup"/>
+    </element>
+  </define>
   <define name="subcommittee">
     <element name="subcommittee">
       <ref name="IsoWorkgroup"/>

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "2.0.8".freeze
+    VERSION = "2.1.2".freeze
   end
 end
 

data/metanorma-iec.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["open.source@ribose.com"]
 
   spec.summary       = "metanorma-iec lets you write IEC standards "\
-    "in AsciiDoc."
+                       "in AsciiDoc."
   spec.description   = <<~DESCRIPTION
     metanorma-iec lets you write IEC standards in AsciiDoc syntax.
 
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "metanorma-iso", "~> 2.0.0"
+  spec.add_dependency "metanorma-iso", "~> 2.1.1"
   spec.add_dependency "ruby-jing"
 
   spec.add_development_dependency "debug"
@@ -41,4 +41,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sassc", "2.4.0"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
+  # spec.metadata["rubygems_mfa_required"] = "true"
 end