diff options
author | Nick Wellnhofer <wellnhofer@aevum.de> | 2009-09-17 10:57:22 +0200 |
---|---|---|
committer | Daniel Veillard <veillard@redhat.com> | 2009-09-17 10:57:22 +0200 |
commit | 4fedd0dc16bfa394e7dd0b2a44e21256ce3b4021 (patch) | |
tree | 449c36c5872390c8135c1365b715e83aecb2e882 /tests | |
parent | ab09910837fc0f2296498bdd76e0fc05c280979d (diff) | |
download | libxslt-4fedd0dc16bfa394e7dd0b2a44e21256ce3b4021.tar.gz libxslt-4fedd0dc16bfa394e7dd0b2a44e21256ce3b4021.tar.bz2 libxslt-4fedd0dc16bfa394e7dd0b2a44e21256ce3b4021.zip |
Fix importing of encoding from included stylesheets
* libxslt/transform.c: process encoding like other imported output
properties
* tests/docs/Makefile.am tests/docs/bug-169.xml tests/general/Makefile.am
tests/general/bug-169.*: add a specific regression test
Diffstat (limited to 'tests')
-rw-r--r-- | tests/docs/Makefile.am | 1 | ||||
-rw-r--r-- | tests/docs/bug-169.xml | 1 | ||||
-rw-r--r-- | tests/general/Makefile.am | 1 | ||||
-rw-r--r-- | tests/general/bug-169.imp | 5 | ||||
-rw-r--r-- | tests/general/bug-169.out | 2 | ||||
-rw-r--r-- | tests/general/bug-169.xsl | 11 |
6 files changed, 21 insertions, 0 deletions
diff --git a/tests/docs/Makefile.am b/tests/docs/Makefile.am index b10edcab..43937399 100644 --- a/tests/docs/Makefile.am +++ b/tests/docs/Makefile.am @@ -167,6 +167,7 @@ EXTRA_DIST = \ bug-166.xml \ bug-167.xml \ bug-168.xml \ + bug-169.xml \ character.xml \ array.xml \ items.xml diff --git a/tests/docs/bug-169.xml b/tests/docs/bug-169.xml new file mode 100644 index 00000000..69d62f2c --- /dev/null +++ b/tests/docs/bug-169.xml @@ -0,0 +1 @@ +<doc/> diff --git a/tests/general/Makefile.am b/tests/general/Makefile.am index 87b0ed2c..5d5baf09 100644 --- a/tests/general/Makefile.am +++ b/tests/general/Makefile.am @@ -176,6 +176,7 @@ EXTRA_DIST = \ bug-166.out bug-166.xsl \ bug-167.out bug-167.xsl \ bug-168.out bug-168.xsl \ + bug-169.out bug-169.xsl bug-169.imp \ character.out character.xsl \ character2.out character2.xsl \ itemschoose.out itemschoose.xsl \ diff --git a/tests/general/bug-169.imp b/tests/general/bug-169.imp new file mode 100644 index 00000000..2928f4b7 --- /dev/null +++ b/tests/general/bug-169.imp @@ -0,0 +1,5 @@ +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> + +<xsl:output encoding="iso-8859-1"/> + +</xsl:stylesheet> diff --git a/tests/general/bug-169.out b/tests/general/bug-169.out new file mode 100644 index 00000000..30f8fad9 --- /dev/null +++ b/tests/general/bug-169.out @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<result attr="Fahrvergnügen"/> diff --git a/tests/general/bug-169.xsl b/tests/general/bug-169.xsl new file mode 100644 index 00000000..e34ad9e7 --- /dev/null +++ b/tests/general/bug-169.xsl @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="iso-8859-1"?> + +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> + +<xsl:import href="bug-169.imp"/> + +<xsl:template match="/"> + <result attr="Fahrvergnügen"/> +</xsl:template> + +</xsl:stylesheet> |