From 77408cb12c6f17a5f3aafa772535e943cf28acd2 Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Mon, 16 May 2005 08:26:08 +0000
Subject: [PATCH] fixed bug 1201333 mediaobjectco images not aligned.

---
 xsl/fo/formal.xsl   | 6 +++---
 xsl/fo/graphics.xsl | 2 +-
 xsl/fo/lists.xsl    | 4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/xsl/fo/formal.xsl b/xsl/fo/formal.xsl
index 37aa88505..ebc392fb8 100644
--- a/xsl/fo/formal.xsl
+++ b/xsl/fo/formal.xsl
@@ -258,9 +258,9 @@
 
   <!-- Get align value from internal mediaobject -->
   <xsl:variable name="align">
-    <xsl:if test="mediaobject">
+    <xsl:if test="mediaobject|mediaobjectco">
       <xsl:variable name="olist" select="mediaobject/imageobject
-                     |mediaobject/imageobjectco
+                     |mediaobjectco/imageobjectco
                      |mediaobject/videoobject
                      |mediaobject/audioobject
                      |mediaobject/textobject"/>
@@ -274,7 +274,7 @@
 
       <xsl:variable name="object" select="$olist[position() = $object.index]"/>
 
-      <xsl:value-of select="$object/imagedata[@align][1]/@align"/>
+      <xsl:value-of select="$object/descendant::imagedata[@align][1]/@align"/>
     </xsl:if>
   </xsl:variable>
 
diff --git a/xsl/fo/graphics.xsl b/xsl/fo/graphics.xsl
index df2798642..f2d491a46 100644
--- a/xsl/fo/graphics.xsl
+++ b/xsl/fo/graphics.xsl
@@ -356,7 +356,7 @@
   <xsl:variable name="object" select="$olist[position() = $object.index]"/>
 
   <xsl:variable name="align">
-    <xsl:value-of select="$object/imagedata[@align][1]/@align"/>
+    <xsl:value-of select="$object/descendant::imagedata[@align][1]/@align"/>
   </xsl:variable>
 
   <xsl:variable name="id">
diff --git a/xsl/fo/lists.xsl b/xsl/fo/lists.xsl
index a13a4e1d0..b09ff3797 100644
--- a/xsl/fo/lists.xsl
+++ b/xsl/fo/lists.xsl
@@ -1107,7 +1107,9 @@
   <xsl:call-template name="object.id"/>
   </xsl:variable>
 
-  <fo:block id="{$id}">
+  <fo:block id="{$id}"
+            text-align="{$alignment}">
+    <!-- The above restores alignment altered by image align attribute -->
     <xsl:if test="title">
       <xsl:apply-templates select="title" mode="list.title.mode"/>
     </xsl:if>
-- 
2.49.0