metanorma-itu 2.2.3 → 2.2.4

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

@@ -1298,21 +1298,42 @@
 	<!-- PREFACE (Summary, History, ...)          -->
 	<!-- ============================= -->
 
+	<xsl:template match="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*" priority="3">
+		<xsl:choose>
+			<xsl:when test="preceding-sibling::*">
+				<!-- page-break before 2nd and next elements only -->
+				<fo:block break-after="page"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:block font-size="12pt">
+					<xsl:value-of select="$linebreak"/>
+					<xsl:value-of select="$linebreak"/>
+				</fo:block>
+			</xsl:otherwise>
+		</xsl:choose>
+		<fo:block>
+			<xsl:call-template name="setId"/>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+
 	<!-- Summary -->
 	<xsl:template match="itu:itu-standard/itu:preface/itu:abstract[@id = '_summary']" priority="3">
 		<fo:block font-size="12pt">
 			<xsl:value-of select="$linebreak"/>
 			<xsl:value-of select="$linebreak"/>
 		</fo:block>
-		<fo:block font-weight="bold" margin-top="18pt" margin-bottom="18pt">
-			<xsl:variable name="title-summary">
-				<xsl:call-template name="getTitle">
-					<xsl:with-param name="name" select="'title-summary'"/>
-				</xsl:call-template>
-			</xsl:variable>
-			<xsl:value-of select="$title-summary"/>
+		<fo:block id="{@id}">
+			<fo:block font-weight="bold" keep-with-next="always" margin-top="18pt" margin-bottom="18pt" role="H2">
+				<xsl:variable name="title-summary">
+					<xsl:call-template name="getTitle">
+						<xsl:with-param name="name" select="'title-summary'"/>
+					</xsl:call-template>
+				</xsl:variable>
+				<xsl:value-of select="$title-summary"/>
+			</fo:block>
+			<xsl:apply-templates/>
 		</fo:block>
-		<xsl:apply-templates/>
 	</xsl:template>
 	<xsl:template match="itu:itu-standard/itu:preface/itu:abstract[@id = '_summary']/itu:title" priority="4"/>
 
@@ -2113,14 +2134,14 @@
 	BUT DON'T put any another conditions together with $namespace = '...' (such conditions will be ignored). For another conditions, please use nested xsl:if or xsl:choose -->
 
 	<!--
-	<misc-container>
+	<metanorma-extension>
 		<presentation-metadata>
 			<papersize>letter</papersize>
 		</presentation-metadata>
-	</misc-container>
+	</metanorma-extension>
 	-->
 
-	<xsl:variable name="papersize" select="java:toLowerCase(java:java.lang.String.new(normalize-space(//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata']/*[local-name() = 'papersize'])))"/>
+	<xsl:variable name="papersize" select="java:toLowerCase(java:java.lang.String.new(normalize-space(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata']/*[local-name() = 'papersize'])))"/>
 	<xsl:variable name="papersize_width_">
 		<xsl:choose>
 			<xsl:when test="$papersize = 'letter'">215.9</xsl:when>
@@ -2235,7 +2256,7 @@
 	<xsl:variable name="titles" select="xalan:nodeset($titles_)"/>
 
 	<xsl:variable name="title-list-tables">
-		<xsl:variable name="toc_table_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']"/>
+		<xsl:variable name="toc_table_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']"/>
 		<xsl:value-of select="$toc_table_title"/>
 		<xsl:if test="normalize-space($toc_table_title) = ''">
 			<xsl:call-template name="getTitle">
@@ -2245,7 +2266,7 @@
 	</xsl:variable>
 
 	<xsl:variable name="title-list-figures">
-		<xsl:variable name="toc_figure_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']"/>
+		<xsl:variable name="toc_figure_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']"/>
 		<xsl:value-of select="$toc_figure_title"/>
 		<xsl:if test="normalize-space($toc_figure_title) = ''">
 			<xsl:call-template name="getTitle">
@@ -2255,7 +2276,7 @@
 	</xsl:variable>
 
 	<xsl:variable name="title-list-recommendations">
-		<xsl:variable name="toc_requirement_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='requirement']/*[local-name() = 'title']"/>
+		<xsl:variable name="toc_requirement_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='requirement']/*[local-name() = 'title']"/>
 		<xsl:value-of select="$toc_requirement_title"/>
 		<xsl:if test="normalize-space($toc_requirement_title) = ''">
 			<xsl:call-template name="getTitle">
@@ -2327,7 +2348,7 @@
 		<xsl:variable name="root-style_" select="xalan:nodeset($root-style)"/>
 
 		<xsl:variable name="additional_fonts_">
-			<xsl:for-each select="//*[contains(local-name(), '-standard')][1]/*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'fonts']/*[local-name() = 'value'] |       //*[contains(local-name(), '-standard')][1]/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'fonts']/*[local-name() = 'value']">
+			<xsl:for-each select="//*[contains(local-name(), '-standard')][1]/*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'fonts']/*[local-name() = 'value'] |       //*[contains(local-name(), '-standard')][1]/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'fonts']/*[local-name() = 'value']">
 				<xsl:value-of select="."/><xsl:if test="position() != last()">, </xsl:if>
 			</xsl:for-each>
 		</xsl:variable>
@@ -3049,17 +3070,28 @@
 	<!-- admonition -->
 	<xsl:attribute-set name="admonition-style">
 
+			<xsl:attribute name="border">0.5pt solid black</xsl:attribute>
+			<xsl:attribute name="space-before">12pt</xsl:attribute>
+			<xsl:attribute name="space-after">12pt</xsl:attribute>
+
 	</xsl:attribute-set> <!-- admonition-style -->
 
 	<xsl:attribute-set name="admonition-container-style">
 		<xsl:attribute name="margin-left">0mm</xsl:attribute>
 		<xsl:attribute name="margin-right">0mm</xsl:attribute>
 
+			<xsl:attribute name="padding">2mm</xsl:attribute>
+			<xsl:attribute name="padding-top">3mm</xsl:attribute>
+
 	</xsl:attribute-set> <!-- admonition-container-style -->
 
 	<xsl:attribute-set name="admonition-name-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 
+			<xsl:attribute name="text-align">center</xsl:attribute>
+			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+			<xsl:attribute name="font-weight">bold</xsl:attribute>
+
 	</xsl:attribute-set> <!-- admonition-name-style -->
 
 	<xsl:attribute-set name="admonition-p-style">
@@ -3381,10 +3413,10 @@
 
 	<xsl:template name="processTablesFigures_Contents">
 		<xsl:param name="always"/>
-		<xsl:if test="(//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']) or normalize-space($always) = 'true'">
+		<xsl:if test="(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']) or normalize-space($always) = 'true'">
 			<xsl:call-template name="processTables_Contents"/>
 		</xsl:if>
-		<xsl:if test="(//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']) or normalize-space($always) = 'true'">
+		<xsl:if test="(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']) or normalize-space($always) = 'true'">
 			<xsl:call-template name="processFigures_Contents"/>
 		</xsl:if>
 	</xsl:template>
@@ -3730,6 +3762,8 @@
 
 						<xsl:attribute name="width"><xsl:value-of select="normalize-space($table_width)"/></xsl:attribute>
 
+						<xsl:call-template name="setBordersTableArray"/>
+
 							<xsl:if test="$doctype = 'service-publication'">
 								<xsl:attribute name="border">1pt solid rgb(211,211,211)</xsl:attribute>
 							</xsl:if>
@@ -3878,6 +3912,10 @@
 
 	</xsl:template>
 
+	<xsl:template name="setBordersTableArray">
+
+	</xsl:template>
+
 	<xsl:template match="*[local-name()='table']/*[local-name() = 'name']">
 		<xsl:param name="continued"/>
 		<xsl:if test="normalize-space() != ''">
@@ -4367,6 +4405,8 @@
 										<xsl:attribute name="border">none</xsl:attribute>
 									</xsl:if>
 
+								<xsl:call-template name="setBordersTableArray"/>
+
 								<!-- fn will be processed inside 'note' processing -->
 
 									<xsl:if test="$doctype = 'service-publication'">
@@ -4492,6 +4532,8 @@
 	<xsl:template match="*[local-name()='thead']/*[local-name()='tr']" priority="2">
 		<fo:table-row xsl:use-attribute-sets="table-header-row-style">
 
+			<xsl:call-template name="setBordersTableArray"/>
+
 				<xsl:if test="$doctype = 'service-publication'">
 					<xsl:attribute name="border-bottom">1.1pt solid black</xsl:attribute>
 				</xsl:if>
@@ -4519,6 +4561,8 @@
 				<xsl:attribute name="keep-with-next">always</xsl:attribute>
 			</xsl:if>
 
+			<xsl:call-template name="setBordersTableArray"/>
+
 			<xsl:call-template name="setTableRowAttributes"/>
 			<xsl:apply-templates/>
 		</fo:table-row>
@@ -4542,6 +4586,8 @@
 				<xsl:with-param name="default">center</xsl:with-param>
 			</xsl:call-template>
 
+			<xsl:call-template name="setBordersTableArray"/>
+
 				<xsl:if test="ancestor::*[local-name()='preface']">
 					<xsl:if test="$doctype != 'service-publication'">
 						<xsl:attribute name="border">solid black 0pt</xsl:attribute>
@@ -4605,6 +4651,8 @@
 
 			 <!-- bsi -->
 
+			<xsl:call-template name="setBordersTableArray"/>
+
 				<xsl:if test="ancestor::*[local-name()='preface']">
 					<xsl:attribute name="border">solid black 0pt</xsl:attribute>
 				</xsl:if>
@@ -8277,7 +8325,7 @@
 	<!-- sourcecode  -->
 	<!-- =============== -->
 
-	<xsl:variable name="source-highlighter-css_" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'source-highlighter-css']"/>
+	<xsl:variable name="source-highlighter-css_" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'source-highlighter-css']"/>
 	<xsl:variable name="sourcecode_css_" select="java:org.metanorma.fop.Util.parseCSS($source-highlighter-css_)"/>
 	<xsl:variable name="sourcecode_css" select="xalan:nodeset($sourcecode_css_)"/>
 
@@ -10368,8 +10416,8 @@
 
 	<xsl:variable name="toc_level">
 		<!-- https://www.metanorma.org/author/ref/document-attributes/ -->
-		<xsl:variable name="htmltoclevels" select="normalize-space(//*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'HTML TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :htmltoclevels  Number of table of contents levels to render in HTML/PDF output; used to override :toclevels:-->
-		<xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render -->
+		<xsl:variable name="htmltoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'HTML TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :htmltoclevels  Number of table of contents levels to render in HTML/PDF output; used to override :toclevels:-->
+		<xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render -->
 		<xsl:choose>
 			<xsl:when test="$htmltoclevels != ''"><xsl:value-of select="number($htmltoclevels)"/></xsl:when> <!-- if there is value in xml -->
 			<xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when>  <!-- if there is value in xml -->
@@ -11361,6 +11409,7 @@
 			<xsl:choose>
 				<xsl:when test="$lang = 'ar' and $align = 'left'">start</xsl:when>
 				<xsl:when test="$lang = 'ar' and $align = 'right'">end</xsl:when>
+				<xsl:when test="$align = 'justified'">justify</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>

data/lib/isodoc/itu/ref.rb

@@ -7,7 +7,7 @@ module IsoDoc
     module BaseConvert
       def nonstd_bibitem(list, bibitem, _ordinal, biblio)
         list.tr **attr_code(iso_bibitem_entry_attrs(bibitem, biblio)) do |ref|
-          ref.td **{ style: "vertical-align:top" } do |td|
+          ref.td style: "vertical-align:top" do |td|
             tag = bibitem.at(ns("./biblio-tag"))
             tag&.children&.each { |n| parse(n, td) }
           end
@@ -20,7 +20,7 @@ module IsoDoc
       end
 
       def biblio_list(clause, div, biblio)
-        div.table **{ class: "biblio", border: "0" } do |t|
+        div.table class: "biblio", border: "0" do |t|
           i = 0
           t.tbody do |tbody|
             clause.elements.each do |b|
@@ -64,14 +64,12 @@ module IsoDoc
         ret
       end
 
-      IGNORE_IDS = "@type = 'DOI' or @type = 'ISSN' or @type = 'ISBN' or "\
-                   "@type = 'rfc-anchor' or @type = 'metanorma-ordinal'".freeze
-
       def multi_bibitem_ref_code(bibitem)
-        id = bibitem.xpath(ns("./docidentifier[not(@type = 'metanorma' or "\
-                              "#{IGNORE_IDS})]"))
+        id = bibitem.xpath(ns("./docidentifier[not(@type = 'metanorma' or " \
+                              "#{IsoDoc::Function::References::SKIP_DOCID} or " \
+                              "@type = 'metanorma-ordinal')]"))
         id.empty? and
-          id = bibitem.xpath(ns("./docidentifier[not(@type = 'metanorma' or "\
+          id = bibitem.xpath(ns("./docidentifier[not(@type = 'metanorma' or " \
                                 "@type = 'metanorma-ordinal')]"))
         return [] if id.empty?
 
@@ -91,7 +89,7 @@ module IsoDoc
       def doctype_title(id)
         type = id.parent&.at(ns("./ext/doctype"))&.text || "recommendation"
         if type == "recommendation" &&
-            /^(?<prefix>ITU-[A-Z] [A-Z])[ .-]Sup[a-z]*\. ?(?<num>\d+)$/ =~ id.text
+            /^(?<prefix>ITU-[A-Z][  ][A-Z])[  .-]Sup[a-z]*\.[  ]?(?<num>\d+)$/ =~ id.text
           "#{prefix}-series Recommendations – Supplement #{num}"
         else
           d = docid_prefix(id["type"], id.text.sub(/^\[/, "").sub(/\]$/, ""))

data/lib/metanorma/itu/biblio.rng

@@ -1316,7 +1316,7 @@
       <value>commentaryOf</value>
       <value>hasCommentary</value>
       <value>related</value>
-      <value>complements</value>
+      <value>hasComplement</value>
       <value>complementOf</value>
       <value>obsoletes</value>
       <value>obsoletedBy</value>

data/lib/metanorma/itu/cleanup.rb

@@ -46,7 +46,7 @@ module Metanorma
         ins = xml.at("//sections").elements.first
         xml.at("//sections/clause[@type = 'scope']") or
           ins.previous =
-            "<clause type='scope' #{add_id}><title>#{@i18n.scope}</title><p>"\
+            "<clause type='scope' #{add_id}><title>#{@i18n.scope}</title><p>" \
             "#{@i18n.clause_empty}</p></clause>"
         xml&.at("//sentinel")&.remove
       end
@@ -57,7 +57,7 @@ module Metanorma
             "<bibliography><sentinel/></bibliography>"
         ins = xml.at("//bibliography").elements.first
         xml.at("//bibliography/references[@normative = 'true']") or
-          ins.previous = "<references #{add_id} normative='true'>"\
+          ins.previous = "<references #{add_id} normative='true'>" \
                          "<title>#{@i18n.normref}</title></references>"
         xml&.at("//sentinel")&.remove
       end
@@ -72,7 +72,7 @@ module Metanorma
         ins =  xml.at("//sections/terms") ||
           xml.at("//sections/clause[descendant::terms]")
         unless xml.at("//sections//definitions")
-          ins.next = "<definitions #{add_id}>"\
+          ins.next = "<definitions #{add_id}>" \
                      "<title>#{@i18n.symbolsabbrev}</title></definitions>"
         end
       end
@@ -81,8 +81,8 @@ module Metanorma
         ins =  xml.at("//sections//definitions") ||
           xml.at("//sections/clause[descendant::definitions]")
         unless xml.at("//sections/clause[@type = 'conventions']")
-          ins.next = "<clause #{add_id} type='conventions'>"\
-                     "<title>#{@i18n.conventions}</title><p>"\
+          ins.next = "<clause #{add_id} type='conventions'>" \
+                     "<title>#{@i18n.conventions}</title><p>" \
                      "#{@i18n.clause_empty}</p></clause>"
         end
       end
@@ -149,14 +149,14 @@ module Metanorma
       def section_names_terms_cleanup(xml)
         super
         replace_title(
-          xml, "//terms[@type = 'internal'] | "\
-               "//clause[./terms[@type = 'internal']]"\
+          xml, "//terms[@type = 'internal'] | " \
+               "//clause[./terms[@type = 'internal']]" \
                "[not(./terms[@type = 'external'])]",
           @i18n&.internal_termsdef
         )
         replace_title(
-          xml, "//terms[@type = 'external'] | "\
-               "//clause[./terms[@type = 'external']]"\
+          xml, "//terms[@type = 'external'] | " \
+               "//clause[./terms[@type = 'external']]" \
                "[not(./terms[@type = 'internal'])]",
           @i18n&.external_termsdef
         )
@@ -172,17 +172,16 @@ module Metanorma
 
       def pub_class(bib)
         return 1 if bib.at("#{PUBLISHER}[abbreviation = 'ITU']")
-        return 1 if bib.at("#{PUBLISHER}[name = 'International "\
+        return 1 if bib.at("#{PUBLISHER}[name = 'International " \
                            "Telecommunication Union']")
         return 2 if bib.at("#{PUBLISHER}[abbreviation = 'ISO']")
-        return 2 if bib.at("#{PUBLISHER}[name = 'International Organization "\
+        return 2 if bib.at("#{PUBLISHER}[name = 'International Organization " \
                            "for Standardization']")
         return 3 if bib.at("#{PUBLISHER}[abbreviation = 'IEC']")
-        return 3 if bib.at("#{PUBLISHER}[name = 'International "\
+        return 3 if bib.at("#{PUBLISHER}[name = 'International " \
                            "Electrotechnical Commission']")
-        return 4 if bib.at("./docidentifier[@type][not(@type = 'DOI' or "\
-                           "@type = 'metanorma' or @type = 'ISSN' or @type = "\
-                           "'ISBN')]")
+        return 4 if bib.at("./docidentifier[@type][not(#{skip_docid} or " \
+                           "@type = 'metanorma')]")
 
         5
       end
@@ -199,8 +198,8 @@ module Metanorma
       # then title
       def sort_biblio_key(bib)
         pubclass = pub_class(bib)
-        id = bib&.at("./docidentifier[not(@type = 'DOI' or @type = "\
-                     "'metanorma' or @type = 'ISSN' or @type = 'ISBN')]")
+        id = bib&.at("./docidentifier[not(#{skip_docid} or @type = " \
+                     "'metanorma')]")
         metaid = bib&.at("./docidentifier[@type = 'metanorma']")&.text
         abbrid = metaid unless /^\[\d+\]$/.match?(metaid)
         type = id["type"] if id

data/lib/metanorma/itu/isodoc.rng

@@ -571,6 +571,11 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="linenums">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <optional>
           <ref name="tname"/>
         </optional>
@@ -1575,7 +1580,7 @@
     </element>
   </define>
   <define name="misccontainer">
-    <element name="misc-container">
+    <element name="metanorma-extension">
       <oneOrMore>
         <ref name="AnyElement"/>
       </oneOrMore>

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "2.2.3".freeze
+    VERSION = "2.2.4".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-30 00:00:00.000000000 Z
+date: 2023-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities