metanorma-itu 2.6.4 → 2.6.5

data/lib/metanorma/itu/boilerplate.adoc

@@ -35,6 +35,14 @@ Compliance with this Recommendation is voluntary. However, the Recommendation ma
 
 {% endif %}
 
+{% if doctype == "Contribution" %}
+
+[[draft-warning]]
+=== CAUTION! CONTRIBUTION
+
+This is an ITU Contribution. It is an internal document to ITU,
+and it is not to be used outside of ITU.
+{% else %}
 {% if unpublished and docnumber_provisional == nil %}
 [[draft-warning]]
 === CAUTION! PREPUBLISHED {{ doctype  | upcase }}
@@ -45,6 +53,7 @@ there will be differences between this prepublication and the published
 version.
 {% endif %}
 {% endif %}
+{% endif %}
 
 
 

data/lib/metanorma/itu/front_id.rb

@@ -44,7 +44,7 @@ module Metanorma
 
       def itu_contrib_id(node)
         group = node.attr("group-acronym") ||
-          node.attr("group").sub("Study Group ", "SG")
+          node.attr("group")&.sub("Study Group ", "SG") || "XXX"
         "#{group}-C#{node.attr('docnumber')}"
       end
 

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.3 -->
+<!-- VERSION v2.0.4 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -1328,6 +1328,7 @@ numbers</a:documentation>
           <ref name="foreword"/>
           <ref name="introduction"/>
           <ref name="acknowledgements"/>
+          <ref name="executivesummary"/>
         </choice>
       </oneOrMore>
     </element>
@@ -1351,6 +1352,11 @@ numbers</a:documentation>
       <ref name="Content-Section"/>
     </element>
   </define>
+  <define name="executivesummary">
+    <element name="executivesummary">
+      <ref name="Content-Section"/>
+    </element>
+  </define>
   <define name="indexsect">
     <element name="indexsect">
       <ref name="Content-Section"/>
@@ -1576,6 +1582,15 @@ used in document amendments</a:documentation>
   <define name="annex">
     <element name="annex">
       <ref name="Annex-Section"/>
+      <zeroOrMore>
+        <ref name="annex-appendix"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="annex-appendix">
+    <a:documentation>Appendix, distinct subclause type for annexes (annex to annex, rather than subclause to annex)</a:documentation>
+    <element name="appendix">
+      <ref name="Clause-Section"/>
     </element>
   </define>
   <define name="terms">

data/lib/metanorma/itu/itu.rng

@@ -9,20 +9,6 @@
         </attribute>
       </optional>
     </define>
-    <define name="preface">
-      <element name="preface">
-        <oneOrMore>
-          <choice>
-            <ref name="content"/>
-            <ref name="abstract"/>
-            <ref name="foreword"/>
-            <ref name="introduction"/>
-            <ref name="acknowledgements"/>
-            <ref name="clause"/>
-          </choice>
-        </oneOrMore>
-      </element>
-    </define>
     <define name="Clause-Section">
       <ref name="Section-Attributes"/>
       <optional>

data/lib/metanorma/itu/validate.rb

@@ -75,9 +75,8 @@ module Metanorma
         text.nil? and return
         arr = text.split(/\W+/)
         arr.each_index do |i|
-          m = regex.match arr[i]
           m_prev = i.zero? ? nil : regex_prev.match(arr[i - 1])
-          if !m.nil? && m_prev.nil?
+          if !regex.match?(arr[i]) && m_prev.nil?
             @log.add("Style", node, "#{warning}: #{m[:num]}")
           end
         end
@@ -98,7 +97,7 @@ module Metanorma
       def itu_identifier_validate(xmldoc)
         xmldoc.xpath("//bibdata/docidentifier[@type = 'ITU']").each do |x|
           /^SG \d+/.match?(x.text) ||
-          /^ITU-[RTD] [AD-VX-Z]\.\d+(\.\d+)?$/.match?(x.text) or
+            /^ITU-[RTD] [AD-VX-Z]\.\d+(\.\d+)?$/.match?(x.text) or
             @log.add("Style", nil, "#{x.text} does not match ITU document " \
                                    "identifier conventions")
         end

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Itu
-    VERSION = "2.6.4".freeze
+    VERSION = "2.6.5".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 2.6.4
+  version: 2.6.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-14 00:00:00.000000000 Z
+date: 2025-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc