metanorma-iec 2.6.7 → 2.6.8

data/lib/isodoc/iec/presentation_terms.rb

@@ -136,11 +136,12 @@ module IsoDoc
         )
         pr.empty? and return
         prefs = pr.map do |p|
-          "<dt>#{p[:lang]}</dt>" \
-            "<dd language='#{p[:lang]}' script='#{p[:script]}'>" \
-            "#{cleanup_entities(p[:designation])}</dd>"
+          <<~XML
+            <dt>#{p[:lang]}</dt>
+            <dd #{add_id_text} language='#{p[:lang]}' script='#{p[:script]}'>#{cleanup_entities(p[:designation])}</dd>
+          XML
         end
-        term << "<dl type='other-lang'>#{prefs.join}</dl>"
+        term << "<dl #{add_id_text} type='other-lang'>#{prefs.join}</dl>"
       end
 
       def remove_otherlang_designations1(term, lgs)

data/lib/isodoc/iec/presentation_xml_convert.rb

@@ -14,12 +14,6 @@ module IsoDoc
         @i18n_lg["default"] = @i18n
       end
 
-      # KILL 
-      def clausex(docxml)
-        super
-        docxml.xpath(ns("//terms")).each { |f| termclause1(f) }
-      end
-
       def clause1(elem)
         if elem.name == "terms" && @is_iev then iev_termclause1(elem)
         else
@@ -57,7 +51,7 @@ module IsoDoc
         unless f = docxml.at(ns("//preface/foreword"))
           ins = toc_title_insert_pt(docxml)
           f = ins.before(<<~CLAUSE).previous_element
-            <foreword id='_#{UUIDTools::UUID.random_create}'> </foreword>
+            <foreword #{add_id_text}> </foreword>
           CLAUSE
         end
         insert_foreword_boilerplate(f, b)
@@ -67,7 +61,7 @@ module IsoDoc
         elem.children.empty? and elem.children = " "
         ins = elem.at(ns("./title")) || elem.children.first.before(" ").previous
         ins.next = <<~CLAUSE
-          <clause type='boilerplate_legal'>#{to_xml(boilerplate.children)}</clause>
+          <clause type='boilerplate_legal' #{add_id_text}>#{to_xml(boilerplate.children)}</clause>
         CLAUSE
       end
 

data/lib/metanorma/iec/converter.rb

@@ -145,7 +145,7 @@ module Metanorma
         m = /60050-(\d+)/.match(id) or return
         xmldoc.xpath("//sections/clause/terms/title").each_with_index do |t, i|
           num = "%02d" % [i + 1]
-          t.next = "<variant-title type='toc'>" \
+          t.next = "<variant-title #{add_id_text} type='toc'>" \
                    "#{@i18n.section_iev} #{m[1]}-#{num} &#x2013; " \
                    "#{t.children.to_xml}</variant-title>"
         end

data/lib/metanorma/iec/isodoc.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-<!-- VERSION v2.0.6 -->
+<!-- VERSION v2.0.7 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -76,6 +76,7 @@ but to `@anchor`, the user-supplied cross-reference</a:documentation>
       <a:documentation>Title(s) of a clause</a:documentation>
       <element name="title">
         <a:documentation>Title proper for a clause</a:documentation>
+        <ref name="RequiredId"/>
         <zeroOrMore>
           <ref name="TextElement"/>
         </zeroOrMore>
@@ -83,10 +84,19 @@ but to `@anchor`, the user-supplied cross-reference</a:documentation>
       <zeroOrMore>
         <element name="variant-title">
           <a:documentation>Alternate title for a clause</a:documentation>
+          <ref name="RequiredId"/>
           <ref name="TypedTitleString"/>
         </element>
       </zeroOrMore>
     </define>
+    <define name="tname">
+      <element name="name">
+        <ref name="RequiredId"/>
+        <oneOrMore>
+          <ref name="NestedTextElement"/>
+        </oneOrMore>
+      </element>
+    </define>
     <define name="UlBody">
       <optional>
         <ref name="tname">
@@ -475,6 +485,7 @@ normative or informative references, some split references into sections organiz
     <!-- exclude figures? -->
     <define name="dd">
       <element name="dd">
+        <ref name="OptionalId"/>
         <zeroOrMore>
           <!-- exclude figures? -->
           <ref name="BasicBlock"/>
@@ -526,6 +537,7 @@ normative or informative references, some split references into sections organiz
       </choice>
     </define>
     <define name="TrAttributes">
+      <ref name="OptionalId"/>
       <optional>
         <attribute name="style">
           <a:documentation>CSS style: only background-color supported</a:documentation>
@@ -595,6 +607,7 @@ gives an explicit page orientation</a:documentation>
   </include>
   <!-- end overrides -->
   <define name="FnAttributes" combine="interleave">
+    <ref name="RequiredId"/>
     <optional>
       <attribute name="hiddenref">
         <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
@@ -604,6 +617,7 @@ This is done if the footnote reference is already presented in some other form,
     </optional>
   </define>
   <define name="TdAttributes" combine="interleave">
+    <ref name="RequiredId"/>
     <optional>
       <attribute name="style">
         <a:documentation>CSS style: only background-color supported</a:documentation>
@@ -1821,7 +1835,7 @@ used in document amendments</a:documentation>
     </element>
   </define>
   <define name="TermAttributes">
-    <ref name="OptionalId"/>
+    <ref name="RequiredId"/>
     <ref name="LocalizedStringAttributes"/>
     <ref name="BlockAttributes"/>
   </define>
@@ -2164,6 +2178,7 @@ used in document amendments</a:documentation>
   <define name="termdefinition">
     <a:documentation>The definition of a term applied in the current document</a:documentation>
     <element name="definition">
+      <ref name="RequiredId"/>
       <optional>
         <attribute name="type">
           <a:documentation>Type of definition, used to differentiate it from other definitions of the same term if present</a:documentation>
@@ -2185,6 +2200,7 @@ used in document amendments</a:documentation>
   </define>
   <define name="verbaldefinition">
     <element name="verbal-definition">
+      <ref name="RequiredId"/>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the verbal representation of the term</a:documentation>
@@ -2205,6 +2221,7 @@ used in document amendments</a:documentation>
   <define name="nonverbalrep">
     <a:documentation>Non-verbal representation of the term</a:documentation>
     <element name="non-verbal-representation">
+      <ref name="RequiredId"/>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the non-verbal representation of the term</a:documentation>

data/lib/metanorma/iec/processor.rb

@@ -37,17 +37,17 @@ module Metanorma
         options_preprocess(options)
         case format
         when :html
-          IsoDoc::Iec::HtmlConvert.new(options).convert(inname, isodoc_node,
-                                                        nil, outname)
+          IsoDoc::Iec::HtmlConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
         when :doc
-          IsoDoc::Iec::WordConvert.new(options).convert(inname, isodoc_node,
-                                                        nil, outname)
+          IsoDoc::Iec::WordConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
         when :pdf
-          IsoDoc::Iec::PdfConvert.new(options).convert(inname, isodoc_node,
-                                                       nil, outname)
+          IsoDoc::Iec::PdfConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
         when :sts
-          IsoDoc::Iso::StsConvert.new(options).convert(inname, isodoc_node,
-                                                       nil, outname)
+          IsoDoc::Iso::StsConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
         when :presentation
           IsoDoc::Iec::PresentationXMLConvert.new(options)
             .convert(inname, isodoc_node, nil, outname)

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "2.6.7".freeze
+    VERSION = "2.6.8".freeze
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 2.6.7
+  version: 2.6.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-26 00:00:00.000000000 Z
+date: 2025-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso