Handle alignment correctly when screenshot is used in figure

diff --git a/xsl/fo/formal.xsl b/xsl/fo/formal.xsl
index 8147c7efca2b0322abea4bf5f97e42efbb47946b..413fbfaa4f41d939e815736d81aab99b837f74d0 100644 (file)
--- a/xsl/fo/formal.xsl
+++ b/xsl/fo/formal.xsl
@@ -154,12 +154,35 @@
 
   <!-- Get align value from internal mediaobject -->
   <xsl:variable name="align">
-    <xsl:if test="mediaobject">
+    <xsl:if test="mediaobject|mediaobjectco|screenshot|graphic|graphicco">
       <xsl:variable name="olist" select="mediaobject/imageobject
-                     |mediaobject/imageobjectco
-                     |mediaobject/videoobject
-                    |mediaobject/audioobject
-                    |mediaobject/textobject"/>
+                                         |mediaobject/imageobjectco
+                                         |mediaobject/videoobject
+                                         |mediaobject/audioobject
+                                         |mediaobject/textobject
+
+                                         |mediaobjectco/imageobject
+                                         |mediaobjectco/imageobjectco
+                                         |mediaobjectco/videoobject
+                                         |mediaobjectco/audioobject
+                                         |mediaobjectco/textobject
+
+                                         |screenshot/mediaobject/imageobject
+                                         |screenshot/mediaobject/imageobjectco
+                                         |screenshot/mediaobject/videoobject
+                                         |screenshot/mediaobject/audioobject
+                                         |screenshot/mediaobject/textobject
+
+                                         |screenshot/mediaobjectco/imageobject
+                                         |screenshot/mediaobjectco/imageobjectco
+                                         |screenshot/mediaobjectco/videoobject
+                                         |screenshot/mediaobjectco/audioobject
+                                         |screenshot/mediaobjectco/textobject
+
+                                         |graphic
+                                         |graphicco/graphic
+                                         |screenshot/graphic
+                                         |screenshot/graphicco/graphic"/>
 
       <xsl:variable name="object.index">
         <xsl:call-template name="select.mediaobject.index">