enhanced previous fix to bug #120684, using excellent suggestion by Daniel

* transform.c: enhanced previous fix to bug #120684, using
  excellent suggestion by Daniel
* attributes.c: fixed bug #119583, merging attribute sets
  from imported stylesheets.
* tests/docs/Makefile.am tests/docs/bug-131.xml
  tests/general/Makefile.am tests/docs/bug-131*: added tests
  to the regression suite for bug #120684.

diff --git a/tests/docs/bug-131.xml b/tests/docs/bug-131.xml
new file mode 100644 (file)
index 0000000..cc77fb4
--- /dev/null
+++ b/tests/docs/bug-131.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<title>My title</title>
+

diff --git a/tests/general/bug-131-imp.imp b/tests/general/bug-131-imp.imp
new file mode 100644 (file)
index 0000000..eaaf77e
--- /dev/null
+++ b/tests/general/bug-131-imp.imp
@@ -0,0 +1,19 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:fo="http://www.w3.org/1999/XSL/Format"
+                version="1.0">
+<xsl:attribute-set name="title.properties">
+  <xsl:attribute name="font-size">14pt</xsl:attribute>
+  <xsl:attribute name="font-weight">bold</xsl:attribute>
+  <xsl:attribute name="hyphenate">false</xsl:attribute>
+  <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
+</xsl:attribute-set>
+
+<xsl:template match="/title">
+    <fo:block xsl:use-attribute-sets="title.properties">
+        <xsl:apply-templates/>
+    </fo:block>
+</xsl:template>
+
+</xsl:stylesheet>
+
+

diff --git a/tests/general/bug-131.out b/tests/general/bug-131.out
new file mode 100644 (file)
index 0000000..f80ca81
--- /dev/null
+++ b/tests/general/bug-131.out
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="8pt" font-weight="bold" hyphenate="false" keep-with-next.within-column="always">My title</fo:block>

diff --git a/tests/general/bug-131.xsl b/tests/general/bug-131.xsl
new file mode 100644 (file)
index 0000000..7d8d631
--- /dev/null
+++ b/tests/general/bug-131.xsl
@@ -0,0 +1,13 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:fo="http://www.w3.org/1999/XSL/Format"
+                version="1.0">
+
+<xsl:import href="bug-131-imp.imp"/>
+
+<xsl:attribute-set name="title.properties">
+    <xsl:attribute name="font-size">8pt</xsl:attribute>
+</xsl:attribute-set>
+
+</xsl:stylesheet>
+
+