metanorma-itu 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1164c6fb0287be4c0c1f9f8d437cbcfedf5c7905d86c13f8992847a0bfb696d
-  data.tar.gz: 06a084cdde9d262683e457ea5b2f9c3d57a1e3f14dcd17fc255854f8ff9c79e2
+  metadata.gz: 884443bd7f066d1f36f6619d27f1c18ccea67e94f7630c1683c316d1f6147a34
+  data.tar.gz: 8e6338fa60555339dcf8d1201d899ce9d12dfba028f928e3d9cf3f981560bb80
 SHA512:
-  metadata.gz: 0b965a8f12e85d64c07ce2b36ebe51151c38e0c43542b3dd7a497cc2b344fbd7a58b2c4087f2f1ee90f9b1d67e4b9c73d1b7b43ddc2d5847af672602427cd357
-  data.tar.gz: d3dc91a7831b1f94ec6abffa2f3a925218bb73c002e68c244c7c215ac051c2ac62fb6ba7951da04bf3a2b872d7ce3645bad326872fe50346b7fb8c0b366dade6
+  metadata.gz: '0582f0b0770409d595b19e0976f2438b6fff7084b02220d35ac0e29936ba2c2fe98682810b21b502c029a5a6defdcb6e0d4a3f00142174c07ec44df5e2bd5db6'
+  data.tar.gz: f3e40a05f45bcf0f1a87a920210188c1700950aa676a78c7f08c31fa1c0cce04282a2ed47a9f64506528220893bf9d39c484e2f43a3f3a263b63cef4619d0085

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

@@ -7544,12 +7544,15 @@
 		<xsl:param name="default">left</xsl:param>
 		<xsl:attribute name="text-align">
 			<xsl:choose>
-				<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
+				<xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
 				<xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
 				<xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
 				<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:attribute>
+		<xsl:if test="@align = 'indent'">
+			<xsl:attribute name="margin-left">7mm</xsl:attribute>
+		</xsl:if>
 	</xsl:template><xsl:template name="number-to-words">
 		<xsl:param name="number"/>
 		<xsl:param name="first"/>

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

@@ -7544,12 +7544,15 @@
 		<xsl:param name="default">left</xsl:param>
 		<xsl:attribute name="text-align">
 			<xsl:choose>
-				<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
+				<xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
 				<xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
 				<xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
 				<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:attribute>
+		<xsl:if test="@align = 'indent'">
+			<xsl:attribute name="margin-left">7mm</xsl:attribute>
+		</xsl:if>
 	</xsl:template><xsl:template name="number-to-words">
 		<xsl:param name="number"/>
 		<xsl:param name="first"/>

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

@@ -7544,12 +7544,15 @@
 		<xsl:param name="default">left</xsl:param>
 		<xsl:attribute name="text-align">
 			<xsl:choose>
-				<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
+				<xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
 				<xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
 				<xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
 				<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:attribute>
+		<xsl:if test="@align = 'indent'">
+			<xsl:attribute name="margin-left">7mm</xsl:attribute>
+		</xsl:if>
 	</xsl:template><xsl:template name="number-to-words">
 		<xsl:param name="number"/>
 		<xsl:param name="first"/>

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

@@ -7544,12 +7544,15 @@
 		<xsl:param name="default">left</xsl:param>
 		<xsl:attribute name="text-align">
 			<xsl:choose>
-				<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
+				<xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
 				<xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
 				<xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
 				<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:attribute>
+		<xsl:if test="@align = 'indent'">
+			<xsl:attribute name="margin-left">7mm</xsl:attribute>
+		</xsl:if>
 	</xsl:template><xsl:template name="number-to-words">
 		<xsl:param name="number"/>
 		<xsl:param name="first"/>

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

@@ -7544,12 +7544,15 @@
 		<xsl:param name="default">left</xsl:param>
 		<xsl:attribute name="text-align">
 			<xsl:choose>
-				<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
+				<xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
 				<xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
 				<xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
 				<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:attribute>
+		<xsl:if test="@align = 'indent'">
+			<xsl:attribute name="margin-left">7mm</xsl:attribute>
+		</xsl:if>
 	</xsl:template><xsl:template name="number-to-words">
 		<xsl:param name="number"/>
 		<xsl:param name="first"/>

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

@@ -7544,12 +7544,15 @@
 		<xsl:param name="default">left</xsl:param>
 		<xsl:attribute name="text-align">
 			<xsl:choose>
-				<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
+				<xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
 				<xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
 				<xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
 				<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:attribute>
+		<xsl:if test="@align = 'indent'">
+			<xsl:attribute name="margin-left">7mm</xsl:attribute>
+		</xsl:if>
 	</xsl:template><xsl:template name="number-to-words">
 		<xsl:param name="number"/>
 		<xsl:param name="first"/>

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

@@ -7544,12 +7544,15 @@
 		<xsl:param name="default">left</xsl:param>
 		<xsl:attribute name="text-align">
 			<xsl:choose>
-				<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
+				<xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
 				<xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
 				<xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
 				<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:attribute>
+		<xsl:if test="@align = 'indent'">
+			<xsl:attribute name="margin-left">7mm</xsl:attribute>
+		</xsl:if>
 	</xsl:template><xsl:template name="number-to-words">
 		<xsl:param name="number"/>
 		<xsl:param name="first"/>

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

@@ -7544,12 +7544,15 @@
 		<xsl:param name="default">left</xsl:param>
 		<xsl:attribute name="text-align">
 			<xsl:choose>
-				<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
+				<xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
 				<xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
 				<xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
 				<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:attribute>
+		<xsl:if test="@align = 'indent'">
+			<xsl:attribute name="margin-left">7mm</xsl:attribute>
+		</xsl:if>
 	</xsl:template><xsl:template name="number-to-words">
 		<xsl:param name="number"/>
 		<xsl:param name="first"/>

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

@@ -7544,12 +7544,15 @@
 		<xsl:param name="default">left</xsl:param>
 		<xsl:attribute name="text-align">
 			<xsl:choose>
-				<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
+				<xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
 				<xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
 				<xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
 				<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:attribute>
+		<xsl:if test="@align = 'indent'">
+			<xsl:attribute name="margin-left">7mm</xsl:attribute>
+		</xsl:if>
 	</xsl:template><xsl:template name="number-to-words">
 		<xsl:param name="number"/>
 		<xsl:param name="first"/>

data/lib/isodoc/itu/metadata.rb

@@ -6,16 +6,16 @@ module IsoDoc
     class Metadata < IsoDoc::Metadata
       def initialize(lang, script, labels)
         super
-        here = File.dirname(__FILE__)
         n = "International_Telecommunication_Union_Logo.svg"
-        set(:logo_html,
-            File.expand_path(File.join(here, "html", n)))
-        set(:logo_comb,
-            File.expand_path(File.join(here, "html", "itu-document-comb.png")))
-        set(:logo_word,
-            File.expand_path(File.join(here, "html", n)))
-        set(:logo_sp,
-            File.expand_path(File.join(here, "html", "logo-sp.png")))
+        set(:logo_html, fileloc(n))
+        set(:logo_comb, fileloc("itu-document-comb.png"))
+        set(:logo_word, fileloc(n))
+        set(:logo_sp, fileloc("logo-sp.png"))
+      end
+
+      def fileloc(file)
+        here = File.dirname(__FILE__)
+        File.expand_path(File.join(here, "html", file))
       end
 
       def title(isoxml, _out)
@@ -114,10 +114,8 @@ module IsoDoc
           isoxml.at(ns("//bibdata/copyright/from"))
         pubdate and
           set(:placedate_year,
-              @labels["placedate"].sub(/%/,
-                                       pubdate.text.sub(
-                                         /^(\d\d\d\d).*$/, "\\1"
-                                       )))
+              @labels["placedate"]
+          .sub(/%/, pubdate.text.sub(/^(\d\d\d\d).*$/, "\\1")))
       end
 
       def monthyr(isodate)
@@ -156,8 +154,8 @@ module IsoDoc
         return isodate unless m && m[:yr] && m[:mo] && m[:dd]
 
         mmm = DateTime.parse(isodate).localize(@lang.to_sym)
-          .to_additional_s("MMM")
-        @i18n.l10n("#{m[:dd]} #{mmm} #{m[:yr]}")
+          .to_additional_s("yMMM")
+        @i18n.l10n("#{m[:dd]} #{mmm}")
       end
 
       def ddMMMMYYYY(date1, date2)

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "1.4.1".freeze
+    VERSION = "1.4.2".freeze
   end
 end

data/metanorma-itu.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "metanorma-standoc", "~> 1.11.0"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "twitter_cldr"
+  spec.add_dependency "twitter_cldr", ">= 3.0.0"
   spec.add_dependency "tzinfo-data" # we need this for windows only
 
   spec.add_development_dependency "byebug", "~> 9.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-04 00:00:00.000000000 Z
+date: 2021-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: tzinfo-data
   requirement: !ruby/object:Gem::Requirement