metanorma-iho 0.9.3 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f23932cc917c41bf9680cf9e300d37ea48db54c2bebb8f489b6fca2630836f5
-  data.tar.gz: dad38711590324bb7f1c9accfeeb34b9c6aafbddad5464ccf44b9e9111dd9589
+  metadata.gz: ac6b94d80ec01694cb92156d01300f4b05f795a52f8b8ac3e941114c8e804f38
+  data.tar.gz: 89138692b96dd9f82e6362566c959f9d00fbc5a8c1e0f7e7e1f7848d830a3429
 SHA512:
-  metadata.gz: 81026b6867354a0a96005f3a79f6b298abb37d0bee2ba2c8a4871d183cca50c743b23ae00500757024e33e70e9f1094fc81772956c1f78b5723c6aff778b52b2
-  data.tar.gz: c96d8655a05f751d5475fcd622f6bdc1230a2ef579cac08790aa0218100ab404e3df196b80f97ae56a0012e8b07fa0a4b5a43aaa4b2831967b4b7e34edea28e4
+  metadata.gz: 1f6f860a2276969866f9559f573890bae77027a50c9f3e399b922e66563e50a8581f4c716659acd98a8997d4702fb2a9901eadafd26acc01921df14dd9a48754
+  data.tar.gz: cb01939da80416546f14d86b085a7b20e7159174fa6f3b300fc1474db6b13d55b8bfde07c13b2dc3739ee37109b72abc1021045490926e42f4526a8a6da2ea9b

data/lib/isodoc/iho/iho.specification.xsl

@@ -1083,6 +1083,7 @@
 	<xsl:variable name="zero_width_space">​</xsl:variable>
 	<xsl:variable name="hair_space"> </xsl:variable>
 	<xsl:variable name="en_dash">–</xsl:variable>
+	<xsl:variable name="em_dash">—</xsl:variable>
 
 	<xsl:template name="getTitle">
 		<xsl:param name="name"/>
@@ -1404,6 +1405,10 @@
 
 	</xsl:attribute-set> <!-- example-name-style -->
 
+	<xsl:template name="refine_example-name-style">
+
+	</xsl:template>
+
 	<xsl:attribute-set name="example-p-style">
 
 			<xsl:attribute name="font-size">11pt</xsl:attribute>
@@ -1421,6 +1426,10 @@
 
 	</xsl:attribute-set> <!-- termexample-name-style -->
 
+	<xsl:template name="refine_termexample-name-style">
+
+	</xsl:template>
+
 	<!-- ========================== -->
 	<!-- Table styles -->
 	<!-- ========================== -->
@@ -1604,6 +1613,10 @@
 
 	</xsl:attribute-set> <!-- table-fn-style -->
 
+	<xsl:template name="refine_table-fn-style">
+
+	</xsl:template>
+
 	<xsl:attribute-set name="table-fn-number-style">
 		<xsl:attribute name="font-size">80%</xsl:attribute>
 		<xsl:attribute name="padding-right">5mm</xsl:attribute>
@@ -1612,6 +1625,10 @@
 
 	</xsl:attribute-set> <!-- table-fn-number-style -->
 
+	<xsl:template name="refine_table-fn-number-style">
+
+	</xsl:template>
+
 	<xsl:attribute-set name="fn-container-body-style">
 		<xsl:attribute name="text-indent">0</xsl:attribute>
 		<xsl:attribute name="start-indent">0</xsl:attribute>
@@ -2928,6 +2945,7 @@
 				<!-- centered table when table name is centered (see table-name-style) -->
 
 					<fo:table table-layout="fixed" width="100%" xsl:use-attribute-sets="table-container-style">
+
 						<fo:table-column column-width="proportional-column-width(1)"/>
 						<fo:table-column column-width="{@width}"/>
 						<fo:table-column column-width="proportional-column-width(1)"/>
@@ -3969,8 +3987,9 @@
 			<xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
 
 						<fo:block xsl:use-attribute-sets="table-fn-style">
-
+							<xsl:call-template name="refine_table-fn-style"/>
 							<fo:inline id="{@id}" xsl:use-attribute-sets="table-fn-number-style">
+								<xsl:call-template name="refine_table-fn-number-style"/>
 
 								<xsl:value-of select="@reference"/>
 
@@ -5113,12 +5132,18 @@
 	</xsl:template>
 
 	<xsl:template match="text()[ancestor::*[local-name()='smallcap']]">
-		<xsl:variable name="text" select="normalize-space(.)"/>
-		<fo:inline font-size="75%" role="SKIP">
+		<!-- <xsl:variable name="text" select="normalize-space(.)"/> --> <!-- https://github.com/metanorma/metanorma-iso/issues/1115 -->
+		<xsl:variable name="text" select="."/>
+		<xsl:variable name="ratio_">
+			0.75
+		</xsl:variable>
+		<xsl:variable name="ratio" select="number(normalize-space($ratio_))"/>
+		<fo:inline font-size="{$ratio * 100}%" role="SKIP">
 				<xsl:if test="string-length($text) &gt; 0">
 					<xsl:variable name="smallCapsText">
 						<xsl:call-template name="recursiveSmallCaps">
 							<xsl:with-param name="text" select="$text"/>
+							<xsl:with-param name="ratio" select="$ratio"/>
 						</xsl:call-template>
 					</xsl:variable>
 					<!-- merge neighboring fo:inline -->
@@ -5155,12 +5180,13 @@
 
 	<xsl:template name="recursiveSmallCaps">
     <xsl:param name="text"/>
+    <xsl:param name="ratio"/>
     <xsl:variable name="char" select="substring($text,1,1)"/>
     <!-- <xsl:variable name="upperCase" select="translate($char, $lower, $upper)"/> -->
 		<xsl:variable name="upperCase" select="java:toUpperCase(java:java.lang.String.new($char))"/>
     <xsl:choose>
       <xsl:when test="$char=$upperCase">
-        <fo:inline font-size="{100 div 0.75}%" role="SKIP">
+        <fo:inline font-size="{100 div $ratio}%" role="SKIP">
           <xsl:value-of select="$upperCase"/>
         </fo:inline>
       </xsl:when>
@@ -5171,6 +5197,7 @@
     <xsl:if test="string-length($text) &gt; 1">
       <xsl:call-template name="recursiveSmallCaps">
         <xsl:with-param name="text" select="substring($text,2)"/>
+        <xsl:with-param name="ratio" select="$ratio"/>
       </xsl:call-template>
     </xsl:if>
   </xsl:template>
@@ -5278,6 +5305,9 @@
 				<xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
 					<style name="{$key}"><xsl:value-of select="$value"/></style>
 				</xsl:if>
+				<xsl:if test="$key = 'text-indent'">
+					<style name="padding-left"><xsl:value-of select="$value"/></style>
+				</xsl:if>
 			</xsl:for-each>
 		</xsl:variable>
 		<xsl:variable name="styles" select="xalan:nodeset($styles_)"/>
@@ -6680,6 +6710,11 @@
 		</xsl:call-template>
 	</xsl:template>
 
+	<!-- command between two xref points to non-standard bibitem -->
+	<xsl:template match="text()[. = ','][preceding-sibling::node()[1][local-name() = 'sup'][*[local-name() = 'xref'][@type = 'footnote']] and    following-sibling::node()[1][local-name() = 'sup'][*[local-name() = 'xref'][@type = 'footnote']]]">
+		<xsl:value-of select="."/>
+	</xsl:template>
+
 	<!-- ====== -->
 	<!-- formula  -->
 	<!-- ====== -->
@@ -7321,16 +7356,44 @@
 							</xsl:choose>
 
 							<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
-							<xsl:variable name="svg_width" select="xalan:nodeset($svg_content)/*/@width"/>
-							<xsl:variable name="svg_height" select="xalan:nodeset($svg_content)/*/@height"/>
+							<xsl:variable name="svg_width_" select="xalan:nodeset($svg_content)/*/@width"/>
+							<xsl:variable name="svg_width" select="number(translate($svg_width_, 'px', ''))"/>
+							<xsl:variable name="svg_height_" select="xalan:nodeset($svg_content)/*/@height"/>
+							<xsl:variable name="svg_height" select="number(translate($svg_height_, 'px', ''))"/>
+
+							<!-- Example: -->
 							<!-- effective height 297 - 27.4 - 13 =  256.6 -->
 							<!-- effective width 210 - 12.5 - 25 = 172.5 -->
 							<!-- effective height / width = 1.48, 1.4 - with title -->
-							<xsl:if test="$svg_height &gt; ($svg_width * 1.4)"> <!-- for images with big height -->
+
+							<xsl:variable name="scale_x">
+								<xsl:choose>
+									<xsl:when test="$svg_width &gt; $width_effective_px">
+										<xsl:value-of select="$width_effective_px div $svg_width"/>
+									</xsl:when>
+									<xsl:otherwise>1</xsl:otherwise>
+								</xsl:choose>
+							</xsl:variable>
+							<xsl:variable name="scale_y">
+								<xsl:choose>
+									<xsl:when test="$svg_height * $scale_x &gt; $height_effective_px">
+										<xsl:value-of select="$height_effective_px div ($svg_height * $scale_x)"/>
+									</xsl:when>
+									<xsl:otherwise>1</xsl:otherwise>
+								</xsl:choose>
+							</xsl:variable>
+
+							 <!-- for images with big height -->
+							<!-- <xsl:if test="$svg_height &gt; ($svg_width * 1.4)">
 								<xsl:variable name="width" select="(($svg_width * 1.4) div $svg_height) * 100"/>
 								<xsl:attribute name="width"><xsl:value-of select="$width"/>%</xsl:attribute>
-							</xsl:if>
+							</xsl:if> -->
 							<xsl:attribute name="scaling">uniform</xsl:attribute>
+
+							<xsl:if test="$scale_y != 1">
+								<xsl:attribute name="content-height"><xsl:value-of select="round($scale_x * $scale_y * 100)"/>%</xsl:attribute>
+							</xsl:if>
+
 							<xsl:copy-of select="$svg_content"/>
 						</fo:instream-foreign-object>
 					<!-- </fo:block> -->
@@ -7355,6 +7418,8 @@
 		</xsl:attribute>
 	</xsl:template>
 
+	<xsl:variable name="regex_starts_with_digit">^[0-9].*</xsl:variable>
+
 	<xsl:template match="*[local-name() = 'svg'][not(@width and @height)]" mode="svg_update">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="svg_update"/>
@@ -7368,8 +7433,13 @@
 			<xsl:variable name="width" select="normalize-space($viewbox//item[3])"/>
 			<xsl:variable name="height" select="normalize-space($viewbox//item[4])"/>
 
+			<xsl:variable name="parent_image_width" select="normalize-space(ancestor::*[1][local-name() = 'image']/@width)"/>
+			<xsl:variable name="parent_image_height" select="normalize-space(ancestor::*[1][local-name() = 'image']/@height)"/>
+
 			<xsl:attribute name="width">
 				<xsl:choose>
+					<!-- width is non 'auto', 'text-width', 'full-page-width' or 'narrow' -->
+					<xsl:when test="$parent_image_width != '' and normalize-space(java:matches(java:java.lang.String.new($parent_image_width), $regex_starts_with_digit)) = 'true'"><xsl:value-of select="$parent_image_width"/></xsl:when>
 					<xsl:when test="$width != ''">
 						<xsl:value-of select="round($width)"/>
 					</xsl:when>
@@ -7378,6 +7448,8 @@
 			</xsl:attribute>
 			<xsl:attribute name="height">
 				<xsl:choose>
+					<!-- height non 'auto', 'text-width', 'full-page-width' or 'narrow' -->
+					<xsl:when test="$parent_image_height != '' and normalize-space(java:matches(java:java.lang.String.new($parent_image_height), $regex_starts_with_digit)) = 'true'"><xsl:value-of select="$parent_image_height"/></xsl:when>
 					<xsl:when test="$height != ''">
 						<xsl:value-of select="round($height)"/>
 					</xsl:when>
@@ -7389,6 +7461,28 @@
 		</xsl:copy>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'svg']/@width" mode="svg_update">
+		<!-- image[@width]/svg -->
+		<xsl:variable name="parent_image_width" select="normalize-space(ancestor::*[2][local-name() = 'image']/@width)"/>
+		<xsl:attribute name="width">
+			<xsl:choose>
+				<xsl:when test="$parent_image_width != '' and normalize-space(java:matches(java:java.lang.String.new($parent_image_width), $regex_starts_with_digit)) = 'true'"><xsl:value-of select="$parent_image_width"/></xsl:when>
+				<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:attribute>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'svg']/@height" mode="svg_update">
+		<!-- image[@height]/svg -->
+		<xsl:variable name="parent_image_height" select="normalize-space(ancestor::*[2][local-name() = 'image']/@height)"/>
+		<xsl:attribute name="height">
+			<xsl:choose>
+				<xsl:when test="$parent_image_height != '' and normalize-space(java:matches(java:java.lang.String.new($parent_image_height), $regex_starts_with_digit)) = 'true'"><xsl:value-of select="$parent_image_height"/></xsl:when>
+				<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:attribute>
+	</xsl:template>
+
 	<!-- regex for 'display: inline-block;' -->
 	<xsl:variable name="regex_svg_style_notsupported">display(\s|\h)*:(\s|\h)*inline-block(\s|\h)*;</xsl:variable>
 	<xsl:template match="*[local-name() = 'svg']//*[local-name() = 'style']/text()" mode="svg_update">
@@ -8845,6 +8939,7 @@
 	<xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'name']">
 		<xsl:if test="normalize-space() != ''">
 			<fo:inline xsl:use-attribute-sets="termexample-name-style">
+				<xsl:call-template name="refine_termexample-name-style"/>
 				<xsl:apply-templates/>
 			</fo:inline>
 		</xsl:if>
@@ -8995,6 +9090,7 @@
 			</xsl:when>
 			<xsl:otherwise>
 				<fo:inline xsl:use-attribute-sets="example-name-style">
+					<xsl:call-template name="refine_example-name-style"/>
 					<xsl:apply-templates/>: 
 				</fo:inline>
 			</xsl:otherwise>
@@ -9455,7 +9551,9 @@
 	</xsl:template> <!-- sections_element_style -->
 
 	<xsl:template match="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*" priority="2"> <!-- /*/*[local-name() = 'preface']/* -->
-		<fo:block break-after="page"/>
+
+				<fo:block break-after="page"/>
+
 		<fo:block>
 			<xsl:call-template name="setId"/>
 			<xsl:apply-templates/>
@@ -9522,7 +9620,7 @@
 			<xsl:when test="ancestor::*[contains(local-name(), '-standard')] and not(ancestor::*[contains(local-name(), '-standard')]//*[@id = $id_from])">
 				<fo:block id="{@from}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:block>
 			</xsl:when>
-			<xsl:when test="not(//*[@id = $id_from]) and not(preceding-sibling::*[@id = $id_from])">
+			<xsl:when test="not(/*[@id = $id_from]) and not(/*//*[@id = $id_from]) and not(preceding-sibling::*[@id = $id_from])">
 				<fo:block id="{@from}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:block>
 			</xsl:when>
 		</xsl:choose>
@@ -10244,6 +10342,7 @@
 			<xsl:when test="@hidden = 'true'"><!-- skip --></xsl:when>
 			<xsl:otherwise>
 				<fo:list-item id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-item-style">
+
 					<fo:list-item-label end-indent="label-end()">
 						<fo:block role="SKIP">
 							<fo:inline role="SKIP">
@@ -12006,4 +12105,6 @@
 		</xsl:if>
 	</xsl:template>
 
+	<!-- update -->
+
 </xsl:stylesheet>

data/lib/isodoc/iho/iho.standard.xsl

@@ -1083,6 +1083,7 @@
 	<xsl:variable name="zero_width_space">​</xsl:variable>
 	<xsl:variable name="hair_space"> </xsl:variable>
 	<xsl:variable name="en_dash">–</xsl:variable>
+	<xsl:variable name="em_dash">—</xsl:variable>
 
 	<xsl:template name="getTitle">
 		<xsl:param name="name"/>
@@ -1404,6 +1405,10 @@
 
 	</xsl:attribute-set> <!-- example-name-style -->
 
+	<xsl:template name="refine_example-name-style">
+
+	</xsl:template>
+
 	<xsl:attribute-set name="example-p-style">
 
 			<xsl:attribute name="font-size">11pt</xsl:attribute>
@@ -1421,6 +1426,10 @@
 
 	</xsl:attribute-set> <!-- termexample-name-style -->
 
+	<xsl:template name="refine_termexample-name-style">
+
+	</xsl:template>
+
 	<!-- ========================== -->
 	<!-- Table styles -->
 	<!-- ========================== -->
@@ -1604,6 +1613,10 @@
 
 	</xsl:attribute-set> <!-- table-fn-style -->
 
+	<xsl:template name="refine_table-fn-style">
+
+	</xsl:template>
+
 	<xsl:attribute-set name="table-fn-number-style">
 		<xsl:attribute name="font-size">80%</xsl:attribute>
 		<xsl:attribute name="padding-right">5mm</xsl:attribute>
@@ -1612,6 +1625,10 @@
 
 	</xsl:attribute-set> <!-- table-fn-number-style -->
 
+	<xsl:template name="refine_table-fn-number-style">
+
+	</xsl:template>
+
 	<xsl:attribute-set name="fn-container-body-style">
 		<xsl:attribute name="text-indent">0</xsl:attribute>
 		<xsl:attribute name="start-indent">0</xsl:attribute>
@@ -2928,6 +2945,7 @@
 				<!-- centered table when table name is centered (see table-name-style) -->
 
 					<fo:table table-layout="fixed" width="100%" xsl:use-attribute-sets="table-container-style">
+
 						<fo:table-column column-width="proportional-column-width(1)"/>
 						<fo:table-column column-width="{@width}"/>
 						<fo:table-column column-width="proportional-column-width(1)"/>
@@ -3969,8 +3987,9 @@
 			<xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
 
 						<fo:block xsl:use-attribute-sets="table-fn-style">
-
+							<xsl:call-template name="refine_table-fn-style"/>
 							<fo:inline id="{@id}" xsl:use-attribute-sets="table-fn-number-style">
+								<xsl:call-template name="refine_table-fn-number-style"/>
 
 								<xsl:value-of select="@reference"/>
 
@@ -5113,12 +5132,18 @@
 	</xsl:template>
 
 	<xsl:template match="text()[ancestor::*[local-name()='smallcap']]">
-		<xsl:variable name="text" select="normalize-space(.)"/>
-		<fo:inline font-size="75%" role="SKIP">
+		<!-- <xsl:variable name="text" select="normalize-space(.)"/> --> <!-- https://github.com/metanorma/metanorma-iso/issues/1115 -->
+		<xsl:variable name="text" select="."/>
+		<xsl:variable name="ratio_">
+			0.75
+		</xsl:variable>
+		<xsl:variable name="ratio" select="number(normalize-space($ratio_))"/>
+		<fo:inline font-size="{$ratio * 100}%" role="SKIP">
 				<xsl:if test="string-length($text) &gt; 0">
 					<xsl:variable name="smallCapsText">
 						<xsl:call-template name="recursiveSmallCaps">
 							<xsl:with-param name="text" select="$text"/>
+							<xsl:with-param name="ratio" select="$ratio"/>
 						</xsl:call-template>
 					</xsl:variable>
 					<!-- merge neighboring fo:inline -->
@@ -5155,12 +5180,13 @@
 
 	<xsl:template name="recursiveSmallCaps">
     <xsl:param name="text"/>
+    <xsl:param name="ratio"/>
     <xsl:variable name="char" select="substring($text,1,1)"/>
     <!-- <xsl:variable name="upperCase" select="translate($char, $lower, $upper)"/> -->
 		<xsl:variable name="upperCase" select="java:toUpperCase(java:java.lang.String.new($char))"/>
     <xsl:choose>
       <xsl:when test="$char=$upperCase">
-        <fo:inline font-size="{100 div 0.75}%" role="SKIP">
+        <fo:inline font-size="{100 div $ratio}%" role="SKIP">
           <xsl:value-of select="$upperCase"/>
         </fo:inline>
       </xsl:when>
@@ -5171,6 +5197,7 @@
     <xsl:if test="string-length($text) &gt; 1">
       <xsl:call-template name="recursiveSmallCaps">
         <xsl:with-param name="text" select="substring($text,2)"/>
+        <xsl:with-param name="ratio" select="$ratio"/>
       </xsl:call-template>
     </xsl:if>
   </xsl:template>
@@ -5278,6 +5305,9 @@
 				<xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
 					<style name="{$key}"><xsl:value-of select="$value"/></style>
 				</xsl:if>
+				<xsl:if test="$key = 'text-indent'">
+					<style name="padding-left"><xsl:value-of select="$value"/></style>
+				</xsl:if>
 			</xsl:for-each>
 		</xsl:variable>
 		<xsl:variable name="styles" select="xalan:nodeset($styles_)"/>
@@ -6680,6 +6710,11 @@
 		</xsl:call-template>
 	</xsl:template>
 
+	<!-- command between two xref points to non-standard bibitem -->
+	<xsl:template match="text()[. = ','][preceding-sibling::node()[1][local-name() = 'sup'][*[local-name() = 'xref'][@type = 'footnote']] and    following-sibling::node()[1][local-name() = 'sup'][*[local-name() = 'xref'][@type = 'footnote']]]">
+		<xsl:value-of select="."/>
+	</xsl:template>
+
 	<!-- ====== -->
 	<!-- formula  -->
 	<!-- ====== -->
@@ -7321,16 +7356,44 @@
 							</xsl:choose>
 
 							<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
-							<xsl:variable name="svg_width" select="xalan:nodeset($svg_content)/*/@width"/>
-							<xsl:variable name="svg_height" select="xalan:nodeset($svg_content)/*/@height"/>
+							<xsl:variable name="svg_width_" select="xalan:nodeset($svg_content)/*/@width"/>
+							<xsl:variable name="svg_width" select="number(translate($svg_width_, 'px', ''))"/>
+							<xsl:variable name="svg_height_" select="xalan:nodeset($svg_content)/*/@height"/>
+							<xsl:variable name="svg_height" select="number(translate($svg_height_, 'px', ''))"/>
+
+							<!-- Example: -->
 							<!-- effective height 297 - 27.4 - 13 =  256.6 -->
 							<!-- effective width 210 - 12.5 - 25 = 172.5 -->
 							<!-- effective height / width = 1.48, 1.4 - with title -->
-							<xsl:if test="$svg_height &gt; ($svg_width * 1.4)"> <!-- for images with big height -->
+
+							<xsl:variable name="scale_x">
+								<xsl:choose>
+									<xsl:when test="$svg_width &gt; $width_effective_px">
+										<xsl:value-of select="$width_effective_px div $svg_width"/>
+									</xsl:when>
+									<xsl:otherwise>1</xsl:otherwise>
+								</xsl:choose>
+							</xsl:variable>
+							<xsl:variable name="scale_y">
+								<xsl:choose>
+									<xsl:when test="$svg_height * $scale_x &gt; $height_effective_px">
+										<xsl:value-of select="$height_effective_px div ($svg_height * $scale_x)"/>
+									</xsl:when>
+									<xsl:otherwise>1</xsl:otherwise>
+								</xsl:choose>
+							</xsl:variable>
+
+							 <!-- for images with big height -->
+							<!-- <xsl:if test="$svg_height &gt; ($svg_width * 1.4)">
 								<xsl:variable name="width" select="(($svg_width * 1.4) div $svg_height) * 100"/>
 								<xsl:attribute name="width"><xsl:value-of select="$width"/>%</xsl:attribute>
-							</xsl:if>
+							</xsl:if> -->
 							<xsl:attribute name="scaling">uniform</xsl:attribute>
+
+							<xsl:if test="$scale_y != 1">
+								<xsl:attribute name="content-height"><xsl:value-of select="round($scale_x * $scale_y * 100)"/>%</xsl:attribute>
+							</xsl:if>
+
 							<xsl:copy-of select="$svg_content"/>
 						</fo:instream-foreign-object>
 					<!-- </fo:block> -->
@@ -7355,6 +7418,8 @@
 		</xsl:attribute>
 	</xsl:template>
 
+	<xsl:variable name="regex_starts_with_digit">^[0-9].*</xsl:variable>
+
 	<xsl:template match="*[local-name() = 'svg'][not(@width and @height)]" mode="svg_update">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="svg_update"/>
@@ -7368,8 +7433,13 @@
 			<xsl:variable name="width" select="normalize-space($viewbox//item[3])"/>
 			<xsl:variable name="height" select="normalize-space($viewbox//item[4])"/>
 
+			<xsl:variable name="parent_image_width" select="normalize-space(ancestor::*[1][local-name() = 'image']/@width)"/>
+			<xsl:variable name="parent_image_height" select="normalize-space(ancestor::*[1][local-name() = 'image']/@height)"/>
+
 			<xsl:attribute name="width">
 				<xsl:choose>
+					<!-- width is non 'auto', 'text-width', 'full-page-width' or 'narrow' -->
+					<xsl:when test="$parent_image_width != '' and normalize-space(java:matches(java:java.lang.String.new($parent_image_width), $regex_starts_with_digit)) = 'true'"><xsl:value-of select="$parent_image_width"/></xsl:when>
 					<xsl:when test="$width != ''">
 						<xsl:value-of select="round($width)"/>
 					</xsl:when>
@@ -7378,6 +7448,8 @@
 			</xsl:attribute>
 			<xsl:attribute name="height">
 				<xsl:choose>
+					<!-- height non 'auto', 'text-width', 'full-page-width' or 'narrow' -->
+					<xsl:when test="$parent_image_height != '' and normalize-space(java:matches(java:java.lang.String.new($parent_image_height), $regex_starts_with_digit)) = 'true'"><xsl:value-of select="$parent_image_height"/></xsl:when>
 					<xsl:when test="$height != ''">
 						<xsl:value-of select="round($height)"/>
 					</xsl:when>
@@ -7389,6 +7461,28 @@
 		</xsl:copy>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'svg']/@width" mode="svg_update">
+		<!-- image[@width]/svg -->
+		<xsl:variable name="parent_image_width" select="normalize-space(ancestor::*[2][local-name() = 'image']/@width)"/>
+		<xsl:attribute name="width">
+			<xsl:choose>
+				<xsl:when test="$parent_image_width != '' and normalize-space(java:matches(java:java.lang.String.new($parent_image_width), $regex_starts_with_digit)) = 'true'"><xsl:value-of select="$parent_image_width"/></xsl:when>
+				<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:attribute>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'svg']/@height" mode="svg_update">
+		<!-- image[@height]/svg -->
+		<xsl:variable name="parent_image_height" select="normalize-space(ancestor::*[2][local-name() = 'image']/@height)"/>
+		<xsl:attribute name="height">
+			<xsl:choose>
+				<xsl:when test="$parent_image_height != '' and normalize-space(java:matches(java:java.lang.String.new($parent_image_height), $regex_starts_with_digit)) = 'true'"><xsl:value-of select="$parent_image_height"/></xsl:when>
+				<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:attribute>
+	</xsl:template>
+
 	<!-- regex for 'display: inline-block;' -->
 	<xsl:variable name="regex_svg_style_notsupported">display(\s|\h)*:(\s|\h)*inline-block(\s|\h)*;</xsl:variable>
 	<xsl:template match="*[local-name() = 'svg']//*[local-name() = 'style']/text()" mode="svg_update">
@@ -8845,6 +8939,7 @@
 	<xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'name']">
 		<xsl:if test="normalize-space() != ''">
 			<fo:inline xsl:use-attribute-sets="termexample-name-style">
+				<xsl:call-template name="refine_termexample-name-style"/>
 				<xsl:apply-templates/>
 			</fo:inline>
 		</xsl:if>
@@ -8995,6 +9090,7 @@
 			</xsl:when>
 			<xsl:otherwise>
 				<fo:inline xsl:use-attribute-sets="example-name-style">
+					<xsl:call-template name="refine_example-name-style"/>
 					<xsl:apply-templates/>: 
 				</fo:inline>
 			</xsl:otherwise>
@@ -9455,7 +9551,9 @@
 	</xsl:template> <!-- sections_element_style -->
 
 	<xsl:template match="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*" priority="2"> <!-- /*/*[local-name() = 'preface']/* -->
-		<fo:block break-after="page"/>
+
+				<fo:block break-after="page"/>
+
 		<fo:block>
 			<xsl:call-template name="setId"/>
 			<xsl:apply-templates/>
@@ -9522,7 +9620,7 @@
 			<xsl:when test="ancestor::*[contains(local-name(), '-standard')] and not(ancestor::*[contains(local-name(), '-standard')]//*[@id = $id_from])">
 				<fo:block id="{@from}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:block>
 			</xsl:when>
-			<xsl:when test="not(//*[@id = $id_from]) and not(preceding-sibling::*[@id = $id_from])">
+			<xsl:when test="not(/*[@id = $id_from]) and not(/*//*[@id = $id_from]) and not(preceding-sibling::*[@id = $id_from])">
 				<fo:block id="{@from}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:block>
 			</xsl:when>
 		</xsl:choose>
@@ -10244,6 +10342,7 @@
 			<xsl:when test="@hidden = 'true'"><!-- skip --></xsl:when>
 			<xsl:otherwise>
 				<fo:list-item id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-item-style">
+
 					<fo:list-item-label end-indent="label-end()">
 						<fo:block role="SKIP">
 							<fo:inline role="SKIP">
@@ -12006,4 +12105,6 @@
 		</xsl:if>
 	</xsl:template>
 
+	<!-- update -->
+
 </xsl:stylesheet>

data/lib/metanorma/iho/biblio.rng

@@ -208,7 +208,9 @@
   </define>
   <define name="roledescription">
     <element name="description">
-      <ref name="FormattedString"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="person">
@@ -333,7 +335,9 @@
   </define>
   <define name="affiliationdescription">
     <element name="description">
-      <ref name="FormattedString"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="organization">
@@ -897,7 +901,9 @@
   </define>
   <define name="formattedref">
     <element name="formattedref">
-      <ref name="FormattedString"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="license">
@@ -942,7 +948,9 @@
     <optional>
       <attribute name="type"/>
     </optional>
-    <ref name="FormattedString"/>
+    <zeroOrMore>
+      <ref name="TextElement"/>
+    </zeroOrMore>
   </define>
   <!-- TitleType = ( "alternative" | "original" | "unofficial" | "subtitle" | "main" ) -->
   <define name="TypedUri">
@@ -1042,7 +1050,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="docnumber">
@@ -1267,12 +1277,16 @@
       <optional>
         <attribute name="type"/>
       </optional>
-      <ref name="FormattedString"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="bibabstract">
     <element name="abstract">
-      <ref name="FormattedString"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="copyright">
@@ -1377,7 +1391,9 @@
       </attribute>
       <optional>
         <element name="description">
-          <ref name="FormattedString"/>
+          <oneOrMore>
+            <ref name="TextElement"/>
+          </oneOrMore>
         </element>
       </optional>
       <element name="bibitem">

data/lib/metanorma/iho/isodoc.rng

@@ -156,44 +156,7 @@
     </define>
     <define name="xref">
       <element name="xref">
-        <attribute name="target">
-          <data type="string">
-            <param name="pattern">\i\c*|\c+#\c+</param>
-          </data>
-        </attribute>
-        <optional>
-          <attribute name="to">
-            <data type="string">
-              <param name="pattern">\i\c*|\c+#\c+</param>
-            </data>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="type">
-            <ref name="ReferenceFormat"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="alt"/>
-        </optional>
-        <optional>
-          <attribute name="case">
-            <choice>
-              <value>capital</value>
-              <value>lowercase</value>
-            </choice>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="droploc">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="style">
-            <ref name="XrefStyleType"/>
-          </attribute>
-        </optional>
+        <ref name="XrefAttributes"/>
         <ref name="XrefBody"/>
       </element>
     </define>
@@ -407,23 +370,7 @@
     </define>
     <define name="figure">
       <element name="figure">
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-        <optional>
-          <attribute name="unnumbered">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="number"/>
-        </optional>
-        <optional>
-          <attribute name="subsequence"/>
-        </optional>
-        <optional>
-          <attribute name="class"/>
-        </optional>
+        <ref name="FigureAttributes"/>
         <ref name="BlockAttributes"/>
         <optional>
           <ref name="tname"/>
@@ -2450,6 +2397,49 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="XrefAttributes">
+    <attribute name="target">
+      <data type="string">
+        <param name="pattern">\i\c*|\c+#\c+</param>
+      </data>
+    </attribute>
+    <optional>
+      <attribute name="to">
+        <data type="string">
+          <param name="pattern">\i\c*|\c+#\c+</param>
+        </data>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="type">
+        <ref name="ReferenceFormat"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="alt"/>
+    </optional>
+    <optional>
+      <attribute name="case">
+        <choice>
+          <value>capital</value>
+          <value>lowercase</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="droploc">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="style">
+        <ref name="XrefStyleType"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="label"/>
+    </optional>
+  </define>
   <define name="XrefBody">
     <zeroOrMore>
       <ref name="XrefTarget"/>
@@ -2528,6 +2518,28 @@
       <attribute name="columns"/>
     </optional>
   </define>
+  <define name="FigureAttributes">
+    <attribute name="id">
+      <data type="ID"/>
+    </attribute>
+    <optional>
+      <attribute name="unnumbered">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
+    <optional>
+      <attribute name="subsequence"/>
+    </optional>
+    <optional>
+      <attribute name="class"/>
+    </optional>
+    <optional>
+      <attribute name="width"/>
+    </optional>
+  </define>
   <start>
     <ref name="standard-document"/>
   </start>

data/lib/metanorma/iho/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module IHO
-    VERSION = "0.9.3".freeze
+    VERSION = "0.9.5".freeze
   end
 end

data/lib/relaton/render/general.rb

@@ -11,11 +11,7 @@ module Relaton
         end
 
         def klass_initialize(_options)
-          @nametemplateklass = Relaton::Render::Template::Name
-          @seriestemplateklass = Relaton::Render::Template::Series
-          @extenttemplateklass = Relaton::Render::Template::Extent
-          @sizetemplateklass = Relaton::Render::Template::Size
-          @generaltemplateklass = Relaton::Render::Template::General
+          super
           @fieldsklass = Relaton::Render::IHO::Fields
           @parseklass = Relaton::Render::IHO::Parse
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iho
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-04 00:00:00.000000000 Z
+date: 2024-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic