Author: gmcdonald
Date: Wed Oct 1 02:02:30 2008
New Revision: 700720
URL: http://svn.apache.org/viewvc?rev=700720&view=rev
Log:
Output styling tweaks.
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.OOo/resources/stylesheets/include_styles.xml
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/include_styles.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.OOo/resources/stylesheets/include_styles.xml?rev=700720&r1=700719&r2=700720&view=diff
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.OOo/resources/stylesheets/include_styles.xml
(original)
+++
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.OOo/resources/stylesheets/include_styles.xml
Wed Oct 1 02:02:30 2008
@@ -51,7 +51,7 @@
</style:default-style>
<style:style style:name="Standard" style:family="paragraph"
style:class="text"/>
<style:style style:name="Text_20_body" style:display-name="Text body"
style:family="paragraph" style:parent-style-name="Standard" style:class="text"
style:master-page-name="">
-<style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.212cm"
fo:hyphenation-ladder-count="no-limit" style:register-true="true"/>
+<style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.212cm"
fo:margin-left="1cm" fo:hyphenation-ladder-count="no-limit"
style:register-true="true"/>
<style:text-properties style:font-name="Times New Roman" fo:hyphenate="true"
fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2"/>
</style:style><style:style style:name="Heading" style:family="paragraph"
style:parent-style-name="Standard" style:next-style-name="Text_20_body"
style:class="text">
<style:paragraph-properties fo:margin-top="0.423cm" fo:margin-bottom="0.212cm"
fo:keep-with-next="always"/>
@@ -185,4 +185,4 @@
</style:footer>
</style:master-page>
</office:master-styles>
-</office:document-styles>
\ No newline at end of file
+</office:document-styles>
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=700720&r1=700719&r2=700720&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
Wed Oct 1 02:02:30 2008
@@ -111,7 +111,7 @@
<text:a xlink:type="simple" xlink:href="[EMAIL
PROTECTED]"><xsl:value-of select="."/></text:a>
</xsl:template>
<xsl:template match="p">
- <text:p><xsl:apply-templates/></text:p>
+ <text:p text:style-name="P2"><xsl:apply-templates/></text:p>
</xsl:template>
<xsl:template match="ul">
<text:list>
@@ -181,8 +181,8 @@
<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:attribute name="svg:width"><xsl:value-of
select="@width"/>px</xsl:attribute>
+ <xsl:attribute name="svg:height"><xsl:value-of
select="@height"/>px</xsl:attribute>
<xsl:call-template name="drawImage"/>
</draw:frame>
<xsl:apply-templates/>
