metanorma-bipm 2.2.14 → 2.3.1

data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl

@@ -32,7 +32,7 @@
 						<xsl:for-each select="//bipm:bipm-standard">
 							<xsl:variable name="lang" select="*[local-name()='bibdata']/*[local-name()='language'][@current = 'true']"/>
 							<xsl:variable name="num"><xsl:number level="any" count="bipm:bipm-standard"/></xsl:variable>
-							<xsl:variable name="title-part"><xsl:value-of select="bipm:bibdata/bipm:title[@type = 'part']"/></xsl:variable>
+							<xsl:variable name="title-part"><xsl:value-of select="bipm:bibdata/bipm:title[@type = 'title-part']"/></xsl:variable>
 							<xsl:variable name="current_document">
 								<xsl:copy-of select="."/>
 							</xsl:variable>
@@ -983,7 +983,7 @@
 
 						<fo:block-container font-size="18pt" font-weight="bold" text-align="center">
 							<fo:block role="H1">
-								<xsl:value-of select="//bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type='cover']"/>
+								<xsl:value-of select="//bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type='title-cover']"/>
 							</fo:block>
 						</fo:block-container>
 
@@ -1076,7 +1076,7 @@
 						<fo:block-container margin-left="-14mm" margin-right="0mm">
 							<fo:block-container margin-left="0mm" margin-right="0mm">
 								<fo:block font-family="Arial" font-size="16pt" font-weight="bold" text-align-last="justify" margin-bottom="82pt" role="H1">
-									<fo:inline><xsl:value-of select="//bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type='main']"/></fo:inline>
+									<fo:inline><xsl:value-of select="//bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type='title-main']"/></fo:inline>
 									<fo:inline keep-together.within-line="always">
 										<fo:leader leader-pattern="space"/>
 										<fo:inline>
@@ -1215,20 +1215,20 @@
 
 								<xsl:choose>
 									<xsl:when test="$independentAppendix != ''">
-										<xsl:apply-templates select="//bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type='appendix']" mode="title"/>
+										<xsl:apply-templates select="//bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type='title-appendix']" mode="title"/>
 										<fo:block>
-											<xsl:apply-templates select="//bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type='annex']" mode="title"/>
+											<xsl:apply-templates select="//bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type='title-annex']" mode="title"/>
 										</fo:block>
 									</xsl:when>
 									<xsl:otherwise> <!-- doctype = 'guide' -->
-										<xsl:apply-templates select="//bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type='main']" mode="title"/>
+										<xsl:apply-templates select="//bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type='title-main']" mode="title"/>
 									</xsl:otherwise>
 								</xsl:choose>
 
 							</fo:block>
 
 							<!-- <xsl:variable name="part_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:part)"/> -->
-							<xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part-with-numbering']">
+							<xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'title-part-with-numbering']">
 								<fo:block role="H2">
 									<!-- <xsl:if test="$part_num != ''">
 										<xsl:call-template name="getLocalizedString">
@@ -1239,17 +1239,17 @@
 										<xsl:value-of select="$part_num"/>
 									</xsl:if>
 									<xsl:text>: </xsl:text> -->
-									<xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part-with-numbering']" mode="title"/>
+									<xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'title-part-with-numbering']" mode="title"/>
 								</fo:block>
 							</xsl:if>
 							<!-- <xsl:variable name="subpart_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:subpart)"/> -->
-							<xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart-with-numbering']">
+							<xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'title-subpart-with-numbering']">
 								<fo:block role="H3">
 									<!-- <xsl:if test="$subpart_num != ''">
 										<xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-subpart[@lang=$curr_lang]),'#',$subpart_num)"/>
 									</xsl:if>
 									<xsl:text>: </xsl:text> -->
-									<xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart-with-numbering']" mode="title"/>
+									<xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'title-subpart-with-numbering']" mode="title"/>
 								</fo:block>
 							</xsl:if>
 
@@ -1362,7 +1362,7 @@
 						<xsl:for-each select="xalan:nodeset($languages)/lang">
 							<xsl:variable name="title_num" select="position()"/>
 							<xsl:variable name="curr_lang" select="."/>
-							<xsl:variable name="title-cover" select="xalan:nodeset($titles)//bipm:title[@language = $curr_lang and @type='main']"/>
+							<xsl:variable name="title-cover" select="xalan:nodeset($titles)//bipm:title[@language = $curr_lang and @type='title-main']"/>
 							<xsl:variable name="title-cover_" select="java:replaceAll(java:java.lang.String.new($title-cover),'( (of )| (and )| (or ))','#$2')"/>
 							<xsl:variable name="titleParts">
 								<xsl:call-template name="splitTitle">
@@ -1421,8 +1421,8 @@
 
 				<fo:block-container absolute-position="fixed" left="12.5mm" top="60mm">
 
-					<fo:block font-size="22.2pt" font-weight="{$weight-normal}" role="H1"><xsl:value-of select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'fr' and @type = 'main']"/></fo:block>
-					<fo:block font-size="22.2pt" font-weight="{$weight-bold}" margin-top="1mm" role="H1"><xsl:value-of select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'en' and @type = 'main']"/></fo:block>
+					<fo:block font-size="22.2pt" font-weight="{$weight-normal}" role="H1"><xsl:value-of select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'fr' and @type = 'title-main']"/></fo:block>
+					<fo:block font-size="22.2pt" font-weight="{$weight-bold}" margin-top="1mm" role="H1"><xsl:value-of select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'en' and @type = 'title-main']"/></fo:block>
 
 					<xsl:variable name="edition_str">édition</xsl:variable>
 
@@ -1433,28 +1433,28 @@
 					<fo:block role="H1">
 
 						<xsl:variable name="title_appendix_fr">
-							<xsl:apply-templates select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'fr' and @type = 'appendix']" mode="title"/>
+							<xsl:apply-templates select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'fr' and @type = 'title-appendix']" mode="title"/>
 						</xsl:variable>
 						<xsl:variable name="title_appendix_en">
-							<xsl:apply-templates select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'en' and @type = 'appendix']" mode="title"/>
+							<xsl:apply-templates select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'en' and @type = 'title-appendix']" mode="title"/>
 						</xsl:variable>
 						<xsl:variable name="title_annex_fr">
-							<xsl:apply-templates select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'fr' and @type = 'annex']" mode="title"/>
+							<xsl:apply-templates select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'fr' and @type = 'title-annex']" mode="title"/>
 						</xsl:variable>
 						<xsl:variable name="title_annex_en">
-							<xsl:apply-templates select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'en' and @type = 'annex']" mode="title"/>
+							<xsl:apply-templates select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'en' and @type = 'title-annex']" mode="title"/>
 						</xsl:variable>
 						<xsl:variable name="title_part_fr">
-							<xsl:apply-templates select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'fr' and @type = 'part']" mode="title"/>
+							<xsl:apply-templates select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'fr' and @type = 'title-part']" mode="title"/>
 						</xsl:variable>
 						<xsl:variable name="title_part_en">
-							<xsl:apply-templates select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'en' and @type = 'part']" mode="title"/>
+							<xsl:apply-templates select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'en' and @type = 'title-part']" mode="title"/>
 						</xsl:variable>
 						<xsl:variable name="title_subpart_fr">
-							<xsl:apply-templates select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'fr' and @type = 'subpart']" mode="title"/>
+							<xsl:apply-templates select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'fr' and @type = 'title-subpart']" mode="title"/>
 						</xsl:variable>
 						<xsl:variable name="title_subpart_en">
-							<xsl:apply-templates select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'en' and @type = 'subpart']" mode="title"/>
+							<xsl:apply-templates select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'en' and @type = 'title-subpart']" mode="title"/>
 						</xsl:variable>
 
 						<xsl:variable name="titles_length" select="string-length($title_appendix_fr) +                               string-length($title_appendix_en) +                              string-length($title_annex_fr) +                              string-length($title_annex_en) +                              string-length($title_part_fr) +                              string-length($title_part_en) +                              string-length($title_subpart_fr) +                              string-length($title_subpart_fr)"/>
@@ -1492,7 +1492,7 @@
 							<fo:block font-size="{$font-size-number-factor * 17}pt" font-weight="{$weight-bold}">Appendix  <xsl:value-of select="$appendix_num"/></fo:block>
 						</xsl:if>
 
-						<xsl:if test="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@type = 'appendix']">
+						<xsl:if test="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@type = 'title-appendix']">
 							<fo:block font-size="{$font-size-factor * 30.4}pt">
 								<fo:block font-size="{$space-factor * 30.4}pt"> </fo:block>
 								<fo:block font-weight="{$weight-normal}"><xsl:copy-of select="$title_appendix_fr"/></fo:block>
@@ -1505,7 +1505,7 @@
 						<!-- End Appendix titles processing -->
 
 						<!-- Annex title processing -->
-						<xsl:if test="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@type = 'annex']">
+						<xsl:if test="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@type = 'title-annex']">
 							<xsl:variable name="annex_num" select="normalize-space((//bipm:bipm-standard)[1]/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:annexid)"/>
 							<xsl:if test="$annex_num != ''">
 								<fo:block font-size="{$space-factor * 30.4}pt"> </fo:block>
@@ -1533,7 +1533,7 @@
 						<!-- End Annex titles  processing -->
 
 						<!--  Part titles processing -->
-						<xsl:if test="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@type = 'part']">
+						<xsl:if test="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@type = 'title-part']">
 							<xsl:variable name="part_num" select="normalize-space((//bipm:bipm-standard)[1]/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:part)"/>
 							<xsl:if test="$part_num != ''">
 								<fo:block font-size="{$space-factor * 30.4}pt"> </fo:block>
@@ -1565,7 +1565,7 @@
 						<!-- End Part titles  processing -->
 
 						<!-- Sub-part titles  processing -->
-						<xsl:if test="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@type = 'subpart']">
+						<xsl:if test="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@type = 'title-subpart']">
 							<xsl:variable name="subpart_num" select="normalize-space((//bipm:bipm-standard)[1]/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:subpart)"/>
 							<xsl:if test="$subpart_num != ''">
 								<fo:block font-size="{$space-factor * 30.4}pt"> </fo:block>
@@ -1657,7 +1657,7 @@
 
 	<xsl:template name="insertInnerCoverPage">
 
-		<xsl:if test="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@type='cover']">
+		<xsl:if test="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@type='title-cover']">
 
 			<fo:page-sequence master-reference="title-page" format="1" initial-page-number="1" force-page-count="even">
 
@@ -1677,7 +1677,7 @@
 
 					<xsl:for-each select="xalan:nodeset($languages)/lang">
 						<xsl:variable name="curr_lang" select="."/>
-						<xsl:variable name="title" select="xalan:nodeset($titles)//bipm:title[@language = $curr_lang and @type='cover']"/>
+						<xsl:variable name="title" select="xalan:nodeset($titles)//bipm: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">
@@ -4188,11 +4188,26 @@
 							<xsl:value-of select="$font_extended"/><xsl:text>, </xsl:text>
 						</xsl:if>
 
-						<xsl:value-of select="."/>
+						<xsl:variable name="font_family" select="."/>
 
-						<xsl:if test="$additional_fonts != ''">
-							<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
-						</xsl:if>
+						<xsl:choose>
+							<xsl:when test="$additional_fonts = ''">
+								<xsl:value-of select="$font_family"/>
+							</xsl:when>
+							<xsl:otherwise> <!-- $additional_fonts != '' -->
+								<xsl:choose>
+									<xsl:when test="contains($font_family, ',')">
+										<xsl:value-of select="substring-before($font_family, ',')"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="substring-after($font_family, ',')"/>
+									</xsl:when>
+									<xsl:otherwise>
+										<xsl:value-of select="$font_family"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
+									</xsl:otherwise>
+								</xsl:choose>
+							</xsl:otherwise>
+						</xsl:choose>
 					</xsl:attribute>
 				</xsl:when>
 				<xsl:otherwise>
@@ -6786,25 +6801,25 @@
 
 	<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example']" priority="2">
 
-		<fo:block xsl:use-attribute-sets="table-note-style">
+				<fo:block xsl:use-attribute-sets="table-note-style">
 
-			<xsl:call-template name="refine_table-note-style"/>
+					<xsl:call-template name="refine_table-note-style"/>
 
-			<!-- Table's note/example name (NOTE, for example) -->
-			<fo:inline xsl:use-attribute-sets="table-note-name-style">
+					<!-- Table's note/example name (NOTE, for example) -->
+					<fo:inline xsl:use-attribute-sets="table-note-name-style">
 
-				<xsl:call-template name="refine_table-note-name-style"/>
+						<xsl:call-template name="refine_table-note-name-style"/>
 
-				<xsl:apply-templates select="*[local-name() = 'name']"/>
+						<xsl:apply-templates select="*[local-name() = 'name']"/>
 
-			</fo:inline>
+					</fo:inline>
 
-				<xsl:if test="ancestor::bipm:preface">
-					<fo:block> </fo:block>
-				</xsl:if>
+						<xsl:if test="ancestor::bipm:preface">
+							<fo:block> </fo:block>
+						</xsl:if>
 
-			<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
-		</fo:block>
+					<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
+				</fo:block>
 
 	</xsl:template> <!-- table/note -->
 
@@ -7878,6 +7893,9 @@
 	<!-- END Definition List -->
 	<!-- ===================== -->
 
+	<!-- default: ignore title in sections/p -->
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3"/>
+
 	<!-- ========================= -->
 	<!-- Rich text formatting -->
 	<!-- ========================= -->
@@ -9979,8 +9997,12 @@
 		<xsl:variable name="isAdded" select="../@added"/>
 		<xsl:variable name="isDeleted" select="../@deleted"/>
 		<xsl:choose>
-			<xsl:when test="ancestor::*[local-name() = 'title']">
+			<xsl:when test="ancestor::*[local-name() = 'title'] or not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
 				<fo:inline padding-left="1mm" padding-right="1mm">
+					<xsl:if test="not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
+						<xsl:attribute name="padding-left">0mm</xsl:attribute>
+						<xsl:attribute name="padding-right">0mm</xsl:attribute>
+					</xsl:if>
 					<xsl:variable name="src">
 						<xsl:call-template name="image_src"/>
 					</xsl:variable>
@@ -10013,25 +10035,45 @@
 							<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
 								<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
 
-									<xsl:variable name="img_src">
-										<xsl:choose>
-											<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
-											<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
-										</xsl:choose>
-									</xsl:variable>
+									<xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
+										<xsl:attribute name="width">
+											<xsl:value-of select="@width"/>
+										</xsl:attribute>
+									</xsl:if>
 
-									<xsl:variable name="image_width_effective">
+									<xsl:if test="@height != '' and @height != 'auto'">
+										<xsl:attribute name="height">
+											<xsl:value-of select="@height"/>
+										</xsl:attribute>
+									</xsl:if>
 
-												<xsl:value-of select="$width_effective"/>
+									<xsl:choose>
+										<xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
+											<xsl:attribute name="scaling">non-uniform</xsl:attribute>
+										</xsl:when>
+										<xsl:otherwise>
 
-									</xsl:variable>
+											<xsl:variable name="img_src">
+												<xsl:choose>
+													<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
+													<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
+												</xsl:choose>
+											</xsl:variable>
 
-									<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
-									<xsl:if test="number($scale) &lt; 100">
+											<xsl:variable name="image_width_effective">
 
-												<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+														<xsl:value-of select="$width_effective"/>
 
-									</xsl:if>
+											</xsl:variable>
+
+											<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
+											<xsl:if test="number($scale) &lt; 100">
+
+														<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+
+											</xsl:if>
+										</xsl:otherwise>
+									</xsl:choose>
 
 								</xsl:if>
 
@@ -13701,7 +13743,7 @@
 	<xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
-	<xsl:template match="*[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]/*[local-name() = 'span'][@class] | *[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
 			<xsl:apply-templates mode="update_xml_step1"/>