metanorma-itu 2.6.7 → 2.6.8

data/lib/isodoc/itu/presentation_contribution.rb

@@ -11,25 +11,25 @@ module IsoDoc
         @doctype == "contribution" or return
         bureau = bold_and_upcase(@meta.get[:bureau_full])
         <<~TABLE
-          <clause unnumbered="true" type="contribution-metadata">
-          <table class="contribution-metadata" unnumbered="true" width="100%">
+          <clause #{add_id_text} unnumbered="true" type="contribution-metadata">
+          <table #{add_id_text} class="contribution-metadata" unnumbered="true" width="100%">
           <colgroup><col width="11.8%"/><col width="41.2%"/><col width="47.0%"/></colgroup>
           <thead>
-          <tr><th rowspan="3"><image height="56" width="56" src="#{@meta.get[:logo_small]}"/></th>
-          <td rowspan="3"><p style="font-size:8pt;margin-top:6pt;margin-bottom:0pt;">#{@i18n.international_telecommunication_union.upcase}</p>
+          <tr #{add_id_text}><th rowspan="3" #{add_id_text}><image height="56" width="56" src="#{@meta.get[:logo_small]}"/></th>
+          <td #{add_id_text} rowspan="3"><p style="font-size:8pt;margin-top:6pt;margin-bottom:0pt;">#{@i18n.international_telecommunication_union.upcase}</p>
           <p class="bureau_big" style="font-size:13pt;margin-top:6pt;margin-bottom:0pt;">#{bureau}</p>
           <p style="font-size:10pt;margin-top:6pt;margin-bottom:0pt;">#{@i18n.studyperiod.sub('%', @meta.get[:study_group_period]).upcase}</p></th>
-          <th align="right"><p style="font-size:16pt;">#{@meta.get[:docnumber]}</p></th></tr>
-          <tr><th align="right"><p  style="font-size:14pt;">#{@meta.get[:group].upcase}</p></th></tr>
-          <tr>
-          <th align="right"><p style="font-size:14pt;">#{@i18n.l10n("#{@i18n.original}: #{@i18n.current_language}")}</p></th>
+          <th #{add_id_text} align="right"><p style="font-size:16pt;">#{@meta.get[:docnumber]}</p></th></tr>
+          <tr #{add_id_text}><th #{add_id_text} align="right"><p  style="font-size:14pt;">#{@meta.get[:group].upcase}</p></th></tr>
+          <tr #{add_id_text}>
+          <th #{add_id_text} align="right"><p style="font-size:14pt;">#{@i18n.l10n("#{@i18n.original}: #{@i18n.current_language}")}</p></th>
           </tr></thead>
           <tbody>
-          <tr><th align="left" width="95">#{colon_i18n(@i18n.questions)}</th><td>#{@meta.get[:questions]}</td>
-          <td align="right">#{@i18n.l10n("#{@meta.get[:meeting_place]}, #{@meta.get[:meeting_date]}")}</td></tr>
-          <tr><th align="center" colspan="3">#{@i18n.get['doctype_dict']['contribution'].upcase}</th></tr>
-          <tr><th align="left" width="95">#{colon_i18n(@i18n.document_source)}</th><td colspan="2">#{@meta.get[:source]}</td></tr>
-          <tr><th align="left" width="95">#{colon_i18n(@i18n.title)}</th><td colspan="2">#{@meta.get[:doctitle_en]}</td></tr>
+          <tr #{add_id_text}><th #{add_id_text} align="left" width="95">#{colon_i18n(@i18n.questions)}</th><td #{add_id_text}>#{@meta.get[:questions]}</td>
+          <td #{add_id_text} align="right">#{@i18n.l10n("#{@meta.get[:meeting_place]}, #{@meta.get[:meeting_date]}")}</td></tr>
+          <tr #{add_id_text}><th #{add_id_text} align="center" colspan="3">#{@i18n.get['doctype_dict']['contribution'].upcase}</th></tr>
+          <tr #{add_id_text}><th #{add_id_text} align="left" width="95">#{colon_i18n(@i18n.document_source)}</th><td #{add_id_text} colspan="2">#{@meta.get[:source]}</td></tr>
+          <tr #{add_id_text}><th #{add_id_text} align="left" width="95">#{colon_i18n(@i18n.title)}</th><td #{add_id_text} colspan="2">#{@meta.get[:doctitle_en]}</td></tr>
           #{contribution_table_contacts}
           </tbody></table>
           </clause>
@@ -55,7 +55,8 @@ module IsoDoc
         end
         n.map do |x|
           lbl = colon_i18n(@i18n.contact)
-          "<tr><th align='left' width='95'>#{lbl}</th>#{x}</tr>"
+          "<tr #{add_id_text}>"  \
+            "<th #{add_id_text} align='left' width='95'>#{lbl}</th>#{x}</tr>"
         end.join("\n")
       end
 
@@ -63,10 +64,10 @@ module IsoDoc
         @meta.get[:emails][idx] and
           e = "<br/>#{@i18n.email}<tab/>#{@meta.get[:emails][idx]}"
         <<~CELL
-          <td>#{@meta.get[:authors][idx]}<br/>
+          <td #{add_id_text}>#{@meta.get[:authors][idx]}<br/>
           #{@meta.get[:affiliations][idx]}<br/>
           #{@meta.get[:addresses][idx]}</td>
-          <td>#{@i18n.tel_abbrev}<tab/>#{@meta.get[:phones][idx]}#{e}</td>
+          <td #{add_id_text}>#{@i18n.tel_abbrev}<tab/>#{@meta.get[:phones][idx]}#{e}</td>
         CELL
       end
 
@@ -108,7 +109,7 @@ module IsoDoc
       def contribution_justification_auths
         auths = contrib_justification_contacts
         auths_tail = auths[1..auths.size].map do |x|
-          "<tr><td colspan='2'>#{x}</td></td>"
+          "<tr #{add_id_text}><td #{add_id_text} colspan='2'>#{x}</td></td>"
         end.join("\n")
         [auths, auths_tail]
       end
@@ -118,33 +119,33 @@ module IsoDoc
         annex = doc.at(ns("//annex[@type = 'justification']")) or return
         auths, auths_tail = contribution_justification_auths
         annex.children = <<~TABLE
-          <title>#{contribution_justification_title(doc)}</title>
-          <table class="contribution-metadata" unnumbered="true" width="100%">
+          <title #{add_id_text}>#{contribution_justification_title(doc)}</title>
+          <table #{add_id_text} class="contribution-metadata" unnumbered="true" width="100%">
             <colgroup><col width="15.9%"/><col width="6.1%"/><col width="45.5%"/><col width="17.4%"/><col width="15.1%"/></colgroup>
             <tbody>
-            <tr>
-            <th align="left">#{colon_i18n(@i18n.questions)}</th><td>#{@meta.get[:questions]}</td>
-            <th align="left">Proposed new ITU-T #{@meta.get[:subdoctype]}</th>
-            <td colspan="2">#{@i18n.l10n("#{@meta.get[:meeting_place]}, #{@meta.get[:meeting_date]}")}</td>
+            <tr #{add_id_text}>
+            <th #{add_id_text} align="left">#{colon_i18n(@i18n.questions)}</th><td #{add_id_text}>#{@meta.get[:questions]}</td>
+            <th #{add_id_text} align="left">Proposed new ITU-T #{@meta.get[:subdoctype]}</th>
+            <td #{add_id_text} colspan="2">#{@i18n.l10n("#{@meta.get[:meeting_place]}, #{@meta.get[:meeting_date]}")}</td>
             </tr>
-            <tr><th align="left">Reference and title:</th>
-            <td colspan="4">Draft new #{@meta.get[:subdoctype]} on “#{@meta.get[:doctitle_en]}”</td>
+            <tr #{add_id_text}><th #{add_id_text} align="left">Reference and title:</th>
+            <td #{add_id_text} colspan="4">Draft new #{@meta.get[:subdoctype]} on “#{@meta.get[:doctitle_en]}”</td>
             </tr>
-            <tr>
-            <th align="left">Base text:</th><td colspan="2">#{extract_clause_data(annex, 'basetext')}</td>
-            <th align="left">Timing:</th><td>#{@meta.get[:timing]}</td>
+            <tr #{add_id_text}>
+            <th #{add_id_text} align="left">Base text:</th><td #{add_id_text} colspan="2">#{extract_clause_data(annex, 'basetext')}</td>
+            <th #{add_id_text} align="left">Timing:</th><td #{add_id_text}>#{@meta.get[:timing]}</td>
             </tr>
-            <tr><th align="left" rowspan="#{auths.size - 1}">Editor(s):</th>
-            <td colspan="2">#{auths[0]}</td>
-            <th align="left" rowspan="#{auths.size - 1}">Approval process:</th>
-            <td rowspan="#{auths.size - 1}">#{@meta.get[:approval_process]}</td>
+            <tr #{add_id_text}><th #{add_id_text} align="left" rowspan="#{auths.size - 1}">Editor(s):</th>
+            <td #{add_id_text} colspan="2">#{auths[0]}</td>
+            <th #{add_id_text} align="left" rowspan="#{auths.size - 1}">Approval process:</th>
+            <td #{add_id_text} rowspan="#{auths.size - 1}">#{@meta.get[:approval_process]}</td>
             </tr>
             #{auths_tail}
-            <tr><td colspan="5"><p><strong>Scope</strong> (defines the intent or object of the Recommendation and the aspects covered, thereby indicating the limits of its applicability):</p>#{extract_clause_data(annex, 'scope')}</td></tr>
-            <tr><td colspan="5"><p><strong>Summary</strong> (provides a brief overview of the purpose and contents of the Recommendation, thus permitting readers to judge its usefulness for their work):</p>#{extract_clause_data(annex, 'summary')}</td></tr>
-            <tr><td colspan="5"><p><strong>Relations to ITU-T Recommendations or to other standards</strong> (approved or under development):</p>#{extract_clause_data(annex, 'relatedstandards')}</td></tr>
-            <tr><td colspan="5"><p><strong>Liaisons with other study groups or with other standards bodies:</strong></p>#{extract_clause_data(annex, 'liaisons')}</td></tr>
-            <tr><td colspan="5"><p><strong>Supporting members that are committing to contributing actively to the work item:</strong></p>#{extract_clause_data(annex, 'supportingmembers')}</td></tr>
+            <tr #{add_id_text}><td #{add_id_text} colspan="5"><p><strong>Scope</strong> (defines the intent or object of the Recommendation and the aspects covered, thereby indicating the limits of its applicability):</p>#{extract_clause_data(annex, 'scope')}</td></tr>
+            <tr #{add_id_text}><td #{add_id_text} colspan="5"><p><strong>Summary</strong> (provides a brief overview of the purpose and contents of the Recommendation, thus permitting readers to judge its usefulness for their work):</p>#{extract_clause_data(annex, 'summary')}</td></tr>
+            <tr #{add_id_text}><td #{add_id_text} colspan="5"><p><strong>Relations to ITU-T Recommendations or to other standards</strong> (approved or under development):</p>#{extract_clause_data(annex, 'relatedstandards')}</td></tr>
+            <tr #{add_id_text}><td #{add_id_text} colspan="5"><p><strong>Liaisons with other study groups or with other standards bodies:</strong></p>#{extract_clause_data(annex, 'liaisons')}</td></tr>
+            <tr #{add_id_text}><td #{add_id_text} colspan="5"><p><strong>Supporting members that are committing to contributing actively to the work item:</strong></p>#{extract_clause_data(annex, 'supportingmembers')}</td></tr>
             </tbody>
           </table>
         TABLE

data/lib/isodoc/itu/presentation_preface.rb

@@ -42,8 +42,8 @@ module IsoDoc
         ed_lbl &&= l10n("#{ed_lbl.capitalize}:")
         mail_lbl = l10n("#{@i18n.get['email']}: ")
         ret = <<~SUBMITTING
-          <clause id="_#{UUIDTools::UUID.random_create}" type="editors">
-          <table id="_#{UUIDTools::UUID.random_create}" unnumbered="true"><tbody>
+          <clause #{add_id_text} type="editors">
+          <table #{add_id_text} unnumbered="true"><tbody>
         SUBMITTING
         ret += editor_table_entries(eds, ed_lbl, mail_lbl)
         "#{ret}</tbody></table></clause>"
@@ -56,8 +56,10 @@ module IsoDoc
             mail = "#{mail_lbl}<link target='mailto:#{n[:email]}'>" \
                    "#{n[:email]}</link>"
           aff = n[:affiliation].empty? ? "" : "<br/>#{n[:affiliation]}"
-          th = "<th>#{i.zero? ? ed_lbl : ''}</th>"
-          m << "<tr>#{th}<td>#{n[:name]}#{aff}</td><td>#{mail}</td></tr>"
+          th = "<th #{add_id_text}>#{i.zero? ? ed_lbl : ''}</th>"
+          m << <<~XML
+            <tr #{add_id_text}>#{th}<td #{add_id_text}>#{n[:name]}#{aff}</td><td #{add_id_text}>#{mail}</td></tr>
+          XML
         end.join("\n")
       end
 
@@ -87,11 +89,11 @@ module IsoDoc
         abstract.at(ns("./title"))&.remove
         abstract.at(ns("./fmt-title"))&.remove
         abstract.children = <<~TABLE
-          <table class="abstract" unnumbered="true" width="100%">
+          <table #{add_id_text} class="abstract" unnumbered="true" width="100%">
           <colgroup><col width="11.8%"/><col width="78.2%"/></colgroup>
           <tbody>
-          <tr><th align="left" width="95"><p>#{colon_i18n(@i18n.abstract)}</p></th>
-          <td>#{abstract.children.to_xml}</td></tr>
+          <tr #{add_id_text}><th #{add_id_text} align="left" width="95"><p>#{colon_i18n(@i18n.abstract)}</p></th>
+          <td #{add_id_text}>#{abstract.children.to_xml}</td></tr>
           </tbody></table>
         TABLE
       end
@@ -99,8 +101,10 @@ module IsoDoc
       def keywords(_docxml)
         kw = @meta.get[:keywords]
         kw.nil? || kw.empty? || @doctype == "contribution" and return
-        "<clause type='keyword'><fmt-title>#{@i18n.keywords}</fmt-title>" \
-          "<p>#{@i18n.l10n(kw.join(', '))}.</p>"
+        <<~XML
+          <clause #{add_id_text} type='keyword'><fmt-title #{add_id_text}>#{@i18n.keywords}</fmt-title>
+            <p>#{@i18n.l10n(kw.join(', '))}.</p>
+        XML
       end
 
       def toc_title(docxml)

data/lib/isodoc/itu/presentation_section.rb

@@ -103,7 +103,7 @@ module IsoDoc
         isoxml.xpath(ns("//note[@type = 'title-footnote']"))
           .each_with_index do |f, i|
             ret += <<~FN.strip
-              <fn id='_#{UUIDTools::UUID.random_create}' reference='H#{i}'>#{f.remove.children.to_xml}</fn>
+              <fn #{add_id_text} reference='H#{i}'>#{f.remove.children.to_xml}</fn>
             FN
           end
         ret

data/lib/metanorma/itu/cleanup_section.rb

@@ -26,10 +26,6 @@ module Metanorma
         insert_conventions(xml)
       end
 
-      def add_id_txt
-        %(id="_#{UUIDTools::UUID.random_create}")
-      end
-
       def insert_scope(xml)
         xml.at("./*/sections") or
           xml.at("./*/preface | ./*/boilerplate | ./*/bibdata").next =
@@ -37,9 +33,10 @@ module Metanorma
         xml.at("./*/sections/*") or xml.at("./*/sections") << "<sentinel/>"
         ins = xml.at("//sections").elements.first
         xml.at("//sections/clause[@type = 'scope']") or
-          ins.previous =
-            "<clause type='scope' #{add_id_txt}><title>#{@i18n.scope}</title><p>" \
-            "#{@i18n.clause_empty}</p></clause>"
+          ins.previous = <<~XML
+            <clause type='scope' #{add_id_text}><title #{add_id_text}>#{@i18n.scope}</title>
+            <p>#{@i18n.clause_empty}</p></clause>
+          XML
         xml.at("//sentinel")&.remove
       end
 
@@ -49,23 +46,29 @@ module Metanorma
             "<bibliography><sentinel/></bibliography>"
         ins = xml.at("//bibliography").elements.first
         xml.at("//bibliography/references[@normative = 'true']") or
-          ins.previous = "<references #{add_id_txt} normative='true'>" \
-                         "<title>#{@i18n.normref}</title></references>"
+          ins.previous = <<~XML
+            <references #{add_id_text} normative='true'>
+            <title #{add_id_text}>#{@i18n.normref}</title></references>
+          XML
         xml.at("//sentinel")&.remove
       end
 
       def insert_terms(xml)
         ins = xml.at("//sections/clause[@type = 'scope']")
         xml.at("//sections//terms") or
-          ins.next = "<terms #{add_id_txt}><title>#{@i18n.termsdef}</title></terms>"
+          ins.next = <<~XML
+            <terms #{add_id_text}><title #{add_id_text}>#{@i18n.termsdef}</title></terms>
+          XML
       end
 
       def insert_symbols(xml)
         ins =  xml.at("//sections/terms") ||
           xml.at("//sections/clause[descendant::terms]")
         unless xml.at("//sections//definitions")
-          ins.next = "<definitions #{add_id_txt}>" \
-                     "<title>#{@i18n.symbolsabbrev}</title></definitions>"
+          ins.next = <<~XML
+            <definitions #{add_id_text}>
+            <title #{add_id_text}>#{@i18n.symbolsabbrev}</title></definitions>
+          XML
         end
       end
 
@@ -73,9 +76,11 @@ module Metanorma
         ins =  xml.at("//sections//definitions") ||
           xml.at("//sections/clause[descendant::definitions]")
         unless xml.at("//sections/clause[@type = 'conventions']")
-          ins.next = "<clause #{add_id_txt} type='conventions'>" \
-                     "<title>#{@i18n.conventions}</title><p>" \
-                     "#{@i18n.clause_empty}</p></clause>"
+          ins.next = <<~XML
+            <clause #{add_id_text} type='conventions'>
+            <title #{add_id_text}>#{@i18n.conventions}</title>
+            <p>#{@i18n.clause_empty}</p></clause>
+          XML
         end
       end
 

data/lib/metanorma/itu/converter.rb

@@ -9,9 +9,6 @@ require_relative "./cleanup"
 module Metanorma
   module Itu
     class Converter < Standoc::Converter
-      XML_ROOT_TAG = "itu-standard".freeze
-      XML_NAMESPACE = "https://www.metanorma.org/ns/itu".freeze
-
       register_for "itu"
 
       def title_validate(_root)

data/lib/metanorma/itu/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/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Itu
-    VERSION = "2.6.7".freeze
+    VERSION = "2.6.8".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 2.6.7
+  version: 2.6.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 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-standoc