metanorma-itu 2.1.8.1 → 2.1.10

data/lib/isodoc/itu/itu.technical-report.xsl

@@ -7907,6 +7907,18 @@
 		</xsl:copy>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'sub']" mode="contents_item">
+		<xsl:copy>
+			<xsl:apply-templates mode="contents_item"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'sup']" mode="contents_item">
+		<xsl:copy>
+			<xsl:apply-templates mode="contents_item"/>
+		</xsl:copy>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'stem']" mode="contents_item">
 		<xsl:copy-of select="."/>
 	</xsl:template>
@@ -8853,7 +8865,7 @@
 	<!-- ====== -->
 	<!-- eref -->
 	<!-- ====== -->
-	<xsl:template match="*[local-name() = 'eref']">
+	<xsl:template match="*[local-name() = 'eref']" name="eref">
 		<xsl:variable name="current_bibitemid" select="@bibitemid"/>
 		<!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
 		<xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
@@ -9358,21 +9370,29 @@
 	</xsl:variable>
 
 	<xsl:template match="@*|node()" mode="index_add_id">
+		<xsl:param name="docid"/>
 		<xsl:copy>
-				<xsl:apply-templates select="@*|node()" mode="index_add_id"/>
+			<xsl:apply-templates select="@*|node()" mode="index_add_id">
+				<xsl:with-param name="docid" select="$docid"/>
+			</xsl:apply-templates>
 		</xsl:copy>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'xref']" mode="index_add_id">
+		<xsl:param name="docid"/>
 		<xsl:variable name="id">
-			<xsl:call-template name="generateIndexXrefId"/>
+			<xsl:call-template name="generateIndexXrefId">
+				<xsl:with-param name="docid" select="$docid"/>
+			</xsl:call-template>
 		</xsl:variable>
 		<xsl:copy> <!-- add id to xref -->
 			<xsl:apply-templates select="@*" mode="index_add_id"/>
 			<xsl:attribute name="id">
 				<xsl:value-of select="$id"/>
 			</xsl:attribute>
-			<xsl:apply-templates mode="index_add_id"/>
+			<xsl:apply-templates mode="index_add_id">
+				<xsl:with-param name="docid" select="$docid"/>
+			</xsl:apply-templates>
 		</xsl:copy>
 		<!-- split <xref target="bm1" to="End" pagenumber="true"> to two xref:
 		<xref target="bm1" pagenumber="true"> and <xref target="End" pagenumber="true"> -->
@@ -9384,7 +9404,9 @@
 				<xsl:attribute name="id">
 					<xsl:value-of select="$id"/><xsl:text>_to</xsl:text>
 				</xsl:attribute>
-				<xsl:apply-templates mode="index_add_id"/>
+				<xsl:apply-templates mode="index_add_id">
+					<xsl:with-param name="docid" select="$docid"/>
+				</xsl:apply-templates>
 			</xsl:copy>
 		</xsl:if>
 	</xsl:template>
@@ -9421,12 +9443,33 @@
 			</xsl:when>
 			<xsl:when test="self::* and local-name(.) = 'xref'">
 				<xsl:variable name="id" select="@id"/>
-				<xsl:variable name="page" select="$index//item[@id = $id]"/>
-				<xsl:variable name="id_next" select="following-sibling::*[local-name() = 'xref'][1]/@id"/>
-				<xsl:variable name="page_next" select="$index//item[@id = $id_next]"/>
 
+				<xsl:variable name="id_next" select="following-sibling::*[local-name() = 'xref'][1]/@id"/>
 				<xsl:variable name="id_prev" select="preceding-sibling::*[local-name() = 'xref'][1]/@id"/>
-				<xsl:variable name="page_prev" select="$index//item[@id = $id_prev]"/>
+
+				<xsl:variable name="pages_">
+					<xsl:for-each select="$index/index/item[@id = $id or @id = $id_next or @id = $id_prev]">
+						<xsl:choose>
+							<xsl:when test="@id = $id">
+								<page><xsl:value-of select="."/></page>
+							</xsl:when>
+							<xsl:when test="@id = $id_next">
+								<page_next><xsl:value-of select="."/></page_next>
+							</xsl:when>
+							<xsl:when test="@id = $id_prev">
+								<page_prev><xsl:value-of select="."/></page_prev>
+							</xsl:when>
+						</xsl:choose>
+					</xsl:for-each>
+				</xsl:variable>
+				<xsl:variable name="pages" select="xalan:nodeset($pages_)"/>
+
+				<!-- <xsl:variable name="page" select="$index/index/item[@id = $id]"/> -->
+				<xsl:variable name="page" select="$pages/page"/>
+				<!-- <xsl:variable name="page_next" select="$index/index/item[@id = $id_next]"/> -->
+				<xsl:variable name="page_next" select="$pages/page_next"/>
+				<!-- <xsl:variable name="page_prev" select="$index/index/item[@id = $id_prev]"/> -->
+				<xsl:variable name="page_prev" select="$pages/page_prev"/>
 
 				<xsl:choose>
 					<!-- 2nd pass -->
@@ -9486,16 +9529,20 @@
 	</xsl:template>
 
 	<xsl:template name="generateIndexXrefId">
+		<xsl:param name="docid"/>
+
 		<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
 
-		<xsl:variable name="docid">
-			<xsl:call-template name="getDocumentId"/>
+		<xsl:variable name="docid_curr">
+			<xsl:value-of select="$docid"/>
+			<xsl:if test="normalize-space($docid) = ''"><xsl:call-template name="getDocumentId"/></xsl:if>
 		</xsl:variable>
+
 		<xsl:variable name="item_number">
 			<xsl:number count="*[local-name() = 'li'][ancestor::*[local-name() = 'indexsect']]" level="any"/>
 		</xsl:variable>
 		<xsl:variable name="xref_number"><xsl:number count="*[local-name() = 'xref']"/></xsl:variable>
-		<xsl:value-of select="concat($docid, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_',  -->
+		<xsl:value-of select="concat($docid_curr, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_',  -->
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'indexsect']/*[local-name() = 'title']" priority="4">

data/lib/isodoc/itu/metadata.rb

@@ -4,7 +4,7 @@ require "twitter_cldr"
 module IsoDoc
   module ITU
     class Metadata < IsoDoc::Metadata
-      def initialize(lang, script, labels)
+      def initialize(lang, script, locale, labels)
         super
         n = "International_Telecommunication_Union_Logo.svg"
         set(:logo_html, fileloc(n))

data/lib/isodoc/itu/presentation_xml_convert.rb

@@ -175,13 +175,12 @@ module IsoDoc
       end
 
       def annex1(elem)
-        return super unless elem&.at(ns("//bibdata/ext/doctype"))&.text ==
+        return super unless elem.at(ns("//bibdata/ext/doctype"))&.text ==
           "resolution"
 
         lbl = @xrefs.anchor(elem["id"], :label)
-        subhead = (@i18n.l10n("(#{@i18n.get['to']} ") +
-                   elem.at(ns("//bibdata/title[@type = 'resolution']"))
-                     .children.to_xml + @i18n.l10n(")"))
+        res = elem.at(ns("//bibdata/title[@type = 'resolution']"))
+        subhead = @i18n.l10n("(#{@i18n.get['to']} #{res.children.to_xml})")
         elem.elements.first.previous =
           "<p class='supertitle'>#{lbl}<br/>#{subhead}</p>"
         t = elem.at(ns("./title")) and

data/lib/isodoc/itu/xref.rb

@@ -24,7 +24,7 @@ module IsoDoc
         super
         if @parse_settings.empty? || @parse_settings[:clauses]
           if annexid = docxml
-            &.at(ns("//bibdata/ext/structuredidentifier/annexid"))&.text
+              .at(ns("//bibdata/ext/structuredidentifier/annexid"))&.text
             docxml.xpath(ns("//annex")).each { |c| annex_names(c, annexid) }
           else
             informative_annex_names(docxml)
@@ -57,14 +57,6 @@ module IsoDoc
           doc.xpath(ns("//boilerplate//clause")).each { |c| preface_names(c) }
           doc.xpath("//xmlns:preface/child::*").each { |c| preface_names(c) }
         end
-        if @parse_settings.empty?
-          if @hierarchical_assets
-            hierarchical_asset_names(doc.xpath("//xmlns:preface/child::*"),
-                                     "Preface")
-          else
-            sequential_asset_names(doc.xpath("//xmlns:preface/child::*"))
-          end
-        end
         if @parse_settings.empty? || @parse_settings[:clauses]
           n = Counter.new
           n = section_names(doc.at(ns("//clause[@type = 'scope']")), n, 1)
@@ -75,11 +67,6 @@ module IsoDoc
           n = section_names(doc.at(ns("//sections/definitions")), n, 1)
           clause_names(doc, n)
         end
-        if @parse_settings.empty?
-          middle_section_asset_names(doc)
-          termnote_anchor_names(doc)
-          termexample_anchor_names(doc)
-        end
       end
 
       def middle_sections
@@ -90,6 +77,18 @@ module IsoDoc
           "//sections/definitions | //clause[parent::sections]"
       end
 
+      def asset_anchor_names(doc)
+        super
+        if @parse_settings.empty?
+          if @hierarchical_assets
+            hierarchical_asset_names(doc.xpath("//xmlns:preface/child::*"),
+                                     "Preface")
+          else
+            sequential_asset_names(doc.xpath("//xmlns:preface/child::*"))
+          end
+        end
+      end
+
       def middle_section_asset_names(doc)
         return super unless @hierarchical_assets
 
@@ -98,47 +97,31 @@ module IsoDoc
         end
       end
 
-      def sequential_figure_names(clause)
-        c = Counter.new
-        j = 0
-        clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]")).each do |t|
-          if t.parent.name == "figure" then j += 1
-          else
-            j = 0
-            c.increment(t)
-          end
-          label = c.print + (j.zero? ? "" : "#{hierfigsep}#{(96 + j).chr}")
-          next if t["id"].nil? || t["id"].empty?
-
-          @anchors[t["id"]] =
-            anchor_struct(label, nil, @labels["figure"], "figure",
-                          t["unnumbered"])
-        end
+      def sequential_figure_body(subfignum, counter, block, klass)
+        label = counter.print
+        label &&= label +
+          (subfignum.zero? ? "" : "#{hierfigsep}#{(subfignum + 96).chr}")
+        @anchors[block["id"]] = anchor_struct(
+          label, nil, @labels[klass] || klass.capitalize, klass,
+          block["unnumbered"]
+        )
       end
 
-      def hierarchical_figure_names(clause, num)
-        c = Counter.new
-        j = 0
-        clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]")).each do |t|
-          if t.parent.name == "figure" then j += 1
-          else
-            j = 0
-            c.increment(t)
-          end
-          label = "#{num}#{hiersep}#{c.print}" + (j.zero? ? "" : "#{hierfigsep}#{(96 + j).chr}")
-          next if t["id"].nil? || t["id"].empty?
+      def hierarchical_figure_body(num, subfignum, counter, block, klass)
+        label = "#{num}#{hiersep}#{counter.print}" +
+          (subfignum.zero? ? "" : "#{hierfigsep}#{(subfignum + 96).chr}")
 
-          @anchors[t["id"]] =
-            anchor_struct(label, nil, @labels["figure"], "figure",
-                          t["unnumbered"])
-        end
+        @anchors[block["id"]] = anchor_struct(
+          label, nil, @labels[klass] || klass.capitalize,
+          klass, block["unnumbered"]
+        )
       end
 
       def sequential_formula_names(clause)
-        clause&.first&.xpath(ns(middle_sections))&.each do |c|
+        clause.first&.xpath(ns(middle_sections))&.each do |c|
           if c["id"] && @anchors[c["id"]]
-            hierarchical_formula_names(c,
-                                       @anchors[c["id"]][:label] || @anchors[c["id"]][:xref] || "???")
+            hierarchical_formula_names(c, @anchors[c["id"]][:label] ||
+                                       @anchors[c["id"]][:xref] || "???")
           else
             hierarchical_formula_names(c, "???")
           end
@@ -147,9 +130,7 @@ module IsoDoc
 
       def hierarchical_formula_names(clause, num)
         c = Counter.new
-        clause.xpath(ns(".//formula")).reject do |n|
-          blank?(n["id"])
-        end.each do |t|
+        clause.xpath(ns(".//formula")).noblank.each do |t|
           @anchors[t["id"]] = anchor_struct(
             "#{num}-#{c.increment(t).print}", nil,
             t["inequality"] ? @labels["inequality"] : @labels["formula"],
@@ -168,7 +149,7 @@ module IsoDoc
         docxml.xpath(ns("//term[termnote]")).each do |t|
           c = Counter.new
           notes = t.xpath(ns("./termnote"))
-          notes.reject { |n| blank?(n["id"]) }.each do |n|
+          notes.noblank.each do |n|
             idx = notes.size == 1 ? "" : " #{c.increment(n).print}"
             @anchors[n["id"]] =
               { label: termnote_label(idx).strip, type: "termnote", value: idx,

data/lib/metanorma/itu/biblio.rng

@@ -73,8 +73,14 @@
       <text/>
     </element>
   </define>
-  <define name="script">
+  <define name="locale">
     <a:documentation>ISO-639</a:documentation>
+    <element name="locale">
+      <text/>
+    </element>
+  </define>
+  <define name="script">
+    <a:documentation>ISO-3166</a:documentation>
     <element name="script">
       <text/>
     </element>
@@ -93,6 +99,9 @@
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
     </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
     <optional>
       <attribute name="script"/>
     </optional>
@@ -136,6 +145,9 @@
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
     </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
     <optional>
       <attribute name="script"/>
     </optional>
@@ -650,6 +662,9 @@
     <zeroOrMore>
       <ref name="language"/>
     </zeroOrMore>
+    <zeroOrMore>
+      <ref name="locale"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="script"/>
     </zeroOrMore>
@@ -741,6 +756,9 @@
     <zeroOrMore>
       <ref name="language"/>
     </zeroOrMore>
+    <zeroOrMore>
+      <ref name="locale"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="script"/>
     </zeroOrMore>
@@ -854,6 +872,15 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="language"/>
+    </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
+    <optional>
+      <attribute name="script"/>
+    </optional>
     <data type="anyURI"/>
   </define>
   <define name="DateType">
@@ -882,6 +909,7 @@
       <value>vote-started</value>
       <value>vote-ended</value>
       <value>announced</value>
+      <value>stable-until</value>
     </choice>
   </define>
   <define name="bdate">
@@ -930,6 +958,9 @@
       <optional>
         <attribute name="language"/>
       </optional>
+      <optional>
+        <attribute name="locale"/>
+      </optional>
       <optional>
         <attribute name="script"/>
       </optional>

data/lib/metanorma/itu/isodoc.rng

@@ -205,6 +205,15 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="style">
+            <choice>
+              <value>basic</value>
+              <value>full</value>
+              <value>short</value>
+            </choice>
+          </attribute>
+        </optional>
         <ref name="XrefBody"/>
       </element>
     </define>

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "2.1.8.1".freeze
+    VERSION = "2.1.10".freeze
   end
 end

data/lib/relaton/render/config.yml

@@ -1,3 +1,3 @@
 template:
-  # skip standardidentifier, it is inserted in front of formattedref within metanorma
+  # skip authoritative identifier, it is inserted in front of formattedref within metanorma
   standard: "<em>{{ title }}</em> ,_{{ edition | capitalize_first }} . {{ extent }}." 

data/metanorma-itu.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "metanorma-standoc", "~> 2.2.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.2.4"
   spec.add_dependency "ruby-jing"
   spec.add_dependency "twitter_cldr", ">= 3.0.0"
   spec.add_dependency "tzinfo-data" # we need this for windows only

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 2.1.8.1
+  version: 2.1.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-07 00:00:00.000000000 Z
+date: 2022-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement