metanorma-itu 2.6.8 → 2.7.0

data/lib/isodoc/itu/metadata.rb

@@ -120,7 +120,7 @@ module IsoDoc
       def docid(xml, _out)
         { docnumber: "ITU", recommendationnumber: "ITU-Recommendation",
           docnumber_lang: "ITU-lang", docnumber_td: "ITU-TemporaryDocument",
-          docnumber_provisional: "ITU-provisional" }
+          docnumber_provisional: "ITU-provisional", docnumber_iso: "ISO" }
           .each do |k, v|
             dn = xml.at(ns("//bibdata/docidentifier[@type = '#{v}']")) and
               set(k, dn.text)
@@ -168,7 +168,7 @@ module IsoDoc
           set(:doctype_display, "Recommendation")
         else super
         end
-        d = get[:doctype] and
+        d = get[:doctype_display] and
           set(:draft_new_doctype, @labels["draft_new"].sub("%", d))
       end
 

data/lib/isodoc/itu/presentation_section.rb

@@ -13,7 +13,6 @@ module IsoDoc
           "<p keep-with-next='true' class='supertitle'>" \
           "#{labelled_autonum(@i18n.get['section'].upcase, elem['id'],
                               lbl)}</p>"
-        # "<span element='fmt-element-name'>#{@i18n.get['section'].upcase}</span> #{autonum(elem['id'], lbl)}</p>"
       end
 
       def clause1_super?(elem)
@@ -43,7 +42,9 @@ module IsoDoc
         ins = elem.at(ns("./fmt-xref-label")) || elem.at(ns("./fmt-title"))
         p = (info ? @i18n.inform_annex : @i18n.norm_annex)
           .gsub("%", @i18n.doctype_dict[@meta.get[:doctype_original]] || "")
