metanorma-itu 2.1.9 → 2.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f72fef8d6e3a4fcaab329f7c4af6243e9b311c3b7f33fd99c35be35916faac6
-  data.tar.gz: 5d3d9a69cb643e04e4d65086d20a445fa3cc37af6b214bbbc3e64665a90c16f1
+  metadata.gz: ff80a10c49839631d4c76846f353bf8e180ce0ec482a126f63474ecbe091b3ad
+  data.tar.gz: e4d8301448368fbd4c9f01a512c8fd7372c88d2adfd34cec55a5e9f33d75c50d
 SHA512:
-  metadata.gz: 882e426a2baf071bf46e8e432d41fc8e914d80e6aebbd2dd7b0c000453629d171b8b74ac0f94541b14948ffd16033af282f0a1d0f20cccb1a84049c1055aa315
-  data.tar.gz: e69929e2e5434ad6a1eb741a067fb3653dae77de44f657b00b5a13d501657455829649cac8d3f889c6645a0ebd3be632354b5a9931a116fa6f9a3b575009a13c
+  metadata.gz: cca3ddc45419d73b876c58cc13f1a3fd3328642bb815308125ceb58a5add436483645160f0975e4385567b7f294e59a2b78e306b5bff7be530092d933d05156d
+  data.tar.gz: bd00bfced817a40dce7e195d36638c15255bd8f76d5429ac5c105bb00852dbba0320d3b72326990be6f9b74cf91add3356069fc3fcf4e35dbffe24ac7ab00edb

data/lib/isodoc/itu/itu.implementers-guide.xsl

@@ -8865,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'])"/>

data/lib/isodoc/itu/itu.in-force.xsl

@@ -8865,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'])"/>

data/lib/isodoc/itu/itu.recommendation-annex.xsl

@@ -8865,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'])"/>

data/lib/isodoc/itu/itu.recommendation-supplement.xsl

@@ -8865,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'])"/>

data/lib/isodoc/itu/itu.recommendation.xsl

@@ -8865,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'])"/>

data/lib/isodoc/itu/itu.resolution.xsl

@@ -8865,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'])"/>

data/lib/isodoc/itu/itu.service-publication.xsl

@@ -8865,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'])"/>

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

@@ -8865,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'])"/>

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

@@ -8865,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'])"/>

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

@@ -97,21 +97,24 @@ module IsoDoc
         end
       end
 
-      def sequential_figure_body(subfignum, counter, block)
+      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["figure"], "figure", block["unnumbered"]
+          label, nil, @labels[klass] || klass.capitalize, klass,
+          block["unnumbered"]
         )
       end
 
-      def hierarchical_figure_body(num, subfignum, counter, block)
+      def hierarchical_figure_body(num, subfignum, counter, block, klass)
         label = "#{num}#{hiersep}#{counter.print}" +
           (subfignum.zero? ? "" : "#{hierfigsep}#{(subfignum + 96).chr}")
 
-        @anchors[block["id"]] = anchor_struct(label, nil, @labels["figure"],
-                                              "figure", block["unnumbered"])
+        @anchors[block["id"]] = anchor_struct(
+          label, nil, @labels[klass] || klass.capitalize,
+          klass, block["unnumbered"]
+        )
       end
 
       def sequential_formula_names(clause)

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.9".freeze
+    VERSION = "2.1.10".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 2.1.9
+  version: 2.1.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-26 00:00:00.000000000 Z
+date: 2022-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities