Support default textdata encoding also on files included via imagedata and inlinegrap...

diff --git a/xsl/fo/graphics.xsl b/xsl/fo/graphics.xsl
index dc193db2791b55634c9b88d46a3e5757d90a14df..0f680d3d7d92f1235e5aa25e59eb42be431f5c2d 100644 (file)
--- a/xsl/fo/graphics.xsl
+++ b/xsl/fo/graphics.xsl
@@ -292,7 +292,7 @@
                         and $textinsert.extension != '0'">
           <xsl:choose>
             <xsl:when test="contains($vendor, 'SAXON')">
-              <stext:insertfile href="{$filename}"/>
+              <stext:insertfile href="{$filename}" encoding="{$textdata.default.encoding}"/>
             </xsl:when>
             <xsl:when test="contains($vendor, 'Apache Software Foundation')">
               <xtext:insertfile href="{$filename}"/>
@@ -406,7 +406,7 @@
                         and $textinsert.extension != '0'">
           <xsl:choose>
             <xsl:when test="contains($vendor, 'SAXON')">
-              <stext:insertfile href="{$filename}"/>
+              <stext:insertfile href="{$filename}" encoding="{$textdata.default.encoding}"/>
             </xsl:when>
             <xsl:when test="contains($vendor, 'Apache Software Foundation')">
               <xtext:insertfile href="{$filename}"/>

diff --git a/xsl/html/graphics.xsl b/xsl/html/graphics.xsl
index 2b53f90b4bfb794733bd17e95846dd8ea8c36d79..1452f772a75448c87c1521d4e8eefdaf2721208f 100644 (file)
--- a/xsl/html/graphics.xsl
+++ b/xsl/html/graphics.xsl
@@ -787,7 +787,7 @@ valign: <xsl:value-of select="@valign"/></xsl:message>
                         and $textinsert.extension != '0'">
           <xsl:choose>
             <xsl:when test="element-available('stext:insertfile')">
-              <stext:insertfile href="{$filename}"/>
+              <stext:insertfile href="{$filename} encoding="{$textdata.default.encoding}""/>
             </xsl:when>
             <xsl:when test="element-available('xtext:insertfile')">
               <xtext:insertfile href="{$filename}"/>
@@ -898,7 +898,7 @@ valign: <xsl:value-of select="@valign"/></xsl:message>
                         and $textinsert.extension != '0'">
           <xsl:choose>
             <xsl:when test="element-available('stext:insertfile')">
-              <stext:insertfile href="{$filename}"/>
+              <stext:insertfile href="{$filename}" encoding="{$textdata.default.encoding}"/>
             </xsl:when>
             <xsl:when test="element-available('xtext:insertfile')">
               <xtext:insertfile href="{$filename}"/>