metanorma-itu 2.7.5 → 2.7.6

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

@@ -326,6 +326,10 @@
 						<xsl:with-param name="num" select="$num"/>
 					</xsl:call-template>
 
+					<xsl:call-template name="inner-cover-page">
+						<xsl:with-param name="num" select="$num"/>
+					</xsl:call-template>
+
 					<!-- <xsl:for-each select="xalan:nodeset($updated_xml)/*"> -->
 
 					<!-- <xsl:for-each select="xalan:nodeset($updated_xml)//mn:metanorma">
@@ -588,6 +592,8 @@
 				</xsl:for-each>
 			</xsl:for-each>
 
+			<xsl:call-template name="back-page"/>
+
 		</fo:root>
 	</xsl:template>
 
@@ -1072,24 +1078,6 @@
 						</fo:block-container>
 					</fo:flow>
 				</fo:page-sequence>
-				<!-- Second cover page -->
-				<xsl:variable name="secondCoverPageData_">
-					<xsl:call-template name="insertBackgroundPageImage">
-						<xsl:with-param name="number">2</xsl:with-param>
-					</xsl:call-template>
-				</xsl:variable>
-				<xsl:variable name="secondCoverPageData" select="xalan:nodeset($secondCoverPageData_)"/>
-				<fo:page-sequence force-page-count="no-force" master-reference="cover-page_2023">
-					<xsl:if test="$secondCoverPageData//*[self::fo:instream-foreign-object or self::fo:external-graphic]">
-						<fo:static-content flow-name="header" role="artifact" id="__internal_layout__coverpage2_header_{$num}_{generate-id()}">
-							<xsl:copy-of select="$secondCoverPageData"/>
-						</fo:static-content>
-					</xsl:if>
-					<fo:flow flow-name="xsl-region-body">
-						<fo:block> </fo:block>
-					</fo:flow>
-				</fo:page-sequence>
-				 <!-- End: Second cover page -->
 			</xsl:when> <!-- $layoutVersion = '2023' -->
 
 			<xsl:otherwise>
@@ -1761,6 +1749,41 @@
 		<!-- ============================================= -->
 	</xsl:template>
 
+	<xsl:template name="inner-cover-page">
+		<xsl:param name="num"/>
+		<xsl:variable name="document_scheme" select="normalize-space(/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata[mn:name = 'document-scheme']/mn:value)"/>
+		<xsl:variable name="layoutVersion_">
+			<xsl:choose>
+				<xsl:when test="$document_scheme = '' or $document_scheme = 'current'">2023</xsl:when>
+				<xsl:otherwise>default</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:variable name="layoutVersion" select="normalize-space($layoutVersion_)"/>
+		<xsl:if test="$layoutVersion = '2023'">
+			<!-- Second cover page -->
+			<xsl:variable name="secondCoverPageData_">
+				<xsl:call-template name="insertBackgroundPageImage">
+					<xsl:with-param name="number">2</xsl:with-param>
+				</xsl:call-template>
+			</xsl:variable>
+			<xsl:variable name="secondCoverPageData" select="xalan:nodeset($secondCoverPageData_)"/>
+			<fo:page-sequence force-page-count="no-force" master-reference="cover-page_2023">
+				<xsl:if test="$secondCoverPageData//*[self::fo:instream-foreign-object or self::fo:external-graphic]">
+					<fo:static-content flow-name="header" role="artifact" id="__internal_layout__coverpage2_header_{$num}_{generate-id()}">
+						<xsl:copy-of select="$secondCoverPageData"/>
+					</fo:static-content>
+				</xsl:if>
+				<fo:flow flow-name="xsl-region-body">
+					<fo:block> </fo:block>
+				</fo:flow>
+			</fo:page-sequence>
+			 <!-- End: Second cover page -->
+		</xsl:if>
+	</xsl:template> <!-- END: inner-cover-page -->
+
+	<xsl:template name="back-page">
+	</xsl:template>
+
 	<xsl:template name="insertMeetingInfo">
 		<fo:block><xsl:value-of select="/mn:metanorma/mn:bibdata/mn:ext/mn:meeting"/></fo:block>
 		<fo:block>
@@ -2345,7 +2368,7 @@
 	<!-- ====== -->
 
 	<xsl:template match="mn:legal-statement//mn:p | mn:license-statement//mn:p" priority="2">
-		<fo:block margin-top="6pt">
+		<fo:block xsl:use-attribute-sets="legal-statement-p-style">
 			<xsl:apply-templates/>
 		</fo:block>
 		<xsl:if test="not(following-sibling::mn:p)"> <!-- last para -->
@@ -4660,6 +4683,7 @@
 	</xsl:template>
 
 	<xsl:attribute-set name="license-statement-p-style">
+		<xsl:attribute name="margin-top">6pt</xsl:attribute>
 	</xsl:attribute-set> <!-- license-statement-p-style -->
 
 	<xsl:template name="refine_license-statement-p-style">
@@ -4682,6 +4706,7 @@
 	</xsl:template>
 
 	<xsl:attribute-set name="legal-statement-p-style">
+		<xsl:attribute name="margin-top">6pt</xsl:attribute>
 	</xsl:attribute-set> <!-- legal-statement-p-style -->
 
 	<xsl:template name="refine_legal-statement-p-style">
@@ -4703,7 +4728,6 @@
 	</xsl:attribute-set> <!-- feedback-statement-title-style -->
 
 	<xsl:template name="refine_feedback-statement-title-style">
-
 	</xsl:template>
 
 	<xsl:attribute-set name="feedback-statement-p-style">
@@ -10576,15 +10600,22 @@
 	</xsl:attribute-set> <!-- quote-style -->
 
 	<xsl:template name="refine_quote-style">
-	</xsl:template>
+	</xsl:template> <!-- refine_quote-style -->
 
 	<xsl:attribute-set name="quote-source-style">
 		<xsl:attribute name="text-align">right</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- quote-source-style -->
 
 	<xsl:template name="refine_quote-source-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="source-style">
+	</xsl:attribute-set> <!-- source-style -->
+
+	<xsl:template name="refine_source-style">
+
+	</xsl:template> <!-- refine_source-style -->
+
 	<!-- ====== -->
 	<!-- quote -->
 	<!-- source -->
@@ -10632,7 +10663,9 @@
 		</xsl:if>
 		<xsl:choose>
 			<xsl:when test="not(parent::quote)">
-				<fo:block>
+				<fo:block xsl:use-attribute-sets="source-style">
+					<xsl:call-template name="refine_source-style"/>
+
 					<xsl:call-template name="insert_basic_link">
 						<xsl:with-param name="element">
 							<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
@@ -12729,7 +12762,7 @@
 
 	<xsl:template name="refine_fn-reference-style">
 		<!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
-		<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">,</xsl:if>
+		<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">, </xsl:if><!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas'"></xsl:if> -->
 	</xsl:template> <!-- refine_fn-reference-style -->
 
 	<xsl:attribute-set name="fn-style">
@@ -12740,7 +12773,9 @@
 	</xsl:template>
 
 	<xsl:attribute-set name="fn-num-style">
+		<xsl:attribute name="role">Reference</xsl:attribute>
 		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
+		<xsl:attribute name="font-size">65%</xsl:attribute>
 		<xsl:attribute name="font-size">60%</xsl:attribute>
 		<xsl:attribute name="vertical-align">super</xsl:attribute>
 	</xsl:attribute-set> <!-- fn-num-style -->
@@ -12819,33 +12854,16 @@
 		<xsl:variable name="ref_id" select="@target"/>
 
 		<xsl:variable name="footnote_inline">
-			<fo:inline role="Reference">
-
-				<xsl:variable name="fn_styles">
-					<xsl:choose>
-						<xsl:when test="ancestor::mn:bibitem">
-							<fn_styles xsl:use-attribute-sets="bibitem-note-fn-style">
-								<xsl:call-template name="refine_bibitem-note-fn-style"/>
-							</fn_styles>
-						</xsl:when>
-						<xsl:otherwise>
-							<fn_styles xsl:use-attribute-sets="fn-num-style">
-								<xsl:call-template name="refine_fn-num-style"/>
-							</fn_styles>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:variable>
+			<fo:inline xsl:use-attribute-sets="fn-num-style">
 
-				<xsl:for-each select="xalan:nodeset($fn_styles)/fn_styles/@*">
-					<xsl:copy-of select="."/>
-				</xsl:for-each>
+				<xsl:call-template name="refine_fn-num-style"/>
 
 				<!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
 				<!-- <xsl:if test="following-sibling::node()[normalize-space() != ''][1][self::mn:fn]">
 					<xsl:attribute name="padding-right">0.5mm</xsl:attribute>
 				</xsl:if> -->
 
-				<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">,</xsl:if>
+				<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">, </xsl:if>
 
 				<xsl:call-template name="insert_basic_link">
 					<xsl:with-param name="element">
@@ -13154,32 +13172,6 @@
 	<xsl:template name="refine_bibitem-non-normative-list-body-style">
 	</xsl:template>
 
-	<!-- footnote reference number for bibitem, in the text  -->
-	<xsl:attribute-set name="bibitem-note-fn-style">
-		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
-		<xsl:attribute name="font-size">65%</xsl:attribute>
-		<xsl:attribute name="font-size">8pt</xsl:attribute>
-		<xsl:attribute name="baseline-shift">30%</xsl:attribute>
-	</xsl:attribute-set> <!-- bibitem-note-fn-style -->
-
-	<xsl:template name="refine_bibitem-note-fn-style">
-	</xsl:template>
-
-	<!-- footnote number on the page bottom -->
-	<xsl:attribute-set name="bibitem-note-fn-number-style">
-		<xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
-		<xsl:attribute name="alignment-baseline">hanging</xsl:attribute>
-		<xsl:attribute name="padding-right">3mm</xsl:attribute>
-	</xsl:attribute-set> <!-- bibitem-note-fn-number-style -->
-
-	<!-- footnote body (text) on the page bottom -->
-	<xsl:attribute-set name="bibitem-note-fn-body-style">
-		<xsl:attribute name="font-size">10pt</xsl:attribute>
-		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-		<xsl:attribute name="start-indent">0pt</xsl:attribute>
-		<xsl:attribute name="margin-bottom">4pt</xsl:attribute>
-	</xsl:attribute-set> <!-- bibitem-note-fn-body-style -->
-
 	<xsl:attribute-set name="references-non-normative-style">
 	</xsl:attribute-set> <!-- references-non-normative-style -->
 
@@ -15586,6 +15578,17 @@
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_clause-style">
+		<!-- commented for https://github.com/metanorma/metanorma-ribose/issues/421 -->
+		<!-- <xsl:if test="$namespace = 'rsd'">
+			<xsl:variable name="level">
+				<xsl:call-template name="getLevel">
+					<xsl:with-param name="depth" select="mn:fmt-title/@depth"/>
+				</xsl:call-template>
+			</xsl:variable>
+			<xsl:if test="$level &gt;= 4">
+				<xsl:attribute name="margin-left">13mm</xsl:attribute>
+			</xsl:if>
+		</xsl:if> -->
 	</xsl:template>
 
 	<!-- main sections -->

data/lib/isodoc/itu/presentation_ref.rb

@@ -122,7 +122,7 @@ module IsoDoc
       def reference_name(ref)
         super
         @xrefs.get[ref["id"]] =
-          { xref: @xrefs.get[ref["id"]][:xref].sub(/^\[/, "").sub(/\]$/, "") }
+          { xref: @xrefs.get[ref["id"]][:xref]&.sub(/^\[/, "")&.sub(/\]$/, "") }
       end
     end
   end

data/lib/isodoc/itu/presentation_xml_convert.rb

@@ -153,8 +153,8 @@ module IsoDoc
           '<colgroup><col width="20%"/><col width="80%"/></colgroup>'
       end
 
-      def termnote_delim(_elem)
-        " &#x2013; "
+      def termnote_delim(_elem, lbl)
+        l10n(" &#x2013; ", { prev: lbl })
       end
 
       include Init

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Itu
-    VERSION = "2.7.5".freeze
+    VERSION = "2.7.6".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 2.7.5
+  version: 2.7.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-09-15 00:00:00.000000000 Z
+date: 2025-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc