metanorma-itu 1.3.10 → 1.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9fedf3f6b88ed3fec5d058a59d289f893646fbcdea430d5f628c2c5f4801b4e
-  data.tar.gz: e569b3339b3437a5ac5db0b72a94fa6b6c8647e64d64e7c6690a3af5c9cc57b2
+  metadata.gz: ad435d6188b9f2e881c84f0d43a6c35fd2bb4d6c993d1d796b830f755a2d3e33
+  data.tar.gz: 95409047e659d65a1c4b0102ebf910d69fe062ab4731511060625ed78ddb362c
 SHA512:
-  metadata.gz: b7870e02cd137d2f25bc39b552dee726ec92144e45b60a3aaf733285eb2394a5cb040f0a38eeef43a0f7fca7f5fca54326c780e4c9c2a0a502667ee497d7ae54
-  data.tar.gz: 02d819038572881fb4882a20cc4a5ee18c96853226e8ca6820600391af390230128cbf32842660ede1e756976efbbfbcc73990bbb4caa51551f9943f20f2aa04
+  metadata.gz: 8a3db12e7809503cd242cb1c1f3b6d1b1a579ebbed62fb7ba91c357bdc264b601aefa5e64dee6c0aa2d3cf0a2afd2a01c5e6f43c98343dbc5d0b742aa3472c96
+  data.tar.gz: bd64d897084265a9be463d56dcf31dde685b7e36ab56f75016d89d2ad7dc486816e393557c8c84a013e4fd06567c4b8ce4ffcd695d15597ada66b12295f5c006

data/lib/asciidoctor/itu/converter.rb

@@ -1,6 +1,7 @@
 require "asciidoctor"
 require "asciidoctor/standoc/converter"
 require "fileutils"
+require "metanorma-utils"
 require_relative "./front"
 require_relative "./validate"
 require_relative "./cleanup"
@@ -107,16 +108,11 @@ module Asciidoctor
         return unless node.attr("keywords")
 
         node.attr("keywords").split(/, */).sort.each_with_index do |kw, i|
-          xml.keyword (i.zero? ? strict_capitalize(kw) : kw)
+          kw_out = i.zero? ? Metanorma::Utils.strict_capitalize_first(kw) : kw
+          xml.keyword kw_out
         end
       end
 
-      def strict_capitalize(str)
-        letters = str.split("")
-        letters.first.upcase!
-        letters.join
-      end
-
       def clause_parse(attrs, xml, node)
         node.option?("unnumbered") and attrs[:unnumbered] = true
         case sectiontype1(node)

data/lib/asciidoctor/itu/isodoc.rng

@@ -990,6 +990,16 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="linkmention">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="linkref">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <optional>
         <element name="refterm">
           <zeroOrMore>
@@ -1700,7 +1710,9 @@
       <zeroOrMore>
         <ref name="termgrammar"/>
       </zeroOrMore>
-      <ref name="definition"/>
+      <oneOrMore>
+        <ref name="termdefinition"/>
+      </oneOrMore>
       <zeroOrMore>
         <ref name="termnote"/>
       </zeroOrMore>
@@ -1763,7 +1775,7 @@
       </oneOrMore>
     </element>
   </define>
-  <define name="definition">
+  <define name="termdefinition">
     <element name="definition">
       <oneOrMore>
         <choice>
@@ -1772,6 +1784,9 @@
           <ref name="formula"/>
         </choice>
       </oneOrMore>
+      <zeroOrMore>
+        <ref name="termsource"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="termnote">

data/lib/isodoc/itu/html/htmlstyle.css

@@ -1005,6 +1005,12 @@ ul > li {
   ul > li:first-child {
     margin-top: 1em; }
 
+ul ul > li:first-child {
+  margin-top: 0; }
+
+ol ul > li:first-child {
+  margin-top: 0; }
+
 /* Bibliograhy */
 p.Biblio, p.NormRef {
   margin-top: 1em;

data/lib/isodoc/itu/html/htmlstyle.scss

@@ -358,6 +358,13 @@ ul {
   }
 }
 
+ul ul > li:first-child {
+      margin-top: 0;
+}
+ol ul > li:first-child {
+      margin-top: 0;
+}
+
 
 /* Bibliograhy */
 

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

@@ -125,10 +125,10 @@
 	
 	<xsl:template match="/">
 		<xsl:call-template name="namespaceCheck"/>
-		<fo:root xsl:use-attribute-sets="root-style">
-			<xsl:if test="$lang != 'ar'">
+		<fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
+			<!-- <xsl:if test="$lang != 'ar'">
 				<xsl:attribute name="xml:lang"><xsl:value-of select="$lang"/></xsl:attribute>
-			</xsl:if>
+			</xsl:if> -->
 			<xsl:if test="$doctype = 'resolution'">
 				<xsl:attribute name="font-size">11pt</xsl:attribute>
 			</xsl:if>
@@ -6752,6 +6752,7 @@
 	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
 		<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
 		<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
+			
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">

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

@@ -125,10 +125,10 @@
 	
 	<xsl:template match="/">
 		<xsl:call-template name="namespaceCheck"/>
-		<fo:root xsl:use-attribute-sets="root-style">
-			<xsl:if test="$lang != 'ar'">
+		<fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
+			<!-- <xsl:if test="$lang != 'ar'">
 				<xsl:attribute name="xml:lang"><xsl:value-of select="$lang"/></xsl:attribute>
-			</xsl:if>
+			</xsl:if> -->
 			<xsl:if test="$doctype = 'resolution'">
 				<xsl:attribute name="font-size">11pt</xsl:attribute>
 			</xsl:if>
@@ -6752,6 +6752,7 @@
 	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
 		<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
 		<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
+			
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">

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

@@ -125,10 +125,10 @@
 	
 	<xsl:template match="/">
 		<xsl:call-template name="namespaceCheck"/>
-		<fo:root xsl:use-attribute-sets="root-style">
-			<xsl:if test="$lang != 'ar'">
+		<fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
+			<!-- <xsl:if test="$lang != 'ar'">
 				<xsl:attribute name="xml:lang"><xsl:value-of select="$lang"/></xsl:attribute>
-			</xsl:if>
+			</xsl:if> -->
 			<xsl:if test="$doctype = 'resolution'">
 				<xsl:attribute name="font-size">11pt</xsl:attribute>
 			</xsl:if>
@@ -6752,6 +6752,7 @@
 	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
 		<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
 		<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
+			
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">

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

@@ -125,10 +125,10 @@
 	
 	<xsl:template match="/">
 		<xsl:call-template name="namespaceCheck"/>
-		<fo:root xsl:use-attribute-sets="root-style">
-			<xsl:if test="$lang != 'ar'">
+		<fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
+			<!-- <xsl:if test="$lang != 'ar'">
 				<xsl:attribute name="xml:lang"><xsl:value-of select="$lang"/></xsl:attribute>
-			</xsl:if>
+			</xsl:if> -->
 			<xsl:if test="$doctype = 'resolution'">
 				<xsl:attribute name="font-size">11pt</xsl:attribute>
 			</xsl:if>
@@ -6752,6 +6752,7 @@
 	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
 		<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
 		<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
+			
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">

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

@@ -125,10 +125,10 @@
 	
 	<xsl:template match="/">
 		<xsl:call-template name="namespaceCheck"/>
-		<fo:root xsl:use-attribute-sets="root-style">
-			<xsl:if test="$lang != 'ar'">
+		<fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
+			<!-- <xsl:if test="$lang != 'ar'">
 				<xsl:attribute name="xml:lang"><xsl:value-of select="$lang"/></xsl:attribute>
-			</xsl:if>
+			</xsl:if> -->
 			<xsl:if test="$doctype = 'resolution'">
 				<xsl:attribute name="font-size">11pt</xsl:attribute>
 			</xsl:if>
@@ -6752,6 +6752,7 @@
 	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
 		<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
 		<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
+			
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">

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

@@ -125,10 +125,10 @@
 	
 	<xsl:template match="/">
 		<xsl:call-template name="namespaceCheck"/>
-		<fo:root xsl:use-attribute-sets="root-style">
-			<xsl:if test="$lang != 'ar'">
+		<fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
+			<!-- <xsl:if test="$lang != 'ar'">
 				<xsl:attribute name="xml:lang"><xsl:value-of select="$lang"/></xsl:attribute>
-			</xsl:if>
+			</xsl:if> -->
 			<xsl:if test="$doctype = 'resolution'">
 				<xsl:attribute name="font-size">11pt</xsl:attribute>
 			</xsl:if>
@@ -6752,6 +6752,7 @@
 	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
 		<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
 		<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
+			
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">

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

@@ -125,10 +125,10 @@
 	
 	<xsl:template match="/">
 		<xsl:call-template name="namespaceCheck"/>
-		<fo:root xsl:use-attribute-sets="root-style">
-			<xsl:if test="$lang != 'ar'">
+		<fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
+			<!-- <xsl:if test="$lang != 'ar'">
 				<xsl:attribute name="xml:lang"><xsl:value-of select="$lang"/></xsl:attribute>
-			</xsl:if>
+			</xsl:if> -->
 			<xsl:if test="$doctype = 'resolution'">
 				<xsl:attribute name="font-size">11pt</xsl:attribute>
 			</xsl:if>
@@ -6752,6 +6752,7 @@
 	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
 		<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
 		<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
+			
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">

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

@@ -125,10 +125,10 @@
 	
 	<xsl:template match="/">
 		<xsl:call-template name="namespaceCheck"/>
-		<fo:root xsl:use-attribute-sets="root-style">
-			<xsl:if test="$lang != 'ar'">
+		<fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
+			<!-- <xsl:if test="$lang != 'ar'">
 				<xsl:attribute name="xml:lang"><xsl:value-of select="$lang"/></xsl:attribute>
-			</xsl:if>
+			</xsl:if> -->
 			<xsl:if test="$doctype = 'resolution'">
 				<xsl:attribute name="font-size">11pt</xsl:attribute>
 			</xsl:if>
@@ -6752,6 +6752,7 @@
 	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
 		<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
 		<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
+			
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">

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

@@ -125,10 +125,10 @@
 	
 	<xsl:template match="/">
 		<xsl:call-template name="namespaceCheck"/>
-		<fo:root xsl:use-attribute-sets="root-style">
-			<xsl:if test="$lang != 'ar'">
+		<fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
+			<!-- <xsl:if test="$lang != 'ar'">
 				<xsl:attribute name="xml:lang"><xsl:value-of select="$lang"/></xsl:attribute>
-			</xsl:if>
+			</xsl:if> -->
 			<xsl:if test="$doctype = 'resolution'">
 				<xsl:attribute name="font-size">11pt</xsl:attribute>
 			</xsl:if>
@@ -6752,6 +6752,7 @@
 	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
 		<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
 		<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
+			
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "1.3.10".freeze
+    VERSION = "1.3.11".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 1.3.10
+  version: 1.3.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-30 00:00:00.000000000 Z
+date: 2021-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities