forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gmcdon...@apache.org
Subject svn commit: r689016 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.OOo/resources/stylesheets/xdoc-to-odt.xsl
Date Tue, 26 Aug 2008 10:11:51 GMT
Author: gmcdonald
Date: Tue Aug 26 03:11:50 2008
New Revision: 689016

URL: http://svn.apache.org/viewvc?rev=689016&view=rev
Log:
re-work draw-frame to allow for variable values, progress towards FOR-1098

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.OOo/resources/stylesheets/xdoc-to-odt.xsl

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.OOo/resources/stylesheets/xdoc-to-odt.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.OOo/resources/stylesheets/xdoc-to-odt.xsl?rev=689016&r1=689015&r2=689016&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.OOo/resources/stylesheets/xdoc-to-odt.xsl
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.OOo/resources/stylesheets/xdoc-to-odt.xsl
Tue Aug 26 03:11:50 2008
@@ -141,7 +141,20 @@
           </xsl:choose>
         </xsl:template>
         <xsl:template match="img|figure|icon">
-          <draw:frame draw:style-name="fr1" draw:name="{@alt}" text:anchor-type="paragraph"
draw:z-index="0">
+                <draw:frame>
+                        <xsl:attribute name="draw:style-name">fr1</xsl:attribute>
+                        <xsl:attribute name="draw:name"><xsl:value-of select="@alt"/></xsl:attribute>
+                        <xsl:attribute name="text:anchor-type">paragraph</xsl:attribute>
+                        <xsl:attribute name="draw:z-index">0</xsl:attribute>
+                        <!-- FIXME: See FOR-1098 - The svg attributes below are being
ignored. -->
+                        <xsl:attribute name="svg:y">0cm</xsl:attribute>
+                        <xsl:attribute name="svg:width"><xsl:value-of select="@width
div 36"/>cm</xsl:attribute>
+                        <xsl:attribute name="svg:height"><xsl:value-of select="@height
div 36"/>cm</xsl:attribute>
+                        <xsl:call-template name="drawImage"/>
+            </draw:frame>
+            <xsl:apply-templates/>
+    </xsl:template>
+    <xsl:template name="drawImage">
             <draw:image>
               <xsl:attribute name="xlink:href">Pictures/<xsl:call-template name="fileName">
               <xsl:with-param name="path" select="@src"/>
@@ -150,10 +163,8 @@
                <xsl:attribute name="xlink:type">simple</xsl:attribute>
                <xsl:attribute name="xlink:show">embed</xsl:attribute>
                <xsl:attribute name="xlink:actuate">onLoad</xsl:attribute>
-             </draw:image>
-            </draw:frame>
-            <xsl:apply-templates/>
-    </xsl:template>
+       </draw:image>
+       </xsl:template>
     <!-- Tables -->
     <xsl:template match="table">
     <xsl:param name="count" select="count(following-sibling::tr)"/>



Mime
View raw message