You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by cb...@apache.org on 2005/08/09 16:56:55 UTC
svn commit: r231047 - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/render/xml/XMLRenderer.java
test/layoutengine/testcases/external-graphic-display-align.xml
test/layoutengine/testcases/ifo-display-align.xml
Author: cbowditch
Date: Tue Aug 9 07:56:41 2005
New Revision: 231047
URL: http://svn.apache.org/viewcvs?rev=231047&view=rev
Log:
Submitted by: Manuel Mall <mm.at.arcus.com.au>
ref to bugzilla 36098
Added:
xmlgraphics/fop/trunk/test/layoutengine/testcases/external-graphic-display-align.xml (with props)
xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo-display-align.xml (with props)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRenderer.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRenderer.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRenderer.java?rev=231047&r1=231046&r2=231047&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRenderer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRenderer.java Tue Aug 9 07:56:41 2005
@@ -560,6 +560,7 @@
atts.clear();
addAreaAttributes(fo);
addTraitAttributes(fo);
+ addAttribute("pos", pos);
startElement("foreignObject", atts);
Document doc = fo.getDocument();
String ns = fo.getNameSpace();
Added: xmlgraphics/fop/trunk/test/layoutengine/testcases/external-graphic-display-align.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/testcases/external-graphic-display-align.xml?rev=231047&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/testcases/external-graphic-display-align.xml (added)
+++ xmlgraphics/fop/trunk/test/layoutengine/testcases/external-graphic-display-align.xml Tue Aug 9 07:56:41 2005
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+ <info>
+ <p>
+ This test checks external-graphics with display-align.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="210mm" page-height="297mm">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>plain external-graphic</fo:block>
+ <fo:block>
+ <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg" block-progression-dimension="60pt"/>EOG
+ </fo:block>
+ <fo:block>external-graphic with display-align="auto"</fo:block>
+ <fo:block>
+ <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg" display-align="auto" block-progression-dimension="60pt"/>EOG
+ </fo:block>
+ <fo:block>external-graphic with display-align="before"</fo:block>
+ <fo:block>
+ <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg" display-align="before" block-progression-dimension="60pt"/>EOG
+ </fo:block>
+ <fo:block>external-graphic with display-align="center"</fo:block>
+ <fo:block>
+ <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg" display-align="center" block-progression-dimension="60pt"/>EOG
+ </fo:block>
+ <fo:block>external-graphic with display-align="after"</fo:block>
+ <fo:block>
+ <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg" display-align="after" block-progression-dimension="60pt"/>EOG
+ </fo:block>
+ <fo:block>EOF</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+ <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+ <eval expected="60000" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+ <eval expected="60000" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+ <eval expected="0 0 46080 46080" xpath="//flow/block[2]/lineArea/viewport/image/@pos"/>
+ <eval expected="46080" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>
+ <eval expected="46080" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>
+ <eval expected="60000" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>
+ <eval expected="60000" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>
+ <eval expected="0 0 46080 46080" xpath="//flow/block[4]/lineArea/viewport/image/@pos"/>
+ <eval expected="46080" xpath="//flow/block[6]/lineArea/viewport/@ipd"/>
+ <eval expected="46080" xpath="//flow/block[6]/lineArea/viewport/@ipda"/>
+ <eval expected="60000" xpath="//flow/block[6]/lineArea/viewport/@bpd"/>
+ <eval expected="60000" xpath="//flow/block[6]/lineArea/viewport/@bpda"/>
+ <eval expected="0 0 46080 46080" xpath="//flow/block[6]/lineArea/viewport/image/@pos"/>
+ <eval expected="46080" xpath="//flow/block[8]/lineArea/viewport/@ipd"/>
+ <eval expected="46080" xpath="//flow/block[8]/lineArea/viewport/@ipda"/>
+ <eval expected="60000" xpath="//flow/block[8]/lineArea/viewport/@bpd"/>
+ <eval expected="60000" xpath="//flow/block[8]/lineArea/viewport/@bpda"/>
+ <eval expected="0 6960 46080 46080" xpath="//flow/block[8]/lineArea/viewport/image/@pos"/>
+ <eval expected="46080" xpath="//flow/block[10]/lineArea/viewport/@ipd"/>
+ <eval expected="46080" xpath="//flow/block[10]/lineArea/viewport/@ipda"/>
+ <eval expected="60000" xpath="//flow/block[10]/lineArea/viewport/@bpd"/>
+ <eval expected="60000" xpath="//flow/block[10]/lineArea/viewport/@bpda"/>
+ <eval expected="0 13920 46080 46080" xpath="//flow/block[10]/lineArea/viewport/image/@pos"/>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/testcases/external-graphic-display-align.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/testcases/external-graphic-display-align.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo-display-align.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo-display-align.xml?rev=231047&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo-display-align.xml (added)
+++ xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo-display-align.xml Tue Aug 9 07:56:41 2005
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+ <info>
+ <p>
+ This test checks instream-foreign-object with display-align.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="210mm" page-height="297mm">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>plain instream-foreign-object</fo:block>
+ <fo:block>
+ <fo:instream-foreign-object content-width="20pt" content-height="20pt" block-progression-dimension="30pt">
+ <svg:svg viewBox="0 0 20 20">
+ <svg:g style="fill:red; stroke:#000000">
+ <svg:rect x="0" y="0" width="15" height="15"/>
+ <svg:rect x="5" y="5" width="15" height="15"/>
+ </svg:g>
+ </svg:svg>
+ </fo:instream-foreign-object>End
+ </fo:block>
+ <fo:block>instream-foreign-object with display-align="auto"</fo:block>
+ <fo:block>
+ <fo:instream-foreign-object content-width="20pt" content-height="20pt" display-align="auto" block-progression-dimension="30pt">
+ <svg:svg viewBox="0 0 20 20">
+ <svg:g style="fill:red; stroke:#000000">
+ <svg:rect x="0" y="0" width="15" height="15"/>
+ <svg:rect x="5" y="5" width="15" height="15"/>
+ </svg:g>
+ </svg:svg>
+ </fo:instream-foreign-object>End
+ </fo:block>
+ <fo:block>instream-foreign-object with display-align="before"</fo:block>
+ <fo:block>
+ <fo:instream-foreign-object content-width="20pt" content-height="20pt" display-align="before" block-progression-dimension="30pt">
+ <svg:svg viewBox="0 0 20 20">
+ <svg:g style="fill:red; stroke:#000000">
+ <svg:rect x="0" y="0" width="15" height="15"/>
+ <svg:rect x="5" y="5" width="15" height="15"/>
+ </svg:g>
+ </svg:svg>
+ </fo:instream-foreign-object>End
+ </fo:block>
+ <fo:block>instream-foreign-object with display-align="center"</fo:block>
+ <fo:block>
+ <fo:instream-foreign-object content-width="20pt" content-height="20pt" display-align="center" block-progression-dimension="30pt">
+ <svg:svg viewBox="0 0 20 20">
+ <svg:g style="fill:red; stroke:#000000">
+ <svg:rect x="0" y="0" width="15" height="15"/>
+ <svg:rect x="5" y="5" width="15" height="15"/>
+ </svg:g>
+ </svg:svg>
+ </fo:instream-foreign-object>End
+ </fo:block>
+ <fo:block>instream-foreign-object with display-align="after"</fo:block>
+ <fo:block>
+ <fo:instream-foreign-object content-width="20pt" content-height="20pt" display-align="after" block-progression-dimension="30pt">
+ <svg:svg viewBox="0 0 20 20">
+ <svg:g style="fill:red; stroke:#000000">
+ <svg:rect x="0" y="0" width="15" height="15"/>
+ <svg:rect x="5" y="5" width="15" height="15"/>
+ </svg:g>
+ </svg:svg>
+ </fo:instream-foreign-object>End
+ </fo:block>
+ <fo:block>EOF</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="20000" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+ <eval expected="20000" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+ <eval expected="30000" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+ <eval expected="30000" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+ <eval expected="0 0 20000 20000" xpath="//flow/block[2]/lineArea/viewport/foreignObject/@pos"/>
+ <eval expected="20000" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>
+ <eval expected="20000" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>
+ <eval expected="30000" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>
+ <eval expected="30000" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>
+ <eval expected="0 0 20000 20000" xpath="//flow/block[4]/lineArea/viewport/foreignObject/@pos"/>
+ <eval expected="20000" xpath="//flow/block[6]/lineArea/viewport/@ipd"/>
+ <eval expected="20000" xpath="//flow/block[6]/lineArea/viewport/@ipda"/>
+ <eval expected="30000" xpath="//flow/block[6]/lineArea/viewport/@bpd"/>
+ <eval expected="30000" xpath="//flow/block[6]/lineArea/viewport/@bpda"/>
+ <eval expected="0 0 20000 20000" xpath="//flow/block[6]/lineArea/viewport/foreignObject/@pos"/>
+ <eval expected="20000" xpath="//flow/block[8]/lineArea/viewport/@ipd"/>
+ <eval expected="20000" xpath="//flow/block[8]/lineArea/viewport/@ipda"/>
+ <eval expected="30000" xpath="//flow/block[8]/lineArea/viewport/@bpd"/>
+ <eval expected="30000" xpath="//flow/block[8]/lineArea/viewport/@bpda"/>
+ <eval expected="0 5000 20000 20000" xpath="//flow/block[8]/lineArea/viewport/foreignObject/@pos"/>
+ <eval expected="20000" xpath="//flow/block[10]/lineArea/viewport/@ipd"/>
+ <eval expected="20000" xpath="//flow/block[10]/lineArea/viewport/@ipda"/>
+ <eval expected="30000" xpath="//flow/block[10]/lineArea/viewport/@bpd"/>
+ <eval expected="30000" xpath="//flow/block[10]/lineArea/viewport/@bpda"/>
+ <eval expected="0 10000 20000 20000" xpath="//flow/block[10]/lineArea/viewport/foreignObject/@pos"/>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo-display-align.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo-display-align.xml
------------------------------------------------------------------------------
svn:keywords = Id
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org