metanorma-iho 1.2.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de5b87c7f048d73869e48dc8d13e8ee88c157b61e7918451d08aeff9fbcf9de5
-  data.tar.gz: d0c0a3cd504f0237963e8229017d50ecbd115f00d1c5271b35d47f9f776163ff
+  metadata.gz: f534b702d06681bb74134be4cdfe8697d59fba10855b894821d8fc05385619b0
+  data.tar.gz: 64d0ec45eff2384ce928c31a9db5d184b18a0db98b03862eb228fa8fdf1d8683
 SHA512:
-  metadata.gz: abf166b6da0b2b9164bf5ed37d2a11704134f59e5b8abf78b23970dfa8349b97830bb6180f39d820bc569e38d643b3b97bd4b385ee1583429a65f1344fdcac0a
-  data.tar.gz: afc91a749a3fb3abb5d21aa2428f8699c7883448b057c678287c7703c731671a1dbe0f9d2aee4608339fd393f79480f145484a24a765bfd16fd85cad3cbe0f85
+  metadata.gz: 8089334d951cb6608e270c2c9920b6d5b1d2d413469da852d428ca2d1f2e7d06cc4ca0d87ddfc9331ffc6fc1eab3ee4f29640c3a4efb43eb0ce470367e4a9963
+  data.tar.gz: 786458cb370e281b7bbf39117c0d0424775e816e0f0bb610a1d93362b04970c3f8d90d1654bbacc7f3bc445ac2af80b64a9e37e549a8539b13dcf422728b71dd

data/README.adoc

@@ -2,7 +2,7 @@
 
 image:https://img.shields.io/gem/v/metanorma-iho.svg["Gem Version", link="https://rubygems.org/gems/metanorma-iho"]
 image:https://github.com/metanorma/metanorma-iso/workflows/rake/badge.svg["Build Status", link="https://github.com/metanorma/metanorma-iso/actions?workflow=rake"]
-image:https://codeclimate.com/github/metanorma/metanorma-iho/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-iho"]
+// image:https://codeclimate.com/github/metanorma/metanorma-iho/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-iho"]
 image:https://img.shields.io/github/issues-pr-raw/metanorma/metanorma-iho.svg["Pull Requests", link="https://github.com/metanorma/metanorma-iho/pulls"]
 image:https://img.shields.io/github/commits-since/metanorma/metanorma-iho/latest.svg["Commits since latest",link="https://github.com/metanorma/metanorma-iho/releases"]
 

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

@@ -416,28 +416,11 @@
 														<fo:block-container font-size="0"> <!-- height="168mm" width="115mm"  -->
 															<fo:block>
 																<xsl:for-each select="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata[mn:name = 'coverpage-image'][1]/mn:value/mn:image[1]">
-																	<xsl:choose>
-																		<xsl:when test="*[local-name() = 'svg'] or java:endsWith(java:java.lang.String.new(@src), '.svg')">
-																			<fo:instream-foreign-object fox:alt-text="Image Front">
-																				<xsl:attribute name="content-height"><xsl:value-of select="$pageHeight"/>mm</xsl:attribute>
-																				<xsl:call-template name="getSVG"/>
-																			</fo:instream-foreign-object>
-																		</xsl:when>
-																		<xsl:when test="starts-with(@src, 'data:application/pdf;base64')">
-																			<fo:external-graphic src="{@src}" fox:alt-text="Image Front"/>
-																		</xsl:when>
-																		<xsl:otherwise> <!-- bitmap image -->
-																			<xsl:variable name="coverimage_src" select="normalize-space(@src)"/>
-																			<xsl:if test="$coverimage_src != ''">
-																				<xsl:variable name="coverpage">
-																					<xsl:call-template name="getImageURL">
-																						<xsl:with-param name="src" select="$coverimage_src"/>
-																					</xsl:call-template>
-																				</xsl:variable>
-																				<fo:external-graphic src="{$coverpage}" width="155.5mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Front"/>
-																			</xsl:if>
-																		</xsl:otherwise>
-																	</xsl:choose>
+
+																	<xsl:call-template name="insertPageImage">
+																		<xsl:with-param name="bitmap_width">155.5</xsl:with-param>
+																	</xsl:call-template>
+
 																</xsl:for-each>
 															</fo:block>
 														</fo:block-container>
@@ -548,20 +531,20 @@
 
 	<xsl:template name="insertListOf_Title">
 		<xsl:param name="title"/>
-		<fo:block role="TOCI" font-weight="bold" margin-top="6pt" keep-with-next="always">
+		<fo:block xsl:use-attribute-sets="toc-listof-title-style">
 			<xsl:value-of select="$title"/>
 		</fo:block>
 	</xsl:template>
 
 	<xsl:template name="insertListOf_Item">
-		<fo:block role="TOCI" text-align-last="justify" margin-left="12mm" text-indent="-12mm">
+		<fo:block xsl:use-attribute-sets="toc-listof-item-style">
 			<fo:basic-link internal-destination="{@id}">
 				<xsl:call-template name="setAltText">
 					<xsl:with-param name="value" select="@alt-text"/>
 				</xsl:call-template>
 				<xsl:apply-templates select="." mode="contents"/>
 				<fo:inline keep-together.within-line="always">
-					<fo:leader font-size="9pt" font-weight="normal" leader-pattern="dots"/>
+					<fo:leader xsl:use-attribute-sets="toc-leader-style"/>
 					<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
 				</fo:inline>
 			</fo:basic-link>
@@ -604,7 +587,7 @@
 		</xsl:call-template>
 	</xsl:template>
 
-	<xsl:template match="mn:preface//mn:clause[@type = 'toc']" priority="4">
+	<xsl:template match="mn:preface//mn:clause[@type = 'toc']" name="toc" priority="4">
 		<!-- Table of Contents -->
 		<fo:block>
 
@@ -618,25 +601,14 @@
 
 			<xsl:if test="count(*) = 1 and mn:fmt-title"> <!-- if there isn't user ToC -->
 
-				<fo:block line-height="115%" role="TOC">
+				<fo:block role="TOC" xsl:use-attribute-sets="toc-style">
 
 					<xsl:for-each select="$contents//mnx:item[@display = 'true']"><!-- [not(@level = 2 and starts-with(@section, '0'))] skip clause from preface -->
 						<fo:block role="TOCI">
-							<fo:list-block>
-								<xsl:attribute name="provisional-distance-between-starts">
-									<xsl:choose>
-										<xsl:when test="@level &gt;= 1 and @root = 'preface'">0mm</xsl:when>
-										<xsl:when test="@level &gt;= 1 and @root = 'annex' and not(@type = 'annex')">13mm</xsl:when>
-										<xsl:when test="@level &gt;= 1 and not(@type = 'annex')">
-											<xsl:choose>
-												<xsl:when test="$toc_level = 3">12.9mm</xsl:when>
-												<xsl:when test="$toc_level &gt; 3">15mm</xsl:when>
-												<xsl:otherwise>10mm</xsl:otherwise>
-											</xsl:choose>
-										</xsl:when>
-										<xsl:otherwise>0mm</xsl:otherwise>
-									</xsl:choose>
-								</xsl:attribute>
+							<fo:list-block xsl:use-attribute-sets="toc-item-block-style">
+
+								<xsl:call-template name="refine_toc-item-block-style"/>
+
 								<fo:list-item>
 									<fo:list-item-label end-indent="label-end()">
 										<fo:block id="__internal_layout__toc_sectionnum_{generate-id()}">
@@ -646,11 +618,11 @@
 										</fo:block>
 									</fo:list-item-label>
 										<fo:list-item-body start-indent="body-start()">
-											<fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm">
+											<fo:block xsl:use-attribute-sets="toc-item-style">
 												<fo:basic-link internal-destination="{@id}" fox:alt-text="{mnx:title}">
 													<xsl:apply-templates select="mnx:title"/>
 													<fo:inline keep-together.within-line="always">
-														<fo:leader font-size="9pt" font-weight="normal" leader-pattern="dots"/>
+														<fo:leader xsl:use-attribute-sets="toc-leader-style"/>
 														<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
 													</fo:inline>
 												</fo:basic-link>
@@ -662,31 +634,31 @@
 					</xsl:for-each>
 
 					<!-- List of Tables -->
-					<xsl:if test="$contents//mnx:tables/mnx:table">
-						<xsl:call-template name="insertListOf_Title">
-							<xsl:with-param name="title" select="$title-list-tables"/>
-						</xsl:call-template>
-						<xsl:for-each select="$contents//mnx:tables/mnx:table">
-							<xsl:call-template name="insertListOf_Item"/>
-						</xsl:for-each>
-					</xsl:if>
+					<xsl:for-each select="$contents//mnx:tables/mnx:table">
+						<xsl:if test="position() = 1">
+							<xsl:call-template name="insertListOf_Title">
+								<xsl:with-param name="title" select="$title-list-tables"/>
+							</xsl:call-template>
+						</xsl:if>
+						<xsl:call-template name="insertListOf_Item"/>
+					</xsl:for-each>
 
 					<!-- List of Figures -->
-					<xsl:if test="$contents//mnx:figures/mnx:figure">
-						<xsl:call-template name="insertListOf_Title">
-							<xsl:with-param name="title" select="$title-list-figures"/>
-						</xsl:call-template>
-						<xsl:for-each select="$contents//mnx:figures/mnx:figure">
-							<xsl:call-template name="insertListOf_Item"/>
-						</xsl:for-each>
-					</xsl:if>
+					<xsl:for-each select="$contents//mnx:figures/mnx:figure">
+						<xsl:if test="position() = 1">
+							<xsl:call-template name="insertListOf_Title">
+								<xsl:with-param name="title" select="$title-list-figures"/>
+							</xsl:call-template>
+						</xsl:if>
+						<xsl:call-template name="insertListOf_Item"/>
+					</xsl:for-each>
 				</fo:block>
 			</xsl:if>
 		</fo:block>
 	</xsl:template>
 
 	<xsl:template match="mn:preface//mn:clause[@type = 'toc']/mn:fmt-title" priority="3">
-		<fo:block font-weight="bold" margin-bottom="7.5pt" font-size="12pt" margin-top="4pt" role="SKIP">
+		<fo:block xsl:use-attribute-sets="toc-title-style">
 			<fo:block-container width="18.3mm" border-bottom="1.25pt solid black" role="SKIP">
 				<fo:block line-height="75%">
 					<!-- <xsl:call-template name="getLocalizedString">
@@ -2772,13 +2744,23 @@
 	<xsl:attribute-set name="copyright-statement-style">
 	</xsl:attribute-set> <!-- copyright-statement-style -->
 
+	<xsl:template name="refine_copyright-statement-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="copyright-statement-title-style">
 	</xsl:attribute-set> <!-- copyright-statement-title-style -->
 
+	<xsl:template name="refine_copyright-statement-title-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="copyright-statement-p-style">
 	</xsl:attribute-set> <!-- copyright-statement-p-style -->
 
-		<xsl:attribute-set name="license-statement-style">
+	<xsl:template name="refine_copyright-statement-p-style">
+
+	</xsl:template>
+
+	<xsl:attribute-set name="license-statement-style">
 	</xsl:attribute-set> <!-- license-statement-style -->
 
 	<xsl:attribute-set name="license-statement-title-style">
@@ -2788,6 +2770,10 @@
 	<xsl:attribute-set name="license-statement-p-style">
 	</xsl:attribute-set> <!-- license-statement-p-style -->
 
+	<xsl:template name="refine_license-statement-p-style">
+
+	</xsl:template>
+
 	<xsl:attribute-set name="legal-statement-style">
 	</xsl:attribute-set> <!-- legal-statement-style -->
 
@@ -2815,6 +2801,8 @@
 	<!-- ================================= -->
 	<xsl:template match="mn:copyright-statement">
 		<fo:block xsl:use-attribute-sets="copyright-statement-style" role="SKIP">
+			<xsl:call-template name="refine_copyright-statement-style"/>
+
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template> <!-- copyright-statement -->
@@ -3913,7 +3901,7 @@
 						</xsl:otherwise>
 					</xsl:choose>
 				</xsl:variable>
-				<xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color' or $key = 'baseline-shift'">
+				<xsl:if test="$key = 'font-family' or           $key = 'font-size' or          $key = 'color' or          $key = 'baseline-shift' or          $key = 'line-height'          ">
 					<style name="{$key}"><xsl:value-of select="$value"/></style>
 				</xsl:if>
 				<xsl:if test="$key = 'text-indent'">
@@ -10675,7 +10663,7 @@
 
 	<xsl:template name="insertFootnoteSeparatorCommon">
 		<xsl:param name="leader_length">30%</xsl:param>
-		<fo:static-content flow-name="xsl-footnote-separator">
+		<fo:static-content flow-name="xsl-footnote-separator" role="artifact">
 			<fo:block>
 				<fo:leader leader-pattern="rule" leader-length="{$leader_length}"/>
 			</fo:block>
@@ -11450,13 +11438,31 @@
 				<!-- skip here, see the template 'fmt-review-start' -->
 			</xsl:when>
 			<xsl:otherwise>
-				<!-- <fo:inline id="{@id}" font-size="1pt"/> -->
-				<fo:inline id="{@id}" font-size="1pt"><xsl:if test="preceding-sibling::node()[self::mn:fmt-annotation-start][@source = $bookmark_id] and        following-sibling::node()[self::mn:fmt-annotation-end][@source = $bookmark_id]"><xsl:attribute name="line-height">0.1</xsl:attribute></xsl:if><xsl:value-of select="$hair_space"/></fo:inline>
-				<!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml -->
-				<xsl:if test="not(following-sibling::node()[normalize-space() != ''])"><fo:inline font-size="1pt"> </fo:inline></xsl:if>
+				<xsl:choose>
+					<xsl:when test="parent::mn:example or parent::mn:termexample or parent::mn:note or parent::mn:termnote">
+						<fo:block font-size="1pt" line-height="0.1">
+							<xsl:call-template name="fo_inline_bookmark">
+								<xsl:with-param name="bookmark_id" select="$bookmark_id"/>
+							</xsl:call-template>
+						</fo:block>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:call-template name="fo_inline_bookmark">
+							<xsl:with-param name="bookmark_id" select="$bookmark_id"/>
+						</xsl:call-template>
+					</xsl:otherwise>
+				</xsl:choose>
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>
+
+	<xsl:template name="fo_inline_bookmark">
+		<xsl:param name="bookmark_id"/>
+		<!-- <fo:inline id="{@id}" font-size="1pt"/> -->
+		<fo:inline id="{@id}" font-size="1pt"><xsl:if test="preceding-sibling::node()[self::mn:fmt-annotation-start][@source = $bookmark_id] and      following-sibling::node()[self::mn:fmt-annotation-end][@source = $bookmark_id]"><xsl:attribute name="line-height">0.1</xsl:attribute></xsl:if><xsl:value-of select="$hair_space"/></fo:inline>
+		<!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml -->
+		<xsl:if test="not(following-sibling::node()[normalize-space() != ''])"><fo:inline font-size="1pt"> </fo:inline></xsl:if>
+	</xsl:template>
 	<!-- =================== -->
 	<!-- End of Index processing -->
 	<!-- =================== -->
@@ -11551,31 +11557,65 @@
 	<!-- =================== -->
 
 	<xsl:attribute-set name="toc-style">
+		<xsl:attribute name="line-height">115%</xsl:attribute>
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_toc-style">
 	</xsl:template>
 
 	<xsl:attribute-set name="toc-title-style">
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="font-size">12pt</xsl:attribute>
+		<xsl:attribute name="margin-top">4pt</xsl:attribute>
+		<xsl:attribute name="margin-bottom">7.5pt</xsl:attribute>
+		<xsl:attribute name="role">SKIP</xsl:attribute>
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_toc-title-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="toc-title-page-style">
 	</xsl:attribute-set> <!-- toc-title-page-style -->
 
+	<xsl:template name="refine_toc-title-page-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="toc-item-block-style">
+		<xsl:attribute name="provisional-distance-between-starts">10mm</xsl:attribute>
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_toc-item-block-style">
+		<xsl:attribute name="provisional-distance-between-starts">
+			<xsl:choose>
+				<xsl:when test="@level &gt;= 1 and @root = 'preface'">0mm</xsl:when>
+				<xsl:when test="@level &gt;= 1 and @root = 'annex' and not(@type = 'annex')">13mm</xsl:when>
+				<xsl:when test="@level &gt;= 1 and not(@type = 'annex')">
+					<xsl:choose>
+						<xsl:when test="$toc_level = 3">12.9mm</xsl:when>
+						<xsl:when test="$toc_level &gt; 3">15mm</xsl:when>
+						<xsl:otherwise>10mm</xsl:otherwise>
+					</xsl:choose>
+				</xsl:when>
+				<xsl:otherwise>0mm</xsl:otherwise>
+			</xsl:choose>
+		</xsl:attribute>
 	</xsl:template>
 
 	<xsl:attribute-set name="toc-item-style">
 		<xsl:attribute name="role">TOCI</xsl:attribute>
+		<xsl:attribute name="role">SKIP</xsl:attribute>
+		<xsl:attribute name="text-align-last">justify</xsl:attribute>
+		<xsl:attribute name="margin-left">12mm</xsl:attribute>
+		<xsl:attribute name="text-indent">-12mm</xsl:attribute>
 	</xsl:attribute-set> <!-- END: toc-item-style -->
 
 	<xsl:template name="refine_toc-item-style">
 	</xsl:template> <!-- END: refine_toc-item-style -->
 
 	<xsl:attribute-set name="toc-leader-style">
+		<xsl:attribute name="font-size">9pt</xsl:attribute>
+		<xsl:attribute name="font-weight">normal</xsl:attribute>
+		<xsl:attribute name="leader-pattern">dots</xsl:attribute>
 	</xsl:attribute-set> <!-- END: toc-leader-style -->
 
 	<xsl:attribute-set name="toc-pagenumber-style">
@@ -11583,13 +11623,23 @@
 
 	<!-- List of Figures, Tables -->
 	<xsl:attribute-set name="toc-listof-title-style">
+		<xsl:attribute name="role">TOCI</xsl:attribute>
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="margin-top">6pt</xsl:attribute>
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_toc-listof-title-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="toc-listof-item-block-style">
 	</xsl:attribute-set>
 
 	<xsl:attribute-set name="toc-listof-item-style">
 		<xsl:attribute name="role">TOCI</xsl:attribute>
+		<xsl:attribute name="text-align-last">justify</xsl:attribute>
+		<xsl:attribute name="margin-left">12mm</xsl:attribute>
+		<xsl:attribute name="text-indent">-12mm</xsl:attribute>
 	</xsl:attribute-set>
 
 	<xsl:template name="processPrefaceSectionsDefault_Contents">
@@ -11929,7 +11979,7 @@
 								</xsl:if>
 
 								<xsl:for-each select="$contents_nodes/mnx:doc">
-									<fo:bookmark internal-destination="{contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
+									<fo:bookmark internal-destination="{mnx:contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
 										<xsl:if test="@bundle = 'true'">
 											<xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
 										</xsl:if>
@@ -11963,7 +12013,7 @@
 											</xsl:choose>
 										</fo:bookmark-title>
 
-										<xsl:apply-templates select="contents/mnx:item" mode="bookmark"/>
+										<xsl:apply-templates select="mnx:contents/mnx:item" mode="bookmark"/>
 
 										<xsl:call-template name="insertFigureBookmarks">
 											<xsl:with-param name="contents" select="mnx:contents"/>
@@ -13312,11 +13362,35 @@
 
 	<xsl:template match="mn:svgmap"/>
 
+	<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]"/>
+
 	<!-- for correct rendering combining chars, added in mode="update_xml_step2" -->
 	<xsl:template match="*[local-name() = 'lang_none']">
 		<fo:inline xml:lang="none"><xsl:value-of select="."/></fo:inline>
 	</xsl:template>
 
+	<xsl:template name="addTagElementT">
+		<xsl:variable name="title_">
+			<xsl:apply-templates select="mn:fmt-title"/>
+		</xsl:variable>
+		<xsl:variable name="title__">
+			<xsl:for-each select="xalan:nodeset($title_)/*/node()">
+				<xsl:choose>
+					<xsl:when test="self::text()"><xsl:text> </xsl:text><xsl:value-of select="."/><xsl:text> </xsl:text></xsl:when>
+					<xsl:otherwise><xsl:text> </xsl:text><xsl:copy-of select="."/><xsl:text> </xsl:text></xsl:otherwise>
+				</xsl:choose>
+			</xsl:for-each>
+		</xsl:variable>
+		<xsl:variable name="title" select="normalize-space($title__)"/>
+		<xsl:if test="$title != ''">
+			<xsl:attribute name="fox:title">
+				<xsl:if test="ancestor::mn:sections">
+					<xsl:text>Section </xsl:text>
+				</xsl:if>
+				<xsl:value-of select="$title"/></xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template name="replaceChar">
 		<xsl:param name="text"/>
 		<xsl:param name="replace"/>
@@ -14083,6 +14157,13 @@
 			<xsl:with-param name="default" select="$text_align_default"/>
 		</xsl:call-template>
 		<xsl:call-template name="setKeepAttributes"/>
+		<xsl:if test="node()[1][self::mn:span][contains(@style, 'line-height')]">
+			<xsl:variable name="styles">
+				<xsl:apply-templates select="*[1]"/>
+			</xsl:variable>
+			<!-- move attribute line-height from inline to block -->
+			<xsl:attribute name="line-height"><xsl:value-of select="xalan:nodeset($styles)//*/@line-height"/></xsl:attribute>
+		</xsl:if>
 	</xsl:template>
 
 	<xsl:template name="setKeepAttributes">
@@ -14108,34 +14189,41 @@
 		<fo:block-container absolute-position="fixed" left="0mm" top="0mm" font-size="0" id="__internal_layout__coverpage{$suffix}_{$name}_{$number}_{generate-id()}">
 			<fo:block>
 				<xsl:for-each select="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata[mn:name = $name][1]/mn:value/mn:image[$num]">
-					<xsl:choose>
-						<xsl:when test="*[local-name() = 'svg'] or java:endsWith(java:java.lang.String.new(@src), '.svg')">
-							<fo:instream-foreign-object fox:alt-text="Image Front">
-								<xsl:attribute name="content-height"><xsl:value-of select="$pageHeight"/>mm</xsl:attribute>
-								<xsl:call-template name="getSVG"/>
-							</fo:instream-foreign-object>
-						</xsl:when>
-						<xsl:when test="starts-with(@src, 'data:application/pdf;base64')">
-							<fo:external-graphic src="{@src}" fox:alt-text="Image Front"/>
-						</xsl:when>
-						<xsl:otherwise> <!-- bitmap image -->
-							<xsl:variable name="coverimage_src" select="normalize-space(@src)"/>
-							<xsl:if test="$coverimage_src != ''">
-								<xsl:variable name="coverpage">
-									<xsl:call-template name="getImageURL">
-										<xsl:with-param name="src" select="$coverimage_src"/>
-									</xsl:call-template>
-								</xsl:variable>
-								<!-- <xsl:variable name="coverpage" select="concat('url(file:',$basepath, 'coverpage1.png', ')')"/> --> <!-- for DEBUG -->
-								<fo:external-graphic src="{$coverpage}" width="{$pageWidth}mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Front"/>
-							</xsl:if>
-						</xsl:otherwise>
-					</xsl:choose>
+
+					<xsl:call-template name="insertPageImage"/>
+
 				</xsl:for-each>
 			</fo:block>
 		</fo:block-container>
 	</xsl:template>
 
+	<xsl:template name="insertPageImage">
+		<xsl:param name="svg_content_height" select="$pageHeight"/>
+		<xsl:param name="bitmap_width" select="$pageWidth"/>
+		<xsl:choose>
+			<xsl:when test="*[local-name() = 'svg'] or java:endsWith(java:java.lang.String.new(@src), '.svg')">
+				<fo:instream-foreign-object fox:alt-text="Image Front">
+					<xsl:attribute name="content-height"><xsl:value-of select="$svg_content_height"/>mm</xsl:attribute>
+					<xsl:call-template name="getSVG"/>
+				</fo:instream-foreign-object>
+			</xsl:when>
+			<xsl:when test="starts-with(@src, 'data:application/pdf;base64')">
+				<fo:external-graphic src="{@src}" fox:alt-text="Image Front"/>
+			</xsl:when>
+			<xsl:otherwise> <!-- bitmap image -->
+				<xsl:variable name="coverimage_src" select="normalize-space(@src)"/>
+				<xsl:if test="$coverimage_src != ''">
+					<xsl:variable name="coverpage">
+						<xsl:call-template name="getImageURL">
+							<xsl:with-param name="src" select="$coverimage_src"/>
+						</xsl:call-template>
+					</xsl:variable>
+					<fo:external-graphic src="{$coverpage}" width="{$bitmap_width}mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Front"/>
+				</xsl:if>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
 	<xsl:template name="getImageURL">
 		<xsl:param name="src"/>
 		<xsl:choose>
@@ -14563,6 +14651,14 @@
 		</xsl:attribute>
 	</xsl:template>
 
+	<xsl:template name="getCharByCodePoint">
+		<xsl:param name="codepoint"/>
+		<xsl:param name="radix">16</xsl:param>
+		<xsl:variable name="codepointInt" select="java:java.lang.Integer.parseInt($codepoint,$radix)"/>
+		<xsl:variable name="chars" select="java:java.lang.Character.toChars($codepointInt)"/>
+		<xsl:value-of select="java:java.lang.String.new($chars)"/>
+	</xsl:template>
+
 	<xsl:template name="substring-after-last">
 		<xsl:param name="value"/>
 		<xsl:param name="delimiter"/>