RubyGems - metanorma-iec - Versions diffs - 2.5.13 → 2.6.0 - Mend

metanorma-iec 2.5.13 → 2.6.0

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 (11) hide show

checksums.yaml +4 -4
data/lib/isodoc/iec/iec.international-standard.xsl +431 -153
data/lib/isodoc/iec/presentation_terms.rb +7 -4
data/lib/isodoc/iec/word_convert.rb +1 -1
data/lib/metanorma/iec/iec.rng +32 -35
data/lib/metanorma/iec/isodoc.rng +12 -6
data/lib/metanorma/iec/isostandard.rng +30 -33
data/lib/metanorma/iec/relaton-iec.rng +21 -13
data/lib/metanorma/iec/version.rb +1 -1
data/metanorma-iec.gemspec +1 -1
metadata +4 -4

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

@@ -13,8 +13,8 @@ module IsoDoc
       end
       def concept(docxml)
-        @is_iev and concept_iev(docxml)
         super
+        @is_iev and concept_iev(docxml)
       end
       def concept_iev(docxml)
@@ -23,7 +23,7 @@ module IsoDoc
         end
         docpart = docxml.at(ns("//bibdata/ext/structuredidentifier/" \
                                 "project-number/@part"))&.text or return
-        docxml.xpath(ns("//termref[@base = 'IEV']")).each do |t|
+        docxml.xpath(ns("//fmt-concept//termref[@base = 'IEV']")).each do |t|
           concept_iev1(t, docpart, labels)
         end
       end
@@ -31,9 +31,10 @@ module IsoDoc
       def concept_iev1(termref, docpart, labels)
         /^#{docpart}-/.match?(termref["target"]) or return
         newtarget = labels[termref["target"]] or return
-        termref.name = "xref"
+        termref.name = "fmt-xref"
         termref.delete("base")
         termref["target"] = newtarget
+        xref1(termref)
       end
       def terms(docxml)
@@ -69,7 +70,9 @@ module IsoDoc
         dup = semx_fmt_dup(fr_term)
         dup.xpath(ns("./fmt-name | ./fmt-xref-label")).each(&:remove)
         en_term << dup
-        fr_term.xpath(ns(".//fmt-name | .//fmt-xref-label | .//fmt-preferred | .//fmt-admitted | .//fmt-deprecates | .//fmt-definition | .//fmt-related | .//fmt-termsource")).each(&:remove)
+        fr_term.xpath(ns(".//fmt-name | .//fmt-xref-label | " \
+          ".//fmt-preferred | .//fmt-admitted | .//fmt-deprecates | " \
+          ".//fmt-definition | .//fmt-related | .//fmt-termsource")).each(&:remove)
         fr_term["unnumbered"] = "true"
         en_term << dl if dl
         en_term["language"] = "en,fr"

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

@@ -214,7 +214,7 @@ module IsoDoc
         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)
+            parse(node.at(ns("./fmt-stem")), div)
             if lbl = node&.at(ns("./fmt-name"))&.text
               insert_tab(div, 1)
               div << lbl

data/lib/metanorma/iec/iec.rng CHANGED Viewed

@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar ns='https://www.metanorma.org/ns/iec' xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+<grammar ns='https://www.metanorma.org/ns/standoc' xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <!--
     VERSION v1.2.1
     default namespace = "https://www.metanorma.com/ns/iec"
   -->
   <include href="relaton-iec.rng"/>
   <include href="isostandard.rng">
-    <start>
-      <ref name="iec-standard"/>
-    </start>
     <define name="term">
       <element name="term">
         <optional>
@@ -50,36 +47,36 @@
         </zeroOrMore>
       </element>
     </define>
+    <!--
+      We display the Normative References between scope and terms; but to keep the
+      grammar simple, we keep the references together
+    -->
+    <define name="standard-document">
+      <element name="metanorma">
+        <ref name="Root-Attributes"/>
+        <ref name="bibdata"/>
+        <zeroOrMore>
+          <ref name="termdocsource"/>
+        </zeroOrMore>
+        <optional>
+          <ref name="misccontainer"/>
+        </optional>
+        <optional>
+          <ref name="boilerplate"/>
+        </optional>
+        <ref name="preface"/>
+        <oneOrMore>
+          <ref name="sections"/>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="annex"/>
+        </zeroOrMore>
+        <ref name="bibliography"/>
+        <zeroOrMore>
+          <ref name="indexsect"/>
+        </zeroOrMore>
+      </element>
+    </define>
   </include>
-  <!-- end overrides -->
-  <!--
-    We display the Normative References between scope and terms; but to keep the
-    grammar simple, we keep the references together
-  -->
-  <define name="iec-standard">
-    <element name="iec-standard">
-      <ref name="Root-Attributes"/>
-      <ref name="bibdata"/>
-      <zeroOrMore>
-        <ref name="termdocsource"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="misccontainer"/>
-      </optional>
-      <optional>
-        <ref name="boilerplate"/>
-      </optional>
-      <ref name="preface"/>
-      <oneOrMore>
-        <ref name="sections"/>
-      </oneOrMore>
-      <zeroOrMore>
-        <ref name="annex"/>
-      </zeroOrMore>
-      <ref name="bibliography"/>
-      <zeroOrMore>
-        <ref name="indexsect"/>
-      </zeroOrMore>
-    </element>
-  </define>
 </grammar>
+<!-- end overrides -->

data/lib/metanorma/iec/isodoc.rng CHANGED Viewed

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.4.1 -->
+<!-- VERSION v2.0.0 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -459,11 +459,14 @@ gives an explicit page orientation</a:documentation>
           <a:documentation>Description of location in a reference, which can be combined with other locations in a single citation</a:documentation>
         </ref>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="PureTextElement">
+      <optional>
+        <element name="display-text">
           <a:documentation>The textual content of the element. The `text` is what we wish to show the link as (e.g., the "content" of `&lt;xx&gt;my link text&lt;/xx&gt;`)</a:documentation>
-        </ref>
-      </zeroOrMore>
+          <oneOrMore>
+            <ref name="PureTextElement"/>
+          </oneOrMore>
+        </element>
+      </optional>
     </define>
   </include>
   <!-- end overrides -->
@@ -1205,10 +1208,13 @@ numbers</a:documentation>
         <value>presentation</value>
       </choice>
     </attribute>
+    <attribute name="flavor">
+      <a:documentation>Metanorma flavor, indicating SDO whose requiremnts the realisation aligns to</a:documentation>
+    </attribute>
   </define>
   <define name="standard-document">
     <a:documentation>Representation of a standardisation document</a:documentation>
-    <element name="standard-document">
+    <element name="metanorma">
       <ref name="Root-Attributes"/>
       <ref name="bibdata">
         <a:documentation>Bibliographic description of the document itself, expressed in the Relaton model</a:documentation>

data/lib/metanorma/iec/isostandard.rng CHANGED Viewed

@@ -5,9 +5,6 @@
     default namespace isostandard = "https://www.metanorma.com/ns/iso"
   -->
   <include href="isodoc.rng">
-    <start>
-      <ref name="iso-standard"/>
-    </start>
     <define name="sections">
       <element name="sections">
         <zeroOrMore>
@@ -238,38 +235,38 @@
         </oneOrMore>
       </choice>
     </define>
+    <!--
+      We display the Normative References between scope and terms; but to keep the
+      grammar simple, we keep the references together
+    -->
+    <define name="standard-document">
+      <element name="metanorma">
+        <ref name="Root-Attributes"/>
+        <ref name="bibdata"/>
+        <zeroOrMore>
+          <ref name="termdocsource"/>
+        </zeroOrMore>
+        <optional>
+          <ref name="misccontainer"/>
+        </optional>
+        <optional>
+          <ref name="boilerplate"/>
+        </optional>
+        <ref name="preface"/>
+        <oneOrMore>
+          <ref name="sections"/>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="annex"/>
+        </zeroOrMore>
+        <ref name="bibliography"/>
+        <zeroOrMore>
+          <ref name="indexsect"/>
+        </zeroOrMore>
+      </element>
+    </define>
   </include>
   <!-- end overrides -->
-  <!--
-    We display the Normative References between scope and terms; but to keep the
-    grammar simple, we keep the references together
-  -->
-  <define name="iso-standard">
-    <element name="iso-standard">
-      <ref name="Root-Attributes"/>
-      <ref name="bibdata"/>
-      <zeroOrMore>
-        <ref name="termdocsource"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="misccontainer"/>
-      </optional>
-      <optional>
-        <ref name="boilerplate"/>
-      </optional>
-      <ref name="preface"/>
-      <oneOrMore>
-        <ref name="sections"/>
-      </oneOrMore>
-      <zeroOrMore>
-        <ref name="annex"/>
-      </zeroOrMore>
-      <ref name="bibliography"/>
-      <zeroOrMore>
-        <ref name="indexsect"/>
-      </zeroOrMore>
-    </element>
-  </define>
   <define name="clause-hanging-paragraph-with-footnote">
     <element name="clause">
       <optional>

data/lib/metanorma/iec/relaton-iec.rng CHANGED Viewed

@@ -75,19 +75,13 @@
         </choice>
       </element>
     </define>
-    <define name="OrganizationType" combine="interleave">
-      <optional>
-        <ref name="technical-committee"/>
-      </optional>
-      <optional>
-        <ref name="subcommittee"/>
-      </optional>
-      <optional>
-        <ref name="workgroup"/>
-      </optional>
-      <optional>
-        <ref name="secretariat"/>
-      </optional>
+    <define name="organization">
+      <element name="organization">
+        <choice>
+          <ref name="OrganizationType"/>
+          <ref name="IsoOrganizationType"/>
+        </choice>
+      </element>
     </define>
     <define name="DocumentType">
       <choice>
@@ -265,4 +259,18 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="IsoOrganizationType">
+    <optional>
+      <ref name="technical-committee"/>
+    </optional>
+    <optional>
+      <ref name="subcommittee"/>
+    </optional>
+    <optional>
+      <ref name="workgroup"/>
+    </optional>
+    <optional>
+      <ref name="secretariat"/>
+    </optional>
+  </define>
 </grammar>

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

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "2.5.13".freeze
+    VERSION = "2.6.0".freeze
   end
 end

data/metanorma-iec.gemspec CHANGED Viewed

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
-  spec.add_dependency "metanorma-iso", "~> 2.9.2"
+  spec.add_dependency "metanorma-iso", "~> 3.0.0"
   spec.add_dependency "pubid"
   spec.add_development_dependency "debug"

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 2.5.13
+  version: 2.6.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-03 00:00:00.000000000 Z
+date: 2025-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.2
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.2
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: pubid
   requirement: !ruby/object:Gem::Requirement