metanorma-itu 2.7.4 → 2.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de022940207ba868d42ba651c9fdde285192df719b62657246b0a9b53494a273
-  data.tar.gz: a8bb44c9f30e989b25a6a9da48f5f768fc05c5518d01262e2099f21098760d96
+  metadata.gz: 282a34b0dd9ed3f5e5f3177ef65bc3603e955652599e48cacaef408590b2f93f
+  data.tar.gz: 36ffc7157a62c8fd0a33ac4a0df6d288ad45e2db77f32294d5ac7c36ecf59aaa
 SHA512:
-  metadata.gz: 5eb078cdc7ff1ca8e65df4136decbe59d9e4dcd2806471491d906552cb22ffd88919bcbbacf91006ce2290712bf711bf8194f7b3b128efaa43be618748bcf8ac
-  data.tar.gz: 3988356edbc783a6ed52d1fb15b6ee1466edf08c4c0deb2bf43b93680096d03e01b943f598952711a93183b157f725db8e6ff12a7d8e93d07c5002580849338b
+  metadata.gz: 7099927dd940ede4df3868e3d436d701036140916f81bc1c0f9ad2445ade4ecfe7c24841e53e30fca0f75c0025ecdbdcc0d7eaf71ab739ef8eb585bbc44aaea5
+  data.tar.gz: 42fb8dcaec81137cff25cb353b5780fede4bf0ad70d9c28cb23fdad64b23c0edb63e9320d41908367f329955606afe719c021dd71c404ff8a6bce3667d661f38

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

@@ -138,16 +138,6 @@ div.document-stage-band, div.document-type-band {
   background-color: #333333;
 }
 
-a.FootnoteRef + a.FootnoteRef::before {
-  content: ", ";
-  vertical-align: super;
-}
-
-a.TableFootnoteRef + a.TableFootnoteRef::before {
-  content: ", ";
-  vertical-align: super;
-}
-
 a.TableFootnoteRef, span.TableFootnoteRef,
 a.FootnoteRef, span.FootnoteRef {
   vertical-align: super;

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

@@ -138,16 +138,6 @@ div.document-stage-band, div.document-type-band {
   background-color: #333333;
 }
 
-a.FootnoteRef + a.FootnoteRef::before {
-  content: ", ";
-  vertical-align: super;
-}
-
-a.TableFootnoteRef + a.TableFootnoteRef::before {
-  content: ", ";
-  vertical-align: super;
-}
-
 a.TableFootnoteRef, span.TableFootnoteRef,
 a.FootnoteRef, span.FootnoteRef {
   vertical-align: super;
@@ -863,16 +853,6 @@ nav #toc {
     margin: 0;
   }
 }
-.figure {
-  line-height: 1.6em;
-  padding: 1.5em;
-  margin: 2em 0 1em 0;
-  overflow: auto;
-  font-family: {{monospacefont}};
-  font-variant-ligatures: none;
-  background-color: #f6f6f6;
-  font-size: {{monospacefontsize}};
-}
 .figure .FigureTitle, .figure .figure-title {
   font-weight: 700;
   font-size: 1em;
@@ -885,6 +865,16 @@ nav #toc {
   max-width: 100%;
   height: auto;
 }
+.figure {
+  line-height: 1.6em;
+  padding: 1.5em;
+  margin: 2em 0 1em 0;
+  overflow: auto;
+  font-family: {{monospacefont}};
+  font-variant-ligatures: none;
+  background-color: #f6f6f6;
+  font-size: {{monospacefontsize}};
+}
 
 table div.figure {
   padding: 0;
@@ -1202,11 +1192,13 @@ p.Biblio, p.NormRef {
   padding: 1.2em;
   margin: 2em 0 1em 0;
   text-align: left;
-  padding-left: 3.2em;
 }
 .example p {
   margin: 0;
 }
+.example {
+  padding-left: 3.2em;
+}
 .example .example-title {
   font-weight: 700;
   text-transform: uppercase;
@@ -1272,7 +1264,6 @@ table:not(.biblio) {
   margin-left: auto;
   margin-right: auto;
   padding-right: 2em;
-  color: #141115;
 }
 table:not(.biblio), table:not(.biblio) th, table:not(.biblio) td {
   border: none;
@@ -1287,6 +1278,9 @@ table:not(.biblio) td.header {
 table:not(.biblio), table:not(.biblio) th, table:not(.biblio) td {
   border: none !important;
 }
+table:not(.biblio) {
+  color: #141115;
+}
 table:not(.biblio) tr:nth-child(even) {
   background: #f1f8ff;
 }

data/lib/isodoc/itu/html_convert.rb

@@ -78,7 +78,6 @@ module IsoDoc
         super
       end
 
-
       include BaseConvert
       include Init
     end

data/lib/isodoc/itu/init.rb

@@ -23,7 +23,7 @@ module IsoDoc
 
       def bibrenderer(options = {})
         ::Relaton::Render::Itu::General.new(options
-          .merge(language: @lang, i18nhash: @i18n.get))
+          .merge(language: @lang, script: @script, i18nhash: @i18n.get))
       end
 
       def fileloc(loc)

data/lib/isodoc/itu/itu.implementers-guide.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 -->
@@ -3290,6 +3313,7 @@
 	<xsl:variable name="en_dash">–</xsl:variable>
 	<xsl:variable name="em_dash">—</xsl:variable>
 	<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
+	<xsl:variable name="nonbreak_space_em_dash"> —</xsl:variable>
 	<xsl:variable name="cr">&#13;</xsl:variable>
 	<xsl:variable name="lf">
 </xsl:variable>
@@ -3832,6 +3856,7 @@
 	<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="update_xml_step1"/>
 	<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]" mode="update_xml_step1"/>
 	<xsl:template match="mn:section-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
+	<xsl:template match="mn:floating-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
 	<!-- <xsl:template match="mn:preferred[following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
 	<xsl:template match="mn:preferred" mode="update_xml_step1"/>
 	<!-- <xsl:template match="mn:admitted[following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
@@ -3846,10 +3871,10 @@
 
 	<xsl:template match="mn:term[@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
 
-	<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title]]" mode="update_xml_step1">
+	<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]]" mode="update_xml_step1">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="update_xml_step1"/>
-			<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title]/@depth"/>
+			<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]/@depth"/>
 			<xsl:apply-templates select="node()" mode="update_xml_step1"/>
 		</xsl:copy>
 	</xsl:template>
@@ -4658,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">
@@ -4680,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">
@@ -4701,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">
@@ -4965,6 +4991,12 @@
 	<xsl:template name="refine_sourcecode-style">
 	</xsl:template> <!-- refine_sourcecode-style -->
 
+	<xsl:attribute-set name="sourcecode-number-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_sourcecode-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="sourcecode-name-style">
 		<xsl:attribute name="font-size">11pt</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -6353,6 +6385,12 @@
 	<xsl:template name="refine_term-name-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="preferred-style">
+	</xsl:attribute-set> <!-- preferred-style -->
+
+	<xsl:template name="refine_preferred-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="preferred-block-style">
 	</xsl:attribute-set> <!-- preferred-block-style -->
 
@@ -6987,6 +7025,12 @@
 		</xsl:if>
 	</xsl:template> <!-- refine_table-style -->
 
+	<xsl:attribute-set name="table-number-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_table-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="table-name-style">
 		<xsl:attribute name="role">Caption</xsl:attribute>
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
@@ -7470,7 +7514,7 @@
 
 			</fo:block>
 
-			<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
+			<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas' or $namespace = 'iec' or $namespace = 'iso'"> -->
 			<xsl:if test="$continued = 'true'">
 
 				<!-- to prevent the error 'THead element may contain only TR elements' -->
@@ -10556,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 -->
@@ -10612,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}">
@@ -10659,6 +10712,12 @@
 	<xsl:template name="refine_figure-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="figure-number-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_figure-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="figure-name-style">
 		<xsl:attribute name="role">Caption</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -12703,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">
@@ -12714,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 -->
@@ -12793,33 +12854,16 @@
 		<xsl:variable name="ref_id" select="@target"/>
 
 		<xsl:variable name="footnote_inline">
-			<fo:inline role="Reference">
+			<fo:inline xsl:use-attribute-sets="fn-num-style">
 
-				<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>
-
-				<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">
@@ -13128,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 -->
 
@@ -15555,10 +15573,28 @@
 			</xsl:choose>
 	</xsl:template>
 
+	<xsl:attribute-set name="clause-style">
+
+	</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 -->
 	<xsl:template match="/*/mn:sections/*" name="sections_node" priority="2">
 		<xsl:call-template name="setNamedDestination"/>
-		<fo:block>
+		<fo:block role="Sect">
 			<xsl:call-template name="setId"/>
 
 			<xsl:call-template name="sections_element_style"/>
@@ -15691,6 +15727,10 @@
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
 	</xsl:template>
 
+	<!-- for case when update_xml_step1 (common.updatexml.xsl) doesn't apply when $table_if = 'true' -->
+	<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]"/>
+	<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]"/>
+
 	<!-- insert fo:basic-link, if external-destination or internal-destination is non-empty, otherwise insert fo:inline -->
 	<xsl:template name="insert_basic_link">
 		<xsl:param name="element"/>