metanorma-bipm 2.7.4 → 2.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9acd4f0038a69389a4e9fe3f817290091e822919636127053f62e7f348ac2587
-  data.tar.gz: d362b897bafd5bc6f8defd38ea27217f8b711f83fd51da171912b905c426d3a7
+  metadata.gz: 07c83f660d900dfe3cc97c6ed6a86c21232380ea523e5bce91bb04dfab3c3443
+  data.tar.gz: 75f8c0356896f8887c50db6c15ef4d648367a629655606489bdf06255a43bd3f
 SHA512:
-  metadata.gz: b409db40dada3ab6011939824ac180935e85bda9590f3c50d2ecca0c52c1c32364b7a7a6d3480a23abf2c96a97d8004666cd73cb16603bb2176dec1d1fa09380
-  data.tar.gz: e3fdf52198601e0f5072c2def6202f8fd58439df5b6c6fc2955acce4c3feba5a114d43b728b82b536104118794aaba07c67f7bb0d54cf506d1f562e19bde0d8e
+  metadata.gz: 9e01a981665cf4e4b277bdd5c9e233175bbe688de67d1855d7aaac35719b10f8a9bffbe829bad8c773b9ecdfd824c4edd781e660ead70cc1ae5398b790c9ccf2
+  data.tar.gz: d4931f41c73f104c35903bfc3f5563f42585ac407f0a636135ac38fd11e05a649b32b3aa9c2afde5674875a77d5a52dbf5872ec8afc46348cad819a6bace7294

data/lib/isodoc/bipm/bipm.brochure.xsl

@@ -409,6 +409,8 @@
 
 			<xsl:call-template name="cover-page"/>
 
+			<xsl:call-template name="inner-cover-page"/>
+
 			<xsl:choose>
 				<xsl:when test="$root-element = 'metanorma-collection'">
 
@@ -597,6 +599,8 @@
 				</xsl:otherwise>
 			</xsl:choose>
 
+			<xsl:call-template name="back-page"/>
+
 		</fo:root>
 	</xsl:template>
 
@@ -1385,7 +1389,6 @@
 			</xsl:when>
 			<xsl:when test="$independentAppendix = ''">
 				<xsl:call-template name="insertCoverPage"/>
-				<xsl:call-template name="insertInnerCoverPage"/>
 			</xsl:when>
 			<xsl:when test="$independentAppendix != ''">
 				<xsl:call-template name="insertCoverPageAppendix"/>
@@ -1760,77 +1763,79 @@
 		</fo:block-container>
 	</xsl:template>
 
-	<xsl:template name="insertInnerCoverPage">
-
-		<xsl:if test="(//mn:metanorma)[1]/mn:bibdata/mn:title[@type='title-cover']">
-
-			<fo:page-sequence master-reference="title-page" format="1" initial-page-number="1" force-page-count="even">
+	<xsl:template name="inner-cover-page">
+		<xsl:if test="$independentAppendix = ''">
+			<xsl:if test="(//mn:metanorma)[1]/mn:bibdata/mn:title[@type='title-cover']">
 
-				<xsl:call-template name="insertHeaderDraftWatermark"/>
+				<fo:page-sequence master-reference="title-page" format="1" initial-page-number="1" force-page-count="even">
 
-				<fo:flow flow-name="xsl-region-body" font-family="Arial">
+					<xsl:call-template name="insertHeaderDraftWatermark"/>
 
-					<xsl:variable name="languages">
-						<xsl:call-template name="getLanguages"/>
-					</xsl:variable>
+					<fo:flow flow-name="xsl-region-body" font-family="Arial">
+						<xsl:variable name="languages">
+							<xsl:call-template name="getLanguages"/>
+						</xsl:variable>
 
-					<xsl:variable name="titles">
-						<xsl:for-each select="(//mn:metanorma)[1]/mn:bibdata/mn:title">
-							<xsl:copy-of select="."/>
-						</xsl:for-each>
-					</xsl:variable>
+						<xsl:variable name="titles">
+							<xsl:for-each select="(//mn:metanorma)[1]/mn:bibdata/mn:title">
+								<xsl:copy-of select="."/>
+							</xsl:for-each>
+						</xsl:variable>
 
-					<xsl:for-each select="xalan:nodeset($languages)/lang">
-						<xsl:variable name="curr_lang" select="."/>
-						<xsl:variable name="title" select="xalan:nodeset($titles)//mn:title[@language = $curr_lang and @type='title-cover']"/>
-						<xsl:choose>
-							<xsl:when test="position() = 1">
-								<fo:block-container font-size="12pt" font-weight="bold" width="55mm">
-										<fo:block>
-											<xsl:call-template name="add-letter-spacing">
-												<xsl:with-param name="text" select="$title"/>
-												<xsl:with-param name="letter-spacing" select="0.09"/>
-											</xsl:call-template>
-										</fo:block>
-										<fo:block font-size="10pt">
-											<fo:block margin-bottom="6pt"> </fo:block>
-											<fo:block margin-bottom="6pt"> </fo:block>
-											<fo:block margin-bottom="6pt"> </fo:block>
-											<fo:block margin-bottom="6pt" line-height="2.4"> </fo:block>
-										</fo:block>
-									</fo:block-container>
-								</xsl:when>
-								<xsl:otherwise>
-									<fo:block font-size="10pt" margin-bottom="3pt">
-										<xsl:variable name="lang_version">
-											<xsl:call-template name="getLangVersion">
-												<xsl:with-param name="lang" select="$curr_lang"/>
-											</xsl:call-template>
-										</xsl:variable>
-										<xsl:call-template name="add-letter-spacing">
-											<xsl:with-param name="text" select="normalize-space($lang_version)"/>
-											<xsl:with-param name="letter-spacing" select="0.09"/>
-										</xsl:call-template>
-									</fo:block>
-									<fo:block-container font-size="12pt" font-weight="bold" border-top="0.5pt solid black" padding-top="2mm" width="45mm">
-										<fo:block role="H1">
+						<xsl:for-each select="xalan:nodeset($languages)/lang">
+							<xsl:variable name="curr_lang" select="."/>
+							<xsl:variable name="title" select="xalan:nodeset($titles)//mn:title[@language = $curr_lang and @type='title-cover']"/>
+							<xsl:choose>
+								<xsl:when test="position() = 1">
+									<fo:block-container font-size="12pt" font-weight="bold" width="55mm">
+											<fo:block>
+												<xsl:call-template name="add-letter-spacing">
+													<xsl:with-param name="text" select="$title"/>
+													<xsl:with-param name="letter-spacing" select="0.09"/>
+												</xsl:call-template>
+											</fo:block>
+											<fo:block font-size="10pt">
+												<fo:block margin-bottom="6pt"> </fo:block>
+												<fo:block margin-bottom="6pt"> </fo:block>
+												<fo:block margin-bottom="6pt"> </fo:block>
+												<fo:block margin-bottom="6pt" line-height="2.4"> </fo:block>
+											</fo:block>
+										</fo:block-container>
+									</xsl:when>
+									<xsl:otherwise>
+										<fo:block font-size="10pt" margin-bottom="3pt">
+											<xsl:variable name="lang_version">
+												<xsl:call-template name="getLangVersion">
+													<xsl:with-param name="lang" select="$curr_lang"/>
+												</xsl:call-template>
+											</xsl:variable>
 											<xsl:call-template name="add-letter-spacing">
-												<xsl:with-param name="text" select="$title"/>
+												<xsl:with-param name="text" select="normalize-space($lang_version)"/>
 												<xsl:with-param name="letter-spacing" select="0.09"/>
 											</xsl:call-template>
 										</fo:block>
-									</fo:block-container>
-								</xsl:otherwise>
-
-							</xsl:choose>
-						</xsl:for-each>
+										<fo:block-container font-size="12pt" font-weight="bold" border-top="0.5pt solid black" padding-top="2mm" width="45mm">
+											<fo:block role="H1">
+												<xsl:call-template name="add-letter-spacing">
+													<xsl:with-param name="text" select="$title"/>
+													<xsl:with-param name="letter-spacing" select="0.09"/>
+												</xsl:call-template>
+											</fo:block>
+										</fo:block-container>
+									</xsl:otherwise>
 
-				</fo:flow>
-			</fo:page-sequence>
+								</xsl:choose>
+							</xsl:for-each>
+					</fo:flow>
+				</fo:page-sequence>
+			</xsl:if>
 		</xsl:if>
-	</xsl:template>
+	</xsl:template> <!-- END: inner-cover-page -->
 	<!-- End Cover Pages -->
 
+	<xsl:template name="back-page">
+	</xsl:template>
+
 	<xsl:template match="mn:metanorma/mn:bibdata/mn:title[@language = 'en']/text()" priority="3">
 		<xsl:variable name="mep_text" select="'Mise en pratique'"/>
 		<xsl:choose>
@@ -2273,7 +2278,7 @@
 	</xsl:template>
 
 	<xsl:template match="mn:feedback-statement//mn:p" priority="2">
-		<fo:block margin-top="6pt">
+		<fo:block xsl:use-attribute-sets="feedback-statement-p-style">
 			<xsl:variable name="p_num"><xsl:number/></xsl:variable>
 			<xsl:if test="$p_num = 1">Édité par le </xsl:if>
 			<xsl:apply-templates/>
@@ -4290,6 +4295,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>
@@ -4832,6 +4838,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"/> -->
@@ -4846,10 +4853,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>
@@ -5699,10 +5706,10 @@
 	</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">
+		<xsl:attribute name="margin-top">6pt</xsl:attribute>
 	</xsl:attribute-set> <!-- feedback-statement-p-style -->
 
 	<xsl:template name="refine_feedback-statement-p-style">
@@ -5960,6 +5967,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>
@@ -7344,6 +7357,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 -->
 
@@ -7978,6 +7997,12 @@
 		<xsl:call-template name="setBordersTableArray"/>
 	</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>
@@ -11538,15 +11563,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 -->
@@ -11594,7 +11626,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}">
@@ -11643,6 +11677,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="keep-with-previous">always</xsl:attribute>
@@ -13717,7 +13757,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">
@@ -13728,6 +13768,7 @@
 	</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="vertical-align">super</xsl:attribute>
@@ -13804,33 +13845,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">
@@ -14139,30 +14163,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="vertical-align">super</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="font-size">60%</xsl:attribute>
-		<xsl:attribute name="vertical-align">super</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-set> <!-- bibitem-note-fn-body-style -->
-
 	<xsl:attribute-set name="references-non-normative-style">
 		<xsl:attribute name="line-height">120%</xsl:attribute>
 	</xsl:attribute-set> <!-- references-non-normative-style -->
@@ -16565,10 +16565,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"/>
@@ -16693,6 +16711,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"/>