metanorma-bipm 2.4.6 → 2.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79ddb94cee8f395735e1b4644c623b81e9522c33f4172b4372c0dfe9b19f0365
-  data.tar.gz: b064eeda4ff1cfbb355f11094d75e576add051310437e9e03ba60547422cac09
+  metadata.gz: 876d0c08428a0b610702a31bc81f0abc40e9d6971499b3ab38bebb1959702ae4
+  data.tar.gz: cc408bfe1f6ba24ddb238479073a58e943953359548650b134bd002562ea1822
 SHA512:
-  metadata.gz: 6a17ed61270f09965d580af5e408aca95060f0683bd6d831691f3e05148d6ca7fc2a149ebf66e8794c8cc7dc0ba65060afb04edd900596289f77c6f4e6ac6a1c
-  data.tar.gz: 7a3ec186afaa3e10b76398e4a2d3f32e49709465929a8931b39add40c7e76b674ee141e35f9c8a8cc91ee11dc3ead4c7f7040bf157ceecb010b83b3c346316fc
+  metadata.gz: 58da984950bbdaf3321b18c8a0164921d4dd1802636c3761992caad1bce8de8cd2961ac558dc7d87f04f964ad018a2f3ced1cfcd360fc8e7c9fda36abeeab3ff
+  data.tar.gz: ce5701587a038e45d1f327a6597da194bb1a8585d283414cf6d9829fd58cf011a743fc35b2afc1b7522ef541f7b94a1bc8c60c4248810fac749d457c9586ea87

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

@@ -10204,10 +10204,11 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'image']">
+		<xsl:param name="indent">0</xsl:param>
 		<xsl:variable name="isAdded" select="../@added"/>
 		<xsl:variable name="isDeleted" select="../@deleted"/>
 		<xsl:choose>
-			<xsl:when test="ancestor::*[local-name() = 'title'] or not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
+			<xsl:when test="ancestor::*[local-name() = 'title'] or not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']"> <!-- inline image ( 'image:path' in adoc, with one colon after image) -->
 				<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>
@@ -10216,7 +10217,43 @@
 					<xsl:variable name="src">
 						<xsl:call-template name="image_src"/>
 					</xsl:variable>
-					<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/>
+
+					<xsl:variable name="scale">
+						<xsl:call-template name="getImageScale">
+							<xsl:with-param name="indent" select="$indent"/>
+						</xsl:call-template>
+					</xsl:variable>
+
+					<!-- debug scale='<xsl:value-of select="$scale"/>', indent='<xsl:value-of select="$indent"/>' -->
+
+					<!-- <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/> -->
+					<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle">
+
+						<xsl:variable name="width">
+							<xsl:call-template name="setImageWidth"/>
+						</xsl:variable>
+						<xsl:if test="$width != ''">
+							<xsl:attribute name="width"><xsl:value-of select="$width"/></xsl:attribute>
+						</xsl:if>
+						<xsl:variable name="height">
+							<xsl:call-template name="setImageHeight"/>
+						</xsl:variable>
+						<xsl:if test="$height != ''">
+							<xsl:attribute name="height"><xsl:value-of select="$height"/></xsl:attribute>
+						</xsl:if>
+
+						<xsl:if test="$width = '' and $height = ''">
+							<xsl:if test="number($scale) &lt; 100">
+								<xsl:attribute name="content-width"><xsl:value-of select="number($scale)"/>%</xsl:attribute>
+								<!-- <xsl:attribute name="content-width">scale-to-fit</xsl:attribute>
+								<xsl:attribute name="content-height">100%</xsl:attribute>
+								<xsl:attribute name="width">100%</xsl:attribute>
+								<xsl:attribute name="scaling">uniform</xsl:attribute> -->
+							</xsl:if>
+						</xsl:if>
+
+					</fo:external-graphic>
+
 				</fo:inline>
 			</xsl:when>
 			<xsl:otherwise>
@@ -10237,25 +10274,23 @@
 								<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
 								<xsl:attribute name="scaling">uniform</xsl:attribute>
 
-									<xsl:apply-templates select="." mode="cross_image"/>
+								<xsl:apply-templates select="." mode="cross_image"/>
 
 							</fo:instream-foreign-object>
 						</xsl:when>
 						<xsl:otherwise>
+							<!-- <fo:block>debug block image:
+							<xsl:variable name="scale">
+								<xsl:call-template name="getImageScale">
+									<xsl:with-param name="indent" select="$indent"/>
+								</xsl:call-template>
+							</xsl:variable>
+							<xsl:value-of select="concat('scale=', $scale,', indent=', $indent)"/>
+							</fo:block> -->
 							<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'] or parent::*[local-name() = 'figure'][@unnumbered = 'true']) and not(ancestor::*[local-name() = 'table'])">
 
-									<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:if test="@height != '' and @height != 'auto'">
-										<xsl:attribute name="height">
-											<xsl:value-of select="@height"/>
-										</xsl:attribute>
-									</xsl:if>
+									<xsl:call-template name="setImageWidthHeight"/>
 
 									<xsl:choose>
 										<xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
@@ -10263,24 +10298,18 @@
 										</xsl:when>
 										<xsl:otherwise>
 
-											<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 name="scale">
+												<xsl:call-template name="getImageScale">
+													<xsl:with-param name="indent" select="$indent"/>
+												</xsl:call-template>
 											</xsl:variable>
 
-											<xsl:variable name="image_width_effective">
-
-														<xsl:value-of select="$width_effective"/>
-
+											<xsl:variable name="scaleRatio">
+												1
 											</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:attribute name="content-width"><xsl:value-of select="number($scale) * number($scaleRatio)"/>%</xsl:attribute>
 											</xsl:if>
 										</xsl:otherwise>
 									</xsl:choose>
@@ -10296,6 +10325,62 @@
 		</xsl:choose>
 	</xsl:template>
 
+	<xsl:template name="setImageWidth">
+		<xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
+			<xsl:value-of select="@width"/>
+		</xsl:if>
+	</xsl:template>
+	<xsl:template name="setImageHeight">
+		<xsl:if test="@height != '' and @height != 'auto'">
+			<xsl:value-of select="@height"/>
+		</xsl:if>
+	</xsl:template>
+	<xsl:template name="setImageWidthHeight">
+		<xsl:variable name="width">
+			<xsl:call-template name="setImageWidth"/>
+		</xsl:variable>
+		<xsl:if test="$width != ''">
+			<xsl:attribute name="width">
+				<xsl:value-of select="$width"/>
+			</xsl:attribute>
+		</xsl:if>
+		<xsl:variable name="height">
+			<xsl:call-template name="setImageHeight"/>
+		</xsl:variable>
+		<xsl:if test="$height != ''">
+			<xsl:attribute name="height">
+				<xsl:value-of select="$height"/>
+			</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template name="getImageScale">
+		<xsl:param name="indent"/>
+		<xsl:variable name="indent_left">
+			<xsl:choose>
+				<xsl:when test="$indent != ''"><xsl:value-of select="$indent"/></xsl:when>
+				<xsl:otherwise>0</xsl:otherwise>
+			</xsl:choose>
+		</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="image_width_effective">
+
+					<xsl:value-of select="$width_effective - number($indent_left)"/>
+
+		</xsl:variable>
+		<!-- <xsl:message>width_effective=<xsl:value-of select="$width_effective"/></xsl:message>
+		<xsl:message>indent_left=<xsl:value-of select="$indent_left"/></xsl:message>
+		<xsl:message>image_width_effective=<xsl:value-of select="$image_width_effective"/> for <xsl:value-of select="ancestor::ogc:p[1]/@id"/></xsl:message> -->
+		<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
+		<xsl:value-of select="$scale"/>
+	</xsl:template>
+
 	<xsl:template name="image_src">
 		<xsl:choose>
 			<xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
@@ -12990,6 +13075,7 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
+		<xsl:param name="indent">0</xsl:param>
 		<xsl:choose>
 			<xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
 				<fo:block-container role="SKIP">
@@ -13004,7 +13090,9 @@
 
 					<fo:block-container margin-left="0mm" role="SKIP">
 						<fo:block>
-							<xsl:apply-templates select="." mode="list"/>
+							<xsl:apply-templates select="." mode="list">
+								<xsl:with-param name="indent" select="$indent"/>
+							</xsl:apply-templates>
 						</fo:block>
 					</fo:block-container>
 				</fo:block-container>
@@ -13012,7 +13100,9 @@
 			<xsl:otherwise>
 
 						<fo:block role="SKIP">
-							<xsl:apply-templates select="." mode="list"/>
+							<xsl:apply-templates select="." mode="list">
+								<xsl:with-param name="indent" select="$indent"/>
+							</xsl:apply-templates>
 						</fo:block>
 
 			</xsl:otherwise>
@@ -13099,6 +13189,13 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name()='li']">
+		<xsl:param name="indent">0</xsl:param>
+		<!-- <fo:list-item xsl:use-attribute-sets="list-item-style">
+			<fo:list-item-label end-indent="label-end()"><fo:block>x</fo:block></fo:list-item-label>
+			<fo:list-item-body start-indent="body-start()" xsl:use-attribute-sets="list-item-body-style">
+				<fo:block>debug li indent=<xsl:value-of select="$indent"/></fo:block>
+			</fo:list-item-body>
+		</fo:list-item> -->
 		<fo:list-item xsl:use-attribute-sets="list-item-style">
 			<xsl:copy-of select="@id"/>
 
@@ -13123,7 +13220,9 @@
 
 					<xsl:call-template name="refine_list-item-body-style"/>
 
-					<xsl:apply-templates/>
+					<xsl:apply-templates>
+						<xsl:with-param name="indent" select="$indent"/>
+					</xsl:apply-templates>
 
 					<!-- <xsl:apply-templates select="node()[not(local-name() = 'note')]" />
 					

data/lib/isodoc/bipm/bipm.guide.xsl

@@ -10204,10 +10204,11 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'image']">
+		<xsl:param name="indent">0</xsl:param>
 		<xsl:variable name="isAdded" select="../@added"/>
 		<xsl:variable name="isDeleted" select="../@deleted"/>
 		<xsl:choose>
-			<xsl:when test="ancestor::*[local-name() = 'title'] or not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
+			<xsl:when test="ancestor::*[local-name() = 'title'] or not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']"> <!-- inline image ( 'image:path' in adoc, with one colon after image) -->
 				<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>
@@ -10216,7 +10217,43 @@
 					<xsl:variable name="src">
 						<xsl:call-template name="image_src"/>
 					</xsl:variable>
-					<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/>
+
+					<xsl:variable name="scale">
+						<xsl:call-template name="getImageScale">
+							<xsl:with-param name="indent" select="$indent"/>
+						</xsl:call-template>
+					</xsl:variable>
+
+					<!-- debug scale='<xsl:value-of select="$scale"/>', indent='<xsl:value-of select="$indent"/>' -->
+
+					<!-- <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/> -->
+					<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle">
+
+						<xsl:variable name="width">
+							<xsl:call-template name="setImageWidth"/>
+						</xsl:variable>
+						<xsl:if test="$width != ''">
+							<xsl:attribute name="width"><xsl:value-of select="$width"/></xsl:attribute>
+						</xsl:if>
+						<xsl:variable name="height">
+							<xsl:call-template name="setImageHeight"/>
+						</xsl:variable>
+						<xsl:if test="$height != ''">
+							<xsl:attribute name="height"><xsl:value-of select="$height"/></xsl:attribute>
+						</xsl:if>
+
+						<xsl:if test="$width = '' and $height = ''">
+							<xsl:if test="number($scale) &lt; 100">
+								<xsl:attribute name="content-width"><xsl:value-of select="number($scale)"/>%</xsl:attribute>
+								<!-- <xsl:attribute name="content-width">scale-to-fit</xsl:attribute>
+								<xsl:attribute name="content-height">100%</xsl:attribute>
+								<xsl:attribute name="width">100%</xsl:attribute>
+								<xsl:attribute name="scaling">uniform</xsl:attribute> -->
+							</xsl:if>
+						</xsl:if>
+
+					</fo:external-graphic>
+
 				</fo:inline>
 			</xsl:when>
 			<xsl:otherwise>
@@ -10237,25 +10274,23 @@
 								<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
 								<xsl:attribute name="scaling">uniform</xsl:attribute>
 
-									<xsl:apply-templates select="." mode="cross_image"/>
+								<xsl:apply-templates select="." mode="cross_image"/>
 
 							</fo:instream-foreign-object>
 						</xsl:when>
 						<xsl:otherwise>
+							<!-- <fo:block>debug block image:
+							<xsl:variable name="scale">
+								<xsl:call-template name="getImageScale">
+									<xsl:with-param name="indent" select="$indent"/>
+								</xsl:call-template>
+							</xsl:variable>
+							<xsl:value-of select="concat('scale=', $scale,', indent=', $indent)"/>
+							</fo:block> -->
 							<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'] or parent::*[local-name() = 'figure'][@unnumbered = 'true']) and not(ancestor::*[local-name() = 'table'])">
 
-									<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:if test="@height != '' and @height != 'auto'">
-										<xsl:attribute name="height">
-											<xsl:value-of select="@height"/>
-										</xsl:attribute>
-									</xsl:if>
+									<xsl:call-template name="setImageWidthHeight"/>
 
 									<xsl:choose>
 										<xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
@@ -10263,24 +10298,18 @@
 										</xsl:when>
 										<xsl:otherwise>
 
-											<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 name="scale">
+												<xsl:call-template name="getImageScale">
+													<xsl:with-param name="indent" select="$indent"/>
+												</xsl:call-template>
 											</xsl:variable>
 
-											<xsl:variable name="image_width_effective">
-
-														<xsl:value-of select="$width_effective"/>
-
+											<xsl:variable name="scaleRatio">
+												1
 											</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:attribute name="content-width"><xsl:value-of select="number($scale) * number($scaleRatio)"/>%</xsl:attribute>
 											</xsl:if>
 										</xsl:otherwise>
 									</xsl:choose>
@@ -10296,6 +10325,62 @@
 		</xsl:choose>
 	</xsl:template>
 
+	<xsl:template name="setImageWidth">
+		<xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
+			<xsl:value-of select="@width"/>
+		</xsl:if>
+	</xsl:template>
+	<xsl:template name="setImageHeight">
+		<xsl:if test="@height != '' and @height != 'auto'">
+			<xsl:value-of select="@height"/>
+		</xsl:if>
+	</xsl:template>
+	<xsl:template name="setImageWidthHeight">
+		<xsl:variable name="width">
+			<xsl:call-template name="setImageWidth"/>
+		</xsl:variable>
+		<xsl:if test="$width != ''">
+			<xsl:attribute name="width">
+				<xsl:value-of select="$width"/>
+			</xsl:attribute>
+		</xsl:if>
+		<xsl:variable name="height">
+			<xsl:call-template name="setImageHeight"/>
+		</xsl:variable>
+		<xsl:if test="$height != ''">
+			<xsl:attribute name="height">
+				<xsl:value-of select="$height"/>
+			</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template name="getImageScale">
+		<xsl:param name="indent"/>
+		<xsl:variable name="indent_left">
+			<xsl:choose>
+				<xsl:when test="$indent != ''"><xsl:value-of select="$indent"/></xsl:when>
+				<xsl:otherwise>0</xsl:otherwise>
+			</xsl:choose>
+		</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="image_width_effective">
+
+					<xsl:value-of select="$width_effective - number($indent_left)"/>
+
+		</xsl:variable>
+		<!-- <xsl:message>width_effective=<xsl:value-of select="$width_effective"/></xsl:message>
+		<xsl:message>indent_left=<xsl:value-of select="$indent_left"/></xsl:message>
+		<xsl:message>image_width_effective=<xsl:value-of select="$image_width_effective"/> for <xsl:value-of select="ancestor::ogc:p[1]/@id"/></xsl:message> -->
+		<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
+		<xsl:value-of select="$scale"/>
+	</xsl:template>
+
 	<xsl:template name="image_src">
 		<xsl:choose>
 			<xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
@@ -12990,6 +13075,7 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
+		<xsl:param name="indent">0</xsl:param>
 		<xsl:choose>
 			<xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
 				<fo:block-container role="SKIP">
@@ -13004,7 +13090,9 @@
 
 					<fo:block-container margin-left="0mm" role="SKIP">
 						<fo:block>
-							<xsl:apply-templates select="." mode="list"/>
+							<xsl:apply-templates select="." mode="list">
+								<xsl:with-param name="indent" select="$indent"/>
+							</xsl:apply-templates>
 						</fo:block>
 					</fo:block-container>
 				</fo:block-container>
@@ -13012,7 +13100,9 @@
 			<xsl:otherwise>
 
 						<fo:block role="SKIP">
-							<xsl:apply-templates select="." mode="list"/>
+							<xsl:apply-templates select="." mode="list">
+								<xsl:with-param name="indent" select="$indent"/>
+							</xsl:apply-templates>
 						</fo:block>
 
 			</xsl:otherwise>
@@ -13099,6 +13189,13 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name()='li']">
+		<xsl:param name="indent">0</xsl:param>
+		<!-- <fo:list-item xsl:use-attribute-sets="list-item-style">
+			<fo:list-item-label end-indent="label-end()"><fo:block>x</fo:block></fo:list-item-label>
+			<fo:list-item-body start-indent="body-start()" xsl:use-attribute-sets="list-item-body-style">
+				<fo:block>debug li indent=<xsl:value-of select="$indent"/></fo:block>
+			</fo:list-item-body>
+		</fo:list-item> -->
 		<fo:list-item xsl:use-attribute-sets="list-item-style">
 			<xsl:copy-of select="@id"/>
 
@@ -13123,7 +13220,9 @@
 
 					<xsl:call-template name="refine_list-item-body-style"/>
 
-					<xsl:apply-templates/>
+					<xsl:apply-templates>
+						<xsl:with-param name="indent" select="$indent"/>
+					</xsl:apply-templates>
 
 					<!-- <xsl:apply-templates select="node()[not(local-name() = 'note')]" />