cvs commit: xml-fop build.bat build.sh
pbwest 2004/10/05 04:13:32 Modified:.Tag: FOP_0-20-0_Alt-Design build.bat build.sh Log: Mods to make scripts independent of any particular jars in lib. Revision ChangesPath No revision No revision 1.12.2.4 +2 -5 xml-fop/build.bat Index: build.bat === RCS file: /home/cvs/xml-fop/build.bat,v retrieving revision 1.12.2.3 retrieving revision 1.12.2.4 diff -u -r1.12.2.3 -r1.12.2.4 --- build.bat 8 Jul 2003 11:11:11 - 1.12.2.3 +++ build.bat 5 Oct 2004 11:13:31 - 1.12.2.4 @@ -7,10 +7,7 @@ set LIBDIR=lib set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip -set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\ant.jar -set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xml-apis.jar -set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xercesImpl-2.2.1.jar -set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xalan-2.4.1.jar +for %%j in ( %LIBDIR%\*.jar ) do set LOCALCLASSPATH=%LOCALCLASSPATH%;%%j set ANT_HOME=%LIBDIR% 1.13.2.4 +4 -5 xml-fop/build.sh Index: build.sh === RCS file: /home/cvs/xml-fop/build.sh,v retrieving revision 1.13.2.3 retrieving revision 1.13.2.4 diff -u -r1.13.2.3 -r1.13.2.4 --- build.sh 8 Jul 2003 11:11:11 - 1.13.2.3 +++ build.sh 5 Oct 2004 11:13:31 - 1.13.2.4 @@ -79,10 +79,9 @@ LIBDIR=lib LOCALCLASSPATH="$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip" -LOCALCLASSPATH="$LOCALCLASSPATH:$LIBDIR/ant.jar" -LOCALCLASSPATH="$LOCALCLASSPATH:$LIBDIR/xml-apis.jar" -LOCALCLASSPATH="$LOCALCLASSPATH:$LIBDIR/xercesImpl-2.2.1.jar" -LOCALCLASSPATH="$LOCALCLASSPATH:$LIBDIR/xalan-2.4.1.jar" +for jar in $LIBDIR/*.jar; do +LOCALCLASSPATH="$LOCALCLASSPATH:$jar" +done ANT_HOME="$LIBDIR" # antRun must be executable (can't do this in build.xml because Ant uses antRun - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/lib commons-logging.jar commons-logging-api.jar
pbwest 2004/10/04 07:26:47 Removed: lib Tag: FOP_0-20-0_Alt-Design commons-logging.jar commons-logging-api.jar Log: Unused. FAD uses Java 1.4 logging - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/codegen/org/apache/fop/datatypes CountryLanguageScript.java
pbwest 2004/10/04 05:20:53
Modified:src/codegen/org/apache/fop/datatypes Tag:
FOP_0-20-0_Alt-Design CountryLanguageScript.java
Log:
Generated with UTF-8 encoding
Revision ChangesPath
No revision
No revision
1.1.2.9 +109 -109
xml-fop/src/codegen/org/apache/fop/datatypes/Attic/CountryLanguageScript.java
Index: CountryLanguageScript.java
===
RCS file:
/home/cvs/xml-fop/src/codegen/org/apache/fop/datatypes/Attic/CountryLanguageScript.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- CountryLanguageScript.java3 Oct 2004 01:32:42 - 1.1.2.8
+++ CountryLanguageScript.java4 Oct 2004 12:20:52 - 1.1.2.9
@@ -622,7 +622,7 @@
// Aleut
iso639_2T_ToENLang.put("ale", "Aleut");
-iso639_2T_ToFRLang.put("ale", "aléoute");
+iso639_2T_ToFRLang.put("ale", "aléoute");
// Algonquian languages
iso639_2T_ToENLang.put("alg", "Algonquian languages");
@@ -652,11 +652,11 @@
// Aramaic
iso639_2T_ToENLang.put("arc", "Aramaic");
-iso639_2T_ToFRLang.put("arc", "araméen");
+iso639_2T_ToFRLang.put("arc", "araméen");
// Armenian
iso639_2T_ToENLang.put("hye", "Armenian");
-iso639_2T_ToFRLang.put("hye", "arménien");
+iso639_2T_ToFRLang.put("hye", "arménien");
iso639_2B_To_639_2T.put("arm", "hye");
@@ -722,7 +722,7 @@
// Azerbaijani
iso639_2T_ToENLang.put("aze", "Azerbaijani");
-iso639_2T_ToFRLang.put("aze", "azéri");
+iso639_2T_ToFRLang.put("aze", "azéri");
iso639_1_To_639_2T.put("az", "aze");
iso639_2T_To_639_1.put("aze", "az");
@@ -733,7 +733,7 @@
// Bamileke languages
iso639_2T_ToENLang.put("bai", "Bamileke languages");
-iso639_2T_ToFRLang.put("bai", "bamilékés, langues");
+iso639_2T_ToFRLang.put("bai", "bamilékés, langues");
// Bashkir
iso639_2T_ToENLang.put("bak", "Bashkir");
@@ -777,7 +777,7 @@
// Belarusian
iso639_2T_ToENLang.put("bel", "Belarusian");
-iso639_2T_ToFRLang.put("bel", "biélorusse");
+iso639_2T_ToFRLang.put("bel", "biélorusse");
iso639_1_To_639_2T.put("be", "bel");
iso639_2T_To_639_1.put("bel", "be");
@@ -795,7 +795,7 @@
// Berber (Other)
iso639_2T_ToENLang.put("ber", "Berber (Other)");
-iso639_2T_ToFRLang.put("ber", "berbères, autres langues");
+iso639_2T_ToFRLang.put("ber", "berbères, autres langues");
// Bhojpuri
iso639_2T_ToENLang.put("bho", "Bhojpuri");
@@ -833,7 +833,7 @@
// Tibetan
iso639_2T_ToENLang.put("bod", "Tibetan");
-iso639_2T_ToFRLang.put("bod", "tibétain");
+iso639_2T_ToFRLang.put("bod", "tibétain");
iso639_2B_To_639_2T.put("tib", "bod");
@@ -860,7 +860,7 @@
// Batak (Indonesia)
iso639_2T_ToENLang.put("btk", "Batak (Indonesia)");
-iso639_2T_ToFRLang.put("btk", "batak (Indonésie)");
+iso639_2T_ToFRLang.put("btk", "batak (Indonésie)");
// Buriat
iso639_2T_ToENLang.put("bua", "Buriat");
@@ -892,7 +892,7 @@
// Central American Indian (Other)
iso639_2T_ToENLang.put("cai", "Central American Indian (Other)");
-iso639_2T_ToFRLang.put("cai", "indiennes d'Amérique centrale, autres
langues");
+iso639_2T_ToFRLang.put("cai", "indiennes d'Amérique centrale, autres
langues");
// Carib
iso639_2T_ToENLang.put("car", "Carib");
@@ -919,7 +919,7 @@
// Czech
iso639_2T_ToENLang.put("ces", "Czech");
-iso639_2T_ToFRLang.put("
cvs commit: xml-fop/lib commons-io.LICENSE.txt commons-io.NOTICE.txt
pbwest 2004/10/03 22:37:21 Added: lib Tag: FOP_0-20-0_Alt-Design commons-io.LICENSE.txt commons-io.NOTICE.txt Log: Updates Revision ChangesPath No revision No revision 1.1.2.1 +203 -56 xml-fop/lib/commons-io.LICENSE.txt Index: commons-io.LICENSE.txt === RCS file: /home/cvs/xml-fop/lib/commons-io.LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- commons-io.LICENSE.txt27 Mar 2003 11:38:23 - 1.1 +++ commons-io.LICENSE.txt4 Oct 2004 05:37:21 - 1.1.2.1 @@ -1,56 +1,203 @@ -/* - * - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999-2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, if - *any, must include the following acknowlegement: - * "This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/)." - *Alternately, this acknowlegement may appear in the software itself, - *if and wherever such third-party acknowlegements normally appear. - * - * 4. The names "The Jakarta Project", "Commons", and "Apache Software - *Foundation" must not be used to endorse or promote products derived - *from this software without prior written permission. For written - *permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called "Apache" - *nor may "Apache" appear in their names without prior written - *permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - * - */ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred f
cvs commit: xml-fop/lib commons-logging.LICENSE.txt
pbwest 2004/10/03 22:36:03 Removed: lib Tag: FOP_0-20-0_Alt-Design commons-logging.LICENSE.txt Log: Superseded - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/lib jakarta-commons-io-SNAPSHOT.jar
pbwest 2004/10/03 22:34:58 Removed: lib Tag: FOP_0-20-0_Alt-Design jakarta-commons-io-SNAPSHOT.jar Log: Superseded - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/lib commons-io-1.0.jar
pbwest 2004/10/03 22:34:09 Added: lib Tag: FOP_0-20-0_Alt-Design commons-io-1.0.jar Log: Update Revision ChangesPath No revision No revision 1.1.2.1 +0 -0 xml-fop/lib/commons-io-1.0.jar <> - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/pagination PageSequenceMaster.java
pbwest 2004/10/03 22:18:13
Modified:src/java/org/apache/fop/fo/pagination Tag:
FOP_0-20-0_Alt-Design PageSequenceMaster.java
Log:
Modified for 1.5 compatibility
Revision ChangesPath
No revision
No revision
1.1.2.8 +7 -7
xml-fop/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
Index: PageSequenceMaster.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- PageSequenceMaster.java 15 Feb 2004 03:45:52 - 1.1.2.7
+++ PageSequenceMaster.java 4 Oct 2004 05:18:13 - 1.1.2.8
@@ -203,24 +203,24 @@
for (int cond = 0; cond < numConds; cond++) {
FoConditionalPageMasterReference foCond;
int blankOrNot, oddOrEven, pagePosition;
-EnumType enum;
+EnumType enumval;
foCond = (FoConditionalPageMasterReference)
(masterReference.getChild(cond));
// Get the master-reference property value
simplePM = getMasterReference(foCond, simplePageMasters);
-enum = (EnumType)
+enumval = (EnumType)
(foCond.getPropertyValue
(PropNames.BLANK_OR_NOT_BLANK));
-blankOrNot = enum.getEnumValue();
-enum = (EnumType)
+blankOrNot = enumval.getEnumValue();
+enumval = (EnumType)
(foCond.getPropertyValue
(PropNames.ODD_OR_EVEN));
-oddOrEven = enum.getEnumValue();
-enum = (EnumType)
+oddOrEven = enumval.getEnumValue();
+enumval = (EnumType)
(foCond.getPropertyValue
(PropNames.PAGE_POSITION));
-pagePosition = enum.getEnumValue();
+pagePosition = enumval.getEnumValue();
// Create and add a single default PageCondition
masterAlt.addCondition
(masterAlt.new PageCondition
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/datatypes EnumType.java
pbwest 2004/10/03 15:41:56
Modified:src/java/org/apache/fop/fonts/apps Tag:
FOP_0-20-0_Alt-Design PFMReader.java TTFReader.java
src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
PropertyConsts.java
src/java/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design
EnumType.java
Log:
Removed variables 'enum' for 1.5 compatibility
Revision ChangesPath
No revision
No revision
1.2.2.2 +3 -3 xml-fop/src/java/org/apache/fop/fonts/apps/PFMReader.java
Index: PFMReader.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fonts/apps/PFMReader.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- PFMReader.java10 Mar 2004 06:24:29 - 1.2.2.1
+++ PFMReader.java3 Oct 2004 22:41:56 - 1.2.2.2
@@ -345,9 +345,9 @@
// Get kerning
-Iterator enum = pfm.getKerning().keySet().iterator();
-while (enum.hasNext()) {
-Integer kpx1 = (Integer)enum.next();
+Iterator iter = pfm.getKerning().keySet().iterator();
+while (iter.hasNext()) {
+Integer kpx1 = (Integer)iter.next();
el = doc.createElement("kerning");
el.setAttribute("kpx1", kpx1.toString());
root.appendChild(el);
1.3.2.2 +5 -5 xml-fop/src/java/org/apache/fop/fonts/apps/TTFReader.java
Index: TTFReader.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fonts/apps/TTFReader.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- TTFReader.java10 Mar 2004 06:24:29 - 1.3.2.1
+++ TTFReader.java3 Oct 2004 22:41:56 - 1.3.2.2
@@ -443,15 +443,15 @@
Document doc = parent.getOwnerDocument();
// Get kerning
-Iterator enum;
+Iterator iter;
if (isCid) {
-enum = ttf.getKerning().keySet().iterator();
+iter = ttf.getKerning().keySet().iterator();
} else {
-enum = ttf.getAnsiKerning().keySet().iterator();
+iter = ttf.getAnsiKerning().keySet().iterator();
}
-while (enum.hasNext()) {
-Integer kpx1 = (Integer)enum.next();
+while (iter.hasNext()) {
+Integer kpx1 = (Integer)iter.next();
el = doc.createElement("kerning");
el.setAttribute("kpx1", kpx1.toString());
No revision
No revision
1.1.2.7 +10 -10xml-fop/src/java/org/apache/fop/fo/Attic/PropertyConsts.java
Index: PropertyConsts.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/PropertyConsts.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- PropertyConsts.java 30 May 2004 06:29:02 - 1.1.2.6
+++ PropertyConsts.java 3 Oct 2004 22:41:56 - 1.1.2.7
@@ -205,16 +205,16 @@
* Get the Numeric value corresponding to an enumerated value.
* @param foNode the FONode being built
* @param propindex int index of the FO property
- * @param enum - the integer equivalent of the enumeration keyword.
+ * @param enumval - the integer equivalent of the enumeration keyword.
* @return the Numeric result.
* @throws PropertyException
*/
-public Numeric getMappedNumeric(FONode foNode, int propindex, int enum)
+public Numeric getMappedNumeric(FONode foNode, int propindex, int enumval)
throws PropertyException
{
Property property = setupProperty(propindex);
if ((datatypes[propindex] & Property.MAPPED_LENGTH) != 0)
-return property.getMappedLength(foNode, enum);
+return property.getMappedLength(foNode, enumval);
else
throw new PropertyException
("MAPPED_LENGTH not valid in "
@@ -250,7 +250,7 @@
}
/**
- * Map the integer value of an enum into its mapped value.
+ * Map the integer value of an enumval into its mapped value.
* Only valid when the datatype of the property includes MAPPED_ENUM.
* Generally, the path will be enumText->enumIndex->mappedEnumText.
* @param index int containing the enumeration index.
@@ -265,15 +265,15 @@
/**
* @param propindex int property index.
- * @param enum String containing the enumeration text.
+ * @param enumval
cvs commit: xml-fop build.xml
pbwest 2004/10/03 15:38:16 Modified:.Tag: FOP_0-20-0_Alt-Design build.xml Log: Changed temp properties file name for compatibility with NetBeans Revision ChangesPath No revision No revision 1.37.2.13 +1 -1 xml-fop/build.xml Index: build.xml === RCS file: /home/cvs/xml-fop/build.xml,v retrieving revision 1.37.2.12 retrieving revision 1.37.2.13 diff -u -r1.37.2.12 -r1.37.2.13 --- build.xml 13 May 2004 13:45:46 - 1.37.2.12 +++ build.xml 3 Oct 2004 22:38:15 - 1.37.2.13 @@ -197,7 +197,7 @@ - + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/codegen xml-lang.xsl
pbwest 2004/10/02 20:05:22 Modified:src/codegen Tag: FOP_0-20-0_Alt-Design xml-lang.xsl Log: Encoding change Revision ChangesPath No revision No revision 1.1.2.7 +4 -4 xml-fop/src/codegen/Attic/xml-lang.xsl Index: xml-lang.xsl === RCS file: /home/cvs/xml-fop/src/codegen/Attic/xml-lang.xsl,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -u -r1.1.2.6 -r1.1.2.7 --- xml-lang.xsl 29 May 2004 14:24:23 - 1.1.2.6 +++ xml-lang.xsl 3 Oct 2004 03:05:22 - 1.1.2.7 @@ -1,4 +1,4 @@ - + http://www.w3.org/1999/XSL/Transform";> @@ -32,7 +32,7 @@ from the input file xml-lang.xml found in the conf directory. --> - + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/codegen/org/apache/fop/datatypes CountryLanguageScript.java
pbwest 2004/10/02 18:32:42 Modified:src/codegen/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design CountryLanguageScript.java Log: Tinkering with file encodings Revision ChangesPath No revision No revision 1.1.2.8 +1 -1 xml-fop/src/codegen/org/apache/fop/datatypes/Attic/CountryLanguageScript.java Index: CountryLanguageScript.java === RCS file: /home/cvs/xml-fop/src/codegen/org/apache/fop/datatypes/Attic/CountryLanguageScript.java,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -u -r1.1.2.7 -r1.1.2.8 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/.externalToolBuilders Alt-Design build.launch Alt-design clean build.launch
pbwest 2004/09/12 00:02:04 Modified:.externalToolBuilders Tag: FOP_0-20-0_Alt-Design Alt-Design build.launch Alt-design clean build.launch Log: Changes to launch configs Revision ChangesPath No revision No revision No revision No revision No revision No revision No revision - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/build/classes/conf .cvsignore
pbwest 2004/09/12 00:01:16 Modified:build/classes/conf Tag: FOP_0-20-0_Alt-Design .cvsignore Log: Ignore all Revision ChangesPath No revision No revision 1.1.2.4 +1 -5 xml-fop/build/classes/conf/Attic/.cvsignore Index: .cvsignore === RCS file: /home/cvs/xml-fop/build/classes/conf/Attic/.cvsignore,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- .cvsignore15 Apr 2004 07:49:09 - 1.1.2.3 +++ .cvsignore12 Sep 2004 07:01:16 - 1.1.2.4 @@ -1,5 +1 @@ -config.dtd -config.xml -fop.system.properties -fop.xconf -logging.properties +* \ No newline at end of file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo FoRoot.java
pbwest 2004/09/11 23:57:12
Modified:src/java/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design
FoPageSequence.java
src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FoRoot.java
Log:
Work in progress
Revision ChangesPath
No revision
No revision
1.1.2.19 +90 -30
xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPageSequence.java
Index: FoPageSequence.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPageSequence.java,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- FoPageSequence.java 3 Jun 2004 13:28:47 - 1.1.2.18
+++ FoPageSequence.java 12 Sep 2004 06:57:12 - 1.1.2.19
@@ -36,17 +36,19 @@
import org.apache.fop.area.Area;
import org.apache.fop.area.Page;
import org.apache.fop.area.PageList;
-import org.apache.fop.area.PageListElement;
-import org.apache.fop.area.PageSet;
-import org.apache.fop.area.PageSetElement;
import org.apache.fop.datastructs.TreeException;
+import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.IntegerType;
+import org.apache.fop.datatypes.Numeric;
+import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FOPageSeqNode;
import org.apache.fop.fo.FOTree;
import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.FoRoot;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.pagination.FoLayoutMasterSet;
+import org.apache.fop.fo.properties.InitialPageNumber;
import org.apache.fop.xml.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.XmlEventReader;
@@ -129,6 +131,7 @@
private int flowChild = -1;
/** The page currently being processed by this page-sequence */
private Page page = null;
+
/**
* Gets the current page of this page-sequence
* @return the page
@@ -137,22 +140,30 @@
return page;
}
-/** The PageList for this page-sequence */
-private PageList pagelist = null;
-/** The index of the current element in the pagelist */
+/** The PageList containing the flattened
+ * pageTree for this page-sequence. This PageList contains
+ * only Page elements. */
+private ArrayList pageArray = new ArrayList();
+/** The index of the current element in the pageList */
private int pgListIndex = -1;
+/** The tree of all layout attempts for this page-sequence */
+private PageList pageList = null;
+/** An array of indicies mapping the path through the
+ * pageTree to the current element */
+private ArrayList pageTreeMap = null;
+
/**
- * @return the pagelist
+ * @return the pageList
*/
-public PageList getPagelist() {
-return pagelist;
+public PageList getPageList() {
+return pageList;
}
/**
- * @param pagelist to set
+ * @param pageList to set
*/
-public void setPagelist(PageList pagelist) {
-this.pagelist = pagelist;
+public void setPagelist(PageList pageList) {
+this.pageList = pageList;
}
/**
* @return the pgListIndex
@@ -167,22 +178,69 @@
this.pgListIndex = pgListIndex;
}
+public Page getCurr1stPage() {
+if (pageArray == null) {
+return null;
+}
+return (Page)(pageArray.get(0));
+}
+
/**
- * Gets the current first page
- * @return the first page
+ * The number of the page being laid out
*/
-public Page getCurr1stPage() {
-PageListElement firstPage = pagelist.get(0);
-while (firstPage.isPageSet()) {
-PageSet pageset = (PageSet)firstPage;
-PageSetElement setEl = pageset.get(pageset.getCurrentElement());
-if (setEl.isPageList()) {
-firstPage = ((PageList)setEl).get(0);
+private int currPageNumber = 0;
+
+private FoRoot root;
+
+private void getInitialPageNumber() {
+PropertyValue pv;
+try {
+pv = getPropertyValue(PropNames.INITIAL_PAGE_NUMBER);
+} catch (PropertyException e) {
+throw new RuntimeException(
+"Unable to obtain InitialPageNumber value");
+}
+int i = 0;
+int lastnum = root.getLastPageNumber();
+switch (pv.getType()) {
+case PropertyValue.AUTO:
+currPageNumber = lastnum + 1;
+break;
+case PropertyValue.ENUM:
+i = ((EnumType)pv).ge
cvs commit: xml-fop/src/java/org/apache/fop/fo/properties ForcePageCount.java
pbwest 2004/09/11 23:30:19
Modified:src/java/org/apache/fop/fo/properties Tag:
FOP_0-20-0_Alt-Design ForcePageCount.java
Log:
Added FORCE_AUTO enum
Revision ChangesPath
No revision
No revision
1.1.2.6 +3 -1
xml-fop/src/java/org/apache/fop/fo/properties/Attic/ForcePageCount.java
Index: ForcePageCount.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/ForcePageCount.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ForcePageCount.java 25 Feb 2004 23:09:09 - 1.1.2.5
+++ ForcePageCount.java 12 Sep 2004 06:30:19 - 1.1.2.6
@@ -49,6 +49,7 @@
public static final int END_ON_EVEN = 3;
public static final int END_ON_ODD = 4;
public static final int NO_FORCE = 5;
+public static final int FORCE_AUTO = 6;
public static final int inherited = NO;
@@ -64,6 +65,7 @@
,"end-on-even"
,"end-on-odd"
,"no-force"
+,"auto"
};
private static final HashMap rwEnumHash;
static {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/lib ant.LICENSE.txt
pbwest 2004/08/20 17:31:09 Removed: lib Tag: FOP_0-20-0_Alt-Design ant.LICENSE.txt Log: Windows case problems - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area BlockContentRectangle.java BlockAllocationRectangle.java
pbwest 2004/07/24 10:40:02 Removed: src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design BlockContentRectangle.java BlockAllocationRectangle.java Log: Superseded by the BlockArea inner class BlockAllocationRectangle - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area BlockArea.java
pbwest 2004/07/24 10:34:49
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
BlockArea.java
Log:
BlockAllocationRectangle implements AreaListener
BlockAllocationRectangle instance created in constructor of BlockArea
setDimensions() from AreaListener is implements by re-calculating the
allocation-recatngle dimensions
Revision ChangesPath
No revision
No revision
1.1.2.11 +14 -5 xml-fop/src/java/org/apache/fop/area/Attic/BlockArea.java
Index: BlockArea.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/BlockArea.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- BlockArea.java10 Jul 2004 16:38:44 - 1.1.2.10
+++ BlockArea.java24 Jul 2004 17:34:48 - 1.1.2.11
@@ -40,9 +40,11 @@
Node parent,
Object sync) {
super(pageSeq, generatedBy, parent, sync);
-// TODO Auto-generated constructor stub
+// Setup the allocation-rectangle
+allocation = new BlockAllocationRectangle();
}
+private BlockAllocationRectangle allocation;
/** The page space allocation for layout of the block */
private Rectangle2D pageSpace = new Rectangle2D.Double();
/** The content space equivalent to the pageSpace */
@@ -142,7 +144,7 @@
* @version $Revision$ $Name$
*/
public class BlockAllocationRectangle extends AreaFrame implements
-AllocationRectangle {
+AllocationRectangle, AreaListener {
private PaddingRectangle padding;
private BorderRectangle borders;
@@ -167,16 +169,23 @@
padding = BlockArea.this.getPadding();
borders = BlockArea.this.getBorders();
spaces = BlockArea.this.getSpaces();
+// Register the listener
+spaces.registerAreaListener(this);
setAllocationFrame();
}
public void setAllocationFrame() {
+// TODO synchronize this
setStart(spaces.getStart() + borders.getStart() + padding.getStart());
setEnd(spaces.getEnd() + borders.getEnd() + padding.getEnd());
setBefore(borders.getBefore() + padding.getBefore());
setAfter(borders.getAfter() + padding.getAfter());
}
+public void setDimensions(Rectangle2D geometry) {
+setAllocationFrame();
+}
+
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area SpacesRectangle.java
pbwest 2004/07/24 10:01:50
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
SpacesRectangle.java
Log:
Added registerAreaListener() and notifyListeners to allow AllocationRectangle
objects to register interest in size modifications to spaces
Override setContents() to call notifyListeners() to update any dependent
AllocationRectangles
Revision ChangesPath
No revision
No revision
1.1.2.6 +40 -2 xml-fop/src/java/org/apache/fop/area/Attic/SpacesRectangle.java
Index: SpacesRectangle.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/SpacesRectangle.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SpacesRectangle.java 14 Jun 2004 08:53:46 - 1.1.2.5
+++ SpacesRectangle.java 24 Jul 2004 17:01:50 - 1.1.2.6
@@ -21,6 +21,9 @@
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
+import java.util.ArrayList;
+
+import org.apache.fop.area.Area.AreaGeometry;
/**
* @author pbw
@@ -51,5 +54,40 @@
BorderRectangle contents, Point2D contentOffset) {
super(area, rect, contents, contentOffset);
}
+
+public void setContents(AreaGeometry contents) {
+super.setContents(contents);
+notifyListeners(this);
+}
+
+/** Initial size of the listeners array */
+private static final int INITIAL_SPACES_LISTENER_SIZE = 1;
+/** Array of registered AreaListeners */
+private ArrayList listeners = null;
+/**
+ * Registers a listener to be notified on any change of dimension in the
+ * spaces AreaFrame.
+ * @param listener to be notified
+ */
+public void registerAreaListener(AreaListener listener) {
+synchronized (this) {
+if (listeners == null) {
+listeners = new ArrayList(INITIAL_SPACES_LISTENER_SIZE);
+}
+listeners.add(listener);
+}
+}
+
+/**
+ * Notifies any registered listener of a change of dimensions in the
+ * Rectangle2D content
+ */
+protected void notifyListeners(Area.AreaGeometry geometry) {
+for (int i = 0; i < listeners.size(); i++) {
+synchronized (this) {
+((AreaListener)(listeners.get(i))).setDimensions(geometry);
+}
+}
+}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area PaddingRectangle.java
pbwest 2004/07/24 09:57:02
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
PaddingRectangle.java
Log:
Override setContents() to trigger update of borders
Revision ChangesPath
No revision
No revision
1.1.2.8 +9 -3 xml-fop/src/java/org/apache/fop/area/Attic/PaddingRectangle.java
Index: PaddingRectangle.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/PaddingRectangle.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- PaddingRectangle.java 10 Jul 2004 16:35:25 - 1.1.2.7
+++ PaddingRectangle.java 24 Jul 2004 16:57:02 - 1.1.2.8
@@ -21,6 +21,7 @@
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
+import org.apache.fop.area.Area.AreaGeometry;
/**
* @author pbw
@@ -79,6 +80,11 @@
public BorderRectangle getBorders() {
return borders;
+}
+
+public void setContents(AreaGeometry contents) {
+super.setContents(contents);
+borders.setContents(this);
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area BorderRectangle.java
pbwest 2004/07/24 09:56:00
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
BorderRectangle.java
Log:
Override setContenst() to trigger update of spaces
Revision ChangesPath
No revision
No revision
1.1.2.7 +9 -2 xml-fop/src/java/org/apache/fop/area/Attic/BorderRectangle.java
Index: BorderRectangle.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/BorderRectangle.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BorderRectangle.java 10 Jul 2004 16:34:15 - 1.1.2.6
+++ BorderRectangle.java 24 Jul 2004 16:56:00 - 1.1.2.7
@@ -22,6 +22,8 @@
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
+import org.apache.fop.area.Area.AreaGeometry;
+
/**
* @author pbw
* @version $Revision$ $Name$
@@ -55,6 +57,11 @@
public SpacesRectangle getSpaces() {
return spaces;
+}
+
+public void setContents(AreaGeometry contents) {
+super.setContents(contents);
+spaces.setContents(this);
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area AreaFrame.java
pbwest 2004/07/24 09:54:30
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
AreaFrame.java
Log:
getContents() returns AreaGeometry instead of Rectangle2D
Revision ChangesPath
No revision
No revision
1.1.2.12 +4 -4 xml-fop/src/java/org/apache/fop/area/Attic/AreaFrame.java
Index: AreaFrame.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/AreaFrame.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- AreaFrame.java8 Jul 2004 17:21:36 - 1.1.2.11
+++ AreaFrame.java24 Jul 2004 16:54:30 - 1.1.2.12
@@ -125,7 +125,7 @@
this.contents = contents;
}
-public Rectangle2D getContents() {
+public AreaGeometry getContents() {
return contents;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area Area.java
pbwest 2004/07/24 09:53:21
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
Area.java
Log:
Replaced setMargins() with individual margin setting methods
Revision ChangesPath
No revision
No revision
1.1.2.28 +7 -2 xml-fop/src/java/org/apache/fop/area/Area.java
Index: Area.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Area.java,v
retrieving revision 1.1.2.27
retrieving revision 1.1.2.28
diff -u -r1.1.2.27 -r1.1.2.28
--- Area.java 24 Jul 2004 05:12:50 - 1.1.2.27
+++ Area.java 24 Jul 2004 16:53:20 - 1.1.2.28
@@ -94,11 +94,16 @@
return content;
}
-protected void setMargins(
- double before, double after, double start, double end) {
+protected void setBeforeMargin(double before) {
spaces.setBefore(before);
+}
+protected void setAfterMargin(double after) {
spaces.setAfter(after);
+}
+protected void setStartMargin(double start) {
spaces.setStart(start);
+}
+protected void setEndMargin(double end) {
spaces.setEnd(end);
}
/** Translates this area into position in its parent area */
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area/doc-files Area.sxd Area.png
pbwest 2004/07/23 22:26:27 Modified:src/java/org/apache/fop/area/doc-files Tag: FOP_0-20-0_Alt-Design Area.sxd Area.png Log: Updated documentation Revision ChangesPath No revision No revision 1.1.2.3 +26 -42xml-fop/src/java/org/apache/fop/area/doc-files/Attic/Area.sxd <> 1.1.2.3 +266 -225 xml-fop/src/java/org/apache/fop/area/doc-files/Attic/Area.png <> - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop .project
pbwest 2004/07/23 22:21:35 Modified:.Tag: FOP_0-20-0_Alt-Design .project Log: Updates to project Revision ChangesPath No revision No revision 1.1.2.7 +3 -9 xml-fop/Attic/.project Index: .project === RCS file: /home/cvs/xml-fop/Attic/.project,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -u -r1.1.2.6 -r1.1.2.7 --- .project 6 Mar 2004 06:06:03 - 1.1.2.6 +++ .project 24 Jul 2004 05:21:35 - 1.1.2.7 @@ -10,9 +10,7 @@ LaunchConfigHandle - <?xml version="1.0" encoding="UTF-8"?> -<launchConfiguration local="false" path="/FOP_Alt-Design/.externalToolBuilders/Alt-design clean.launch"/> - + <project>/.externalToolBuilders/Alt-design clean.launch @@ -21,9 +19,7 @@ LaunchConfigHandle - <?xml version="1.0" encoding="UTF-8"?> -<launchConfiguration local="false" path="/FOP_Alt-Design/.externalToolBuilders/Alt-design clean build.launch"/> - + <project>/.externalToolBuilders/Alt-design clean build.launch @@ -32,9 +28,7 @@ LaunchConfigHandle - <?xml version="1.0" encoding="UTF-8"?> -<launchConfiguration local="false" path="/FOP_Alt-Design/.externalToolBuilders/Alt-Design build.launch"/> - + <project>/.externalToolBuilders/Alt-Design build.launch - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop javadoc.xml
pbwest 2004/07/23 22:21:13 Added: .Tag: FOP_0-20-0_Alt-Design javadoc.xml Log: XML for generation of Javadoc Revision ChangesPath No revision No revision 1.1.2.1 +9 -0 xml-fop/Attic/javadoc.xml - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/.externalToolBuilders Alt-design clean.launch Alt-design clean build.launch
pbwest 2004/07/23 22:19:30 Modified:.externalToolBuilders Tag: FOP_0-20-0_Alt-Design Alt-design clean.launch Alt-design clean build.launch Log: Eclipse data updates Revision ChangesPath No revision No revision No revision No revision No revision No revision No revision - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area Area.java
pbwest 2004/07/23 22:12:51
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
Area.java
Log:
Moved most frame-relative fields and methods to BlockReferenceArea.
Revision ChangesPath
No revision
No revision
1.1.2.27 +24 -39xml-fop/src/java/org/apache/fop/area/Area.java
Index: Area.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Area.java,v
retrieving revision 1.1.2.26
retrieving revision 1.1.2.27
diff -u -r1.1.2.26 -r1.1.2.27
--- Area.java 9 Jul 2004 00:27:44 - 1.1.2.26
+++ Area.java 24 Jul 2004 05:12:50 - 1.1.2.27
@@ -129,20 +129,6 @@
* differ from the writing mode of the generating FO if this is a
* reference-area. */
protected int frameWritingMode;
-/** True if the writing-mode of the frames of this area is
- * horizontal. May differ from contentIsHorizontal if this is a
- * reference-area. */
-protected boolean frameIsHorizontal = true;
-/** True if the the writing-mode of the frames of this area is
- * left-to-right. May differ from contentIsHorizontal if this is a
- * reference-area. */
-protected boolean frameLeftToRight = true;
-/** The rotation trait for the framing rectangles of this area */
-protected int frameRotation;
-/** Rotation from content to frame. One of 0, 90, 180, 270. */
-protected int rotateToFrame;
-/** Rotation from frame to content. One of 0, 90, 180, 270. */
-protected int rotateToContent;
protected void setup() {
try {
@@ -150,26 +136,14 @@
contentIsHorizontal = WritingMode.isHorizontal(contentWritingMode);
contentLeftToRight = WritingMode.isLeftToRight(contentWritingMode);
contentRotation = generatedBy.getRefOrientation();
-frameWritingMode =
-((FONode)generatedBy.getParent()).getWritingMode();
-frameIsHorizontal = WritingMode.isHorizontal(frameWritingMode);
-frameLeftToRight = WritingMode.isLeftToRight(frameWritingMode);
-frameRotation =
-((FONode)generatedBy.getParent()).getRefOrientation();
+frameWritingMode = contentWritingMode;
} catch (PropertyException e) {
throw new RuntimeException(e.getMessage());
}
-rotateToFrame = frameRotation - contentRotation;
-if (rotateToFrame == 0) {
-rotateToContent = 0;
-} else {
-if (rotateToFrame < 0) {
-rotateToContent = -rotateToFrame;
-rotateToFrame +=360;
-} else {
-rotateToContent = 360 - rotateToFrame;
-}
-}
+setupFrames();
+}
+
+protected void setupFrames() {
content = new ContentRectangle(this);
padding = content.getPadding();
borders = padding.getBorders();
@@ -470,12 +444,16 @@
* @return the writing-mode of the framing rectangles
*/
public int getFrameWritingMode() {
-return frameWritingMode;
+return contentWritingMode;
}
/**
* Gets the reference-orientation applying to the contents of this
* area, expressed as a normalized angle; one of 0, 90, 180 or 270.
+ * TODO - should this simply be 0. Should reference-orientation on
+ * all non-reference areas be set to 0; i.e. not rotated with respect
+ * to the ancestor reference-area?
+ * BEWARE - this is set to 0
* @return the reference-orientation
*/
public int getContentRotation() {
@@ -483,7 +461,7 @@
}
public int getRotationToFrame() {
-return rotateToFrame;
+return 0;
}
/**
@@ -493,11 +471,11 @@
* @return the parent's reference-orientation
*/
public int getFrameRotation() {
-return frameRotation;
+return contentRotation;
}
public int getRotationToContent() {
-return rotateToContent;
+return 0;
}
/**
@@ -514,19 +492,26 @@
/**
* Gets the width of this AreaGeometry as seen from any
- * enclosing frame
+ * enclosing frame. For all
+ * AreaGeometrys except ContentRectangles,
+ * the relative dimensions are the same for frame and contents; i.e.
+ * height is height and width is width.
* @return the frame-view width
*/
protected double getFrameRelativeWidth() {
-return getFrameRelativeDi
cvs commit: xml-fop/src/java/org/apache/fop/area ContentRectangle.java
pbwest 2004/07/23 21:26:50
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
ContentRectangle.java
Log:
Override getFrameRelative{width,Height} from Area.AreaGeometry
Revision ChangesPath
No revision
No revision
1.1.2.11 +20 -3 xml-fop/src/java/org/apache/fop/area/Attic/ContentRectangle.java
Index: ContentRectangle.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/ContentRectangle.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- ContentRectangle.java 10 Jul 2004 16:36:55 - 1.1.2.10
+++ ContentRectangle.java 24 Jul 2004 04:26:50 - 1.1.2.11
@@ -122,6 +122,23 @@
}
/**
+ * Gets the width of this AreaGeometry as seen from any
+ * enclosing frame
+ * @return the frame-view width
+ */
+protected double getFrameRelativeWidth() {
+return getFrameRelativeDimensions().getWidth();
+}
+/**
+ * Gets the height of this AreaGeometry as seen from any
+ * enclosing frame
+ * @return the frame-view height
+ */
+protected double getFrameRelativeHeight() {
+return getFrameRelativeDimensions().getHeight();
+}
+
+/**
* [EMAIL PROTECTED]
* Any registered listeners are notified of the change in the
* dimension.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area BlockViewportArea.java
pbwest 2004/07/23 21:20:41 Added: src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design BlockViewportArea.java Log: Supersedes AbstractViewport as superclass for block-level viewport-areas. Revision ChangesPath No revision No revision 1.1.2.1 +87 -0 xml-fop/src/java/org/apache/fop/area/Attic/BlockViewportArea.java - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area BlockReferenceArea.java
pbwest 2004/07/23 21:20:06 Added: src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design BlockReferenceArea.java Log: Supersedes AbstractReferenceArea as superclass for block-level reference-areas. Revision ChangesPath No revision No revision 1.1.2.1 +162 -0 xml-fop/src/java/org/apache/fop/area/Attic/BlockReferenceArea.java - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area BlockContainer.java
pbwest 2004/07/23 21:19:12
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
BlockContainer.java
Log:
Now extends BlockReferenceArea.
Revision ChangesPath
No revision
No revision
1.1.2.6 +3 -3 xml-fop/src/java/org/apache/fop/area/Attic/BlockContainer.java
Index: BlockContainer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/BlockContainer.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- BlockContainer.java 28 Feb 2004 02:06:44 - 1.1.2.5
+++ BlockContainer.java 24 Jul 2004 04:19:12 - 1.1.2.6
@@ -28,7 +28,7 @@
* @version $Revision$ $Name$
*/
public class BlockContainer
-extends AbstractReferenceArea
+extends BlockReferenceArea
implements ReferenceArea {
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area RegionRefArea.java FootnoteRefArea.java BeforeFloatRefArea.java SpanReferenceArea.java NormalFlowRefArea.java MainReferenceArea.java
pbwest 2004/07/23 21:16:54
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
RegionRefArea.java FootnoteRefArea.java
BeforeFloatRefArea.java SpanReferenceArea.java
NormalFlowRefArea.java MainReferenceArea.java
Log:
Now extends BlockReferenceArea.
Revision ChangesPath
No revision
No revision
1.1.2.5 +2 -16 xml-fop/src/java/org/apache/fop/area/Attic/RegionRefArea.java
Index: RegionRefArea.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/RegionRefArea.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- RegionRefArea.java1 Jun 2004 06:27:05 - 1.1.2.4
+++ RegionRefArea.java24 Jul 2004 04:16:54 - 1.1.2.5
@@ -30,7 +30,7 @@
* It is cloneable through the ReferenceArea interface implementation.
*/
public abstract class RegionRefArea
-extends AbstractReferenceArea
+extends BlockReferenceArea
implements ReferenceArea {
// the list of block areas from the static flow
@@ -58,20 +58,6 @@
*/
public List getBlocks() {
return blocks;
-}
-
-/**
- * Clone this region.
- * This is used when cloning the page by the page master.
- * The blocks are not copied since the master will have no blocks.
- *
- * @return a copy of this region reference area
- */
-public Object clone() {
-RegionRefArea rr;
-rr = (RegionRefArea)(super.clone());
-rr.blocks = (ArrayList)(blocks.clone());
-return rr;
}
}
1.1.2.3 +3 -3 xml-fop/src/java/org/apache/fop/area/Attic/FootnoteRefArea.java
Index: FootnoteRefArea.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/FootnoteRefArea.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FootnoteRefArea.java 28 Feb 2004 02:06:44 - 1.1.2.2
+++ FootnoteRefArea.java 24 Jul 2004 04:16:54 - 1.1.2.3
@@ -28,7 +28,7 @@
* @version $Revision$ $Name$
*/
public class FootnoteRefArea
-extends AbstractReferenceArea
+extends BlockReferenceArea
implements ReferenceArea {
/**
1.1.2.3 +3 -3
xml-fop/src/java/org/apache/fop/area/Attic/BeforeFloatRefArea.java
Index: BeforeFloatRefArea.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/BeforeFloatRefArea.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BeforeFloatRefArea.java 28 Feb 2004 02:06:44 - 1.1.2.2
+++ BeforeFloatRefArea.java 24 Jul 2004 04:16:54 - 1.1.2.3
@@ -28,7 +28,7 @@
* @version $Revision$ $Name$
*/
public class BeforeFloatRefArea
-extends AbstractReferenceArea
+extends BlockReferenceArea
implements ReferenceArea {
/**
1.1.2.5 +2 -2
xml-fop/src/java/org/apache/fop/area/Attic/SpanReferenceArea.java
Index: SpanReferenceArea.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/SpanReferenceArea.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- SpanReferenceArea.java12 May 2004 11:08:23 - 1.1.2.4
+++ SpanReferenceArea.java24 Jul 2004 04:16:54 - 1.1.2.5
@@ -32,7 +32,7 @@
* This is a reference area block area with 0 border and padding
*/
public class SpanReferenceArea
-extends AbstractReferenceArea
+extends BlockReferenceArea
implements ReferenceArea, Serializable {
// the list of normal-flow-reference-areas in this span area
1.1.2.2 +3 -3
xml-fop/src/java/org/apache/fop/area/Attic/NormalFlowRefArea.java
Index: NormalFlowRefArea.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/NormalFlowRefArea.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- NormalFlowRefArea.java28 Feb 2004 02:06:44 - 1.1.2.1
+++ NormalFlowRefArea.java24 Jul 2004 04:16:54 - 1.1.2.2
@@ -27,7 +27,7 @@
* @author pbw
* @version $Revision$ $Name$
*/
-public class NormalFlowRefArea extends AbstractReferenceArea
+public class NormalFlowRefArea extends BlockReferenceArea
implements
ReferenceArea {
/**
1.1.2.6 +2 -2
xml-fop/src/java/org/apache/fop/area/Attic
cvs commit: xml-fop/src/java/org/apache/fop/area PageRefArea.java
pbwest 2004/07/23 21:16:25
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
PageRefArea.java
Log:
Now extends BlockReferenceArea.
clone() removed.
Revision ChangesPath
No revision
No revision
1.1.2.6 +3 -30 xml-fop/src/java/org/apache/fop/area/Attic/PageRefArea.java
Index: PageRefArea.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/PageRefArea.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- PageRefArea.java 10 May 2004 11:45:41 - 1.1.2.5
+++ PageRefArea.java 24 Jul 2004 04:16:24 - 1.1.2.6
@@ -31,7 +31,7 @@
* @version $Revision$ $Name$
*/
public class PageRefArea
-extends AbstractReferenceArea
+extends BlockReferenceArea
implements ReferenceArea, Serializable {
// contains before, start, body, end and after regions
private RegionBodyVport regionBodyVport = null;
@@ -154,33 +154,6 @@
*/
public void setRegionStartVport(RegionStartVport regionStart) {
regionStartVport = regionStart;
-}
-
-/**
- * Clone this page.
- * This returns a new page with a clone of all the regions.
- *
- * @return a new clone of this page
- */
-public Object clone() {
-PageRefArea p = (PageRefArea)(this.clone());
-if (regionBodyVport != null) {
-p.regionBodyVport = (RegionBodyVport)regionBodyVport.clone();
-}
-if (regionBeforeVport != null) {
-p.regionBeforeVport = (RegionBeforeVport)regionBeforeVport.clone();
-}
-if (regionAfterVport != null) {
-p.regionAfterVport = (RegionAfterVport)regionAfterVport.clone();
-}
-if (regionStartVport != null) {
-p.regionStartVport = (RegionStartVport)regionStartVport.clone();
-}
-if (regionEndVport != null) {
-p.regionEndVport = (RegionEndVport)regionEndVport.clone();
-}
-
-return p;
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area RegionBodyRefArea.java
pbwest 2004/07/23 21:14:12
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
RegionBodyRefArea.java
Log:
clone() removed
Revision ChangesPath
No revision
No revision
1.1.2.10 +1 -17
xml-fop/src/java/org/apache/fop/area/Attic/RegionBodyRefArea.java
Index: RegionBodyRefArea.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/RegionBodyRefArea.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- RegionBodyRefArea.java3 Jun 2004 13:33:36 - 1.1.2.9
+++ RegionBodyRefArea.java24 Jul 2004 04:14:12 - 1.1.2.10
@@ -174,20 +174,4 @@
return footnoteRefArea;
}
-/**
- * Clone this object.
- *
- * @return a shallow copy of this object
- */
-public Object clone() {
-synchronized (sync) {
-RegionBodyRefArea br = (RegionBodyRefArea)(super.clone());
-br.columnGap = columnGap;
-br.columnCount = columnCount;
-br.beforeFloatRefArea = beforeFloatRefArea;
-br.mainReference = mainReference;
-br.footnoteRefArea = footnoteRefArea;
-return br;
-}
-}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area RegionViewport.java
pbwest 2004/07/23 21:12:46
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
RegionViewport.java
Log:
No longer implements Cloneable.
clone() removed.
Commented-out methods removed.
Revision ChangesPath
No revision
No revision
1.3.2.8 +2 -102xml-fop/src/java/org/apache/fop/area/RegionViewport.java
Index: RegionViewport.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/RegionViewport.java,v
retrieving revision 1.3.2.7
retrieving revision 1.3.2.8
diff -u -r1.3.2.7 -r1.3.2.8
--- RegionViewport.java 1 Jun 2004 06:27:05 - 1.3.2.7
+++ RegionViewport.java 24 Jul 2004 04:12:46 - 1.3.2.8
@@ -26,8 +26,8 @@
* This area is the viewport for a region and contains a region area.
*/
public class RegionViewport
-extends AbstractViewport
-implements Viewport, Cloneable {
+extends BlockViewportArea
+implements Viewport {
/**
* Creates a new region viewport with a null rectangular area
@@ -60,106 +60,6 @@
*/
public RegionRefArea getRegionRefArea() {
return (RegionRefArea)(getReferenceArea());
-}
-
-/**
- * Return the sum of region border- and padding-before
- *
- * @return width in millipoints
- */
-//public int getBorderAndPaddingWidthBefore() {
-//int margin = 0;
-//BorderProps bps = (BorderProps) getTrait(Trait.BORDER_BEFORE);
-//if (bps != null) {
-//margin = bps.width;
-//}
-//
-//Integer padWidth = (Integer) getTrait(Trait.PADDING_BEFORE);
-//if (padWidth != null) {
-//margin += padWidth.intValue();
-//}
-//
-//return margin;
-//}
-
-/**
- * Return the sum of region border- and padding-after
- *
- * @return width in millipoints
- */
-//public int getBorderAndPaddingWidthAfter() {
-//int margin = 0;
-//
-//BorderProps bps = (BorderProps) getTrait(Trait.BORDER_AFTER);
-//if (bps != null) {
-//margin = bps.width;
-//}
-//
-//Integer padWidth = (Integer) getTrait(Trait.PADDING_AFTER);
-//if (padWidth != null) {
-//margin += padWidth.intValue();
-//}
-//
-//return margin;
-//}
-
-/**
- * Return the sum of region border- and padding-start
- *
- * @return width in millipoints
- */
-//public int getBorderAndPaddingWidthStart() {
-//int margin = 0;
-//BorderProps bps = (BorderProps) getTrait(Trait.BORDER_START);
-//if (bps != null) {
-//margin = bps.width;
-//}
-//
-//Integer padWidth = (Integer) getTrait(Trait.PADDING_START);
-//if (padWidth != null) {
-//margin += padWidth.intValue();
-//}
-//
-//return margin;
-//}
-
-/**
- * Return the sum of region border- and padding-end
- *
- * @return width in millipoints
- */
-//public int getBorderAndPaddingWidthEnd() {
-//int margin = 0;
-//BorderProps bps = (BorderProps) getTrait(Trait.BORDER_END);
-//if (bps != null) {
-//margin = bps.width;
-//}
-//
-//Integer padWidth = (Integer) getTrait(Trait.PADDING_END);
-//if (padWidth != null) {
-//margin += padWidth.intValue();
-//}
-//
-//return margin;
-//}
-
-/**
- * Clone this region viewport.
- * Used when creating a copy from the page master.
- *
- * @return a new copy of this region viewport
- */
-public Object clone() {
-synchronized (sync) {
-RegionViewport rv;
-try {
-rv = (RegionViewport)(super.clone());
-} catch (CloneNotSupportedException e) {
-throw new RuntimeException(e);
-}
-rv.refArea = (PageRefArea)(refArea.clone());
-return rv;
-}
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area PageViewport.java
pbwest 2004/07/23 21:11:13
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
PageViewport.java
Log:
Extends BlockViewportArea.
Unused single argument constructor removed.
clone() removed
Revision ChangesPath
No revision
No revision
1.2.2.8 +1 -31 xml-fop/src/java/org/apache/fop/area/PageViewport.java
Index: PageViewport.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/PageViewport.java,v
retrieving revision 1.2.2.7
retrieving revision 1.2.2.8
diff -u -r1.2.2.7 -r1.2.2.8
--- PageViewport.java 1 Jun 2004 06:27:05 - 1.2.2.7
+++ PageViewport.java 24 Jul 2004 04:11:13 - 1.2.2.8
@@ -30,22 +30,10 @@
* The page reference area is then rendered inside the PageRefArea object
*/
public class PageViewport
-extends AbstractViewport
+extends BlockViewportArea
implements Viewport {
/**
- * Creates a page viewport at the root of a tree, synchronized on itself,
- * with a null page reference area and rectangular area
- * @param pageSeq the page-sequence which generated this area
- * the page-sequence
- */
-public PageViewport(
-FoPageSequence pageSeq) {
-// The pageSeq is also the generating node
-super(pageSeq, pageSeq);
-}
-
-/**
* Creates a page viewport with a null page ref area and rectangular area,
* and the given parent node and sync object
* @param pageSeq the page-sequence which generated this viewport. This is
@@ -96,24 +84,6 @@
*/
public String[] getIDs() {
return null;
-}
-
-/**
- * Clone this page.
- * Used by the page master to create a copy of an original page.
- * @return a copy of this page and associated viewports
- */
-public Object clone() {
-synchronized (sync) {
-PageViewport pv;
-try {
-pv = (PageViewport)(super.clone());
-} catch (CloneNotSupportedException e) {
-throw new RuntimeException(e);
-}
-pv.refArea = (PageRefArea)(refArea.clone());
-return pv;
-}
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area ReferenceArea.java
pbwest 2004/07/23 21:06:57
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
ReferenceArea.java
Log:
No longer extends Cloneable.
Methods getContentOreintation and getFrameOrientation removed.
Method clone removed.
Revision ChangesPath
No revision
No revision
1.1.2.8 +3 -7 xml-fop/src/java/org/apache/fop/area/Attic/ReferenceArea.java
Index: ReferenceArea.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/ReferenceArea.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- ReferenceArea.java17 Jun 2004 11:32:21 - 1.1.2.7
+++ ReferenceArea.java24 Jul 2004 04:06:56 - 1.1.2.8
@@ -29,7 +29,7 @@
* @author pbw
* @version $Revision$ $Name$
*/
-public interface ReferenceArea extends Cloneable {
+public interface ReferenceArea {
/**
* Java's text handling includes facilities for managing writing
@@ -60,10 +60,6 @@
*/
public AffineTransform getCoordTransformer();
-public int getContentOrientation();
-public int getFrameOrientation();
-
-public Object clone();
// TODO - methods to apply transformation to content-rectangle of the
// reference area wrt the allocation-rectangle
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area Viewport.java
pbwest 2004/07/23 20:04:01
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
Viewport.java
Log:
Remove Cloneable interface
Revision ChangesPath
No revision
No revision
1.1.2.4 +3 -3 xml-fop/src/java/org/apache/fop/area/Attic/Viewport.java
Index: Viewport.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/Viewport.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Viewport.java 2 May 2004 06:14:02 - 1.1.2.3
+++ Viewport.java 24 Jul 2004 03:04:01 - 1.1.2.4
@@ -23,7 +23,7 @@
* @author pbw
* @version $Revision$ $Name$
*/
-public interface Viewport extends Cloneable {
+public interface Viewport {
/**
* Sets the reference-area of this viewport/reference pair
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area/inline InlineContainer.java
pbwest 2004/07/23 19:51:24
Modified:src/java/org/apache/fop/area/inline Tag:
FOP_0-20-0_Alt-Design InlineContainer.java
Log:
Now extends InlineReferenceArea
Revision ChangesPath
No revision
No revision
1.1.2.6 +3 -4
xml-fop/src/java/org/apache/fop/area/inline/Attic/InlineContainer.java
Index: InlineContainer.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/inline/Attic/InlineContainer.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- InlineContainer.java 28 Feb 2004 02:03:54 - 1.1.2.5
+++ InlineContainer.java 24 Jul 2004 02:51:23 - 1.1.2.6
@@ -19,7 +19,6 @@
*/
package org.apache.fop.area.inline;
-import org.apache.fop.area.AbstractReferenceArea;
import org.apache.fop.area.ReferenceArea;
import org.apache.fop.datastructs.Node;
import org.apache.fop.fo.FONode;
@@ -30,7 +29,7 @@
* @version $Revision$ $Name$
*/
public class InlineContainer
-extends AbstractReferenceArea
+extends InlineReferenceArea
implements ReferenceArea {
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area/inline InlineViewportArea.java InlineReferenceArea.java
pbwest 2004/07/23 19:50:30 Added: src/java/org/apache/fop/area/inline Tag: FOP_0-20-0_Alt-Design InlineViewportArea.java InlineReferenceArea.java Log: Supersede AbstractViewport and AbstractReferenceArea Revision ChangesPath No revision No revision 1.1.2.1 +82 -0 xml-fop/src/java/org/apache/fop/area/inline/Attic/InlineViewportArea.java 1.1.2.1 +67 -0 xml-fop/src/java/org/apache/fop/area/inline/Attic/InlineReferenceArea.java - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area AbstractViewport.java AbstractReferenceArea.java
pbwest 2004/07/23 19:49:38 Removed: src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design AbstractViewport.java AbstractReferenceArea.java Log: Superseded by Block-specific versions - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area ViewportI.java
pbwest 2004/07/23 19:48:57 Removed: src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design ViewportI.java Log: Not required - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area BlockArea.java
pbwest 2004/07/10 09:38:44
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
BlockArea.java
Log:
Experiment moving BlockAllocationRectangle to inner class of BlockArea
Revision ChangesPath
No revision
No revision
1.1.2.10 +44 -2 xml-fop/src/java/org/apache/fop/area/Attic/BlockArea.java
Index: BlockArea.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/BlockArea.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- BlockArea.java10 Jun 2004 14:57:37 - 1.1.2.9
+++ BlockArea.java10 Jul 2004 16:38:44 - 1.1.2.10
@@ -137,4 +137,46 @@
return 0.0;
}
+/**
+ * @author pbw
+ * @version $Revision$ $Name$
+ */
+public class BlockAllocationRectangle extends AreaFrame implements
+AllocationRectangle {
+
+private PaddingRectangle padding;
+private BorderRectangle borders;
+private SpacesRectangle spaces;
+
+/**
+ * @param area
+ * @param contents
+ */
+public BlockAllocationRectangle() {
+// For block-areas, the allocation-area is bounded in the
+// block-progression-direction by the border-rectangle, and in the
+// inline-progression-direction by the spaces-rectangle.
+// See 4.2.3 Geometric Definitions
+// The contents of the BlockAllocationRectangle is the ContentRectangle.
+// Initally, set up the AreaFrame representing the allocation
+// rectangle to co-incide with the content-rectangle.
+super(BlockArea.this, BlockArea.this.getContent());
+// Now extend the AreaFrame to co-incide with the
+// edges of the border rectangle in the BPDir, and with the edges of
+// the spaces rectangle in the IPDir.
+padding = BlockArea.this.getPadding();
+borders = BlockArea.this.getBorders();
+spaces = BlockArea.this.getSpaces();
+setAllocationFrame();
+}
+
+public void setAllocationFrame() {
+setStart(spaces.getStart() + borders.getStart() + padding.getStart());
+setEnd(spaces.getEnd() + borders.getEnd() + padding.getEnd());
+setBefore(borders.getBefore() + padding.getBefore());
+setAfter(borders.getAfter() + padding.getAfter());
+}
+
+}
+
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area ContentRectangle.java
pbwest 2004/07/10 09:36:55
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
ContentRectangle.java
Log:
setIPDimPts and setBPDimPts modified to update PaddingRectangle
Revision ChangesPath
No revision
No revision
1.1.2.10 +7 -5 xml-fop/src/java/org/apache/fop/area/Attic/ContentRectangle.java
Index: ContentRectangle.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/ContentRectangle.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- ContentRectangle.java 9 Jul 2004 00:31:10 - 1.1.2.9
+++ ContentRectangle.java 10 Jul 2004 16:36:55 - 1.1.2.10
@@ -37,7 +37,7 @@
private final Area area;
/**
- * @param writingMode
+ * @param area the containing Area instance
*/
public ContentRectangle(Area area) {
area.super(area.contentWritingMode);
@@ -46,7 +46,7 @@
}
/**
- * @param writingMode
+ * @param area the containing Area instance
* @param ipOrigin
* @param bpOrigin
* @param ipDim
@@ -128,6 +128,7 @@
*/
public void setIPDimPts(double pts) {
super.setIPDimPts(pts);
+padding.setContents(this);
area.notifyListeners();
}
@@ -138,6 +139,7 @@
*/
public void setBPDimPts(double pts) {
super.setBPDimPts(pts);
+padding.setContents(this);
area.notifyListeners();
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area PaddingRectangle.java
pbwest 2004/07/10 09:35:26
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
PaddingRectangle.java
Log:
set(Top,Bottom,Left,Right) modified to update BorderRectangle
Revision ChangesPath
No revision
No revision
1.1.2.7 +63 -6 xml-fop/src/java/org/apache/fop/area/Attic/PaddingRectangle.java
Index: PaddingRectangle.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/PaddingRectangle.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- PaddingRectangle.java 7 Jul 2004 22:18:29 - 1.1.2.6
+++ PaddingRectangle.java 10 Jul 2004 16:35:25 - 1.1.2.7
@@ -32,12 +32,28 @@
private static final String revision = "$Revision$";
-public PaddingRectangle(Area area, Area.AreaGeometry content) {
+/**
+ * Instantiates a PaddingRectangle within the given instance
+ * of Area, with the given ContentRectangle as
+ * content.
+ * @param area the containing area instance
+ * @param content the content-rectangle framed by this padding
+ */
+public PaddingRectangle(Area area, ContentRectangle content) {
super(area, content);
borders = new BorderRectangle(area, this);
}
-/**
+ /**
+ * Instantiates a PaddingRectangle within the given instance
+ * of Area, with the given offset and dimension values, the
+ * given ContentRectangle as content at the given offset from
+ * the origin corner of the padding-rectangle.
+ * @param area the containing area instance
+ * @param ipOffset
+ * @param bpOffset
+ * @param ipDim
+ * @param bpDim
* @param contents
* @param contentOffset
*/
@@ -64,4 +80,45 @@
public BorderRectangle getBorders() {
return borders;
}
+
+/**
+ * [EMAIL PROTECTED]
+ * The containing BorderRectangle is notified of the
+ * change.
+ */
+public void setTop(double top) {
+super.setTop(top);
+borders.setContents(this);
+}
+
+/**
+ * [EMAIL PROTECTED]
+ * The containing BorderRectangle is notified of the
+ * change.
+ */
+public void setLeft(double left) {
+super.setLeft(left);
+borders.setContents(this);
+}
+
+/**
+ * [EMAIL PROTECTED]
+ * The containing BorderRectangle is notified of the
+ * change.
+ */
+public void setBottom(double bottom) {
+super.setBottom(bottom);
+borders.setContents(this);
+}
+
+/**
+ * [EMAIL PROTECTED]
+ * The containing BorderRectangle is notified of the
+ * change.
+ */
+public void setRight(double right) {
+super.setRight(right);
+borders.setContents(this);
+}
+
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area BorderRectangle.java
pbwest 2004/07/10 09:34:15
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
BorderRectangle.java
Log:
set(Top,Bottom,Left,Right) mosified to update SpacesRectangle
Revision ChangesPath
No revision
No revision
1.1.2.6 +43 -2 xml-fop/src/java/org/apache/fop/area/Attic/BorderRectangle.java
Index: BorderRectangle.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/BorderRectangle.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- BorderRectangle.java 14 Jun 2004 08:53:46 - 1.1.2.5
+++ BorderRectangle.java 10 Jul 2004 16:34:15 - 1.1.2.6
@@ -56,4 +56,45 @@
public SpacesRectangle getSpaces() {
return spaces;
}
+
+/**
+ * [EMAIL PROTECTED]
+ * The containing SpacesRectangle is notified of the
+ * change.
+ */
+public void setTop(double top) {
+super.setTop(top);
+spaces.setContents(this);
+}
+
+/**
+ * [EMAIL PROTECTED]
+ * The containing SpacesRectangle is notified of the
+ * change.
+ */
+public void setLeft(double left) {
+super.setLeft(left);
+spaces.setContents(this);
+}
+
+/**
+ * [EMAIL PROTECTED]
+ * The containing SpacesRectangle is notified of the
+ * change.
+ */
+public void setBottom(double bottom) {
+super.setBottom(bottom);
+spaces.setContents(this);
+}
+
+/**
+ * [EMAIL PROTECTED]
+ * The containing SpacesRectangle is notified of the
+ * change.
+ */
+public void setRight(double right) {
+super.setRight(right);
+spaces.setContents(this);
+}
+
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area BlockAllocationRectangle.java
pbwest 2004/07/10 09:31:34
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
BlockAllocationRectangle.java
Log:
public setAllocationFrame extracted so that allocation-rectangle
can be updated on changes to the other frames of an area
Revision ChangesPath
No revision
No revision
1.1.2.3 +13 -6
xml-fop/src/java/org/apache/fop/area/Attic/BlockAllocationRectangle.java
Index: BlockAllocationRectangle.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/BlockAllocationRectangle.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BlockAllocationRectangle.java 29 Jun 2004 07:41:45 - 1.1.2.2
+++ BlockAllocationRectangle.java 10 Jul 2004 16:31:34 - 1.1.2.3
@@ -27,6 +27,10 @@
public class BlockAllocationRectangle extends AreaFrame implements
AllocationRectangle {
+private PaddingRectangle padding;
+private BorderRectangle borders;
+private SpacesRectangle spaces;
+
/**
* @param area
* @param contents
@@ -43,13 +47,16 @@
// Now extend the AreaFrame to co-incide with the
// edges of the border rectangle in the BPDir, and with the edges of
// the spaces rectangle in the IPDir.
-PaddingRectangle padding = area.getPadding();
-BorderRectangle borders = area.getBorders();
-SpacesRectangle spaces = area.getSpaces();
+padding = area.getPadding();
+borders = area.getBorders();
+spaces = area.getSpaces();
+setAllocationFrame();
+}
+
+public void setAllocationFrame() {
setStart(spaces.getStart() + borders.getStart() + padding.getStart());
setEnd(spaces.getEnd() + borders.getEnd() + padding.getEnd());
setBefore(borders.getBefore() + padding.getBefore());
setAfter(borders.getAfter() + padding.getAfter());
}
-
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area ContentRectangle.java
pbwest 2004/07/08 17:31:11
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
ContentRectangle.java
Log:
Override setIPDimPts and setBPDimPts in AreaGeometry.
The override supplements the setting by calling notifyListeners in the parent area.
Revision ChangesPath
No revision
No revision
1.1.2.9 +25 -4 xml-fop/src/java/org/apache/fop/area/Attic/ContentRectangle.java
Index: ContentRectangle.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/ContentRectangle.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- ContentRectangle.java 6 Jul 2004 14:25:44 - 1.1.2.8
+++ ContentRectangle.java 9 Jul 2004 00:31:10 - 1.1.2.9
@@ -120,4 +120,25 @@
return super.getFrameRelativeDimensions();
}
}
+
+/**
+ * [EMAIL PROTECTED]
+ * Any registered listeners are notified of the change in the
+ * dimension.
+ */
+public void setIPDimPts(double pts) {
+super.setIPDimPts(pts);
+area.notifyListeners();
+}
+
+/**
+ * [EMAIL PROTECTED]
+ * Any registered listeners are notified of the change in the
+ * dimension.
+ */
+public void setBPDimPts(double pts) {
+super.setBPDimPts(pts);
+area.notifyListeners();
+}
+
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area Area.java
pbwest 2004/07/08 17:27:44 Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design Area.java Log: Documentation corrections Revision ChangesPath No revision No revision 1.1.2.26 +3 -9 xml-fop/src/java/org/apache/fop/area/Area.java Index: Area.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Area.java,v retrieving revision 1.1.2.25 retrieving revision 1.1.2.26 diff -u -r1.1.2.25 -r1.1.2.26 --- Area.java 8 Jul 2004 17:22:26 - 1.1.2.25 +++ Area.java 9 Jul 2004 00:27:44 - 1.1.2.26 @@ -564,9 +564,7 @@ * Sets the block-progression-dimension of the contents of * this area to the specified value in millipoints. * This value is applied to the appropriate dimension of the - * Rectangle2D representing this area. If no - * Rectangle2D exists, a zero-dimensioned default is first - * created, then the value is applied. + * Rectangle2D representing this area. * @param millipts block-progression-dimension to set, in * millipoints */ @@ -578,9 +576,7 @@ * Sets the block-progression-dimension of the contents of * this area to the specified value in points. * This value is applied to the appropriate dimension of the - * Rectangle2D representing this area. If no - * Rectangle2D exists, a zero-dimensioned default is first - * created, then the value is applied. + * Rectangle2D representing this area. * N.B. The method is synchronized only on this object. * @param pts block-progression-dimension to set, in points */ @@ -627,9 +623,7 @@ /** * Sets the inline-progression-dimension of the contents of * this area, in points. This value is applied to the appropriate - * dimension of the Rectangle2D representing this area. If no - * Rectangle2D exists, a zero-dimensioned default is first - * created, then the value is applied. + * dimension of the Rectangle2D representing this area. * @param millipts inline-progression-dimension to set, in * millipoints */ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/properties WritingMode.java
pbwest 2004/07/08 10:24:31
Modified:src/java/org/apache/fop/fo/properties Tag:
FOP_0-20-0_Alt-Design WritingMode.java
Log:
Moved rectRelToAbs to Area
Revision ChangesPath
No revision
No revision
1.1.2.11 +1 -94
xml-fop/src/java/org/apache/fop/fo/properties/Attic/WritingMode.java
Index: WritingMode.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/WritingMode.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- WritingMode.java 6 Jul 2004 12:14:21 - 1.1.2.10
+++ WritingMode.java 8 Jul 2004 17:24:31 - 1.1.2.11
@@ -20,8 +20,6 @@
*/
package org.apache.fop.fo.properties;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
import java.util.HashMap;
import org.apache.fop.datastructs.ROIntArray;
@@ -362,97 +360,6 @@
"Writing mode out of range:" + writingMode);
}
return leftToRight[writingMode];
-}
-
-/**
- * Returns a Rectangle2D constructed from the normailized
- * values of offset and dimensions expressed in terms of
- * inline-progression-direction and
- * block-progression-direction
- * @param ipOffset
- * @param bpOffset
- * @param ipDim the inline-progression-dimension
- * @param bpDim the block-progression-dimension
- * @param wMode
- * @return
- * @throws PropertyException
- */
-public static Rectangle2D.Double rectRelToAbs(
-double ipOffset, double bpOffset, double ipDim, double bpDim,
-int wMode) throws PropertyException {
-if (isHorizontal(wMode)) {
-return new Rectangle2D.Double(ipOffset, bpOffset, ipDim, bpDim);
-}
-return new Rectangle2D.Double(bpOffset, ipOffset, bpDim, ipDim);
-}
-
-/**
- * Normalizes a pair of values representing an
- * inline-progression-dimension and a
- * block-progression-dimension by converting them to a
- * Point2D representing the corresponding X and Y values in
- * Java 2D user co-ordinates.
- * @param ipDim the inline-progression-dimension
- * @param bpDim the block-progression-dimension
- * @param writingMode
- * @return the corresponding x, y values
- * @throws PropertyException
- */
-public static Point2D dimsRelToAbs (
-double ipDim, double bpDim, int writingMode)
-throws PropertyException {
-if (isHorizontal(writingMode)) {
-return new Point2D.Double(ipDim, bpDim);
-}
-return new Point2D.Double(bpDim, ipDim);
-}
-
-/**
- * Normalizes a pair of values representing an
- * inline-progression-dimension and a
- * block-progression-dimension by converting them to a
- * Point2D representing the corresponding X and Y values in
- * Java 2D user co-ordinates.
- * @param ipDim the inline-progression-dimension
- * @param bpDim the block-progression-dimension
- * @param writingMode
- * @return the corresponding x, y values
- * @throws PropertyException
- */
-public static Point2D dimsRelToAbs (Point2D in, int writingMode)
-throws PropertyException {
-if (isHorizontal(writingMode)) {
-return in;
-}
-double x, y;
-x = in.getX();
-y = in.getY();
-in.setLocation(y, x);
-return in;
-}
-
-/**
- * Normalizes a pair of values representing an
- * inline-progression-dimension and a
- * block-progression-dimension by converting them to a
- * Point2D representing the corresponding X and Y values in
- * Java 2D user co-ordinates.
- * @param ipDim the inline-progression-dimension
- * @param bpDim the block-progression-dimension
- * @param writingMode
- * @return the corresponding x, y values
- * @throws PropertyException
- */
-public static Rectangle2D dimsRelToAbs (
-Point2D offset, Point2D wideHigh, int writingMode)
-throws PropertyException {
-if (isHorizontal(writingMode)) {
-return new Rectangle2D.Double(
-offset.getX(), offset.getY(),
-wideHigh.getX(), wideHigh.getY());
-}
-return new Rectangle2D.Double(
-offset.getY(), offset.getX(), wideHigh.getY(), wideHigh.getX());
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area Area.java
pbwest 2004/07/08 10:22:26
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
Area.java
Log:
Removed TODO comment (done)
Revision ChangesPath
No revision
No revision
1.1.2.25 +0 -2 xml-fop/src/java/org/apache/fop/area/Area.java
Index: Area.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Area.java,v
retrieving revision 1.1.2.24
retrieving revision 1.1.2.25
diff -u -r1.1.2.24 -r1.1.2.25
--- Area.java 7 Jul 2004 22:18:29 - 1.1.2.24
+++ Area.java 8 Jul 2004 17:22:26 - 1.1.2.25
@@ -398,8 +398,6 @@
double ipOrigin, double bpOrigin, double ipDim, double bpDim) {
this(writingMode);
try {
-// TODO move rectRelToAbs from WritingMode to a more suitable
-// place
setRect(rectRelToAbs(
ipOrigin, bpOrigin, ipDim, bpDim, writingMode));
} catch (PropertyException e) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area AreaFrame.java
pbwest 2004/07/08 10:21:36
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
AreaFrame.java
Log:
Trying to get AreaFrame right.
Removed unused constructors.
Rationalized constructors - use setContents() only where necessary, otherwise simply
assign contents to this.contents.
Fixed setContents for null existing contents rectangle.
Fixed setContentOffset to use absolute values.
Fixed set(Top,Bottom,Left,Right) to use corresponding getter for current value.
Revision ChangesPath
No revision
No revision
1.1.2.11 +35 -57xml-fop/src/java/org/apache/fop/area/Attic/AreaFrame.java
Index: AreaFrame.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/AreaFrame.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- AreaFrame.java7 Jul 2004 22:18:29 - 1.1.2.10
+++ AreaFrame.java8 Jul 2004 17:21:36 - 1.1.2.11
@@ -44,32 +44,6 @@
/** The offset from this origin to the origin of the framed
* rectangle */
protected Point2D contentOffset = new Point2D.Double();
-//
-///**
-// * Instantiates an AreaFrame with zero dimensions and offset,
-// * with contents of zero dimensions and contentOffsets of
-// * zero. The writing-mode and reference-orientation are
-// * assumed to be the same as the containing frame.
-// * @param area the Area on which this AreaFrame
-// * is being defined
-// */
-//public AreaFrame(Area area) {
-//area.super(area.frameWritingMode);
-//contents = area.new AreaGeometry(area.frameWritingMode);
-//contentOffset = new Point2D.Double();
-//}
-
-///**
-// * Instantiates an AreaFrame with the given relative
-// * origin and dimensions, with
-// * Contents and offset remain null
-// */
-//public AreaFrame(Area area,
-//double ipOrigin, double bpOrigin, double ipDim, double bpDim) {
-//area.super(area.frameWritingMode, ipOrigin, bpOrigin, ipDim, bpDim);
-//contents = area.new AreaGeometry(area.frameWritingMode);
-//contentOffset = new Point2D.Double();
-//}
/**
* Instantiates a frame with 0-width edges around the given
@@ -78,10 +52,9 @@
*/
public AreaFrame(Area area, AreaGeometry contents) {
area.super(area.frameWritingMode);
-// TODO - check that this can be eliminated
-//setRect(contents);
+// At this point, the frame is a point at offset 0,0
setContents(contents);
-this.contentOffset = new Point2D.Double();
+// The offset to the frame is the default 0,0
}
/**
@@ -97,7 +70,7 @@
* @param h height of the framing rectangle in user space units
* @param contents the framed rectangle
* @param contentOffset the offset to the origin point of the framed
- * rectangle from the origin point of this framing rectangle.
+ * rectangle from the origin point of this framing rectangle.
*/
public AreaFrame(Area area,
double ipOrigin, double bpOrigin, double ipDim, double bpDim,
@@ -105,7 +78,7 @@
area.super(area.frameWritingMode, ipOrigin, bpOrigin, ipDim, bpDim);
// TODO check this against the handling of the contents rectangle
// Should this initialize with the contents and then set the edges?
-setContents(contents);
+this.contents = contents;
this.contentOffset = contentOffset;
}
@@ -124,7 +97,7 @@
Rectangle2D rect, AreaGeometry contents,
Point2D contentOffset) {
area.super(area.frameWritingMode, rect);
-setContents(contents);
+this.contents = contents;
this.contentOffset = contentOffset;
}
@@ -140,14 +113,15 @@
setRect(getX(), getY(),
getWidth() + contents.getFrameRelativeWidth(),
getHeight() + contents.getFrameRelativeHeight());
+} else {
+setRect(getX(), getY(),
+getWidth() + (
+contents.getFrameRelativeWidth() -
+this.contents.getFrameRelativeWidth()),
+getHeight() + (
+contents.getFrameRelativeHeight() -
+this.contents.getFrameRelativeHeight()));
}
-setRect(getX(), getY(),
-getWidth() + (
-contents.getFrameRelativeWidth() -
-this.contents.getFrameRelativeWidth()),
-getHeight
cvs commit: xml-fop/src/java/org/apache/fop/area PaddingRectangle.java Area.java DimensionDbl.java AbstractReferenceArea.java AreaFrame.java
pbwest 2004/07/07 15:18:29
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
PaddingRectangle.java Area.java DimensionDbl.java
AbstractReferenceArea.java AreaFrame.java
Log:
W.I.P.
Revision ChangesPath
No revision
No revision
1.1.2.6 +6 -2 xml-fop/src/java/org/apache/fop/area/Attic/PaddingRectangle.java
Index: PaddingRectangle.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/PaddingRectangle.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- PaddingRectangle.java 14 Jun 2004 08:53:46 - 1.1.2.5
+++ PaddingRectangle.java 7 Jul 2004 22:18:29 - 1.1.2.6
@@ -28,6 +28,10 @@
*/
public class PaddingRectangle extends AreaFrame {
+private static final String tag = "$Name$";
+private static final String revision = "$Revision$";
+
+
public PaddingRectangle(Area area, Area.AreaGeometry content) {
super(area, content);
borders = new BorderRectangle(area, this);
1.1.2.24 +94 -2 xml-fop/src/java/org/apache/fop/area/Area.java
Index: Area.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Area.java,v
retrieving revision 1.1.2.23
retrieving revision 1.1.2.24
diff -u -r1.1.2.23 -r1.1.2.24
--- Area.java 6 Jul 2004 14:16:25 - 1.1.2.23
+++ Area.java 7 Jul 2004 22:18:29 - 1.1.2.24
@@ -19,6 +19,7 @@
package org.apache.fop.area;
import java.awt.geom.AffineTransform;
+import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import java.util.ArrayList;
@@ -255,6 +256,97 @@
}
/**
+ * Returns a Rectangle2D constructed from the normailized
+ * values of offset and dimensions expressed in terms of
+ * inline-progression-direction and
+ * block-progression-direction
+ * @param ipOffset
+ * @param bpOffset
+ * @param ipDim the inline-progression-dimension
+ * @param bpDim the block-progression-dimension
+ * @param wMode
+ * @return
+ * @throws PropertyException
+ */
+public static Rectangle2D.Double rectRelToAbs(
+double ipOffset, double bpOffset, double ipDim, double bpDim,
+int wMode) throws PropertyException {
+if (WritingMode.isHorizontal(wMode)) {
+return new Rectangle2D.Double(ipOffset, bpOffset, ipDim, bpDim);
+}
+return new Rectangle2D.Double(bpOffset, ipOffset, bpDim, ipDim);
+}
+
+/**
+ * Normalizes a pair of values representing an
+ * inline-progression-dimension and a
+ * block-progression-dimension by converting them to a
+ * Point2D representing the corresponding X and Y values in
+ * Java 2D user co-ordinates.
+ * @param ipDim the inline-progression-dimension
+ * @param bpDim the block-progression-dimension
+ * @param writingMode
+ * @return the corresponding x, y values
+ * @throws PropertyException
+ */
+public static DimensionDbl dimsRelToAbs (
+double ipDim, double bpDim, int writingMode)
+throws PropertyException {
+if (WritingMode.isHorizontal(writingMode)) {
+return new DimensionDbl(ipDim, bpDim);
+}
+return new DimensionDbl(bpDim, ipDim);
+}
+
+/**
+ * Normalizes a DimensonDbl representing an
+ * inline-progression-dimension (width) and a
+ * block-progression-dimension (height) by converting them to
+ * a DimensonDbl representing the corresponding width and
+ * height values in Java 2D user co-ordinates.
+ * @param in the dimensions expressed as inline-progression-dimension
+ * and block-progression-dimension
+ * @param writingMode
+ * @return the corresponding Java2D width, height values
+ * @throws PropertyException
+ */
+public static DimensionDbl dimsRelToAbs (DimensionDbl in, int writingMode)
+throws PropertyException {
+if (WritingMode.isHorizontal(writingMode)) {
+return in;
+}
+double width, height;
+width = in.getHeight();
+height = in.getWidth();
+in.setSize(width, height);
+return in;
+}
+
+/**
+ * Returns a Rectangle2D constructed from the normailized
+ * values of offset and dimensions expressed in terms of
+ * inline-progression-direction and
+ * block-progression-direction
+ * @param offset
+ * @param wideHigh
+ * @param writingMode
+ * @return
+ * @throws PropertyException
+ */
+publi
cvs commit: xml-fop/src/java/org/apache/fop/fo/properties WritingMode.java
pbwest 2004/07/06 05:14:21
Modified:src/java/org/apache/fop/fo/properties Tag:
FOP_0-20-0_Alt-Design WritingMode.java
Log:
Cosmetic changes
Revision ChangesPath
No revision
No revision
1.1.2.10 +27 -14
xml-fop/src/java/org/apache/fop/fo/properties/Attic/WritingMode.java
Index: WritingMode.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/WritingMode.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- WritingMode.java 14 Jun 2004 08:53:46 - 1.1.2.9
+++ WritingMode.java 6 Jul 2004 12:14:21 - 1.1.2.10
@@ -364,6 +364,19 @@
return leftToRight[writingMode];
}
+/**
+ * Returns a Rectangle2D constructed from the normailized
+ * values of offset and dimensions expressed in terms of
+ * inline-progression-direction and
+ * block-progression-direction
+ * @param ipOffset
+ * @param bpOffset
+ * @param ipDim the inline-progression-dimension
+ * @param bpDim the block-progression-dimension
+ * @param wMode
+ * @return
+ * @throws PropertyException
+ */
public static Rectangle2D.Double rectRelToAbs(
double ipOffset, double bpOffset, double ipDim, double bpDim,
int wMode) throws PropertyException {
@@ -375,12 +388,12 @@
/**
* Normalizes a pair of values representing an
- * inline-progression-dimension and a
- * block-progression-dimension by converting them to a
- * Point2D representing the corresponding X and Y values in
+ * inline-progression-dimension and a
+ * block-progression-dimension by converting them to a
+ * Point2D representing the corresponding X and Y values in
* Java 2D user co-ordinates.
- * @param ipDim the inline-progression-dimension
- * @param bpDim the block-progression-dimension
+ * @param ipDim the inline-progression-dimension
+ * @param bpDim the block-progression-dimension
* @param writingMode
* @return the corresponding x, y values
* @throws PropertyException
@@ -396,12 +409,12 @@
/**
* Normalizes a pair of values representing an
- * inline-progression-dimension and a
- * block-progression-dimension by converting them to a
+ * inline-progression-dimension and a
+ * block-progression-dimension by converting them to a
* Point2D representing the corresponding X and Y values in
* Java 2D user co-ordinates.
- * @param ipDim the inline-progression-dimension
- * @param bpDim the block-progression-dimension
+ * @param ipDim the inline-progression-dimension
+ * @param bpDim the block-progression-dimension
* @param writingMode
* @return the corresponding x, y values
* @throws PropertyException
@@ -420,12 +433,12 @@
/**
* Normalizes a pair of values representing an
- * inline-progression-dimension and a
- * block-progression-dimension by converting them to a
+ * inline-progression-dimension and a
+ * block-progression-dimension by converting them to a
* Point2D representing the corresponding X and Y values in
* Java 2D user co-ordinates.
- * @param ipDim the inline-progression-dimension
- * @param bpDim the block-progression-dimension
+ * @param ipDim the inline-progression-dimension
+ * @param bpDim the block-progression-dimension
* @param writingMode
* @return the corresponding x, y values
* @throws PropertyException
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area ContentRectangle.java
pbwest 2004/07/06 07:22:32
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
ContentRectangle.java
Log:
Set area field.
More Javadocs.
Override getFrameRelativeDimensions.
Revision ChangesPath
No revision
No revision
1.1.2.7 +46 -2 xml-fop/src/java/org/apache/fop/area/Attic/ContentRectangle.java
Index: ContentRectangle.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/ContentRectangle.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- ContentRectangle.java 14 Jun 2004 10:12:55 - 1.1.2.6
+++ ContentRectangle.java 6 Jul 2004 14:22:32 - 1.1.2.7
@@ -31,11 +31,14 @@
*/
public class ContentRectangle extends AreaGeometry {
+private final Area area;
+
/**
* @param writingMode
*/
public ContentRectangle(Area area) {
area.super(area.contentWritingMode);
+this.area = area;
padding = new PaddingRectangle(area, this);
}
@@ -50,27 +53,68 @@
double ipOrigin, double bpOrigin, double ipDim, double bpDim) {
area.super(area.contentWritingMode, ipOrigin, bpOrigin, ipDim, bpDim);
// Get the padding writing mode
+this.area = area;
padding = new PaddingRectangle(area, this);
}
+/**
+ * Gets the writing-mode applicable to the content-rectangle
+ * @see org.apache.fop.area.Area.AreaGeometry#getWritingMode()
+ */
public int getWritingMode() {
return getContentWritingMode();
}
+/** The PaddingRectangle AreaFrame around
+ * this */
private PaddingRectangle padding = null;
+/**
+ * Gets the containing PaddingRectangle
+ * @return the padding-ractangle
+ */
public PaddingRectangle getPadding() {
return padding;
}
+/**
+ * Sets the containing PaddingRectangle to the argument
+ * @param padding the padding-rectangle
+ */
public void setPadding(PaddingRectangle padding) {
this.padding = padding;
}
+/**
+ * Sets the offset and dimensions for thiscontent-rectangle, and
+ * then sets this as the contents of the padding
+ * AreaFrame
+ * @param ipOrigin [EMAIL PROTECTED]
+ * @param bpOrigin [EMAIL PROTECTED]
+ * @param ipDim [EMAIL PROTECTED]
+ * @param bpDim [EMAIL PROTECTED]
+ * @see org.apache.fop.area.Area.AreaGeometry#setRect(double, double, double,
double)
+ */
public void setRect(
double ipOrigin, double bpOrigin, double ipDim, double bpDim) {
super.setRect(ipOrigin, bpOrigin, ipDim, bpDim);
padding.setContents(this);
}
+/* (non-Javadoc)
+ * @see org.apache.fop.area.Area.AreaGeometry#getFrameRelativeDimensions()
+ */
+public DimensionDbl getFrameRelativeDimensions() {
+switch (getRotationToFrame()) {
+case 0:
+case 180:
+return super.getFrameRelativeDimensions();
+case 90:
+case 270:
+return new DimensionDbl(getHeight(), getWidth());
+default:
+area.log.warning("Illegal rotation: " + getRotationToFrame());
+return super.getFrameRelativeDimensions();
+}
+}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area AreaFrame.java
pbwest 2004/07/06 07:19:26
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
AreaFrame.java
Log:
Converted contents from Rectangle2D to AreaGeometry.
Revision ChangesPath
No revision
No revision
1.1.2.9 +4 -4 xml-fop/src/java/org/apache/fop/area/Attic/AreaFrame.java
Index: AreaFrame.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/AreaFrame.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- AreaFrame.java29 Jun 2004 07:34:22 - 1.1.2.8
+++ AreaFrame.java6 Jul 2004 14:19:26 - 1.1.2.9
@@ -36,7 +36,7 @@
public class AreaFrame extends AreaGeometry {
/** The framed rectangle */
-protected Rectangle2D contents = null;
+protected AreaGeometry contents = null;
/** The offset from this origin to the origin of the framed
* rectangle */
protected Point2D contentOffset = null;
@@ -120,7 +120,7 @@
* the new framed contents. The offset is not affected.
* @param contents the new framed contents
*/
-public void setContents(Rectangle2D contents) {
+public void setContents(AreaGeometry contents) {
setRect(getX(), getY(),
getWidth() + (contents.getWidth() - this.contents.getWidth()),
getHeight() + (contents.getWidth() - this.contents.getWidth()));
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area AreaNode.java
pbwest 2004/07/06 07:20:21
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
AreaNode.java
Log:
Added logging
Revision ChangesPath
No revision
No revision
1.1.2.2 +6 -2 xml-fop/src/java/org/apache/fop/area/Attic/AreaNode.java
Index: AreaNode.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/AreaNode.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- AreaNode.java 2 May 2004 05:52:55 - 1.1.2.1
+++ AreaNode.java 6 Jul 2004 14:20:21 - 1.1.2.2
@@ -19,6 +19,8 @@
*/
package org.apache.fop.area;
+import java.util.logging.Logger;
+
import org.apache.fop.datastructs.Node;
import org.apache.fop.datastructs.SyncedNode;
import org.apache.fop.fo.FONode;
@@ -37,10 +39,12 @@
protected FoPageSequence pageSeq = null;
/** The FO node that generated this node. */
protected FONode generatedBy = null;
+protected Logger log;
private void setup(FoPageSequence pageSeq, FONode generatedBy) {
this.pageSeq = pageSeq;
this.generatedBy = generatedBy;
+log = generatedBy.getLogger();
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area Area.java
pbwest 2004/07/06 07:16:25
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
Area.java
Log:
No initializer for writing modes and rotations.
Set up rotateToFrame and rotateToContent in initializer.
Added getContentRotation(), getRotationToFrame(), getFrameRotation(),
getRotationToContent(), getFrameRelativeDimensions(), getFrameRelativeWidth() and
getFrameRelativeHeight().
More Javadoc comments.
Revision ChangesPath
No revision
No revision
1.1.2.23 +151 -7xml-fop/src/java/org/apache/fop/area/Area.java
Index: Area.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Area.java,v
retrieving revision 1.1.2.22
retrieving revision 1.1.2.23
diff -u -r1.1.2.22 -r1.1.2.23
--- Area.java 29 Jun 2004 07:37:16 - 1.1.2.22
+++ Area.java 6 Jul 2004 14:16:25 - 1.1.2.23
@@ -86,6 +86,7 @@
/** Geometrical area embraced by the content rectangle of this area */
protected ContentRectangle content = null;
/**
+ * Gets the content-rectangle of this
* @return the content
*/
protected ContentRectangle getContent() {
@@ -114,7 +115,7 @@
this.translation = translation;
}
/** The writing-mode of the generating FO */
-protected int contentWritingMode = 0;
+protected int contentWritingMode;
/** True if the writing-mode of the content area is
* horizontal */
protected boolean contentIsHorizontal = true;
@@ -122,11 +123,11 @@
* left-to-right */
protected boolean contentLeftToRight = true;
/** The rotation trait for the content rectangle of this area */
-protected int contentRotation = 0;
+protected int contentRotation;
/** The writing-mode of the parent of the generating FO. This may
* differ from the writing mode of the generating FO if this is a
* reference-area. */
-protected int frameWritingMode = 0;
+protected int frameWritingMode;
/** True if the writing-mode of the frames of this area is
* horizontal. May differ from contentIsHorizontal if this is a
* reference-area. */
@@ -136,8 +137,11 @@
* reference-area. */
protected boolean frameLeftToRight = true;
/** The rotation trait for the framing rectangles of this area */
-protected int frameRotation = 0;
-
+protected int frameRotation;
+/** Rotation from content to frame. One of 0, 90, 180, 270. */
+protected int rotateToFrame;
+/** Rotation from frame to content. One of 0, 90, 180, 270. */
+protected int rotateToContent;
protected void setup() {
try {
@@ -154,6 +158,17 @@
} catch (PropertyException e) {
throw new RuntimeException(e.getMessage());
}
+rotateToFrame = frameRotation - contentRotation;
+if (rotateToFrame == 0) {
+rotateToContent = 0;
+} else {
+if (rotateToFrame < 0) {
+rotateToContent = -rotateToFrame;
+rotateToFrame +=360;
+} else {
+rotateToContent = 360 - rotateToFrame;
+}
+}
content = new ContentRectangle(this);
padding = content.getPadding();
borders = padding.getBorders();
@@ -239,11 +254,24 @@
}
}
+/**
+ * A nested class of Area, representing the geometry of one of the frames
+ * associated with this area. These include the content-rectangle,
+ * border-rectangle, padding-rectangle, spaces-rectangle and
+ * allocation-rectangle.
+ * @author pbw
+ * @version $Revision$ $Name$
+ */
public class AreaGeometry extends Rectangle2D.Double {
protected int writingMode;
protected boolean isLeftToRight;
protected boolean isHorizontal;
+/**
+ * Creates an empty rectangle, with height and width of 0.0 at an
+ * offset of 0.0,0.0, with the given writing-mode
+ * @param writingMode
+ */
public AreaGeometry(int writingMode) {
super();
this.writingMode = writingMode;
@@ -255,10 +283,31 @@
}
}
+/**
+ * Creates a rectangle with an origin determined by the parameters
+ * ipOrigin and bpOrigin, and with width and
+ * height determined by the parameters ipDim and
+ * bpDim. The translation of the relative offsets and
+ * dimensions into absolute directions is determined by the parameter
+ * writingMode.
+ * @param writingMode the writing-mode of the instantiated
+ * rectangular area, expressed as an enumerated const
cvs commit: xml-fop/src/java/org/apache/fop/fo FONode.java
pbwest 2004/07/06 07:27:46
Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FONode.java
Log:
Added getLogger()
Revision ChangesPath
No revision
No revision
1.2.2.33 +7 -0 xml-fop/src/java/org/apache/fop/fo/FONode.java
Index: FONode.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FONode.java,v
retrieving revision 1.2.2.32
retrieving revision 1.2.2.33
diff -u -r1.2.2.32 -r1.2.2.33
--- FONode.java 29 Jun 2004 07:57:18 - 1.2.2.32
+++ FONode.java 6 Jul 2004 14:27:46 - 1.2.2.33
@@ -120,6 +120,13 @@
/** The FOP logger */
protected final Logger log;
+/**
+ * Gets the logger from this FONode
+ * @return the logger
+ */
+public Logger getLogger() {
+return log;
+}
/** The buffer from which parser events are drawn. */
protected final XmlEventReader xmlevents;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area DimensionDbl.java
pbwest 2004/07/06 07:26:45 Added: src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design DimensionDbl.java Log: Class to represent Area dimensions as doubles Revision ChangesPath No revision No revision 1.1.2.1 +66 -0 xml-fop/src/java/org/apache/fop/area/Attic/DimensionDbl.java - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area ContentRectangle.java
pbwest 2004/07/06 07:25:44
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
ContentRectangle.java
Log:
Added tag and revision strings
Revision ChangesPath
No revision
No revision
1.1.2.8 +5 -2 xml-fop/src/java/org/apache/fop/area/Attic/ContentRectangle.java
Index: ContentRectangle.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/ContentRectangle.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- ContentRectangle.java 6 Jul 2004 14:22:32 - 1.1.2.7
+++ ContentRectangle.java 6 Jul 2004 14:25:44 - 1.1.2.8
@@ -31,6 +31,9 @@
*/
public class ContentRectangle extends AreaGeometry {
+private static final String tag = "$Name$";
+private static final String revision = "$Revision$";
+
private final Area area;
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo FONode.java
pbwest 2004/06/29 00:57:18
Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FONode.java
Log:
Added getRefOrientation
Revision ChangesPath
No revision
No revision
1.2.2.32 +12 -2 xml-fop/src/java/org/apache/fop/fo/FONode.java
Index: FONode.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FONode.java,v
retrieving revision 1.2.2.31
retrieving revision 1.2.2.32
diff -u -r1.2.2.31 -r1.2.2.32
--- FONode.java 30 May 2004 06:30:36 - 1.2.2.31
+++ FONode.java 29 Jun 2004 07:57:18 - 1.2.2.32
@@ -34,6 +34,7 @@
import org.apache.fop.datastructs.TreeException;
import org.apache.fop.datatypes.CountryType;
import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.IntegerType;
import org.apache.fop.datatypes.LanguageType;
import org.apache.fop.datatypes.Numeric;
import org.apache.fop.datatypes.PropertyValue;
@@ -603,10 +604,19 @@
* @return an enumerated constant representing the writing-mode
* @throws PropertyException
*/
-public int getWritingMode()
-throws PropertyException {
+public int getWritingMode() throws PropertyException {
PropertyValue wm = getPropertyValue(PropNames.WRITING_MODE);
return EnumType.getEnumValue(wm);
+}
+
+/**
+ * Gets the reference-orientation applying to this node.
+ * @return the orientation as a positive integer quadrant angle
+ * @throws PropertyException
+ */
+public int getRefOrientation() throws PropertyException {
+PropertyValue rot = getPropertyValue(PropNames.REFERENCE_ORIENTATION);
+return IntegerType.getIntValue(rot);
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area BlockAllocationRectangle.java
pbwest 2004/06/29 00:41:46
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
BlockAllocationRectangle.java
Log:
Set up allocation-rectangle frame around content-rectangle.
Revision ChangesPath
No revision
No revision
1.1.2.2 +19 -3
xml-fop/src/java/org/apache/fop/area/Attic/BlockAllocationRectangle.java
Index: BlockAllocationRectangle.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/BlockAllocationRectangle.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BlockAllocationRectangle.java 17 Jun 2004 11:26:03 - 1.1.2.1
+++ BlockAllocationRectangle.java 29 Jun 2004 07:41:45 - 1.1.2.2
@@ -32,8 +32,24 @@
* @param contents
*/
public BlockAllocationRectangle(Area area) {
+// For block-areas, the allocation-area is bounded in the
+// block-progression-direction by the border-rectangle, and in the
+// inline-progression-direction by the spaces-rectangle.
+// See 4.2.3 Geometric Definitions
+// The contents of the BlockAllocationRectangle is the ContentRectangle.
+// Initally, set up the AreaFrame representing the allocation
+// rectangle to co-incide with the content-rectangle.
super(area, area.getContent());
-
+// Now extend the AreaFrame to co-incide with the
+// edges of the border rectangle in the BPDir, and with the edges of
+// the spaces rectangle in the IPDir.
+PaddingRectangle padding = area.getPadding();
+BorderRectangle borders = area.getBorders();
+SpacesRectangle spaces = area.getSpaces();
+setStart(spaces.getStart() + borders.getStart() + padding.getStart());
+setEnd(spaces.getEnd() + borders.getEnd() + padding.getEnd());
+setBefore(borders.getBefore() + padding.getBefore());
+setAfter(borders.getAfter() + padding.getAfter());
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area Area.java
pbwest 2004/06/29 00:37:16
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
Area.java
Log:
Added contentRotation and frameRotation fields to represent reference-orientation
for content-rectangle and framing rectangles respectively.
WIP for integrating reference-orientation.
Revision ChangesPath
No revision
No revision
1.1.2.22 +8 -1 xml-fop/src/java/org/apache/fop/area/Area.java
Index: Area.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Area.java,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -r1.1.2.21 -r1.1.2.22
--- Area.java 17 Jun 2004 11:28:22 - 1.1.2.21
+++ Area.java 29 Jun 2004 07:37:16 - 1.1.2.22
@@ -29,7 +29,7 @@
import org.apache.fop.fo.properties.WritingMode;
/**
- * The base class for all gemetrical areas. Area extends
+ * The base class for all geometrical areas. Area extends
* AreaNode because all areas will find themselves in a tree of
* some kind. It represents its geometry with a
* Rectangle2D.Double, whose dimensions are expressed in Java
@@ -121,6 +121,8 @@
/** True if the the writing-mode of the content area is
* left-to-right */
protected boolean contentLeftToRight = true;
+/** The rotation trait for the content rectangle of this area */
+protected int contentRotation = 0;
/** The writing-mode of the parent of the generating FO. This may
* differ from the writing mode of the generating FO if this is a
* reference-area. */
@@ -133,6 +135,8 @@
* left-to-right. May differ from contentIsHorizontal if this is a
* reference-area. */
protected boolean frameLeftToRight = true;
+/** The rotation trait for the framing rectangles of this area */
+protected int frameRotation = 0;
protected void setup() {
@@ -140,10 +144,13 @@
contentWritingMode = generatedBy.getWritingMode();
contentIsHorizontal = WritingMode.isHorizontal(contentWritingMode);
contentLeftToRight = WritingMode.isLeftToRight(contentWritingMode);
+contentRotation = generatedBy.getRefOrientation();
frameWritingMode =
((FONode)generatedBy.getParent()).getWritingMode();
frameIsHorizontal = WritingMode.isHorizontal(frameWritingMode);
frameLeftToRight = WritingMode.isLeftToRight(frameWritingMode);
+frameRotation =
+((FONode)generatedBy.getParent()).getRefOrientation();
} catch (PropertyException e) {
throw new RuntimeException(e.getMessage());
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area AreaFrame.java
pbwest 2004/06/29 00:34:22
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
AreaFrame.java
Log:
Documentation changes and code re-arragement.
Removed redundant getWritingMode method.
Added double getBefore, getAfter, getStart & getEnd methods.
WIP on incorporating reference-orientation.
Revision ChangesPath
No revision
No revision
1.1.2.8 +107 -24 xml-fop/src/java/org/apache/fop/area/Attic/AreaFrame.java
Index: AreaFrame.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/AreaFrame.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- AreaFrame.java17 Jun 2004 11:27:27 - 1.1.2.7
+++ AreaFrame.java29 Jun 2004 07:34:22 - 1.1.2.8
@@ -42,7 +42,10 @@
protected Point2D contentOffset = null;
/**
- * @param writingMode
+ * Instantiates an AreaFrame with zero dimensions and offset,
+ * whose contents and contentOffset are null
+ * @param area the Area on which this AreaFrame
+ * is being defined
*/
public AreaFrame(Area area) {
area.super(area.frameWritingMode);
@@ -58,7 +61,8 @@
}
/**
- * Instantiates a frame with 0-width edges.
+ * Instantiates a frame with 0-width edges around the given
+ * AreaGeometry contents
* @param contents the contained rectangle
*/
public AreaFrame(Area area, AreaGeometry contents) {
@@ -110,10 +114,6 @@
this.contentOffset = contentOffset;
}
-public int getWritingMode() {
-return writingMode;
-}
-
/**
* Sets the contents rectangle. The dimensions of this are
* adjusted to the difference between the current framed contents and
@@ -145,6 +145,11 @@
contentOffset = offset;
}
+/**
+ * Gets the offset of the contents rectangle's Java2D origin point
+ * from the Java2D origin point of the AreaFrame.
+ * @return the offset as a Point2D.
+ */
public Point2D getContentOffset() {
return contentOffset;
}
@@ -169,6 +174,20 @@
}
/**
+ * Gets the width of the before edge of the AreaFrame
+ * @return the width in user co-ordinate units (points)
+ */
+public double getBefore() {
+try {
+return getAbsoluteEdgeWidth(
+WritingMode.getCorrespondingAbsoluteEdge(
+writingMode, WritingMode.BEFORE));
+} catch (PropertyException e) {
+throw new RuntimeException(e);
+}
+}
+
+/**
* Sets the start edge width of the frame. The contents size
* is unaffected, but the size of the frame (this) will
* change. The width will vary by the difference between the previous and
@@ -188,6 +207,20 @@
}
/**
+ * Gets the width of the start edge of the AreaFrame
+ * @return the width in user co-ordinate units (points)
+ */
+public double getStart() {
+try {
+return getAbsoluteEdgeWidth(
+WritingMode.getCorrespondingAbsoluteEdge(
+writingMode, WritingMode.START));
+} catch (PropertyException e) {
+throw new RuntimeException(e);
+}
+}
+
+/**
* Sets the after edge width of the frame. The contents size
* and the contentOffset are unaffected, but the size of the
* frame (this) will change. The height will vary by the
@@ -206,6 +239,20 @@
}
/**
+ * Gets the width of the after edge of the AreaFrame
+ * @return the width in user co-ordinate units (points)
+ */
+public double getAfter() {
+try {
+return getAbsoluteEdgeWidth(
+WritingMode.getCorrespondingAbsoluteEdge(
+writingMode, WritingMode.AFTER));
+} catch (PropertyException e) {
+throw new RuntimeException(e);
+}
+}
+
+/**
* Sets the end edge width of the frame. The contents size
* and the contentOffset are unaffected, but the size of the
* frame (this) will change. The width will vary by the
@@ -223,6 +270,26 @@
}
}
+/**
+ * Gets the width of the end edge of the AreaFrame
+ * @return the width in user co-ordinate units (points)
+ */
+public double getEnd() {
+try {
+return getAbsoluteEdgeWidth(
+WritingMode.getCorrespondingAbsoluteEdge(
+writingMode, WritingMode.END));
+} catch (PropertyEx
cvs commit: xml-fop/src/java/org/apache/fop/area AbstractReferenceArea.java
pbwest 2004/06/17 04:33:06
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
AbstractReferenceArea.java
Log:
Extended to handle getFrameOrientation() and getContentOrientation()
Revision ChangesPath
No revision
No revision
1.1.2.6 +42 -3
xml-fop/src/java/org/apache/fop/area/Attic/AbstractReferenceArea.java
Index: AbstractReferenceArea.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/AbstractReferenceArea.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- AbstractReferenceArea.java1 Jun 2004 06:27:05 - 1.1.2.5
+++ AbstractReferenceArea.java17 Jun 2004 11:33:06 - 1.1.2.6
@@ -20,7 +20,10 @@
import java.awt.geom.AffineTransform;
import org.apache.fop.datastructs.Node;
+import org.apache.fop.datatypes.IntegerType;
import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.flow.FoPageSequence;
/**
@@ -46,9 +49,17 @@
Node parent,
Object sync) {
super(pageSeq, generatedBy, parent, sync);
-// TODO Auto-generated constructor stub
+contentOrientation = setContentOrientation();
+frameOrientation = setFrameOrientation();
+// What transform is required?
+// TODO work out the transformation
+// TODO check for reference-area rotational transformation
+// in interactions between AreaFrames and ContentAreas
}
+private int contentOrientation;
+private int frameOrientation;
+
/**
* Set the Coordinate Transformation Matrix which transforms content
* coordinates in this reference area which are specified in
@@ -73,6 +84,34 @@
synchronized (sync) {
return this.transformer;
}
+}
+
+private int setContentOrientation() {
+try {
+return IntegerType.getIntValue(
+generatedBy.getPropertyValue(
+PropNames.REFERENCE_ORIENTATION));
+} catch (PropertyException e) {
+throw new RuntimeException(e);
+}
+}
+
+public int getContentOrientation() {
+return contentOrientation;
+}
+
+private int setFrameOrientation() {
+try {
+return IntegerType.getIntValue(
+((FONode)generatedBy.getParent()).getPropertyValue(
+PropNames.REFERENCE_ORIENTATION));
+} catch (PropertyException e) {
+throw new RuntimeException(e);
+}
+}
+
+public int getFrameOrientation() {
+return frameOrientation;
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area ReferenceArea.java
pbwest 2004/06/17 04:32:21 Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design ReferenceArea.java Log: Added getContentOreintation() and getFrameOrientation() Revision ChangesPath No revision No revision 1.1.2.7 +6 -3 xml-fop/src/java/org/apache/fop/area/Attic/ReferenceArea.java Index: ReferenceArea.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/ReferenceArea.java,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -u -r1.1.2.6 -r1.1.2.7 --- ReferenceArea.java10 Jun 2004 14:58:51 - 1.1.2.6 +++ ReferenceArea.java17 Jun 2004 11:32:21 - 1.1.2.7 @@ -59,7 +59,10 @@ * @return the current transform of this reference area. */ public AffineTransform getCoordTransformer(); - + +public int getContentOrientation(); +public int getFrameOrientation(); + public Object clone(); // TODO - methods to apply transformation to content-rectangle of the // reference area wrt the allocation-rectangle - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area BlockContentRectangle.java
pbwest 2004/06/17 04:30:30 Added: src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design BlockContentRectangle.java Log: BlockContentRectangle extends ContentRectangle to allow BP specific treatment of allocation-rectangle. Revision ChangesPath No revision No revision 1.1.2.1 +58 -0 xml-fop/src/java/org/apache/fop/area/Attic/BlockContentRectangle.java - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area Area.java
pbwest 2004/06/17 04:28:22
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
Area.java
Log:
Made setup() protected. (May need to revert this.)
Revision ChangesPath
No revision
No revision
1.1.2.21 +1 -1 xml-fop/src/java/org/apache/fop/area/Area.java
Index: Area.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Area.java,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -u -r1.1.2.20 -r1.1.2.21
--- Area.java 14 Jun 2004 10:50:33 - 1.1.2.20
+++ Area.java 17 Jun 2004 11:28:22 - 1.1.2.21
@@ -135,7 +135,7 @@
protected boolean frameLeftToRight = true;
-private void setup() {
+protected void setup() {
try {
contentWritingMode = generatedBy.getWritingMode();
contentIsHorizontal = WritingMode.isHorizontal(contentWritingMode);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area AreaFrame.java
pbwest 2004/06/17 04:27:27
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
AreaFrame.java
Log:
Added getAbsoluteEdgeWidth()
Revision ChangesPath
No revision
No revision
1.1.2.7 +35 -3 xml-fop/src/java/org/apache/fop/area/Attic/AreaFrame.java
Index: AreaFrame.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/AreaFrame.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- AreaFrame.java14 Jun 2004 11:30:02 - 1.1.2.6
+++ AreaFrame.java17 Jun 2004 11:27:27 - 1.1.2.7
@@ -223,7 +223,7 @@
}
}
-private void setAbsoluteEdgeWidth(int edge, double width) {
+public void setAbsoluteEdgeWidth(int edge, double width) {
switch (edge) {
case WritingMode.TOP:
setTop(width);
@@ -299,6 +299,38 @@
public void setRight(double right) {
double diff = right - (getX() - contentOffset.getX() - contents.getX());
setRect(getX(), getY(), getWidth() + diff, getHeight());
+}
+
+public double getAbsoluteEdgeWidth(int edge) {
+switch (edge) {
+case WritingMode.TOP:
+return getTop();
+case WritingMode.BOTTOM:
+return getBottom();
+case WritingMode.LEFT:
+return getLeft();
+case WritingMode.RIGHT:
+return getRight();
+default:
+throw new RuntimeException(
+"Invalid absolute writing mode: " + edge);
+}
+}
+
+public double getTop() {
+return contentOffset.getY();
+}
+
+public double getLeft() {
+return contentOffset.getX();
+}
+
+public double getBottom() {
+return getHeight() - contentOffset.getY() - contents.getHeight();
+}
+
+public double getRight() {
+return getWidth() - contentOffset.getX() - contents.getWidth();
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area BlockAllocationRectangle.java
pbwest 2004/06/17 04:26:03 Added: src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design BlockAllocationRectangle.java Log: BlockAllocationRectangle stub for calculating the block-allocation-rectangle from the content-rectangle and the spaces-reactangle Revision ChangesPath No revision No revision 1.1.2.1 +39 -0 xml-fop/src/java/org/apache/fop/area/Attic/BlockAllocationRectangle.java - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area AllocationRectangle.java
pbwest 2004/06/17 04:22:27 Added: src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design AllocationRectangle.java Log: AllocationRectangle marker interface Revision ChangesPath No revision No revision 1.1.2.1 +27 -0 xml-fop/src/java/org/apache/fop/area/Attic/AllocationRectangle.java - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area/inline InlineBorderRectangle.java
pbwest 2004/06/17 04:21:18 Added: src/java/org/apache/fop/area/inline Tag: FOP_0-20-0_Alt-Design InlineBorderRectangle.java Log: Added InlineBorderRectangle implementing AllocationRectangle for large-allocation-rectangle Revision ChangesPath No revision No revision 1.1.2.1 +75 -0 xml-fop/src/java/org/apache/fop/area/inline/Attic/InlineBorderRectangle.java - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/datatypes IntegerType.java
pbwest 2004/06/17 04:18:38
Modified:src/java/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design
IntegerType.java
Log:
Added static getIntValue(PropertyValue)
Revision ChangesPath
No revision
No revision
1.1.2.3 +17 -2 xml-fop/src/java/org/apache/fop/datatypes/Attic/IntegerType.java
Index: IntegerType.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/datatypes/Attic/IntegerType.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- IntegerType.java 19 Feb 2004 03:11:55 - 1.1.2.2
+++ IntegerType.java 17 Jun 2004 11:18:38 - 1.1.2.3
@@ -79,6 +79,21 @@
}
/**
+ * Return the int value from a PropertyValue.
+ * @param pv
+ * @return the int value
+ * @exception PropertyException if the PropertyValue is not
+ * an IntegerType
+ */
+public static int getIntValue(PropertyValue pv)
+throws PropertyException {
+if (pv.getType() == PropertyValue.INTEGER) {
+return ((IntegerType)pv).getInt();
+}
+throw new PropertyException("PropertyValue not an INTEGER type");
+}
+
+/**
* validate the IntegerType against the associated property.
*/
public void validate() throws PropertyException {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/properties ReferenceOrientation.java
pbwest 2004/06/17 04:17:29
Modified:src/java/org/apache/fop/fo/properties Tag:
FOP_0-20-0_Alt-Design ReferenceOrientation.java
Log:
Added refneParsing() to validate the rotation values
Revision ChangesPath
No revision
No revision
1.1.2.4 +41 -1
xml-fop/src/java/org/apache/fop/fo/properties/Attic/ReferenceOrientation.java
Index: ReferenceOrientation.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/ReferenceOrientation.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- ReferenceOrientation.java 19 Feb 2004 03:11:41 - 1.1.2.3
+++ ReferenceOrientation.java 17 Jun 2004 11:17:29 - 1.1.2.4
@@ -22,6 +22,7 @@
import org.apache.fop.datatypes.IntegerType;
import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.fo.FONode;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.expr.PropertyException;
@@ -53,6 +54,45 @@
public int getInherited() {
return inherited;
+}
+
+public PropertyValue refineParsing
+(int propindex, FONode foNode, PropertyValue value)
+throws PropertyException
+{
+return refineParsing(propindex, foNode, value, NOT_NESTED);
+}
+
+public PropertyValue refineParsing
+(int propindex, FONode foNode, PropertyValue value, boolean nested)
+throws PropertyException
+{
+int proptype = value.getType();
+switch (proptype) {
+case PropertyValue.INTEGER:
+int angle = ((IntegerType)value).getInt();
+int absangle = Math.abs(angle);
+if (absangle == 0 || absangle == 90
+|| absangle == 180 || absangle == 270) {
+if (angle < 0) {
+angle += 360;
+((IntegerType)value).setInt(angle);
+}
+return value;
+} else {
+int adjangle = angle % 360;
+if (adjangle < 0) {
+adjangle += 360;
+}
+adjangle = (int)(Math.round(adjangle / 90.0f)) * 4;
+logger.warning("Illegal orientation value " + angle +
+". Replaced with " + adjangle);
+((IntegerType)value).setInt(adjangle);
+return value;
+}
+default:
+return super.refineParsing(propindex, foNode, value, nested);
+}
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area/doc-files Area.sxd Area.png
pbwest 2004/06/14 07:18:20 Modified:src/java/org/apache/fop/area/doc-files Tag: FOP_0-20-0_Alt-Design Area.sxd Area.png Log: Modified diagram Revision ChangesPath No revision No revision 1.1.2.2 +18 -14xml-fop/src/java/org/apache/fop/area/doc-files/Attic/Area.sxd <> 1.1.2.2 +224 -247 xml-fop/src/java/org/apache/fop/area/doc-files/Attic/Area.png <> - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area/doc-files Area.sxd Area.png
pbwest 2004/06/14 07:01:43 Added: src/java/org/apache/fop/area/doc-files Tag: FOP_0-20-0_Alt-Design Area.sxd Area.png Log: Documentation for Area class hierarchy Revision ChangesPath No revision No revision 1.1.2.1 +38 -0 xml-fop/src/java/org/apache/fop/area/doc-files/Attic/Area.sxd <> 1.1.2.1 +250 -0xml-fop/src/java/org/apache/fop/area/doc-files/Attic/Area.png <> - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area AreaFrame.java
pbwest 2004/06/14 04:30:02
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
AreaFrame.java
Log:
Added setAbsoluteEdgeWidth();
Added setTop(), setBottom(), setLeft(), setRight()
absolute edge setting methods.
Modified setBefore(), setAfter(), setStart() and setEnd()
to use corresponding absoolute method.
Revision ChangesPath
No revision
No revision
1.1.2.6 +109 -13 xml-fop/src/java/org/apache/fop/area/Attic/AreaFrame.java
Index: AreaFrame.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/AreaFrame.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- AreaFrame.java14 Jun 2004 08:53:46 - 1.1.2.5
+++ AreaFrame.java14 Jun 2004 11:30:02 - 1.1.2.6
@@ -23,6 +23,8 @@
import java.awt.geom.Rectangle2D;
import org.apache.fop.area.Area.AreaGeometry;
+import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.properties.WritingMode;
/**
@@ -157,10 +159,13 @@
* @param before
*/
public void setBefore(double before) {
-double diff = before - contentOffset.getY();
-setRect(getX(), getY(),
-getWidth(), getHeight() + diff);
-contentOffset.setLocation(contentOffset.getX(), before);
+try {
+setAbsoluteEdgeWidth(
+WritingMode.getCorrespondingAbsoluteEdge(
+writingMode, WritingMode.BEFORE), before);
+} catch (PropertyException e) {
+throw new RuntimeException(e);
+}
}
/**
@@ -173,10 +178,13 @@
* @param start
*/
public void setStart(double start) {
-double diff = start - contentOffset.getY();
-setRect(getX(), getY(),
-getWidth() + diff, getHeight());
-contentOffset.setLocation(start, contentOffset.getX());
+try {
+setAbsoluteEdgeWidth(
+WritingMode.getCorrespondingAbsoluteEdge(
+writingMode, WritingMode.START), start);
+} catch (PropertyException e) {
+throw new RuntimeException(e);
+}
}
/**
@@ -188,8 +196,13 @@
* @param after
*/
public void setAfter(double after) {
-double diff = after - (getY() - contentOffset.getY() - contents.getY());
-setRect(getX(), getY(), getWidth(), getHeight() + diff);
+try {
+setAbsoluteEdgeWidth(
+WritingMode.getCorrespondingAbsoluteEdge(
+writingMode, WritingMode.AFTER), after);
+} catch (PropertyException e) {
+throw new RuntimeException(e);
+}
}
/**
@@ -201,7 +214,90 @@
* @param end
*/
public void setEnd(double end) {
-double diff = end - (getX() - contentOffset.getX() - contents.getX());
+try {
+setAbsoluteEdgeWidth(
+WritingMode.getCorrespondingAbsoluteEdge(
+writingMode, WritingMode.END), end);
+} catch (PropertyException e) {
+throw new RuntimeException(e);
+}
+}
+
+private void setAbsoluteEdgeWidth(int edge, double width) {
+switch (edge) {
+case WritingMode.TOP:
+setTop(width);
+break;
+case WritingMode.BOTTOM:
+setBottom(width);
+break;
+case WritingMode.LEFT:
+setLeft(width);
+break;
+case WritingMode.RIGHT:
+setRight(width);
+break;
+default:
+throw new RuntimeException(
+"Invalid absolute writing mode: " + edge);
+}
+}
+
+/**
+ * Sets the top edge width of the frame. The contents size
+ * is unaffected, but the size of the frame (this) will
+ * change. The height will vary by the difference between the previous and
+ * new top edge. The contentOffset will also change by the
+ * same amount. Note that the origin of this frame (getX(),
+ * getY()) will not change.
+ * @param top
+ */
+public void setTop(double top) {
+double diff = top - contentOffset.getY();
+setRect(getX(), getY(),
+getWidth(), getHeight() + diff);
+contentOffset.setLocation(contentOffset.getX(), top);
+}
+
+/**
+ * Sets the left edge width of the frame. The contents size
+ * is unaffected, but the size of the frame (this) will
+ * change. The width will vary by the difference between the previous and
+ * new left
cvs commit: xml-fop/src/java/org/apache/fop/area Area.java
pbwest 2004/06/14 03:50:33
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
Area.java
Log:
Restored setMargins.
Fixed creation of nested rectangles through ContentRectangle.
Made get*WritingMode() methods public.
Revision ChangesPath
No revision
No revision
1.1.2.20 +12 -12xml-fop/src/java/org/apache/fop/area/Area.java
Index: Area.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Area.java,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -u -r1.1.2.19 -r1.1.2.20
--- Area.java 14 Jun 2004 08:53:46 - 1.1.2.19
+++ Area.java 14 Jun 2004 10:50:33 - 1.1.2.20
@@ -92,13 +92,13 @@
return content;
}
-//protected void setMargins(
-// double before, double after, double start, double end) {
-//spaces.setBefore(before);
-//spaces.setAfter(after);
-//spaces.setStart(start);
-//spaces.setEnd(end);
-//}
+protected void setMargins(
+ double before, double after, double start, double end) {
+spaces.setBefore(before);
+spaces.setAfter(after);
+spaces.setStart(start);
+spaces.setEnd(end);
+}
/** Translates this area into position in its parent area */
protected AffineTransform translation = null;
/**
@@ -147,8 +147,8 @@
} catch (PropertyException e) {
throw new RuntimeException(e.getMessage());
}
-content = new ContentRectangle(this, contentWritingMode);
-//padding = new PaddingRectangle(frameWritingMode, content, 0.0, 0.0);
+content = new ContentRectangle(this);
+padding = content.getPadding();
borders = padding.getBorders();
spaces = borders.getSpaces();
}
@@ -275,15 +275,15 @@
}
}
-protected int getWritingMode() {
+public int getWritingMode() {
return writingMode;
}
-protected int getContentWritingMode() {
+public int getContentWritingMode() {
return contentWritingMode;
}
-protected int getFrameWritingMode() {
+public int getFrameWritingMode() {
return frameWritingMode;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area ContentRectangle.java
pbwest 2004/06/14 03:12:55
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
ContentRectangle.java
Log:
Fixed empty content-rectangle constructor
Revision ChangesPath
No revision
No revision
1.1.2.6 +5 -4 xml-fop/src/java/org/apache/fop/area/Attic/ContentRectangle.java
Index: ContentRectangle.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/ContentRectangle.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ContentRectangle.java 14 Jun 2004 08:53:46 - 1.1.2.5
+++ ContentRectangle.java 14 Jun 2004 10:12:55 - 1.1.2.6
@@ -34,8 +34,9 @@
/**
* @param writingMode
*/
-public ContentRectangle(Area area, int writingMode) {
-area.super(writingMode);
+public ContentRectangle(Area area) {
+area.super(area.contentWritingMode);
+padding = new PaddingRectangle(area, this);
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area PaddingRectangle.java ContentRectangle.java Area.java SpacesRectangle.java BorderRectangle.java AreaFrame.java
pbwest 2004/06/14 01:53:46
Modified:src/java/org/apache/fop/fo/properties Tag:
FOP_0-20-0_Alt-Design WritingMode.java
src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
PaddingRectangle.java ContentRectangle.java
Area.java SpacesRectangle.java BorderRectangle.java
AreaFrame.java
Log:
More W.I.P. subclassing AreaFrame and ContentRectangle from
Area.AreaGeometry
Revision ChangesPath
No revision
No revision
1.1.2.9 +60 -1
xml-fop/src/java/org/apache/fop/fo/properties/Attic/WritingMode.java
Index: WritingMode.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/WritingMode.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- WritingMode.java 13 Jun 2004 17:04:51 - 1.1.2.8
+++ WritingMode.java 14 Jun 2004 08:53:46 - 1.1.2.9
@@ -21,6 +21,7 @@
package org.apache.fop.fo.properties;
import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
import java.util.HashMap;
import org.apache.fop.datastructs.ROIntArray;
@@ -363,6 +364,15 @@
return leftToRight[writingMode];
}
+public static Rectangle2D.Double rectRelToAbs(
+double ipOffset, double bpOffset, double ipDim, double bpDim,
+int wMode) throws PropertyException {
+if (isHorizontal(wMode)) {
+return new Rectangle2D.Double(ipOffset, bpOffset, ipDim, bpDim);
+}
+return new Rectangle2D.Double(bpOffset, ipOffset, bpDim, ipDim);
+}
+
/**
* Normalizes a pair of values representing an
* inline-progression-dimension and a
@@ -383,5 +393,54 @@
}
return new Point2D.Double(bpDim, ipDim);
}
+
+/**
+ * Normalizes a pair of values representing an
+ * inline-progression-dimension and a
+ * block-progression-dimension by converting them to a
+ * Point2D representing the corresponding X and Y values in
+ * Java 2D user co-ordinates.
+ * @param ipDim the inline-progression-dimension
+ * @param bpDim the block-progression-dimension
+ * @param writingMode
+ * @return the corresponding x, y values
+ * @throws PropertyException
+ */
+public static Point2D dimsRelToAbs (Point2D in, int writingMode)
+throws PropertyException {
+if (isHorizontal(writingMode)) {
+return in;
+}
+double x, y;
+x = in.getX();
+y = in.getY();
+in.setLocation(y, x);
+return in;
+}
+
+/**
+ * Normalizes a pair of values representing an
+ * inline-progression-dimension and a
+ * block-progression-dimension by converting them to a
+ * Point2D representing the corresponding X and Y values in
+ * Java 2D user co-ordinates.
+ * @param ipDim the inline-progression-dimension
+ * @param bpDim the block-progression-dimension
+ * @param writingMode
+ * @return the corresponding x, y values
+ * @throws PropertyException
+ */
+public static Rectangle2D dimsRelToAbs (
+Point2D offset, Point2D wideHigh, int writingMode)
+throws PropertyException {
+if (isHorizontal(writingMode)) {
+return new Rectangle2D.Double(
+offset.getX(), offset.getY(),
+wideHigh.getX(), wideHigh.getY());
+}
+return new Rectangle2D.Double(
+offset.getY(), offset.getX(), wideHigh.getY(), wideHigh.getX());
+}
+
}
No revision
No revision
1.1.2.5 +13 -22xml-fop/src/java/org/apache/fop/area/Attic/PaddingRectangle.java
Index: PaddingRectangle.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/PaddingRectangle.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- PaddingRectangle.java 13 Jun 2004 17:03:31 - 1.1.2.4
+++ PaddingRectangle.java 14 Jun 2004 08:53:46 - 1.1.2.5
@@ -26,30 +26,22 @@
* @author pbw
* @version $Revision$ $Name$
*/
-public class PaddingRectangle extends Area.AreaFrame {
+public class PaddingRectangle extends AreaFrame {
-public PaddingRectangle(Area area, int writingMode) {
-area.super(writingMode);
-contents = new ContentRectangle(area, writingMode);
-contentOffset = new Point2D.Double();
-borders = new BorderRectangle(area, writingMode);
-borders.setContents(this);
+public PaddingRectangle
cvs commit: xml-fop/src/java/org/apache/fop/fo/properties WritingMode.java
pbwest 2004/06/13 10:04:51
Modified:src/java/org/apache/fop/fo/properties Tag:
FOP_0-20-0_Alt-Design WritingMode.java
Log:
Changes for Area support
Revision ChangesPath
No revision
No revision
1.1.2.8 +22 -1
xml-fop/src/java/org/apache/fop/fo/properties/Attic/WritingMode.java
Index: WritingMode.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/WritingMode.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- WritingMode.java 2 May 2004 02:56:15 - 1.1.2.7
+++ WritingMode.java 13 Jun 2004 17:04:51 - 1.1.2.8
@@ -20,6 +20,7 @@
*/
package org.apache.fop.fo.properties;
+import java.awt.geom.Point2D;
import java.util.HashMap;
import org.apache.fop.datastructs.ROIntArray;
@@ -362,5 +363,25 @@
return leftToRight[writingMode];
}
+/**
+ * Normalizes a pair of values representing an
+ * inline-progression-dimension and a
+ * block-progression-dimension by converting them to a
+ * Point2D representing the corresponding X and Y values in
+ * Java 2D user co-ordinates.
+ * @param ipDim the inline-progression-dimension
+ * @param bpDim the block-progression-dimension
+ * @param writingMode
+ * @return the corresponding x, y values
+ * @throws PropertyException
+ */
+public static Point2D dimsRelToAbs (
+double ipDim, double bpDim, int writingMode)
+throws PropertyException {
+if (isHorizontal(writingMode)) {
+return new Point2D.Double(ipDim, bpDim);
+}
+return new Point2D.Double(bpDim, ipDim);
+}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area ContentRectangle.java AreaFrame.java PaddingRectangle.java Area.java SpacesRectangle.java BorderRectangle.java
pbwest 2004/06/13 10:03:32
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
PaddingRectangle.java Area.java
SpacesRectangle.java BorderRectangle.java
Added: src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
ContentRectangle.java AreaFrame.java
Log:
W.I.P. subclassing AreaFrame and ContentRectangle from
Area.AreaGeometry
Revision ChangesPath
No revision
No revision
1.1.2.4 +15 -14xml-fop/src/java/org/apache/fop/area/Attic/PaddingRectangle.java
Index: PaddingRectangle.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/PaddingRectangle.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- PaddingRectangle.java 11 Jun 2004 14:44:10 - 1.1.2.3
+++ PaddingRectangle.java 13 Jun 2004 17:03:31 - 1.1.2.4
@@ -28,11 +28,11 @@
*/
public class PaddingRectangle extends Area.AreaFrame {
-public PaddingRectangle(Area area) {
-area.super();
-contents = area.new ContentRectangle();
+public PaddingRectangle(Area area, int writingMode) {
+area.super(writingMode);
+contents = new ContentRectangle(area, writingMode);
contentOffset = new Point2D.Double();
-borders = new BorderRectangle(area);
+borders = new BorderRectangle(area, writingMode);
borders.setContents(this);
}
@@ -44,10 +44,11 @@
* @param contents
* @param contentOffset
*/
- public PaddingRectangle(Area area, double x, double y, double w, double h,
- Area.ContentRectangle contents, Point2D contentOffset) {
- area.super(x, y, w, h, contents, contentOffset);
-borders = new BorderRectangle(area);
+ public PaddingRectangle(Area area, int writingMode,
+double x, double y, double w, double h,
+ ContentRectangle contents, Point2D contentOffset) {
+ area.super(writingMode, x, y, w, h, contents, contentOffset);
+borders = new BorderRectangle(area, writingMode);
borders.setContents(this);
}
@@ -56,10 +57,10 @@
* @param contents
* @param contentOffset
*/
- public PaddingRectangle(Area area, Rectangle2D rect,
-Area.ContentRectangle contents, Point2D contentOffset) {
- area.super(rect, contents, contentOffset);
-borders = new BorderRectangle(area);
+ public PaddingRectangle(Area area, int writingMode, Rectangle2D rect,
+ContentRectangle contents, Point2D contentOffset) {
+ area.super(writingMode, rect, contents, contentOffset);
+borders = new BorderRectangle(area, writingMode);
borders.setContents(this);
}
1.1.2.18 +187 -200 xml-fop/src/java/org/apache/fop/area/Area.java
Index: Area.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Area.java,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -r1.1.2.17 -r1.1.2.18
--- Area.java 11 Jun 2004 14:44:10 - 1.1.2.17
+++ Area.java 13 Jun 2004 17:03:31 - 1.1.2.18
@@ -21,7 +21,6 @@
import java.awt.geom.AffineTransform;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
-import java.awt.geom.Rectangle2D.Double;
import java.util.ArrayList;
import org.apache.fop.datastructs.Node;
@@ -138,10 +137,6 @@
private void setup() {
-content = new ContentRectangle();
-padding = content.getPadding();
-borders = padding.getBorders();
-spaces = borders.getSpaces();
try {
contentWritingMode = generatedBy.getWritingMode();
contentIsHorizontal = WritingMode.isHorizontal(contentWritingMode);
@@ -153,6 +148,10 @@
} catch (PropertyException e) {
throw new RuntimeException(e.getMessage());
}
+content = new ContentRectangle(this, contentWritingMode);
+//padding = new PaddingRectangle(frameWritingMode, content, 0.0, 0.0);
+borders = padding.getBorders();
+spaces = borders.getSpaces();
}
/**
@@ -186,147 +185,6 @@
setup();
}
-/**
- * Gets the block-progression-dimension of the contents of
- * this area in millipoints. This value is taken from the appropriate
- * dimension of the Rectangle2D representing this area. If no
- * Rectangle2D exists, a zero-dimensioned default is first
- * created, then the zero value is returned.
- * @return the block-progression-dimension
cvs commit: xml-fop/src/java/org/apache/fop/area PaddingRectangle.java Area.java SpacesRectangle.java BorderRectangle.java ContentRectangle.java AreaFrame.java
pbwest 2004/06/11 07:44:10
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
PaddingRectangle.java Area.java
SpacesRectangle.java BorderRectangle.java
Removed: src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
ContentRectangle.java AreaFrame.java
Log:
AreaFrame and ContentRectangle made inner classes of Area.
Revision ChangesPath
No revision
No revision
1.1.2.3 +15 -14xml-fop/src/java/org/apache/fop/area/Attic/PaddingRectangle.java
Index: PaddingRectangle.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/PaddingRectangle.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- PaddingRectangle.java 6 Jun 2004 16:50:58 - 1.1.2.2
+++ PaddingRectangle.java 11 Jun 2004 14:44:10 - 1.1.2.3
@@ -26,12 +26,13 @@
* @author pbw
* @version $Revision$ $Name$
*/
-public class PaddingRectangle extends AreaFrame {
+public class PaddingRectangle extends Area.AreaFrame {
-public PaddingRectangle() {
-contents = new ContentRectangle();
+public PaddingRectangle(Area area) {
+area.super();
+contents = area.new ContentRectangle();
contentOffset = new Point2D.Double();
-borders = new BorderRectangle();
+borders = new BorderRectangle(area);
borders.setContents(this);
}
@@ -43,10 +44,10 @@
* @param contents
* @param contentOffset
*/
- public PaddingRectangle(double x, double y, double w, double h,
- ContentRectangle contents, Point2D contentOffset) {
- super(x, y, w, h, contents, contentOffset);
-borders = new BorderRectangle();
+ public PaddingRectangle(Area area, double x, double y, double w, double h,
+ Area.ContentRectangle contents, Point2D contentOffset) {
+ area.super(x, y, w, h, contents, contentOffset);
+borders = new BorderRectangle(area);
borders.setContents(this);
}
@@ -55,10 +56,10 @@
* @param contents
* @param contentOffset
*/
- public PaddingRectangle(Rectangle2D rect, ContentRectangle contents,
- Point2D contentOffset) {
- super(rect, contents, contentOffset);
-borders = new BorderRectangle();
+ public PaddingRectangle(Area area, Rectangle2D rect,
+Area.ContentRectangle contents, Point2D contentOffset) {
+ area.super(rect, contents, contentOffset);
+borders = new BorderRectangle(area);
borders.setContents(this);
}
1.1.2.17 +236 -4xml-fop/src/java/org/apache/fop/area/Area.java
Index: Area.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Area.java,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- Area.java 6 Jun 2004 17:07:26 - 1.1.2.16
+++ Area.java 11 Jun 2004 14:44:10 - 1.1.2.17
@@ -19,6 +19,9 @@
package org.apache.fop.area;
import java.awt.geom.AffineTransform;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+import java.awt.geom.Rectangle2D.Double;
import java.util.ArrayList;
import org.apache.fop.datastructs.Node;
@@ -112,12 +115,26 @@
protected void setTranslation(AffineTransform translation) {
this.translation = translation;
}
+/** The writing-mode of the generating FO */
+protected int contentWritingMode = 0;
/** True if the writing-mode of the content area is
* horizontal */
protected boolean contentIsHorizontal = true;
/** True if the the writing-mode of the content area is
* left-to-right */
protected boolean contentLeftToRight = true;
+/** The writing-mode of the parent of the generating FO. This may
+ * differ from the writing mode of the generating FO if this is a
+ * reference-area. */
+protected int frameWritingMode = 0;
+/** True if the writing-mode of the frames of this area is
+ * horizontal. May differ from contentIsHorizontal if this is a
+ * reference-area. */
+protected boolean frameIsHorizontal = true;
+/** True if the the writing-mode of the frames of this area is
+ * left-to-right. May differ from contentIsHorizontal if this is a
+ * reference-area. */
+protected boolean frameLeftToRight = true;
private void setup() {
@@ -126,10 +143,13 @@
borders = padding.getBorders();
spaces = borders.getSpaces();
try
cvs commit: xml-fop/src/java/org/apache/fop/area ReferenceArea.java
pbwest 2004/06/10 07:58:51 Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design ReferenceArea.java Log: Comments Revision ChangesPath No revision No revision 1.1.2.6 +7 -4 xml-fop/src/java/org/apache/fop/area/Attic/ReferenceArea.java Index: ReferenceArea.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/ReferenceArea.java,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -r1.1.2.5 -r1.1.2.6 --- ReferenceArea.java30 Apr 2004 00:34:50 - 1.1.2.5 +++ ReferenceArea.java10 Jun 2004 14:58:51 - 1.1.2.6 @@ -46,7 +46,9 @@ * Adobe 1st quadrant co-ordinates for PDF and Postscript rendering. * * @param matrix the transform to map the contents of this reference-area - * into statndard Java page co-ordinates. + * into standard Java page co-ordinates. N.B. The + * AffineTransform should be null if no tranformation is + * required. */ public void setCoordTransformer(AffineTransform matrix); @@ -59,5 +61,6 @@ public AffineTransform getCoordTransformer(); public Object clone(); - +// TODO - methods to apply transformation to content-rectangle of the +// reference area wrt the allocation-rectangle } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area BlockArea.java
pbwest 2004/06/10 07:57:37
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
BlockArea.java
Log:
Cosmetics
Revision ChangesPath
No revision
No revision
1.1.2.9 +4 -3 xml-fop/src/java/org/apache/fop/area/Attic/BlockArea.java
Index: BlockArea.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/BlockArea.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- BlockArea.java6 Jun 2004 17:09:30 - 1.1.2.8
+++ BlockArea.java10 Jun 2004 14:57:37 - 1.1.2.9
@@ -92,7 +92,8 @@
private boolean spaceContains(Rectangle2D rect) {
return pageSpace.contains(
-rect.getMinX(), rect.getMinY(), rect.getWidth(), rect.getHeight());
+rect.getMinX(), rect.getMinY(),
+rect.getWidth(), rect.getHeight());
}
private AreaRange adjustedRequest(AreaRange request) {
// TODO Adjust the request for padding, borders and margins on this
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area BlockArea.java
pbwest 2004/06/06 10:09:30
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
BlockArea.java
Log:
Changed dimensions from float to double.
Added contentSpace rectangle
Revision ChangesPath
No revision
No revision
1.1.2.8 +21 -14xml-fop/src/java/org/apache/fop/area/Attic/BlockArea.java
Index: BlockArea.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/BlockArea.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- BlockArea.java1 Jun 2004 06:27:05 - 1.1.2.7
+++ BlockArea.java6 Jun 2004 17:09:30 - 1.1.2.8
@@ -44,7 +44,9 @@
}
/** The page space allocation for layout of the block */
-private Rectangle2D pageSpace = new Rectangle2D.Float();
+private Rectangle2D pageSpace = new Rectangle2D.Double();
+/** The content space equivalent to the pageSpace */
+private Rectangle2D contentSpace = null;
///**
// * Receives an allocation of page space from area parent
@@ -59,6 +61,9 @@
* child area. N.B. reference-areas must override
* this method to apply an AffineTransform to areas passed
* up and returned.
+ * The requested space is the whole area required by the child, including
+ * padding, borders and margins (spaces). The area is allocated from the
+ * content area of the parent.
* @return
*/
public Rectangle2D pageSpaceRequest(AreaRange spaceRange) {
@@ -74,8 +79,10 @@
// they contain inline items which will go into the same
// line-area. At this point, e.g., footnotes will be found.
} else {
+ // The available space is sufficient to contain the mimimum
+ // layout from the child, but insufficient to contain all of it.
// Negotiate available space with the requester
-
+
}
} else { // Need more space from above. Page may be full
// Negotiate with parent for more space
@@ -101,32 +108,32 @@
}
-protected float getStartSpace() {
+protected double getStartSpace() {
return getStartIndent() + getStartIntrusion();
}
-protected float getEndSpace() {
+protected double getEndSpace() {
return getEndIndent() + getEndIntrusion();
}
-protected float getStartIndent() {
+protected double getStartIndent() {
// Dummy start-indent
-return 10.0f;
+return 10.0;
}
-protected float getEndIndent() {
+protected double getEndIndent() {
// Dummy end-indent
-return 10.0f;
+return 10.0;
}
-protected float getStartIntrusion() {
+protected double getStartIntrusion() {
// dummy intrusion
-return 0.0f;
+return 0.0;
}
-protected float getEndIntrusion() {
+protected double getEndIntrusion() {
// dummy intrusion
-return 0.0f;
+return 0.0;
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area Area.java
pbwest 2004/06/06 10:07:26
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
Area.java
Log:
Changed distances from float to double.
Only content constructed directly;
padding, borders and spaces recovered through content;
changed types of these from Rectangle2D to specific instance types of AreaFrame or
ContentRectangle;
removed setters for these.
Added translation AffineTransform with accessors.
Only content constructed directly;
padding, borders and spaces recovered through content;
changed types of these from Rectangle2D to specific instance types of AreaFrame or
ContentRectangle;
removed setters for these.
Added translation AffineTransform with accessors.
Revision ChangesPath
No revision
No revision
1.1.2.16 +67 -51xml-fop/src/java/org/apache/fop/area/Area.java
Index: Area.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Area.java,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- Area.java 1 Jun 2004 06:27:05 - 1.1.2.15
+++ Area.java 6 Jun 2004 17:07:26 - 1.1.2.16
@@ -18,7 +18,7 @@
*/
package org.apache.fop.area;
-import java.awt.geom.Rectangle2D;
+import java.awt.geom.AffineTransform;
import java.util.ArrayList;
import org.apache.fop.datastructs.Node;
@@ -43,72 +43,88 @@
*/
public class Area extends AreaNode implements Cloneable {
-/** The total geometrical area covered by this Area, including
- * content rectangle, padding, borders and spaces. The width
- * of this Rectangle is the inline-progression-dimension
- * of the area, and the height is the
- * block-progression-dimension. */
-protected Rectangle2D space = new Rectangle2D.Float();
-protected Rectangle2D border = null;
-protected Rectangle2D padding = null;
-protected Rectangle2D content = new Rectangle2D.Float();
-/** True if the the writing-mode of the content area is
- * horizontal */
-protected boolean contentIsHorizontal = true;
-/** True if the the writing-mode of the content area is
- * left-to-right */
-protected boolean contentLeftToRight = true;
-
/**
- * @return the border
- */
-public Rectangle2D getBorder() {
-return border;
-}
+ * The total geometrical area covered by this Area, including
+ * content rectangle, padding, borders and spaces or margins. The
+ * width of this Rectangle is the
+ * inline-progression-dimension of the area, and the
+ * height is the block-progression-dimension.
+ * The spaces are always implicitly defined with respect to the borders.
+ * The only way in which individual margins/spaces can be derived is with
+ * respect to the padding rectangle, so this rectangle is always associated
+ * with a point offset to the top left corner of the padding rectangle.
+ * Note that spaces/margins are dynamic, in that they are frequently
+ * adjusted or eliminated in the course of layout.
+ * */
+protected SpacesRectangle spaces = null;
/**
- * @param border to set
+ * @return the space
*/
-public void setBorder(Rectangle2D border) {
-this.border = border;
+protected SpacesRectangle getSpaces() {
+return spaces;
}
-/**
- * @return the content
+/** Geometrical area embraced by the border rectangle of this area. Note
+ * that borders may be collapsed.
*/
-public Rectangle2D getContent() {
-return content;
-}
+protected BorderRectangle borders = null;
/**
- * @param content to set
+ * @return the border
*/
-public void setContent(Rectangle2D content) {
-this.content = content;
+protected BorderRectangle getBorders() {
+return borders;
}
+/** Geometrical area embraced by the padding rectangle of this area.
+ * N.B. The background (if any) is rendered in the padding rectangle. */
+protected PaddingRectangle padding = null;
/**
* @return the padding
*/
-public Rectangle2D getPadding() {
+protected PaddingRectangle getPadding() {
return padding;
}
+/** Geometrical area embraced by the content rectangle of this area */
+protected ContentRectangle content = null;
/**
- * @param padding to set
- */
-public void setPadding(Rectangle2D padding) {
-this.padding = padding;
-}
-/**
- * @return the space
- */
-public Rectangle2D getSpace() {
-return space;
-}
-/**
- * @param space to set
+ * @return the content
cvs commit: xml-fop/src/java/org/apache/fop/area AreaFrame.java
pbwest 2004/06/06 09:57:06
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
AreaFrame.java
Log:
Made no-arg constructor public.
Added AreaFrame(Rectangle2D contents) construtor to create AreaFrame of same
dimensions as contents.
Made contents and contentOffset protected.
Added getContents() and getContentOffset().
Revision ChangesPath
No revision
No revision
1.1.2.2 +23 -8 xml-fop/src/java/org/apache/fop/area/Attic/AreaFrame.java
Index: AreaFrame.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/AreaFrame.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- AreaFrame.java6 Jun 2004 15:30:29 - 1.1.2.1
+++ AreaFrame.java6 Jun 2004 16:57:06 - 1.1.2.2
@@ -33,7 +33,14 @@
/**
*
*/
- private AreaFrame() {}
+ public AreaFrame() {}
+
+public AreaFrame(Rectangle2D contents) {
+super();
+setRect(contents);
+this.contents = contents;
+this.contentOffset = new Point2D.Double();
+}
/**
* Instantiates a new framing rectangle with the given origin point, the
@@ -58,10 +65,10 @@
}
/** The framed rectangle */
- private Rectangle2D contents = null;
+ protected Rectangle2D contents = null;
/** The offset from this origin to the origin of the framed
* rectangle */
- private Point2D contentOffset = null;
+ protected Point2D contentOffset = null;
/**
* Instantiates a new framing rectangle from the given rectangle, given
@@ -94,7 +101,11 @@
contents = this.contents;
}
- /**
+public Rectangle2D getContents() {
+return contents;
+}
+
+/**
* Sets the offset from the origin of this to the origin of
* the framed contents rectangle. The dimensions of the framed contents
* are not affected, but the dimensions of this are changed
@@ -102,13 +113,17 @@
* X and Y axes.
* @param offset the new offset to the framed rectangle
*/
- public void setContentsOffset(Point2D offset) {
+ public void setContentOffset(Point2D offset) {
setStart(offset.getX());
setBefore(offset.getY());
contentOffset = offset;
}
- /**
+public Point2D getContentOffset() {
+return contentOffset;
+}
+
+/**
* Sets the before edge width of the frame. The contents size
* is unaffected, but the size of the frame (this) will
* change. The height will vary by the difference between the previous and
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area PaddingRectangle.java ContentRectangle.java SpacesRectangle.java BorderRectangle.java
pbwest 2004/06/06 09:50:58
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
PaddingRectangle.java ContentRectangle.java
SpacesRectangle.java BorderRectangle.java
Log:
Added ripple constructor:
ContentRectangle>PaddingRectangle>BorderRectangle>SpacesRectangle
with private frame field and get method
Revision ChangesPath
No revision
No revision
1.1.2.2 +21 -5 xml-fop/src/java/org/apache/fop/area/Attic/PaddingRectangle.java
Index: PaddingRectangle.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/PaddingRectangle.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- PaddingRectangle.java 6 Jun 2004 15:30:29 - 1.1.2.1
+++ PaddingRectangle.java 6 Jun 2004 16:50:58 - 1.1.2.2
@@ -28,7 +28,14 @@
*/
public class PaddingRectangle extends AreaFrame {
- /**
+public PaddingRectangle() {
+contents = new ContentRectangle();
+contentOffset = new Point2D.Double();
+borders = new BorderRectangle();
+borders.setContents(this);
+}
+
+/**
* @param x
* @param y
* @param w
@@ -37,8 +44,10 @@
* @param contentOffset
*/
public PaddingRectangle(double x, double y, double w, double h,
- Rectangle2D contents, Point2D contentOffset) {
+ ContentRectangle contents, Point2D contentOffset) {
super(x, y, w, h, contents, contentOffset);
+borders = new BorderRectangle();
+borders.setContents(this);
}
/**
@@ -46,9 +55,16 @@
* @param contents
* @param contentOffset
*/
- public PaddingRectangle(Rectangle2D rect, Rectangle2D contents,
+ public PaddingRectangle(Rectangle2D rect, ContentRectangle contents,
Point2D contentOffset) {
super(rect, contents, contentOffset);
+borders = new BorderRectangle();
+borders.setContents(this);
}
+private BorderRectangle borders = null;
+
+public BorderRectangle getBorders() {
+return borders;
+}
}
1.1.2.2 +11 -13xml-fop/src/java/org/apache/fop/area/Attic/ContentRectangle.java
Index: ContentRectangle.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/ContentRectangle.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ContentRectangle.java 6 Jun 2004 15:30:29 - 1.1.2.1
+++ ContentRectangle.java 6 Jun 2004 16:50:58 - 1.1.2.2
@@ -35,6 +35,8 @@
*/
public ContentRectangle() {
super();
+padding = new PaddingRectangle();
+padding.setContents(this);
}
/**
@@ -47,22 +49,18 @@
*/
public ContentRectangle(double x, double y, double w, double h) {
super(x, y, w, h);
+padding = new PaddingRectangle();
+padding.setContents(this);
}
private PaddingRectangle padding = null;
- private BorderRectangle borders = null;
- private SpacesRectangle spaces = null;
-public void setPadding(PaddingRectangle padding) {
-this.padding = padding;
+public PaddingRectangle getPadding() {
+return padding;
}
-public void setBorders(BorderRectangle borders) {
-this.borders = borders;
+public void setRect(double x, double y, double w, double h) {
+super.setRect(x, y, w, h);
+padding.setContents(this);
}
-
-public void setSpaces(SpacesRectangle spaces) {
-this.spaces = spaces;
-}
-
}
1.1.2.2 +11 -5 xml-fop/src/java/org/apache/fop/area/Attic/SpacesRectangle.java
Index: SpacesRectangle.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/SpacesRectangle.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SpacesRectangle.java 6 Jun 2004 15:30:29 - 1.1.2.1
+++ SpacesRectangle.java 6 Jun 2004 16:50:58 - 1.1.2.2
@@ -28,7 +28,13 @@
*/
public class SpacesRectangle extends AreaFrame {
- /**
+public SpacesRectangle() {
+contents = new BorderRectangle();
+contentOffset = new Point2D.Double();
+
+}
+
+/**
* @param x
* @param y
* @param w
@@ -37,7 +43,7 @@
* @param contentOffset
*/
public Spaces
cvs commit: xml-fop/src/java/org/apache/fop/area AreaRange.java
pbwest 2004/06/06 08:32:16
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
AreaRange.java
Log:
Switched from float to double
Revision ChangesPath
No revision
No revision
1.1.2.2 +26 -23xml-fop/src/java/org/apache/fop/area/Attic/AreaRange.java
Index: AreaRange.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/AreaRange.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- AreaRange.java30 May 2004 16:16:58 - 1.1.2.1
+++ AreaRange.java6 Jun 2004 15:32:16 - 1.1.2.2
@@ -45,8 +45,8 @@
public AreaRange(
float iPDimMin, float iPDimMax, float bPDimMin, float bPDimMax) {
-minima = new Rectangle2D.Float(0, 0, iPDimMin, bPDimMin);
-maxima = new Rectangle2D.Float(0, 0, iPDimMax, bPDimMax);
+minima = new Rectangle2D.Double(0, 0, iPDimMin, bPDimMin);
+maxima = new Rectangle2D.Double(0, 0, iPDimMax, bPDimMax);
}
public AreaRange(Rectangle2D minima, Rectangle2D maxima) {
@@ -60,12 +60,12 @@
* N.B. The method is synchronized only on this object.
* @return the block-progression-dimension maximum value
*/
-public Float getBPDimMax() {
+public Double getBPDimMax() {
synchronized (this) {
if (maxima == null) {
return null;
}
-return new Float(maxima.getHeight());
+return new Double(maxima.getHeight());
}
}
@@ -76,10 +76,10 @@
* @param dimMax block-progression-dimension maximum value
* to set
*/
-public void setBPDimMax(float dimMax) {
+public void setBPDimMax(double dimMax) {
synchronized (this) {
if (maxima == null) {
-maxima = new Rectangle2D.Float(0, 0, 0, 0);
+maxima = new Rectangle2D.Double(0, 0, 0, 0);
}
maxima.setRect(
maxima.getMinX(), maxima.getMinY(), maxima.getWidth(),
@@ -93,12 +93,12 @@
* N.B. The method is synchronized only on this object.
* @return the block-progression-dimension minimum value
*/
-public Float getBPDimMin() {
+public Double getBPDimMin() {
synchronized (this) {
if (minima == null) {
return null;
}
-return new Float(minima.getHeight());
+return new Double(minima.getHeight());
}
}
@@ -109,12 +109,13 @@
* @param dimMin block-progression-dimension minimum value
* to set
*/
-public void setBPDimMin(float dimMin) {
+public void setBPDimMin(double dimMin) {
synchronized (this) {
if (minima == null) {
-minima = new Rectangle2D.Float(0, 0, 0, 0);
+minima = new Rectangle2D.Double(0, 0, 0, 0);
}
-minima.setRect(maxima.getMinX(), maxima.getMinY(), maxima.getWidth(),
+minima.setRect(maxima.getMinX(),
+ maxima.getMinY(), maxima.getWidth(),
dimMin);
}
}
@@ -125,12 +126,12 @@
* N.B. The method is synchronized only on this object.
* @return the inline-progression-dimension maximum value
*/
-public Float getIPDimMax() {
+public Double getIPDimMax() {
synchronized(this) {
if (maxima == null) {
return null;
}
-return new Float(maxima.getWidth());
+return new Double(maxima.getWidth());
}
}
@@ -141,13 +142,14 @@
* @param dimMax inline-progression-dimension maximum value
* to set
*/
-public void setIPDimMax(float dimMax) {
+public void setIPDimMax(double dimMax) {
synchronized (this) {
if (maxima == null) {
-maxima = new Rectangle2D.Float(0, 0, 0, 0);
+maxima = new Rectangle2D.Double(0, 0, 0, 0);
}
maxima.setRect(
-maxima.getMinX(), maxima.getMinY(), dimMax, maxima.getHeight());
+maxima.getMinX(), maxima.getMinY(),
+ dimMax, maxima.getHeight());
}
}
@@ -157,12 +159,12 @@
* N.B. The method is synchronized only on this object.
* @return the inline-progression-dimension minimum value
*/
-public Float getIPDimMin() {
+public Double getIPDimMin() {
synchronized (this) {
if (minima == null) {
return null;
}
-return new Float
cvs commit: xml-fop/src/java/org/apache/fop/area PaddingRectangle.java ContentRectangle.java SpacesRectangle.java BorderRectangle.java AreaFrame.java
pbwest 2004/06/06 08:30:29 Added: src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design PaddingRectangle.java ContentRectangle.java SpacesRectangle.java BorderRectangle.java AreaFrame.java Log: AreaFrames (padding, borders and spaces/margins) and ContentRectangle to represent geometries of basic area components Revision ChangesPath No revision No revision 1.1.2.1 +54 -0 xml-fop/src/java/org/apache/fop/area/Attic/PaddingRectangle.java 1.1.2.1 +68 -0 xml-fop/src/java/org/apache/fop/area/Attic/ContentRectangle.java 1.1.2.1 +54 -0 xml-fop/src/java/org/apache/fop/area/Attic/SpacesRectangle.java 1.1.2.1 +54 -0 xml-fop/src/java/org/apache/fop/area/Attic/BorderRectangle.java 1.1.2.1 +169 -0xml-fop/src/java/org/apache/fop/area/Attic/AreaFrame.java - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area RegionBodyRefArea.java
pbwest 2004/06/03 06:33:36
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
RegionBodyRefArea.java
Log:
Acknowledge before-float-reference-area and footnote-reference-area
Revision ChangesPath
No revision
No revision
1.1.2.9 +23 -19
xml-fop/src/java/org/apache/fop/area/Attic/RegionBodyRefArea.java
Index: RegionBodyRefArea.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/RegionBodyRefArea.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- RegionBodyRefArea.java1 Jun 2004 06:27:05 - 1.1.2.8
+++ RegionBodyRefArea.java3 Jun 2004 13:33:36 - 1.1.2.9
@@ -31,9 +31,9 @@
public class RegionBodyRefArea
extends RegionRefArea
implements ReferenceArea {
-//private BeforeFloat beforeFloat;
private MainReferenceArea mainReference;
-//private Footnote footnote;
+private BeforeFloatRefArea beforeFloatRefArea;
+private FootnoteRefArea footnoteRefArea;
private int columnGap = 0;
private int columnCount = 1;
@@ -68,6 +68,10 @@
new RegionBodyRefArea(pageSeq, parent, sync);
bodyRef.setMainReference(MainReferenceArea.nullMainRefArea(
pageSeq, pageSeq, bodyRef, sync));
+bodyRef.setBeforeFloatRefArea(
+new BeforeFloatRefArea(pageSeq, pageSeq, bodyRef, sync));
+bodyRef.setFootnoteRefArea(
+new FootnoteRefArea(pageSeq, pageSeq, bodyRef, sync));
return bodyRef;
}
/**
@@ -115,11 +119,11 @@
/**
* Set the before float area.
*
- * @param bf the before float area
+ * @param bf the before float reference area
*/
-//public void setBeforeFloat(BeforeFloat bf) {
-//beforeFloat = bf;
-//}
+public void setBeforeFloatRefArea(BeforeFloatRefArea bf) {
+beforeFloatRefArea = bf;
+}
/**
* Set the main reference area.
@@ -135,20 +139,20 @@
/**
* Set the footnote area.
*
- * @param foot the footnote area
+ * @param foot the footnote reference area
*/
-//public void setFootnote(Footnote foot) {
-//footnote = foot;
-//}
+public void setFootnoteRefArea(FootnoteRefArea foot) {
+footnoteRefArea = foot;
+}
/**
* Get the before float area.
*
* @return the before float area
*/
-//public BeforeFloat getBeforeFloat() {
-//return beforeFloat;
-//}
+public BeforeFloatRefArea getBeforeFloatRefArea() {
+return beforeFloatRefArea;
+}
/**
* Get the main reference area.
@@ -166,9 +170,9 @@
*
* @return the footnote area
*/
-//public Footnote getFootnote() {
-//return footnote;
-//}
+public FootnoteRefArea getFootnoteRefArea() {
+return footnoteRefArea;
+}
/**
* Clone this object.
@@ -180,9 +184,9 @@
RegionBodyRefArea br = (RegionBodyRefArea)(super.clone());
br.columnGap = columnGap;
br.columnCount = columnCount;
-//br.beforeFloat = beforeFloat;
+br.beforeFloatRefArea = beforeFloatRefArea;
br.mainReference = mainReference;
-//br.footnote = footnote;
+br.footnoteRefArea = footnoteRefArea;
return br;
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/flow FoStaticContent.java
pbwest 2004/06/03 06:32:03
Modified:src/java/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design
FoStaticContent.java
Log:
Added some features corresponding to fo:flow
Revision ChangesPath
No revision
No revision
1.1.2.14 +36 -4
xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoStaticContent.java
Index: FoStaticContent.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoStaticContent.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- FoStaticContent.java 30 May 2004 16:46:40 - 1.1.2.13
+++ FoStaticContent.java 3 Jun 2004 13:32:03 - 1.1.2.14
@@ -29,6 +29,7 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.area.Area;
+import org.apache.fop.area.Page;
import org.apache.fop.datastructs.TreeException;
import org.apache.fop.datatypes.NCName;
import org.apache.fop.fo.FONode;
@@ -152,14 +153,45 @@
public String getFlowName() {
return flowName;
}
+//
+//public Area getReferenceRectangle() throws FOPException {
+//// TODO Reference rectangle is assumed to be the content rectangle of
+//// the first region into which the content is flowed. For region-body
+//// it is normal-flow reference-area; for other regions it is the
+//// region-reference-area. See
+//// 7.3 Reference Rectangle for Percentage Computations
+//throw new FOPException("Called from FoStaticContent");
+//}
-public Area getReferenceRectangle() throws FOPException {
+public Area getReferenceRectangle() {
// TODO Reference rectangle is assumed to be the content rectangle of
// the first region into which the content is flowed. For region-body
// it is normal-flow reference-area; for other regions it is the
// region-reference-area. See
// 7.3 Reference Rectangle for Percentage Computations
-throw new FOPException("Called from FoStaticContent");
+// The difficulty is that there may be multiple attempts to layout the
+// flow. Each attempt will generate its own page set, only the first
+// of which contains a region-body-reference-area which qualifies as
+// the reference rectangle for percentages defined on the flow.
+//
+// Get the first page of the page-sequence
+// TODO check whether the current page from the page-sequence will be
+// enough
+Page page = pageSequence.getCurr1stPage();
+if (page == null) return null;
+return page.getNormalFlowRefArea();
+}
+
+public Area getLayoutContext() {
+// The layout context for fo:flow is
+// the first normal-flow-reference-area.
+return getReferenceRectangle();
+}
+
+public Area getChildrensLayoutContext() {
+// The layout context for the █ children of fo:flow is
+// the current normal-flow-reference-area.
+return pageSequence.getPage().getNormalFlowRefArea();
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/flow FoBlock.java
pbwest 2004/06/03 06:30:54
Modified:src/java/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design
FoBlock.java
Log:
Initial BlockArea creation
Revision ChangesPath
No revision
No revision
1.1.2.19 +9 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBlock.java
Index: FoBlock.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBlock.java,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- FoBlock.java 30 May 2004 16:46:40 - 1.1.2.18
+++ FoBlock.java 3 Jun 2004 13:30:54 - 1.1.2.19
@@ -24,10 +24,12 @@
package org.apache.fop.fo.flow;
// FOP
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.BitSet;
import org.apache.fop.apps.FOPException;
import org.apache.fop.area.Area;
+import org.apache.fop.area.BlockArea;
import org.apache.fop.datastructs.TreeException;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FOPageSeqNode;
@@ -140,7 +142,10 @@
stateFlags, sparsePropsMap, sparseIndices);
getMarkers();
// Generate a block area
-
+currentArea = new BlockArea(
+pageSequence, this, layoutContext, layoutContext.getSync());
+generated = new ArrayList();
+generated.add(currentArea);
XmlEvent ev = null;
do {
try {
@@ -150,6 +155,7 @@
ev = xmlevents.expectOutOfLinePcdataOrInlineOrBlock();
if (ev != null) {
// Generate the flow object
+
FObjects.makePageSeqFOChild(
foTree, pageSequence, this, ev, stateFlags);
// Area generation happening here
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/flow FoFlow.java
pbwest 2004/06/03 06:29:50
Modified:src/java/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design
FoFlow.java
Log:
Minor code compression
Revision ChangesPath
No revision
No revision
1.1.2.17 +3 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFlow.java
Index: FoFlow.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFlow.java,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- FoFlow.java 30 May 2004 16:46:40 - 1.1.2.16
+++ FoFlow.java 3 Jun 2004 13:29:50 - 1.1.2.17
@@ -154,8 +154,7 @@
public Area getChildrensLayoutContext() {
// The layout context for the █ children of fo:flow is
// the current normal-flow-reference-area.
-Page page = pageSequence.getPage();
-return page.getNormalFlowRefArea();
+return pageSequence.getPage().getNormalFlowRefArea();
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/flow FoPageSequence.java
pbwest 2004/06/03 06:28:47
Modified:src/java/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design
FoPageSequence.java
Log:
Added mapFlowName() and unmapFlowName()
Revision ChangesPath
No revision
No revision
1.1.2.18 +41 -7
xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPageSequence.java
Index: FoPageSequence.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPageSequence.java,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -r1.1.2.17 -r1.1.2.18
--- FoPageSequence.java 23 May 2004 10:41:24 - 1.1.2.17
+++ FoPageSequence.java 3 Jun 2004 13:28:47 - 1.1.2.18
@@ -41,6 +41,7 @@
import org.apache.fop.area.PageSetElement;
import org.apache.fop.datastructs.TreeException;
import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.FOPageSeqNode;
import org.apache.fop.fo.FOTree;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.PropNames;
@@ -126,10 +127,6 @@
public Map staticContents = null;
/** Child index of fo:flow child. */
private int flowChild = -1;
-/** The PageList for this page-sequence */
-private PageList pagelist = null;
-/** The index of the current element in the pagelist */
-private int pgListIndex = -1;
/** The page currently being processed by this page-sequence */
private Page page = null;
/**
@@ -140,6 +137,11 @@
return page;
}
+/** The PageList for this page-sequence */
+private PageList pagelist = null;
+/** The index of the current element in the pagelist */
+private int pgListIndex = -1;
+
/**
* @return the pagelist
*/
@@ -183,6 +185,38 @@
return (Page)firstPage;
}
+/** Maps flownames to fo:flow and fo:static-content objects */
+private HashMap flowMap = new HashMap(10);
+/**
+ * Maps a flow name to a FoFlow or FoStaticContent
+ * object.
+ * @param flowname the name of the flow
+ * @param flow the flow or static-content object
+ * @throws FOPException if object that the name is being mapped to is
+ * not a flow or static-content
+ */
+public void mapFlowName(String flowname, FOPageSeqNode flow)
+throws FOPException {
+synchronized (flowMap) {
+if ( ! (flow.type == FObjectNames.FLOW
+|| flow.type == FObjectNames.STATIC_CONTENT)) {
+throw new FOPException(
+"Only fo:flow or fo:static-content allowed in flowmap");
+}
+flowMap.put(flowname, flow);
+}
+}
+
+
+/**
+ * @param flowname
+ * @return
+ */
+public FOPageSeqNode unmapFlowName(String flowname) {
+synchronized (flowMap) {
+return (FOPageSeqNode)(flowMap.get(flowname));
+}
+}
/** An image on which to draw areas */
private BufferedImage pageSpread = null;
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area RegionStartVport.java RegionEndVport.java BlockArea.java RegionStartRefArea.java RegionBeforeVport.java RegionRefArea.java RegionAfterVport.java RegionBodyVport.java PageViewport.java RegionBodyRefArea.java AbstractViewport.java RegionEndRefArea.java Area.java RegionAfterRefArea.java RegionViewport.java RegionBeforeRefArea.java AbstractReferenceArea.java
pbwest 2004/05/31 23:27:05
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
RegionStartVport.java RegionEndVport.java
BlockArea.java RegionStartRefArea.java
RegionBeforeVport.java RegionRefArea.java
RegionAfterVport.java RegionBodyVport.java
PageViewport.java RegionBodyRefArea.java
AbstractViewport.java RegionEndRefArea.java
Area.java RegionAfterRefArea.java
RegionViewport.java RegionBeforeRefArea.java
AbstractReferenceArea.java
Log:
W.I.P. Removed constructors with Rectangle2D.
Changed Rectangle2D area to space, added Rectangle2Ds
border, padding and content to Area.
Made content the reference for IPD and BPD calculations.
Revision ChangesPath
No revision
No revision
1.1.2.6 +2 -20 xml-fop/src/java/org/apache/fop/area/Attic/RegionStartVport.java
Index: RegionStartVport.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/RegionStartVport.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- RegionStartVport.java 10 May 2004 11:45:18 - 1.1.2.5
+++ RegionStartVport.java 1 Jun 2004 06:27:05 - 1.1.2.6
@@ -19,8 +19,6 @@
*/
package org.apache.fop.area;
-import java.awt.geom.Rectangle2D;
-
import org.apache.fop.datastructs.Node;
import org.apache.fop.fo.flow.FoPageSequence;
@@ -42,22 +40,6 @@
Object sync) {
// the page-sequence is the generated-by node
super(pageSeq, pageSeq, parent, sync);
-}
-
-/**
- * Creates a new region-start area with the defined rectangular area
- * @param area the rectangular area
- * @param pageSeq the generating page-sequence
- * @param parent the page-reference-area
- * @param sync
- */
-public RegionStartVport(
-Rectangle2D area,
-FoPageSequence pageSeq,
-Node parent,
-Object sync) {
-// the page-sequence is the generated-by node
-super(area, pageSeq, pageSeq, parent, sync);
}
/**
1.1.2.6 +2 -20 xml-fop/src/java/org/apache/fop/area/Attic/RegionEndVport.java
Index: RegionEndVport.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/RegionEndVport.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- RegionEndVport.java 10 May 2004 11:45:18 - 1.1.2.5
+++ RegionEndVport.java 1 Jun 2004 06:27:05 - 1.1.2.6
@@ -19,8 +19,6 @@
*/
package org.apache.fop.area;
-import java.awt.geom.Rectangle2D;
-
import org.apache.fop.datastructs.Node;
import org.apache.fop.fo.flow.FoPageSequence;
@@ -42,22 +40,6 @@
Object sync) {
// the page-sequence is the generated-by node
super(pageSeq, pageSeq, parent, sync);
-}
-
-/**
- * Creates a new region-end area with the defined rectangular area
- * @param area the rectangular area
- * @param pageSeq the generating page-sequence
- * @param parent the page-reference-area
- * @param sync
- */
-public RegionEndVport(
-Rectangle2D area,
-FoPageSequence pageSeq,
-Node parent,
-Object sync) {
-// the page-sequence is the generated-by node
-super(area, pageSeq, pageSeq, parent, sync);
}
/**
1.1.2.7 +52 -3 xml-fop/src/java/org/apache/fop/area/Attic/BlockArea.java
Index: BlockArea.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/BlockArea.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BlockArea.java30 May 2004 16:19:36 - 1.1.2.6
+++ BlockArea.java1 Jun 2004 06:27:05 - 1.1.2.7
@@ -44,7 +44,7 @@
}
/** The page space allocation for layout of the block */
-private Rectangle2D pageSpace;
+private Rectangle2D pageSpace = new Rectangle2D.Float();
///**
// * Receives an allocation of page space from area parent
@@ -63,9 +63,30 @@
*/
public Rectangle2D pageSpaceRequest(AreaRange spaceRange) {
AreaRange request = adjustedRequest(spaceRange);
+// Is there a sufficient allocation already available?
+if (spaceContains(spaceRange.minima)) {
+if (spaceContains(spaceRange.maxima