-        ins.next = %(<p class="annex_obligation"><span class='fmt-obligation'>#{p}</span></p>)
+        ins.next = <<~XML
+          <p class="annex_obligation"><span class='fmt-obligation'>#{p}</span></p>
+        XML
       end
 
       def annex1_supertitle(elem)
@@ -86,16 +87,31 @@ module IsoDoc
 
       def middle_title_recommendation(isoxml, out)
         ret = ""
-        type = @meta.get[:doctype]
+        id = @meta.get[:docnumber_iso] and ret += <<~XML
+          <p class='zzSTDTitle1'>#{@i18n.international_standard} #{id}</p>
+        XML
+        ret += middle_title_recommendation_first_line
+        ret += middle_title_recommendation_second_line(isoxml)
+        s = @meta.get[:docsubtitle] and ret += "<p class='zzSTDTitle3'>#{s}</p>"
+        out.previous = ret
+      end
+
+      def middle_title_recommendation_first_line
+        ret = ""
+        type = @meta.get[:doctype_display]
         @meta.get[:unpublished] && @meta.get[:draft_new_doctype] and
           type = @meta.get[:draft_new_doctype]
         id = @meta.get[:docnumber] and
-          ret += "<<p class='zzSTDTitle1'>#{type} #{id}</p>"
-        t = @meta.get[:doctitle] and
-          ret += "<p class='zzSTDTitle2'>#{t}"
+          ret += "<p class='zzSTDTitle1'>#{type} #{id}</p>"
+        ret
+      end
+
+      def middle_title_recommendation_second_line(isoxml)
+        ret = ""
+        t = @meta.get[:doctitle] or return ret
+        ret += "<p class='zzSTDTitle2'>#{t}"
         ret += "#{title_footnotes(isoxml)}</p>"
-        s = @meta.get[:docsubtitle] and ret += "<p class='zzSTDTitle3'>#{s}</p>"
-        out.previous = ret
+        ret
       end
 
       def title_footnotes(isoxml)

data/lib/isodoc/itu/word_convert.rb

@@ -102,7 +102,8 @@ module IsoDoc
       end
 
       def ol_attrs(node)
-        { class: node["class"], id: node["id"], style: keep_style(node) }
+        { class: node["class"], id: node["id"], style: keep_style(node),
+          start: node["start"] }
       end
 
       def link_parse(node, out)

data/lib/metanorma/itu/boilerplate.adoc

@@ -12,7 +12,7 @@ All rights reserved. No part of this publication may be reproduced, by any means
 
 ITU draws attention to the possibility that the practice or implementation of this Recommendation may involve the use of a claimed Intellectual Property Right. ITU takes no position concerning the evidence, validity or applicability of claimed Intellectual Property Rights, whether asserted by ITU members or others outside of the Recommendation development process.
 
-As of the date of approval of this Recommendation, ITU had {% if ip_notice_received %}{% else %}not{% endif %} received notice of intellectual property, protected by patents, which may be required to implement this Recommendation. However, implementers are cautioned that this may not represent the latest information and are therefore strongly urged to consult the TSB patent database at http://www.itu.int/ITU-T/ipr/[].
+As of the date of approval of this Recommendation, ITU had {% if ip_notice_received != 'false' %}{% else %}not{% endif %} received notice of intellectual property, protected by patents, which may be required to implement this Recommendation. However, implementers are cautioned that this may not represent the latest information and are therefore strongly urged to consult the TSB patent database at http://www.itu.int/ITU-T/ipr/[].
 {% endif %}
 
 == legal-statement
@@ -45,9 +45,9 @@ and it is not to be used outside of ITU.
 {% else %}
 {% if unpublished and docnumber_provisional == nil %}
 [[draft-warning]]
-=== CAUTION! PREPUBLISHED {{ doctype  | upcase }}
+=== CAUTION! PREPUBLISHED {{ doctype_display  | upcase }}
 
-This prepublication is an unedited version of a recently approved {{doctype}}.
+This prepublication is an unedited version of a recently approved {{doctype_display}}.
 It will be replaced by the published version after editing. Therefore,
 there will be differences between this prepublication and the published
 version.

data/lib/metanorma/itu/converter.rb

@@ -27,18 +27,15 @@ module Metanorma
         File.join(@libdir, "boilerplate.adoc")
       end
 
-      def makexml(node)
-        @draft = node.attributes.has_key?("draft")
-        super
-      end
-
       def init_misc(node)
         super
         @default_doctype = "recommendation"
       end
 
       def ol_attrs(node)
-        attr_code(id_attr(node).merge(class: node.attr("class")))
+        ret = super
+        ret.delete(:type)
+        ret.merge(class: node.attr("class"))
       end
 
       def outputs(node, ret)

data/lib/metanorma/itu/front_id.rb

@@ -6,6 +6,7 @@ module Metanorma
         td_id(node, xml)
         itu_id(node, xml)
         recommendation_id(node, xml)
+        iso_id(node, xml)
       end
 
       def provisional_id(node, xml)
@@ -22,6 +23,11 @@ module Metanorma
         end
       end
 
+      def iso_id(node, xml)
+        a = node.attr("common-text-docnumber") and
+          xml.docidentifier a, type: "ISO"
+      end
+
       ITULANG = { "en" => "E", "fr" => "F", "ar" => "A", "es" => "S",
                   "zh" => "C", "ru" => "R" }.freeze
 

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.7 -->
+<!-- VERSION v2.0.8 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -72,6 +72,46 @@ but to `@anchor`, the user-supplied cross-reference</a:documentation>
         </oneOrMore>
       </element>
     </define>
+    <define name="review">
+      <a:documentation>Generalise BasicDoc element from just review comments, to general annotations;
+the type attribute defaults to `review` for reviews</a:documentation>
+      <element name="annotation">
+        <ref name="RequiredId"/>
+        <ref name="ReviewAttributes"/>
+        <oneOrMore>
+          <ref name="paragraph">
+            <a:documentation>Reviewer comments content</a:documentation>
+          </ref>
+        </oneOrMore>
+      </element>
+    </define>
+    <define name="ruby_pronunciation">
+      <a:documentation>Ruby annotation giving pronunciation of text: change tag from BasicDoc for disambiguation</a:documentation>
+      <element name="ruby-pronunciation">
+        <attribute name="value">
+          <a:documentation>Ruby annotation value</a:documentation>
+        </attribute>
+        <ref name="LocalizedStringAttributes"/>
+      </element>
+    </define>
+    <define name="ruby_annotation">
+      <a:documentation>Ruby annotation giving information other than pronunciation of text: change tag from BasicDoc for disambiguation</a:documentation>
+      <element name="ruby-annotation">
+        <attribute name="value">
+          <a:documentation>Ruby annotation value</a:documentation>
+        </attribute>
+        <ref name="LocalizedStringAttributes"/>
+      </element>
+    </define>
+    <define name="annotation">
+      <a:documentation>Source code annotation, corresponding to a callout</a:documentation>
+      <element name="callout-annotation">
+        <ref name="RequiredId"/>
+        <oneOrMore>
+          <ref name="paragraph"/>
+        </oneOrMore>
+      </element>
+    </define>
     <define name="section-title">
       <a:documentation>Title(s) of a clause</a:documentation>
       <element name="title">
@@ -540,7 +580,7 @@ normative or informative references, some split references into sections organiz
       <ref name="OptionalId"/>
       <optional>
         <attribute name="style">
-          <a:documentation>CSS style: only background-color supported</a:documentation>
+          <a:documentation>CSS style: only background-color, color, border supported</a:documentation>
         </attribute>
       </optional>
     </define>
@@ -620,7 +660,7 @@ This is done if the footnote reference is already presented in some other form,
     <ref name="RequiredId"/>
     <optional>
       <attribute name="style">
-        <a:documentation>CSS style: only background-color supported</a:documentation>
+        <a:documentation>CSS style: only background-color, color, border supported</a:documentation>
       </attribute>
     </optional>
   </define>
@@ -700,6 +740,11 @@ titlecase, or lowercase</a:documentation>
         <a:documentation>Width of the table block in rendering</a:documentation>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="style">
+        <a:documentation>CSS style: only background-color, color, border supported</a:documentation>
+      </attribute>
+    </optional>
     <ref name="BlockAttributes"/>
   </define>
   <define name="FigureAttributes" combine="interleave">
@@ -1417,7 +1462,7 @@ numbers</a:documentation>
       </optional>
       <ref name="DocumentBody"/>
       <optional>
-        <ref name="review-container">
+        <ref name="annotation-container">
           <a:documentation>Annotations to the document</a:documentation>
         </ref>
       </optional>
@@ -1461,8 +1506,8 @@ numbers</a:documentation>
       </oneOrMore>
     </element>
   </define>
-  <define name="review-container">
-    <element name="review-container">
+  <define name="annotation-container">
+    <element name="annotation-container">
       <oneOrMore>
         <ref name="review"/>
       </oneOrMore>

data/lib/metanorma/itu/version.rb

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

data/metanorma-itu.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 3.0.0"
+  spec.add_dependency "metanorma-standoc", "~> 3.1.0"
   spec.add_dependency "pubid"
   spec.add_dependency "twitter_cldr", ">= 3.0.0"
   spec.add_dependency "tzinfo-data" # we need this for windows only
@@ -41,7 +41,6 @@ spec.add_development_dependency "rubocop-performance"
   spec.add_development_dependency "sassc-embedded", "~> 1"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "vcr", "~> 6.1.0"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "xml-c14n"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 2.6.8
+  version: 2.7.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-06-09 00:00:00.000000000 Z
+date: 2025-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: pubid
   requirement: !ruby/object:Gem::Requirement
@@ -220,20 +220,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement