cvs commit: xml-fop build.xml
pietsch 2004/02/07 15:03:44
Modified:.build.xml
Log:
Don't copy codegen files.
Pass graphics configuration adapter source to javadoc.
Random xdoc directory reference fixes (still incomplete).
Revision ChangesPath
1.104 +27 -25xml-fop/build.xml
Index: build.xml
===
RCS file: /home/cvs/xml-fop/build.xml,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- build.xml 6 Feb 2004 21:51:01 - 1.103
+++ build.xml 7 Feb 2004 23:03:44 - 1.104
@@ -206,28 +206,28 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -332,9 +332,9 @@
-
+
@@ -625,6 +625,7 @@
refVersion="${ref-version}"/>
-->
+
@@ -724,6 +725,7 @@
+
@@ -779,10 +781,10 @@
-
+
-
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr/table Row.java
pietsch 2004/02/07 15:10:19
Modified:src/java/org/apache/fop/layoutmgr/table Row.java
Log:
Fixed the missing table header bug.
Revision ChangesPath
1.6 +2 -2 xml-fop/src/java/org/apache/fop/layoutmgr/table/Row.java
Index: Row.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/Row.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Row.java 8 Sep 2003 17:00:56 - 1.5
+++ Row.java 7 Feb 2004 23:10:19 - 1.6
@@ -273,7 +273,7 @@
int cellcount = 0;
if (pos == null) {
-while ((curLM = getCellLM(cellcount++)) != null) {
+while ((curLM = getCellLM(cellcount)) != null) {
curLM.resetPosition(null);
cellcount++;
}
@@ -281,7 +281,7 @@
RowPosition rpos = (RowPosition)pos;
List breaks = rpos.cellBreaks;
-while ((curLM = getCellLM(cellcount++)) != null) {
+while ((curLM = getCellLM(cellcount)) != null) {
List childbreaks = (List)breaks.get(cellcount);
curLM.resetPosition((Position)childbreaks.get(childbreaks.size() -
1));
cellcount++;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/documentation/content/xdocs faq.xml
pietsch 2003/01/26 16:49:44 Modified:lib ant.jar src/documentation/content/xdocs faq.xml Log: Actualization and some additions to the FAQ. Revision ChangesPath 1.8 +2361 -2665xml-fop/lib/ant.jar <> 1.8 +245 -154 xml-fop/src/documentation/content/xdocs/faq.xml Index: faq.xml === RCS file: /home/cvs/xml-fop/src/documentation/content/xdocs/faq.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- faq.xml 5 Jan 2003 19:43:57 - 1.7 +++ faq.xml 27 Jan 2003 00:49:44 - 1.8 @@ -9,8 +9,8 @@ What is FOP? -FOP is a print formatter for XSL formatting -objects. +FOP is a print formatter for XSL formatting +objects. It can be used to render an XML file containing XSL formatting objects @@ -66,8 +66,8 @@ XSL is a W3C standard concerned with publishing XML documents. It - consists of two parts: XSLT and XSLFO. The acronym expands to + consists of two parts: XSLT and XSLFO. The acronym expands to eXtensible Stylesheet Language. @@ -123,21 +123,45 @@ Common stumbling blocks + Why does FOP insert a blank page between my page sequences? + + + This is because spec conformance has been improved. + + + The http://www.w3.org/TR/xsl/slice7.html#force-page-count";>force-page-count + property controls how a FO processor pads page sequences in + order to get certain page counts or last page numbers. The default is + "auto". With this setting, if the next page sequence + begins with an odd page number because you set the + initial-page-number, and the current page sequence also ends with an + odd page number, the processor inserts a blank page to keep odd and + even page numbers alternating (similar for the case the current page + sequence ends with an even page number and the next page sequence + starts with an even page number. + + + If you don't want to have this blank page, use + force-page-count="no-force". + + + + I get the error: [ERROR]: 'master-reference' for 'fo:page-sequence'matches no 'simple-page-master' or 'page-sequence-master' - FOP was changed to be in accordance with the latest standard - (see XSL - standard).The page master for a fo:page-sequence is - now refereced by the master-reference attribute. Replace the - master-name attributes of your fo:page-sequence elements by - master-reference attributes. You have to do this also for - fo:single-page-master-reference, + FOP was changed to be in accordance with the latest standard (see + XSL standard).The page + master for a fo:page-sequence is now refereced by the + master-reference attribute. Replace the master-name attributes of + your fo:page-sequence elements by master-reference attributes. You + have to do this also for fo:single-page-master-reference, fo:repeatable-page-master-reference and - fo:conditional-page-master-reference elements in you page - master definitions. + fo:conditional-page-master-reference elements in you page master + definitions. See also release notes. @@ -151,17 +175,24 @@ The Jimi image library, which is by default used for processing images in PNG and other formats, was removed from the distribution for licensing reasons. You have to http://java.sun.com";>download +href="http://java.sun.com/products/jimi";>download and install it by yourself. + + Extract the file "JimiProClasses.zip" from the archive you've downloaded, rename it to "jimi-1.0.jar" and move it to FOP's lib directory. + + + An alternative to Jimi is to use Sun's JAI. It is much faster, but + not available for all platforms. + I get a NoClassDefFound exception. - This is typically a problem with your classpath. + This is typically a problem with your classpath. If you are running FOP from the command line: @@ -176,8 +207,8 @@
cvs commit: xml-fop/src/org/apache/fop/layout BlockArea.java LineArea.java
pietsch 2003/02/02 13:17:41
Modified:src/org/apache/fop/fo Tag: fop-0_20_2-maintain FOText.java
src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain
Leader.java
src/org/apache/fop/layout Tag: fop-0_20_2-maintain
BlockArea.java LineArea.java
Log:
Fixed leader generation to be more conformant with common expectations.
Everything assuming leaders automatically expand as much as possible
is broken now, leaders expand ONLY due to text justification.
Expanding multiple leaders on a line is simplistic.
Fixed leader-alignment="reference" to some extend. Leaders may be
still misaligned if text justification causes spaces to expand, i.e.
slack space was not taken completely by leaders.
Revision ChangesPath
No revision
No revision
1.24.2.6 +1 -2 xml-fop/src/org/apache/fop/fo/FOText.java
Index: FOText.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FOText.java,v
retrieving revision 1.24.2.5
retrieving revision 1.24.2.6
diff -u -r1.24.2.5 -r1.24.2.6
--- FOText.java 22 Nov 2002 15:10:44 - 1.24.2.5
+++ FOText.java 2 Feb 2003 21:17:40 - 1.24.2.6
@@ -230,7 +230,6 @@
ba.setupLinkSet(ls);
start = la.addText(data, start, end, ls, textState);
-// this.hasLines = true;
while ( start != -1) {
la = ba.createNextLineArea();
No revision
No revision
1.13.2.5 +23 -12xml-fop/src/org/apache/fop/fo/flow/Leader.java
Index: Leader.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Leader.java,v
retrieving revision 1.13.2.4
retrieving revision 1.13.2.5
diff -u -r1.13.2.4 -r1.13.2.5
--- Leader.java 22 Nov 2002 15:10:46 - 1.13.2.4
+++ Leader.java 2 Feb 2003 21:17:41 - 1.13.2.5
@@ -108,17 +108,29 @@
// determines the pattern of leader; allowed values: space, rule,dots,
use-content
int leaderPattern = this.properties.get("leader-pattern").getEnum();
// length of the leader
-int leaderLengthOptimum =
-this.properties.get("leader-length.optimum").getLength().mvalue();
-int leaderLengthMinimum =
-this.properties.get("leader-length.minimum").getLength().mvalue();
-Length maxlength = this.properties.get("leader-length.maximum").getLength();
+Length length = this.properties.get("leader-length.minimum").getLength();
+int leaderLengthMinimum;
+if (length instanceof PercentLength) {
+leaderLengthMinimum = (int)(((PercentLength)length).value()
+* area.getAllocationWidth());
+} else {
+leaderLengthMinimum = length.mvalue();
+}
+length = this.properties.get("leader-length.optimum").getLength();
+int leaderLengthOptimum;
+if (length instanceof PercentLength) {
+leaderLengthOptimum = (int)(((PercentLength)length).value()
+ * area.getAllocationWidth());
+} else {
+leaderLengthOptimum = length.mvalue();
+}
+length = this.properties.get("leader-length.maximum").getLength();
int leaderLengthMaximum;
-if(maxlength instanceof PercentLength) {
-leaderLengthMaximum = (int)(((PercentLength)maxlength).value()
+if (length instanceof PercentLength) {
+leaderLengthMaximum = (int)(((PercentLength)length).value()
* area.getAllocationWidth());
} else {
-leaderLengthMaximum = maxlength.mvalue();
+leaderLengthMaximum = length.mvalue();
}
// the following properties only apply for leader-pattern = "rule"
int ruleThickness =
@@ -177,7 +189,7 @@
// in the xsl:fo spec: "User agents may choose to use the value of
'leader-length.optimum'
// to determine where to break the line" (7.20.4)
// if leader is longer then create a new LineArea and put leader there
-if (leaderLengthOptimum <= (la.getRemainingWidth())) {
+if (leaderLengthOptimum <= la.getRemainingWidth()) {
la.addLeader(leaderPattern, leaderLengthMinimum,
leaderLengthOptimum, leaderLengthMaximum, ruleStyle,
ruleThickness, leaderPatternWidth, leaderAlignment);
@@ -200,12 +212,11 @@
} else {
l
cvs commit: xml-fop/src/org/apache/fop/layout/inline WordArea.java
pietsch 2003/02/03 15:43:26
Modified:.Tag: fop-0_20_2-maintain CHANGES
src/org/apache/fop/layout Tag: fop-0_20_2-maintain
LineArea.java
src/org/apache/fop/layout/inline Tag: fop-0_20_2-maintain
WordArea.java
Log:
Fixed leader expansion and leader alignment to reference area to some
extent.
Deleted superfluous text decoration data and assiciated (incomplete)
methods from WordArea.
PR: 7490, 15936
Revision ChangesPath
No revision
No revision
1.10.2.45 +2 -0 xml-fop/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/xml-fop/CHANGES,v
retrieving revision 1.10.2.44
retrieving revision 1.10.2.45
diff -u -r1.10.2.44 -r1.10.2.45
--- CHANGES 23 Jan 2003 08:39:38 - 1.10.2.44
+++ CHANGES 3 Feb 2003 23:43:25 - 1.10.2.45
@@ -1,5 +1,7 @@
==
Done since 0.20.4 release
+- Fixed leader expansion and leader alignment to reference area to some
+ extent(#7490 and #15936).
- Temporary fix for wrong mapping of the hyphen character in the PostScript
renderer. Needs to be done in a clean way later.
Submitted by: Arnd Beissner <[EMAIL PROTECTED]>
No revision
No revision
1.53.2.14 +3 -9 xml-fop/src/org/apache/fop/layout/Attic/LineArea.java
Index: LineArea.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/Attic/LineArea.java,v
retrieving revision 1.53.2.13
retrieving revision 1.53.2.14
diff -u -r1.53.2.13 -r1.53.2.14
--- LineArea.java 2 Feb 2003 21:17:41 - 1.53.2.13
+++ LineArea.java 3 Feb 2003 23:43:25 - 1.53.2.14
@@ -184,7 +184,6 @@
// appending indent space leader-alignment setting
// InlineSpace to false, so it is not used in line
// justification
-System.out.println("align, space="+spaceBeforeLeader);
if (spaceBeforeLeader > 0) {
children.add(idx, new InlineSpace(spaceBeforeLeader,
false));
@@ -219,7 +218,6 @@
// appending indent space leader-alignment setting
// InlineSpace to false, so it is not used in line
// justification
-System.out.println("align, space="+spaceBeforeLeader);
if (spaceBeforeLeader > 0) {
children.add(idx, new InlineSpace(spaceBeforeLeader,
false));
@@ -742,12 +740,6 @@
int leaderLengthOptimum, int leaderLengthMaximum,
int ruleStyle, int ruleThickness,
int leaderPatternWidth, int leaderAlignment) {
-System.out.println(
-"min="+leaderLengthMinimum+
-" opt="+leaderLengthOptimum+
-" max="+leaderLengthMaximum+
-" th="+ruleThickness+
-" al="+leaderAlignment);
if (leaderLengthMinimum>leaderLengthOptimum
|| leaderLengthOptimum>leaderLengthMaximum) {
MessageHandler.errorln("leader sizes wrong");
@@ -892,8 +884,10 @@
}
}
}
+break;
default:
MessageHandler.errorln("bad align: "+type);
+break;
}
}
No revision
No revision
1.3.2.1 +1 -15 xml-fop/src/org/apache/fop/layout/inline/Attic/WordArea.java
Index: WordArea.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/inline/Attic/WordArea.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- WordArea.java 30 Jul 2001 20:29:29 - 1.3
+++ WordArea.java 3 Feb 2003 23:43:26 - 1.3.2.1
@@ -14,12 +14,6 @@
private String text;
-// Textdecoration
-protected boolean underlined = false;
-protected boolean overlined = false;
-protected boolean lineThrough = false;
-
-
public WordArea(FontState fontState, float red, float green, float blue,
String text, int width) {
super(fontState, width, red, green, blue);
@@ -33,1
cvs commit: xml-fop xalan.bat xalan.sh
pietsch 2003/02/03 15:45:20 Added: .Tag: fop-0_20_2-maintain xalan.bat xalan.sh Log: Added convenience command files xalan.bat and xalan.sh to run a standalone XSLT (use standard Xalan commands, to be documented) Revision ChangesPath No revision No revision 1.1.2.1 +8 -0 xml-fop/Attic/xalan.bat 1.1.2.1 +104 -0xml-fop/Attic/xalan.sh - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo/expr LabelEndFunction.java
pietsch 2003/02/11 11:47:25 Modified:src/documentation/content/xdocs Tag: fop-0_20_2-maintain relnotes.xml src/org/apache/fop/fo/expr Tag: fop-0_20_2-maintain LabelEndFunction.java Log: Fixed JAI URL. PR:16957 Submitted by: ole.kvarno Revision ChangesPath No revision No revision 1.3.2.3 +1 -1 xml-fop/src/documentation/content/xdocs/relnotes.xml Index: relnotes.xml === RCS file: /home/cvs/xml-fop/src/documentation/content/xdocs/relnotes.xml,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -u -r1.3.2.2 -r1.3.2.3 --- relnotes.xml 10 Dec 2002 10:06:36 - 1.3.2.2 +++ relnotes.xml 11 Feb 2003 19:47:25 - 1.3.2.3 @@ -26,7 +26,7 @@ copy JimiProClasses.zip to FOP's lib dir and rename it to jimi-1.0.jar. Fop has been compiled with -http://java.sun.com/products/java-media/jai/JAI";>JAI +http://java.sun.com/products/java-media/jai";>JAI support. For using JAI you just need to install it. Links in PDF won't generate multiple link rectangles anymore. If this causes No revision No revision 1.2.2.2 +4 -7 xml-fop/src/org/apache/fop/fo/expr/LabelEndFunction.java Index: LabelEndFunction.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/expr/LabelEndFunction.java,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -r1.2.2.1 -r1.2.2.2 --- LabelEndFunction.java 17 Feb 2002 19:53:36 - 1.2.2.1 +++ LabelEndFunction.java 11 Feb 2003 19:47:25 - 1.2.2.2 @@ -1,8 +1,8 @@ /* * $Id$ - * Copyright (C) 2001 The Apache Software Foundation. All rights reserved. - * For details on use and redistribution please refer to the - * LICENSE file included with these sources. + * Copyright (C) 2001-2003 The Apache Software Foundation. All rights + * reserved. For details on use and redistribution please refer to + * the LICENSE file included with these sources. */ package org.apache.fop.fo.expr; @@ -47,9 +47,6 @@ labelEnd.addTerm(-1.0, distance); labelEnd.addTerm(-1.0, startIndent); labelEnd.addTerm(1.0, separation); - -// make sure value gets calculated -labelEnd.computeValue(); return new LengthProperty(labelEnd); } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/layout/hyphenation HyphenationTree.java
pietsch 2003/02/13 13:21:13
Modified:src/org/apache/fop/layout/hyphenation Tag:
fop-0_20_2-maintain HyphenationTree.java
Log:
Fixed incorrect comparision with hyphenation push character
count.
Submitted by: [EMAIL PROTECTED]
Revision ChangesPath
No revision
No revision
1.5.2.3 +2 -2
xml-fop/src/org/apache/fop/layout/hyphenation/HyphenationTree.java
Index: HyphenationTree.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/layout/hyphenation/HyphenationTree.java,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -r1.5.2.2 -r1.5.2.3
--- HyphenationTree.java 19 Nov 2002 01:04:09 - 1.5.2.2
+++ HyphenationTree.java 13 Feb 2003 21:21:12 - 1.5.2.3
@@ -305,7 +305,7 @@
// hyphenation points are located where interletter value is odd
for (i = 0; i < len; i++) {
if (((il[i + 1] & 1) == 1) && i >= remainCharCount
-&& i < (len - pushCharCount)) {
+&& i <= (len - pushCharCount)) {
result[k++] = i;
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/layout/hyphenation HyphenationTree.java
pietsch 2003/02/13 13:26:43
Modified:src/org/apache/fop/layout/hyphenation HyphenationTree.java
Log:
Fixed comparision with push character count.
Submitted by: [EMAIL PROTECTED]
Revision ChangesPath
1.7 +2 -2
xml-fop/src/org/apache/fop/layout/hyphenation/HyphenationTree.java
Index: HyphenationTree.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/layout/hyphenation/HyphenationTree.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HyphenationTree.java 9 Nov 2001 11:32:41 - 1.6
+++ HyphenationTree.java 13 Feb 2003 21:26:43 - 1.7
@@ -305,7 +305,7 @@
// hyphenation points are located where interletter value is odd
for (i = 0; i < len; i++) {
if (((il[i + 1] & 1) == 1) && i >= remainCharCount
-&& i < (len - pushCharCount)) {
+&& i <= (len - pushCharCount)) {
result[k++] = i;
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/svg PDFGraphics2D.java
pietsch 2003/02/16 16:09:44
Modified:src/org/apache/fop/apps Tag: fop-0_20_2-maintain
StreamRenderer.java
src/org/apache/fop/fo Tag: fop-0_20_2-maintain FONode.java
FObj.java
src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain
AbstractTableBody.java Block.java ListBlock.java
ListItem.java Marker.java RetrieveMarker.java
Table.java
src/org/apache/fop/layout Tag: fop-0_20_2-maintain Area.java
AreaTree.java Page.java
src/org/apache/fop/render/xml Tag: fop-0_20_2-maintain
XMLRenderer.java
src/org/apache/fop/svg Tag: fop-0_20_2-maintain
PDFGraphics2D.java
Log:
Revamped marker handling. Retrieving markers works now always for
all retrieve boundaries. Long markers should also work now.
First-including-carryover does not work yet. Last-ending-within-page
probably doesn't work yet either.
Submitted by: Based on patch submitted by Marc C. Allman
Revision ChangesPath
No revision
No revision
1.6.2.9 +63 -75xml-fop/src/org/apache/fop/apps/Attic/StreamRenderer.java
Index: StreamRenderer.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/Attic/StreamRenderer.java,v
retrieving revision 1.6.2.8
retrieving revision 1.6.2.9
diff -u -r1.6.2.8 -r1.6.2.9
--- StreamRenderer.java 19 Nov 2002 01:03:57 - 1.6.2.8
+++ StreamRenderer.java 17 Feb 2003 00:09:42 - 1.6.2.9
@@ -13,13 +13,14 @@
import org.xml.sax.SAXException;
-import org.apache.fop.layout.FontInfo;
-import org.apache.fop.layout.Page;
-import org.apache.fop.render.Renderer;
-import org.apache.fop.layout.AreaTree;
import org.apache.fop.datatypes.IDReferences;
import org.apache.fop.extensions.ExtensionObj;
+import org.apache.fop.fo.flow.Marker;
import org.apache.fop.fo.pagination.PageSequence;
+import org.apache.fop.layout.AreaTree;
+import org.apache.fop.layout.FontInfo;
+import org.apache.fop.layout.Page;
+import org.apache.fop.render.Renderer;
import org.apache.avalon.framework.logger.Logger;
@@ -98,6 +99,13 @@
*/
private ArrayList extensions = new ArrayList();
+/**
+ * The list of markers.
+ */
+private ArrayList documentMarkers;
+private ArrayList currentPageSequenceMarkers;
+private PageSequence currentPageSequence;
+
private Logger log;
public StreamRenderer(OutputStream outputStream, Renderer renderer) {
@@ -126,7 +134,7 @@
pageCount = 0;
if (MEM_PROFILE_WITH_GC)
-System.gc(); // This takes time but gives better results
+System.gc(); // This takes time but gives better results
initialMemory = runtime.totalMemory() - runtime.freeMemory();
startTime = System.currentTimeMillis();
@@ -158,7 +166,7 @@
}
if (MEM_PROFILE_WITH_GC)
-System.gc(); // This takes time but gives better results
+System.gc(); // This takes time but gives better results
long memoryNow = runtime.totalMemory() - runtime.freeMemory();
long memoryUsed = (memoryNow - initialMemory) / 1024L;
@@ -217,33 +225,50 @@
public synchronized void queuePage(Page page)
throws FOPException, IOException {
+
+// process markers
+PageSequence pageSequence = page.getPageSequence();
+if (pageSequence != currentPageSequence) {
+currentPageSequence = pageSequence;
+currentPageSequenceMarkers = null;
+}
+ArrayList markers = page.getMarkers();
+if (markers != null) {
+if (documentMarkers == null) {
+documentMarkers = new ArrayList();
+}
+if (currentPageSequenceMarkers == null) {
+currentPageSequenceMarkers = new ArrayList();
+}
+for (int i=0;i
*/
-class RenderQueueEntry extends Object {
+class RenderQueueEntry {
/*
The Page that has outstanding ID references.
*/
@@ -309,55 +334,18 @@
}
}
- // unused and broken
-// public Page getNextPage(Page current, boolean isWithinPageSequence,
-// boolean isFirstCall) {
-// Page nextPage = null;
-// int pageIndex = 0;
-// if (isFirstCall)
-// pageIndex = renderQueue.size();
-// else
-// pageIndex = renderQueue.indexOf(current);
-// if ((pageIndex + 1) < renderQu
cvs commit: xml-fop CHANGES
pietsch 2003/02/16 16:31:58 Modified:.Tag: fop-0_20_2-maintain CHANGES Log: Added CHANGES entry for marker fix. Revision ChangesPath No revision No revision 1.10.2.50 +8 -1 xml-fop/CHANGES Index: CHANGES === RCS file: /home/cvs/xml-fop/CHANGES,v retrieving revision 1.10.2.49 retrieving revision 1.10.2.50 diff -u -r1.10.2.49 -r1.10.2.50 --- CHANGES 16 Feb 2003 12:42:33 - 1.10.2.49 +++ CHANGES 17 Feb 2003 00:31:58 - 1.10.2.50 @@ -1,5 +1,12 @@ == Done since 0.20.4 release +- Fixed marker handling thouroughly. All retrieving boundaries and + retrieve-position first-starting-within-page and last-starting-within-page + should work now, as well as multiline/multiblock marker contents. + Retrieve-position first-including-carryover and last-ending-within-page + do not yet work. Also fixed marker handling in case layout was undone + due to keeps (#16999). (J.Pietschmann, based on material submitted + by Marc C. Allman) - Fixed some sources of "wrong operand type" error in Acrobat Reader. They were caused by rounding bugs, mostly experienced with SVG files coming from OpenOffice. (Jeremias Maerki) @@ -18,7 +25,7 @@ - Added Turkish messages for AWT Viewer Submitted by: Togan Muftuoglu <[EMAIL PROTECTED]> - Fixed leader expansion and leader alignment to reference area to some - extent(#7490 and #15936). + extent(#7490 and #15936). (J.Pietschmann) - Temporary fix for wrong mapping of the hyphen character in the PostScript renderer. Needs to be done in a clean way later. Submitted by: Arnd Beissner <[EMAIL PROTECTED]> - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/hyph pt.xml
pietsch 2003/02/16 16:47:42 Modified:src/hyph Tag: fop-0_20_2-maintain pt.xml Log: New portugese hyphenation. Submitted by: [EMAIL PROTECTED] Revision ChangesPath No revision No revision 1.1.2.2 +267 -226 xml-fop/src/hyph/pt.xml Index: pt.xml === RCS file: /home/cvs/xml-fop/src/hyph/pt.xml,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- pt.xml15 Jan 2003 14:03:32 - 1.1.2.1 +++ pt.xml17 Feb 2003 00:47:42 - 1.1.2.2 @@ -1,226 +1,267 @@ - - - - - - -aA -bB -cC -dD -eE -fF -gG -hH -iI -jJ -kK -lL -mM -nN -oO -pP -qQ -rR -sS -tT -uU -vV -wW -xX -yY -zZ -aá -aÁ -aà -aÀ -aâ -a -eé -eÉ -eê -eÊ -ií -iÍ -oó -oÓ -uú -uÚ -çÇ -ãà -õÕ -oô -oÔ - - - - -hard-ware -soft-ware -sub-lin-gual -ec-lipse -ec-lipses -ec-lipsar -ec-le-si-as-ti-co -ec-le-si-as-ti-cos -terp-si-core - - - - -1ba -1be -1bi -1bo -1bu -1by -1b2l -1b2r -o2b3long -1ca -1ce -1ci -1co -1cu -1cy -1c2k -1ch -1c2l -1c2r -1da -1de -1di -1do -1du -1dy -1d2l -1d2r -e1e -1fa -1fe -1fi -1fo -1fu -1fy -1f2l -1f2r -1ga -1ge -1gi -1go -1gu -1gy -1g2l -1g2r -ba1hia -1j -1ka -1ke -1ki -1ko -1ku -1ky -1k2l -1k2r -1la -1le -1li -1lo -1lu -1ly -1lh -1ma -1me -1mi -1mo -1mu -1my -m2n -m1h -1na -1ne -1ni -1no -1nu -1ny -1nh -o1o -1pa -1pe -1pi -1po -1pu -1py -1ph -1p2l -1p2r -1p2neu -1p2sic -1qu -1ra -1re -1ri -1ro -1ru -1ry -1sa -1se -1si -1so -1su -1sy -1ta -1te -1ti -1to -1tu -1ty -1th -1t2l -1t2r -1va -1ve -1vi -1vo -1vu -1vy -1v2l -1v2r -w2 -1xa -1xe -1xi -1xo -1xu -1xy -1z -1ç - - - - + + + + + + + + + + + +'’′ +aA +áÁ +àÀ +ãà +â +bB +cC +çÇ +dD +eE +éÉ +êÊ +fF +gG +hH +iI +íÍ +jJ +kK +lL +mM +nN +oO +óÓ +õÕ +ôÔ +pP +qQ +rR +sS +tT +uU +úÚ +üÜ +vV +wW +xX +yY +zZ + + + +ba-hia +dlim-dlim +pu-dla-gem + + + + +8'8 + +1ba 1bá 1bâ 1bã 1be 1bé 1bê 1bi 1bí 1bo 1bó 1bô 1bõ 1bu 1bú +1ca 1cá 1câ 1cã 1ce 1cé 1cê 1ci 1cí 1co 1có 1cô 1cõ 1cu 1cú +1ça 1çá 1çâ 1çã 1ço 1çó 1çô 1çõ 1çu 1çú +1da 1dá 1dâ 1dã 1de dbé 1dê 1di 1dí 1do 1dó 1dô 1dõ 1du 1dú +1fa 1fá 1fâ 1fã 1fe dfé 1fê 1fi 1fí 1fo 1fó 1fô 1fõ 1fu 1fú +1ga 1gá 1gâ 1gã 1ge dgé 1gê 1gi 1gí 1go 1gó 1gô 1gõ 1gu 1gú 1gü +.ha .há .hâ .he .hé .hê .hi .hí .ho .hó .hô .hu .hú .hü .hy +1ja 1já 1jâ 1jã 1je djé 1jê 1ji 1jí 1jo 1jó 1jô 1jõ 1ju 1jú +1ka 1ká 1kâ 1kã 1ke 1ké 1kê 1ki 1kí 1ko 1kó 1kô 1kõ 1ku 1kú +1la 1lá 1lâ 1lã 1le 1lé 1lê 1li 1lí 1lo 1ló 1lô 1lõ 1lu 1lú +1ma 1má 1mâ 1mã 1me 1mé 1mê 1mi 1mí 1mo 1mó 1mô 1mõ 1mu 1mú +1na 1ná 1nâ 1nã 1ne 1né 1nê 1ni 1ní 1no 1nó 1nô 1nõ 1nu 1nú +1pa 1pá 1pâ 1pã 1pe 1pé 1pê 1pi 1pí 1po 1pó 1pô 1põ 1pu 1pú +1qu 1qü +1ra 1rá 1râ 1rã 1re 1ré 1rê 1ri 1rí 1ro 1ró 1rô 1rõ 1ru 1rú +1sa 1sá 1sâ 1sã 1se 1sé 1sê 1si 1sí 1so 1só 1sô 1sõ 1su 1sú +1ta 1tá 1tâ 1tã 1te 1té 1tê 1ti 1tí 1to 1tó 1tô 1tõ 1tu 1tú +1va 1vá 1vâ 1vã 1ve 1vé 1vê 1vi 1ví 1vo 1vó 1vô 1võ 1vu 1vú +1wa 1wá 1wâ 1wã 1we 1wé 1wê 1wi 1wí 1wo 1wó 1wô 1wõ 1wu 1wú +1xa 1xá 1xâ 1xã 1xe 1xé 1xê 1xi 1xí 1xo 1xó 1xô 1xõ 1xu 1xú +1ya 1yá 1yâ 1yã 1ye 1yé 1yê 1yi 1yí 1yo 1yó 1yô 1yõ 1yu 1yú +1za 1zá 1zâ 1zã 1ze 1zé 1zê 1zi 1zí 1zo 1zó 1zô 1zõ 1zu 1zú + +1c2ha 1c2há 1c2hâ 1c2hã 1c2he 1c2hé 1c2hê 1c2hi 1c2hí 1c2ho 1c2hó 1c2hô 1c2hõ 1c2hu 1c2hú +1l2ha 1l2há 1l2hâ 1l2hã 1l2he 1l2hé 1l2hê 1l2hi 1l2hí 1l2ho 1l2hó 1l2hô 1l2hõ 1l2hu 1l2hú +1n2ha 1n2há 1n2hâ 1n2hã 1n2he 1n2hé 1n2hê 1n2hi 1n2hí 1n2ho 1n2hó 1n2hô 1n2hõ 1n2hu 1n2hú + +1b2ra 1b2rá 1b2râ 1b2rã 1b2re 1b2ré 1b2rê 1b2ri 1b2rí 1b2ro 1b2ró 1b2rô 1b2rõ 1b2ru 1b2rú +1c2ra 1c2rá 1c2râ 1c2rã 1c2re 1c2ré 1c2rê 1c2ri 1c2rí 1c2ro 1c2ró 1c2rô 1c2rõ 1c2ru 1c2rú +1d2ra 1d2rá 1d2râ 1d2rã 1d2re 1d2ré 1d2rê 1d2ri 1d2rí 1d2ro 1d2ró 1d2rô 1d2rõ 1d2ru 1d2rú +1f2ra 1f2rá 1f2râ 1f2rã 1f2re 1f2ré 1f2rê 1f2ri 1f2rí 1f2ro 1f2ró 1f2rô 1f2rõ 1f2ru 1f2rú +1g2ra 1g2rá 1g2râ 1g2rã 1g2re 1g2ré 1g2rê 1g2ri 1g2rí 1g2ro 1g2ró 1g2rô 1g2rõ 1g2ru 1g2rú +1p2ra 1p2rá 1p2râ 1p2rã 1p2re 1p2ré 1p2rê 1p2ri 1p2rí 1p2ro 1p2ró 1p2rô 1p2rõ 1p2ru 1p2rú +1t2ra 1t2rá 1t2râ 1t2rã 1t2re 1t2ré 1t2rê 1t2ri 1t2rí 1t2ro 1t2ró 1t2rô 1t2rõ 1t2ru 1t2rú +1v2ra 1v2rá 1v2râ 1v2rã 1v2re 1v2ré 1v2rê 1v2ri 1v2rí 1v2ro 1v2ró 1v2rô 1v2rõ 1v2ru 1v2rú +1b2la 1b2lá 1b2lâ 1b2lã 1b2le 1b2lé 1b2lê 1b2li 1b2lí 1b2lo 1b2ló 1b2lô 1b2lõ 1b
cvs commit: xml-fop/src/hyph pt.xml
pietsch 2003/02/16 16:49:26 Modified:src/hyph pt.xml Log: New portugese hyphenation file. Submitted by: [EMAIL PROTECTED] Revision ChangesPath 1.3 +267 -226 xml-fop/src/hyph/pt.xml Index: pt.xml === RCS file: /home/cvs/xml-fop/src/hyph/pt.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pt.xml15 Jan 2003 15:02:52 - 1.2 +++ pt.xml17 Feb 2003 00:49:26 - 1.3 @@ -1,226 +1,267 @@ - - - - - - -aA -bB -cC -dD -eE -fF -gG -hH -iI -jJ -kK -lL -mM -nN -oO -pP -qQ -rR -sS -tT -uU -vV -wW -xX -yY -zZ -aá -aÁ -aà -aÀ -aâ -a -eé -eÉ -eê -eÊ -ií -iÍ -oó -oÓ -uú -uÚ -çÇ -ãà -õÕ -oô -oÔ - - - - -hard-ware -soft-ware -sub-lin-gual -ec-lipse -ec-lipses -ec-lipsar -ec-le-si-as-ti-co -ec-le-si-as-ti-cos -terp-si-core - - - - -1ba -1be -1bi -1bo -1bu -1by -1b2l -1b2r -o2b3long -1ca -1ce -1ci -1co -1cu -1cy -1c2k -1ch -1c2l -1c2r -1da -1de -1di -1do -1du -1dy -1d2l -1d2r -e1e -1fa -1fe -1fi -1fo -1fu -1fy -1f2l -1f2r -1ga -1ge -1gi -1go -1gu -1gy -1g2l -1g2r -ba1hia -1j -1ka -1ke -1ki -1ko -1ku -1ky -1k2l -1k2r -1la -1le -1li -1lo -1lu -1ly -1lh -1ma -1me -1mi -1mo -1mu -1my -m2n -m1h -1na -1ne -1ni -1no -1nu -1ny -1nh -o1o -1pa -1pe -1pi -1po -1pu -1py -1ph -1p2l -1p2r -1p2neu -1p2sic -1qu -1ra -1re -1ri -1ro -1ru -1ry -1sa -1se -1si -1so -1su -1sy -1ta -1te -1ti -1to -1tu -1ty -1th -1t2l -1t2r -1va -1ve -1vi -1vo -1vu -1vy -1v2l -1v2r -w2 -1xa -1xe -1xi -1xo -1xu -1xy -1z -1ç - - - - + + + + + + + + + + + +'’′ +aA +áÁ +àÀ +ãà +â +bB +cC +çÇ +dD +eE +éÉ +êÊ +fF +gG +hH +iI +íÍ +jJ +kK +lL +mM +nN +oO +óÓ +õÕ +ôÔ +pP +qQ +rR +sS +tT +uU +úÚ +üÜ +vV +wW +xX +yY +zZ + + + +ba-hia +dlim-dlim +pu-dla-gem + + + + +8'8 + +1ba 1bá 1bâ 1bã 1be 1bé 1bê 1bi 1bí 1bo 1bó 1bô 1bõ 1bu 1bú +1ca 1cá 1câ 1cã 1ce 1cé 1cê 1ci 1cí 1co 1có 1cô 1cõ 1cu 1cú +1ça 1çá 1çâ 1çã 1ço 1çó 1çô 1çõ 1çu 1çú +1da 1dá 1dâ 1dã 1de dbé 1dê 1di 1dí 1do 1dó 1dô 1dõ 1du 1dú +1fa 1fá 1fâ 1fã 1fe dfé 1fê 1fi 1fí 1fo 1fó 1fô 1fõ 1fu 1fú +1ga 1gá 1gâ 1gã 1ge dgé 1gê 1gi 1gí 1go 1gó 1gô 1gõ 1gu 1gú 1gü +.ha .há .hâ .he .hé .hê .hi .hí .ho .hó .hô .hu .hú .hü .hy +1ja 1já 1jâ 1jã 1je djé 1jê 1ji 1jí 1jo 1jó 1jô 1jõ 1ju 1jú +1ka 1ká 1kâ 1kã 1ke 1ké 1kê 1ki 1kí 1ko 1kó 1kô 1kõ 1ku 1kú +1la 1lá 1lâ 1lã 1le 1lé 1lê 1li 1lí 1lo 1ló 1lô 1lõ 1lu 1lú +1ma 1má 1mâ 1mã 1me 1mé 1mê 1mi 1mí 1mo 1mó 1mô 1mõ 1mu 1mú +1na 1ná 1nâ 1nã 1ne 1né 1nê 1ni 1ní 1no 1nó 1nô 1nõ 1nu 1nú +1pa 1pá 1pâ 1pã 1pe 1pé 1pê 1pi 1pí 1po 1pó 1pô 1põ 1pu 1pú +1qu 1qü +1ra 1rá 1râ 1rã 1re 1ré 1rê 1ri 1rí 1ro 1ró 1rô 1rõ 1ru 1rú +1sa 1sá 1sâ 1sã 1se 1sé 1sê 1si 1sí 1so 1só 1sô 1sõ 1su 1sú +1ta 1tá 1tâ 1tã 1te 1té 1tê 1ti 1tí 1to 1tó 1tô 1tõ 1tu 1tú +1va 1vá 1vâ 1vã 1ve 1vé 1vê 1vi 1ví 1vo 1vó 1vô 1võ 1vu 1vú +1wa 1wá 1wâ 1wã 1we 1wé 1wê 1wi 1wí 1wo 1wó 1wô 1wõ 1wu 1wú +1xa 1xá 1xâ 1xã 1xe 1xé 1xê 1xi 1xí 1xo 1xó 1xô 1xõ 1xu 1xú +1ya 1yá 1yâ 1yã 1ye 1yé 1yê 1yi 1yí 1yo 1yó 1yô 1yõ 1yu 1yú +1za 1zá 1zâ 1zã 1ze 1zé 1zê 1zi 1zí 1zo 1zó 1zô 1zõ 1zu 1zú + +1c2ha 1c2há 1c2hâ 1c2hã 1c2he 1c2hé 1c2hê 1c2hi 1c2hí 1c2ho 1c2hó 1c2hô 1c2hõ 1c2hu 1c2hú +1l2ha 1l2há 1l2hâ 1l2hã 1l2he 1l2hé 1l2hê 1l2hi 1l2hí 1l2ho 1l2hó 1l2hô 1l2hõ 1l2hu 1l2hú +1n2ha 1n2há 1n2hâ 1n2hã 1n2he 1n2hé 1n2hê 1n2hi 1n2hí 1n2ho 1n2hó 1n2hô 1n2hõ 1n2hu 1n2hú + +1b2ra 1b2rá 1b2râ 1b2rã 1b2re 1b2ré 1b2rê 1b2ri 1b2rí 1b2ro 1b2ró 1b2rô 1b2rõ 1b2ru 1b2rú +1c2ra 1c2rá 1c2râ 1c2rã 1c2re 1c2ré 1c2rê 1c2ri 1c2rí 1c2ro 1c2ró 1c2rô 1c2rõ 1c2ru 1c2rú +1d2ra 1d2rá 1d2râ 1d2rã 1d2re 1d2ré 1d2rê 1d2ri 1d2rí 1d2ro 1d2ró 1d2rô 1d2rõ 1d2ru 1d2rú +1f2ra 1f2rá 1f2râ 1f2rã 1f2re 1f2ré 1f2rê 1f2ri 1f2rí 1f2ro 1f2ró 1f2rô 1f2rõ 1f2ru 1f2rú +1g2ra 1g2rá 1g2râ 1g2rã 1g2re 1g2ré 1g2rê 1g2ri 1g2rí 1g2ro 1g2ró 1g2rô 1g2rõ 1g2ru 1g2rú +1p2ra 1p2rá 1p2râ 1p2rã 1p2re 1p2ré 1p2rê 1p2ri 1p2rí 1p2ro 1p2ró 1p2rô 1p2rõ 1p2ru 1p2rú +1t2ra 1t2rá 1t2râ 1t2rã 1t2re 1t2ré 1t2rê 1t2ri 1t2rí 1t2ro 1t2ró 1t2rô 1t2rõ 1t2ru 1t2rú +1v2ra 1v2rá 1v2râ 1v2rã 1v2re 1v2ré 1v2rê 1v2ri 1v2rí 1v2ro 1v2ró 1v2rô 1v2rõ 1v2ru 1v2rú +1b2la 1b2lá 1b2lâ 1b2lã 1b2le 1b2lé 1b2lê 1b2li 1b2lí 1b2lo 1b2ló 1b2lô 1b2lõ 1b2lu 1b2lú +1c2la 1c2lá 1c2lâ 1c2lã 1c2le 1c2lé 1c2lê 1c2li 1c2lí 1c2lo 1c2ló 1c2lô 1c2lõ 1c2lu 1c2lú +1f2la 1
cvs commit: xml-fop/src/org/apache/fop/apps TraxInputHandler.java
pietsch 2003/02/23 12:24:30
Modified:src/org/apache/fop/apps Tag: fop-0_20_2-maintain
TraxInputHandler.java
Log:
Made new constructors for XSLTInputHandler and TraxInputHandler
actually construct something usable.
PR:17118
Submitted by: [EMAIL PROTECTED]
Revision ChangesPath
No revision
No revision
1.5.2.2 +54 -44xml-fop/src/org/apache/fop/apps/TraxInputHandler.java
Index: TraxInputHandler.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/TraxInputHandler.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- TraxInputHandler.java 17 Sep 2002 22:01:06 - 1.5.2.1
+++ TraxInputHandler.java 23 Feb 2003 20:24:30 - 1.5.2.2
@@ -1,6 +1,6 @@
/*
* $Id$
- * Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
+ * Copyright (C) 2001-2003 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
*/
@@ -32,48 +32,40 @@
import java.io.File;
/**
- * XSLTInputHandler basically takes an xmlfile and transforms it with an xsltfile
- * and the resulting xsl:fo document is input for Fop.
+ * XSLTInputHandler basically takes an xml source and transforms it with
+ * an xslt source and the resulting xsl:fo document is input for Fop.
*/
public class TraxInputHandler extends InputHandler {
-
-File xmlfile, xsltfile;
private Transformer transformer;
-private Source xmlSource;
+private StreamSource xmlSource;
+private Source xsltSource;
public TraxInputHandler(File xmlfile, File xsltfile)
- throws FOPException {
-this.xmlfile = xmlfile;
-this.xsltfile = xsltfile;
-try {
-transformer = TransformerFactory.newInstance().newTransformer(
- new StreamSource(xsltfile));
-}
-catch( Exception ex) {
-throw new FOPException(ex);
-}
+throws FOPException {
+xmlSource = new StreamSource(xmlfile);
+xsltSource = new StreamSource(xsltfile);
+initTransformer();
}
public TraxInputHandler(String xmlURL, String xsltURL)
- throws FOPException {
-this.xmlSource = new StreamSource(xmlURL);
-try {
-transformer = TransformerFactory.newInstance().newTransformer(
- new StreamSource(xsltURL));
-}
-catch( Exception ex) {
-throw new FOPException(ex);
-}
+throws FOPException {
+this.xmlSource = new StreamSource(xmlURL);
+this.xsltSource = new StreamSource(xsltURL);
+initTransformer();
}
public TraxInputHandler(InputSource xmlSource, InputSource xsltSource)
- throws FOPException {
-this.xmlSource = new StreamSource(xmlSource.getByteStream(),
- xmlSource.getSystemId());
+throws FOPException {
+this.xmlSource = new StreamSource(xmlSource.getByteStream(),
+ xmlSource.getSystemId());
+this.xsltSource = new StreamSource(xsltSource.getByteStream(),
+ xsltSource.getSystemId());
+initTransformer();
+}
+
+private void initTransformer() throws FOPException {
try {
-transformer = TransformerFactory.newInstance().newTransformer(
- new StreamSource(xsltSource.getByteStream(),
- xsltSource.getSystemId()));
+transformer = TransformerFactory.newInstance().newTransformer
(xsltSource);
}
catch( Exception ex) {
throw new FOPException(ex);
@@ -85,17 +77,21 @@
* @deprecated
*/
public InputSource getInputSource() {
-return fileInputSource(xmlfile);
+InputSource is = new InputSource();
+is.setByteStream(xmlSource.getInputStream());
+is.setSystemId(xmlSource.getSystemId());
+return is;
}
/**
- * overwrites this method of the super class and returns an XMLFilter instead
of a
+ * overwrites this method of the super class and returns an XMLFilter
+ instead of a
* simple XMLReader which allows chaining of transformations
* @deprecated
*
*/
public XMLReader getParser() throws FOPException {
-return this.getXMLFilter(xmlfile, xsltfile);
+return this.getXMLFilter(xsltSource);
}
/**
@@ -106,22 +102,22 @@
* @param xmlfile The xmlfile containing the text data
* @param
cvs commit: xml-fop/src/org/apache/fop/apps TraxInputHandler.java XSLTInputHandler.java
pietsch 2003/02/23 12:27:41
Modified:src/org/apache/fop/apps Tag: fop-0_20_2-maintain
TraxInputHandler.java XSLTInputHandler.java
Log:
Added comments on what to use instead to deprecated methods.
Revision ChangesPath
No revision
No revision
1.5.2.3 +7 -5 xml-fop/src/org/apache/fop/apps/TraxInputHandler.java
Index: TraxInputHandler.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/TraxInputHandler.java,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -r1.5.2.2 -r1.5.2.3
--- TraxInputHandler.java 23 Feb 2003 20:24:30 - 1.5.2.2
+++ TraxInputHandler.java 23 Feb 2003 20:27:40 - 1.5.2.3
@@ -73,7 +73,8 @@
}
/**
- * overwrites the method of the super class to return the xmlfile
+ * Overwrites the method of the super class to return the xmlfile.
+ * Use run(Driver driver) instead.
* @deprecated
*/
public InputSource getInputSource() {
@@ -84,9 +85,10 @@
}
/**
- * overwrites this method of the super class and returns an XMLFilter
- instead of a
- * simple XMLReader which allows chaining of transformations
+ * Overwrites this method of the super class and returns an
+ * XMLFilter instead of a simple XMLReader which allows chaining
+ * of transformations.
+ * Use run(Driver driver) instead.
* @deprecated
*
*/
1.7.2.3 +4 -1 xml-fop/src/org/apache/fop/apps/XSLTInputHandler.java
Index: XSLTInputHandler.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/XSLTInputHandler.java,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -r1.7.2.2 -r1.7.2.3
--- XSLTInputHandler.java 26 Sep 2002 21:12:37 - 1.7.2.2
+++ XSLTInputHandler.java 23 Feb 2003 20:27:41 - 1.7.2.3
@@ -19,6 +19,7 @@
* XSLTInputHandler takes an XML input, transforms it with XSLT
* and provides the resulting xsl:fo document as input for the
* FOP driver.
+ * Use TraxInputHandler instead.
*/
public class XSLTInputHandler extends InputHandler {
private TraxInputHandler traxInputHandler;
@@ -40,6 +41,7 @@
/**
* Get the InputSource.
+ * Use TraxInputHandler run(Driver driver) instead.
* @deprecated
*/
public InputSource getInputSource() {
@@ -48,6 +50,7 @@
/**
* Get the parser, actually an XML filter.
+ * Use TraxInputHandler run(Driver driver) instead.
* @deprecated
*/
public XMLReader getParser() throws FOPException {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/image FopImageFactory.java
pietsch 2003/02/24 11:55:46
Modified:src/org/apache/fop/image Tag: fop-0_20_2-maintain
FopImageFactory.java
Log:
provide a protected constructor to FopImageFactory so that
it can't be instantiated (all methods are static).
Revision ChangesPath
No revision
No revision
1.25.2.11 +3 -1 xml-fop/src/org/apache/fop/image/Attic/FopImageFactory.java
Index: FopImageFactory.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/image/Attic/FopImageFactory.java,v
retrieving revision 1.25.2.10
retrieving revision 1.25.2.11
diff -u -r1.25.2.10 -r1.25.2.11
--- FopImageFactory.java 10 Feb 2003 03:07:12 - 1.25.2.10
+++ FopImageFactory.java 24 Feb 2003 19:55:46 - 1.25.2.11
@@ -27,6 +27,8 @@
* @author Eric SCHAEFFER
*/
public class FopImageFactory {
+// prevent instantiation
+protected FopImageFactory() {}
private static Map m_urlMap = new java.util.HashMap();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo/flow RetrieveMarker.java
pietsch 2003/02/24 12:42:20
Modified:src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain
RetrieveMarker.java
Log:
Fixed thinko regarding check for retrieve-boundary="PAGE"
Revision ChangesPath
No revision
No revision
1.6.2.8 +2 -2 xml-fop/src/org/apache/fop/fo/flow/RetrieveMarker.java
Index: RetrieveMarker.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/RetrieveMarker.java,v
retrieving revision 1.6.2.7
retrieving revision 1.6.2.8
diff -u -r1.6.2.7 -r1.6.2.8
--- RetrieveMarker.java 17 Feb 2003 00:09:43 - 1.6.2.7
+++ RetrieveMarker.java 24 Feb 2003 20:42:19 - 1.6.2.8
@@ -79,7 +79,7 @@
}
} else if (retrieveBoundary == RetrieveBoundary.DOCUMENT) {
return layoutBestMarker(areaTree.getDocumentMarkers(),area);
-} else {
+} else if (retrieveBoundary != RetrieveBoundary.PAGE) {
throw new FOPException("Illegal 'retrieve-boundary' value");
}
} else if (bestMarker != null) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo FOText.java
pietsch 2003/03/02 05:04:16
Modified:src/org/apache/fop/fo Tag: fop-0_20_2-maintain FOText.java
Log:
Fixed destructive data mangling while preparing text for small-caps
font variation. The fix is simplisitc and can cause small caps
text to be expensive in terms of memory consumption and processing
time.
PR: 1171
Revision ChangesPath
No revision
No revision
1.24.2.8 +6 -3 xml-fop/src/org/apache/fop/fo/FOText.java
Index: FOText.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FOText.java,v
retrieving revision 1.24.2.7
retrieving revision 1.24.2.8
diff -u -r1.24.2.7 -r1.24.2.8
--- FOText.java 25 Feb 2003 12:56:54 - 1.24.2.7
+++ FOText.java 2 Mar 2003 13:04:15 - 1.24.2.8
@@ -209,6 +209,7 @@
// parse text for upper/lower case and call addRealText
char c;
+char newdata[] = new char[end];
boolean isLowerCase;
int caseStart;
FontState fontStateToUse;
@@ -221,7 +222,9 @@
== (java.lang.Character.isLetter(c)
&& java.lang.Character.isLowerCase(c))) {
if (isLowerCase) {
-data[i] = java.lang.Character.toUpperCase(c);
+newdata[i] = java.lang.Character.toUpperCase(c);
+} else {
+newdata[i] = c;
}
i++;
if (i == end)
@@ -235,7 +238,7 @@
}
int index = addRealText(ba, fontStateToUse, red, green, blue,
wrapOption, ls, whiteSpaceCollapse,
-data, caseStart, i, textState,
+newdata, caseStart, i, textState,
vAlign);
if (index != -1) {
return index;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop CHANGES
pietsch 2003/03/02 05:06:23 Modified:.Tag: fop-0_20_2-maintain CHANGES Log: Addend CHANGES log entry for small caps fix. Revision ChangesPath No revision No revision 1.10.2.51 +2 -0 xml-fop/CHANGES Index: CHANGES === RCS file: /home/cvs/xml-fop/CHANGES,v retrieving revision 1.10.2.50 retrieving revision 1.10.2.51 diff -u -r1.10.2.50 -r1.10.2.51 --- CHANGES 17 Feb 2003 00:31:58 - 1.10.2.50 +++ CHANGES 2 Mar 2003 13:06:23 - 1.10.2.51 @@ -1,5 +1,7 @@ == Done since 0.20.4 release +- Fixed repeatedly laid out small caps text (for example in static + content or due ot keeps). (J.Pietschmann) - Fixed marker handling thouroughly. All retrieving boundaries and retrieve-position first-starting-within-page and last-starting-within-page should work now, as well as multiline/multiblock marker contents. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/layout BlockArea.java
pietsch 2003/03/02 05:47:44
Modified:src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain
Block.java
src/org/apache/fop/layout Tag: fop-0_20_2-maintain
BlockArea.java
Log:
Set currentLine to null after adding it in BlockArea.
Some cosmetical rearrangements.
PR: 17472 and several postings
Revision ChangesPath
No revision
No revision
1.41.2.16 +16 -41xml-fop/src/org/apache/fop/fo/flow/Block.java
Index: Block.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Block.java,v
retrieving revision 1.41.2.15
retrieving revision 1.41.2.16
diff -u -r1.41.2.15 -r1.41.2.16
--- Block.java25 Feb 2003 12:57:00 - 1.41.2.15
+++ Block.java2 Mar 2003 13:47:44 - 1.41.2.16
@@ -185,8 +185,9 @@
area.end();
}
-if (area.getIDReferences() != null)
+if (area.getIDReferences() != null) {
area.getIDReferences().createID(id);
+}
this.marker = 0;
@@ -221,9 +222,6 @@
this.areasGenerated++;
if (this.areasGenerated == 1)
blockArea.isFirst(true);
-// for normal areas this should be the only pair
-//blockArea.addLineagePair(this, this.areasGenerated);
-
// markers
// if (this.hasMarkers())
// blockArea.addMarkers(this.getMarkers());
@@ -243,37 +241,25 @@
int numChildren = this.children.size();
for (int i = this.marker; i < numChildren; i++) {
FONode fo = (FONode)children.get(i);
-int status;
-if (Status.isIncomplete(status = fo.layout(blockArea))) {
+int status = fo.layout(blockArea);
+if (Status.isIncomplete(status)) {
this.marker = i;
-// this block was modified by
-// Hani Elabed 11/27/2000
-// if ((i != 0) && (status.getCode() == Status.AREA_FULL_NONE))
-// {
-// status = new Status(Status.AREA_FULL_SOME);
-// }
-
-// new block to replace the one above
-// Hani Elabed 11/27/2000
if (status == Status.AREA_FULL_NONE) {
-// something has already been laid out
-if ((i != 0)) {
-status = Status.AREA_FULL_SOME;
+if (i == 0) {
+// Nothing was laid out.
+anythingLaidOut = false;
+return status;
+} else {
+// A previous child has already been laid out.
area.addChild(blockArea);
area.setMaxHeight(area.getMaxHeight() - spaceLeft
+ blockArea.getMaxHeight());
area.increaseHeight(blockArea.getHeight());
anythingLaidOut = true;
-
-return status;
-} else// i == 0 nothing was laid out..
-{
-anythingLaidOut = false;
-return status;
+return Status.AREA_FULL_SOME;
}
}
-
-// blockArea.end();
+// Something has been laid out.
area.addChild(blockArea);
area.setMaxHeight(area.getMaxHeight() - spaceLeft
+ blockArea.getMaxHeight());
@@ -285,13 +271,10 @@
}
blockArea.end();
-
+blockArea.isLast(true);
+area.addChild(blockArea);
area.setMaxHeight(area.getMaxHeight() - spaceLeft
+ blockArea.getMaxHeight());
-
-area.addChild(blockArea);
-
-/* should this be combined into above? */
area.increaseHeight(blockArea.getHeight());
if (spaceAfter != 0) {
@@ -301,8 +284,6 @@
if (area instanceof BlockArea) {
area.start();
}
-// This is not needed any more and it consumes a LOT
-// of memory. So we release it for the GC.
areaHeight= blockArea.getHeight();
contentWidth= blockArea.getContentWidth();
@@ -311,18 +292,12 @@
int breakAfterStatus = propMgr.checkBreakAfter(area);
if (breakAfterStatus != Status.OK) {
this.marker = BREAK_AFTER;
-blockArea = null; //Faster GC - BlockArea is big
+blockArea = null;
return break
cvs commit: xml-fop/src/org/apache/fop/render/xml XMLRenderer.java
pietsch 2003/03/02 08:55:19
Modified:.Tag: fop-0_20_2-maintain CHANGES
src/org/apache/fop/layout Tag: fop-0_20_2-maintain
FontState.java LineArea.java
src/org/apache/fop/layout/inline Tag: fop-0_20_2-maintain
InlineArea.java PageNumberInlineArea.java
WordArea.java
src/org/apache/fop/render Tag: fop-0_20_2-maintain
AbstractRenderer.java PrintRenderer.java
Renderer.java
src/org/apache/fop/render/awt Tag: fop-0_20_2-maintain
AWTRenderer.java
src/org/apache/fop/render/pcl Tag: fop-0_20_2-maintain
PCLRenderer.java
src/org/apache/fop/render/pdf Tag: fop-0_20_2-maintain
PDFRenderer.java
src/org/apache/fop/render/ps Tag: fop-0_20_2-maintain
PSRenderer.java
src/org/apache/fop/render/svg Tag: fop-0_20_2-maintain
SVGRenderer.java
src/org/apache/fop/render/txt Tag: fop-0_20_2-maintain
TXTRenderer.java
src/org/apache/fop/render/xml Tag: fop-0_20_2-maintain
XMLRenderer.java
Log:
Do text align before the line is rendered, not when the line is closed.
Moved page number resolving to just before text align. Removed page
number resolving from renderers.
Also, fix leader expansion in case page number resolving has eaten up
too much space for the page number, resolving in a possible area overflow.
Leaders may now be shortened down to leader-length.minimum if necessary.
PR: 1130, 17194
Revision ChangesPath
No revision
No revision
1.10.2.52 +2 -0 xml-fop/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/xml-fop/CHANGES,v
retrieving revision 1.10.2.51
retrieving revision 1.10.2.52
diff -u -r1.10.2.51 -r1.10.2.52
--- CHANGES 2 Mar 2003 13:06:23 - 1.10.2.51
+++ CHANGES 2 Mar 2003 16:55:15 - 1.10.2.52
@@ -1,5 +1,7 @@
==
Done since 0.20.4 release
+- Fixed text alingment for lines containing forward pointing page number
+ citations. This should greatly improve TOC layout. (J.Pietschmann)
- Fixed repeatedly laid out small caps text (for example in static
content or due ot keeps). (J.Pietschmann)
- Fixed marker handling thouroughly. All retrieving boundaries and
No revision
No revision
1.14.2.8 +111 -7xml-fop/src/org/apache/fop/layout/FontState.java
Index: FontState.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/FontState.java,v
retrieving revision 1.14.2.7
retrieving revision 1.14.2.8
diff -u -r1.14.2.7 -r1.14.2.8
--- FontState.java25 Feb 2003 14:07:03 - 1.14.2.7
+++ FontState.java2 Mar 2003 16:55:15 - 1.14.2.8
@@ -215,14 +215,118 @@
}
// Use default CodePointMapping
-char d = CodePointMapping.getMapping("WinAnsiEncoding").mapChar(c);
-if (d != 0) {
-c = d;
-} else {
-c = '#';
+char d = CodePointMapping.getMapping("WinAnsiEncoding").mapChar(c);
+if (d != 0) {
+c = d;
+} else {
+c = '#';
+}
+return c;
}
-return c;
+private int enWidth=-1;
+private int emWidth=-1;
+
+private final int getEmWidth() {
+if (emWidth<0) {
+char mappedChar = mapChar('m');
+// The mapping returns '#' for unmapped characters in
+// standard fonts. What happens for other fonts?
+if (mappedChar == '#') {
+emWidth = 500 * getFontSize();
+} else {
+emWidth = width(mappedChar);
+}
+}
+return emWidth;
+}
+
+private final int getEnWidth() {
+if (enWidth<0) {
+char mappedChar = mapChar('n');
+// The mapping returns '#' for unmapped characters in
+// standard fonts. What happens for other fonts?
+if (mappedChar != '#') {
+// Should do something to discover non-proportional fonts.
+enWidth = (getEmWidth()*9)/10;
+} else {
+enWidth = width(mappedChar);
+}
+}
+return enWidth;
+}
+
+/**
+ * Helper method for getting th
cvs commit: xml-fop/src/java-1.3 - New directory
pietsch 2003/03/05 10:54:28 xml-fop/src/java-1.3 - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java-1.3/org - New directory
pietsch 2003/03/05 10:54:38 xml-fop/src/java-1.3/org - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java-1.3/org/apache - New directory
pietsch 2003/03/05 10:55:12 xml-fop/src/java-1.3/org/apache - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java-1.3/org/apache/fop - New directory
pietsch 2003/03/05 10:55:20 xml-fop/src/java-1.3/org/apache/fop - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java-1.3/org/apache/fop/pdf - New directory
pietsch 2003/03/05 10:55:29 xml-fop/src/java-1.3/org/apache/fop/pdf - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java-1.4 - New directory
pietsch 2003/03/05 10:56:00 xml-fop/src/java-1.4 - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java-1.4/org - New directory
pietsch 2003/03/05 10:56:09 xml-fop/src/java-1.4/org - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java-1.4/org/apache - New directory
pietsch 2003/03/05 10:56:17 xml-fop/src/java-1.4/org/apache - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java-1.4/org/apache/fop - New directory
pietsch 2003/03/05 10:56:25 xml-fop/src/java-1.4/org/apache/fop - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java-1.4/org/apache/fop/pdf - New directory
pietsch 2003/03/05 10:56:33 xml-fop/src/java-1.4/org/apache/fop/pdf - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/render/pdf PDFRenderer.java
pietsch 2003/03/05 10:58:16
Modified:.Tag: fop-0_20_2-maintain build.xml
src/org/apache/fop/apps Tag: fop-0_20_2-maintain
CommandLineOptions.java
src/org/apache/fop/pdf Tag: fop-0_20_2-maintain
PDFDocument.java PDFXObject.java
src/org/apache/fop/render/pdf Tag: fop-0_20_2-maintain
PDFRenderer.java
Added: src/java-1.3/org/apache/fop/pdf Tag: fop-0_20_2-maintain
PDFEncryption.java
src/java-1.4/org/apache/fop/pdf Tag: fop-0_20_2-maintain
PDFEncryption.java
Log:
Added PDF encryption.
Submitted by: Patrick C. Lankswert <[EMAIL PROTECTED]>
Revision ChangesPath
No revision
No revision
1.44.2.38 +10 -3 xml-fop/build.xml
Index: build.xml
===
RCS file: /home/cvs/xml-fop/build.xml,v
retrieving revision 1.44.2.37
retrieving revision 1.44.2.38
diff -u -r1.44.2.37 -r1.44.2.38
--- build.xml 18 Feb 2003 12:27:34 - 1.44.2.37
+++ build.xml 5 Mar 2003 18:58:14 - 1.44.2.38
@@ -189,7 +189,7 @@
-
+
@@ -302,11 +302,17 @@
+
+
+
+
+
+
@@ -371,8 +377,9 @@
-
+
No revision
No revision
1.1.2.1 +156 -0xml-fop/src/java-1.3/org/apache/fop/pdf/Attic/PDFEncryption.java
No revision
No revision
1.1.2.1 +421 -0xml-fop/src/java-1.4/org/apache/fop/pdf/Attic/PDFEncryption.java
No revision
No revision
1.14.2.10 +95 -30xml-fop/src/org/apache/fop/apps/CommandLineOptions.java
Index: CommandLineOptions.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/CommandLineOptions.java,v
retrieving revision 1.14.2.9
retrieving revision 1.14.2.10
diff -u -r1.14.2.9 -r1.14.2.10
--- CommandLineOptions.java 25 Feb 2003 10:18:31 - 1.14.2.9
+++ CommandLineOptions.java 5 Mar 2003 18:58:15 - 1.14.2.10
@@ -147,6 +147,26 @@
}
+private boolean pdfEncryptionAvailable = false;
+private boolean pdfEncryptionChecked = false;
+private boolean encryptionAvailable() {
+if (!pdfEncryptionChecked) {
+try {
+Class c = Class.forName("javax.crypto.Cipher");
+pdfEncryptionAvailable
+= org.apache.fop.pdf.PDFEncryption.encryptionAvailable();
+}
+catch(ClassNotFoundException e) {
+pdfEncryptionAvailable = false;
+}
+pdfEncryptionChecked = true;
+if (!pdfEncryptionAvailable) {
+log.warn("PDF encryption not available.");
+}
+}
+return pdfEncryptionAvailable;
+}
+
/**
* parses the commandline arguments
* @return true if parse was successful and procesing can continue, false if
processing should stop
@@ -219,6 +239,44 @@
outfile = new File(args[i + 1]);
i++;
}
+} else if (args[i].equals("-o")) {
+if ((i + 1 == args.length) || (args[i + 1].charAt(0) == '-')) {
+if (encryptionAvailable()) {
+rendererOptions.put("ownerPassword", "");
+}
+} else {
+if (encryptionAvailable()) {
+rendererOptions.put("ownerPassword", args[i + 1]);
+}
+i++;
+}
+} else if (args[i].equals("-u")) {
+if ((i + 1 == args.length) || (args[i + 1].charAt(0) == '-')) {
+if (encryptionAvailable()) {
+rendererOptions.put("userPassword", "");
+}
+} else {
+if (encryptionAvailable()) {
+rendererOptions.put("userPassword", args[i + 1]);
+}
+i++;
+}
+} else if (args[i].equals("-noprint")) {
+if (encryptionAvailable()) {
+rendererOptions.put("allowPrint", "FALSE");
+
cvs commit: xml-fop CHANGES
pietsch 2003/03/05 11:02:05 Modified:.Tag: fop-0_20_2-maintain CHANGES Log: Update CHANGES for PDF encryption. Revision ChangesPath No revision No revision 1.10.2.53 +3 -0 xml-fop/CHANGES Index: CHANGES === RCS file: /home/cvs/xml-fop/CHANGES,v retrieving revision 1.10.2.52 retrieving revision 1.10.2.53 diff -u -r1.10.2.52 -r1.10.2.53 --- CHANGES 2 Mar 2003 16:55:15 - 1.10.2.52 +++ CHANGES 5 Mar 2003 19:02:05 - 1.10.2.53 @@ -1,5 +1,8 @@ == Done since 0.20.4 release +- Added PDF encryption. Available options: no printing, no copy, no + edit, no annotations. + Submitted by Patrick C. Lankswert <[EMAIL PROTECTED]> - Fixed text alingment for lines containing forward pointing page number citations. This should greatly improve TOC layout. (J.Pietschmann) - Fixed repeatedly laid out small caps text (for example in static - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/documentation/content/xdocs pdfencryption.xml book.xml running.xml
pietsch 2003/03/05 15:15:25 Modified:src/documentation/content/xdocs book.xml running.xml Added: src/documentation/content/xdocs pdfencryption.xml Log: Added documentation for PDF encryption to xdocs. Revision ChangesPath 1.9 +1 -0 xml-fop/src/documentation/content/xdocs/book.xml Index: book.xml === RCS file: /home/cvs/xml-fop/src/documentation/content/xdocs/book.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- book.xml 27 Jan 2003 20:59:55 - 1.8 +++ book.xml 5 Mar 2003 23:15:25 - 1.9 @@ -38,6 +38,7 @@ + 1.5 +68 -62xml-fop/src/documentation/content/xdocs/running.xml Index: running.xml === RCS file: /home/cvs/xml-fop/src/documentation/content/xdocs/running.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- running.xml 18 Jan 2003 18:04:58 - 1.4 +++ running.xml 5 Mar 2003 23:15:25 - 1.5 @@ -3,77 +3,83 @@ "http://cvs.apache.org/viewcvs.cgi/*checkout*/xml-forrest/src/resources/schema/dtd/document-v11.dtd";> - - Running FOP - + +Running FOP + - - -Installation + - Overview - The following software must be installed: - -Java 1.2.x or later. -FOP. The http://xml.apache.org/fop/download.html";>FOP distribution includes all libraries that you will need to run a basic FOP installation. These can be found in the xml-fop/lib directory. These libraries include the following: + Installation + +Overview +The following software must be installed: - Apache http://xml.apache.org/xerces-j/index.html";>Xerces-J for XML parsing. You can use other XML parsers which support SAX and DOM. - Apache Xalan, an XSLT processor. - Apache http://xml.apache.org/batik/";>Batik, an SVG library. + Java 1.2.x or later. + FOP. The http://xml.apache.org/fop/download.html";>FOP distribution includes all libraries that you will need to run a basic FOP installation. These can be found in the xml-fop/lib directory. These libraries include the following: + +Apache http://xml.apache.org/xerces-j/index.html";>Xerces-J for XML parsing. You can use other XML parsers which support SAX and DOM. +Apache Xalan, an XSLT processor. +Apache http://xml.apache.org/batik/";>Batik, an SVG library. + + Optional Libraries -Optional Libraries - + + +Instructions +Basic FOP installation consists of first unzipping the .gz file that is the distribution medium, then unarchiving the resulting .tar file in a directory/folder that is convenient on your system. Please consult your operating system documentation or Zip application software documentation for instructions specific to your site. + + +Problems +Some Mac OSX users have experienced filename truncation problems using Stuffit to unzip and unarchive their distribution media. This is a legacy of older Mac operating systems, which had a 31-character pathname limit. Several Mac OSX users have recommended that Mac OSX users use the shell command tar -xzf instead. + - Instructions - Basic FOP installation consists of first unzipping the .gz file that is the distribution medium, then unarchiving the resulting .tar file in a directory/folder that is convenient on your system. Please consult your operating system documentation or Zip application software documentation for instructions specific to your site. - - - Problems - Some Mac OSX users have experienced filename truncation problems using Stuffit to unzip and unarchive their distribution media. This is a legacy of older Mac operating systems, which had a 31-character pathname limit. Several Mac OSX users have recommended that Mac OSX users use the shell command tar -xzf instead. - - + Starting FOP as a standalone application + Review the batch file fop.bat or the shell script fop.sh to see how FOP is invoked. + The standard scripts for starting FOP require that the environment variable JAVA_HOME be set to a path pointing to the appropriate Java installation on your system. Macintosh OSX includes a Java environment as part of its distribution. We are told by Mac OSX users that the path to use in this case is /Library/Java/Home. Caveat: We suspect that, as Apple releases new Java enviro
cvs commit: xml-fop/src/org/apache/fop/fo/pagination PageSequence.java
pietsch 2003/03/06 15:06:15
Modified:src/org/apache/fop/fo/pagination Tag: fop-0_20_2-maintain
PageSequence.java
Log:
Avoid NPE if links are placed in spilled footnote.
Link areas are still displaced, so they don't appear to work.
Also, page numbers should now work in spilled footnotes.
Revision ChangesPath
No revision
No revision
1.39.2.14 +14 -6 xml-fop/src/org/apache/fop/fo/pagination/PageSequence.java
Index: PageSequence.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/PageSequence.java,v
retrieving revision 1.39.2.13
retrieving revision 1.39.2.14
diff -u -r1.39.2.13 -r1.39.2.14
--- PageSequence.java 25 Feb 2003 12:57:04 - 1.39.2.13
+++ PageSequence.java 6 Mar 2003 23:06:14 - 1.39.2.14
@@ -377,10 +377,6 @@
}
Page newPage = this.currentSimplePageMaster.getPageMaster()
.makePage(areaTree);
-if (currentPage != null) {
-ArrayList foots = currentPage.getPendingFootnotes();
-newPage.setPendingFootnotes(foots);
-}
newPage.setNumber(this.currentPageNumber);
String formattedPageNumber =
pageNumberGenerator.makeFormattedPageNumber(this.currentPageNumber);
@@ -390,9 +386,21 @@
log.info("[" + currentPageNumber + "]");
BodyAreaContainer bodyArea = newPage.getBody();
bodyArea.setIDReferences(areaTree.getIDReferences());
+if (currentPage != null) {
+ArrayList foots = currentPage.getPendingFootnotes();
+newPage.setPendingFootnotes(foots);
+}
flow.layout(bodyArea);
} else {
-log.info("[" + currentPageNumber + " (blank)]");
+log.info("[" + currentPageNumber + "] (blank)");
+if (currentPage != null) {
+ArrayList foots = currentPage.getPendingFootnotes();
+if (foots != null) {
+BodyAreaContainer bodyArea = newPage.getBody();
+bodyArea.setIDReferences(areaTree.getIDReferences());
+newPage.setPendingFootnotes(foots);
+}
+}
}
// because of markers, do after fo:flow (likely also
// justifiable because of spec)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo/flow Block.java
pietsch 2003/03/06 15:24:41
Modified:src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain
Block.java
Log:
Fixed problem with page-number-citations referring to blocks
with a break-before="page".
Revision ChangesPath
No revision
No revision
1.41.2.17 +12 -9 xml-fop/src/org/apache/fop/fo/flow/Block.java
Index: Block.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Block.java,v
retrieving revision 1.41.2.16
retrieving revision 1.41.2.17
diff -u -r1.41.2.16 -r1.41.2.17
--- Block.java2 Mar 2003 13:47:44 - 1.41.2.16
+++ Block.java6 Mar 2003 23:24:40 - 1.41.2.17
@@ -101,6 +101,7 @@
String id;
int span;
+boolean breakStatusBeforeChecked = false;
// this may be helpful on other FOs too
boolean anythingLaidOut = false;
@@ -119,6 +120,16 @@
}
public int layout(Area area) throws FOPException {
+if (!breakStatusBeforeChecked) {
+breakStatusBeforeChecked = true;
+// no break if first in area tree, or leading in context
+// area
+int breakBeforeStatus = propMgr.checkBreakBefore(area);
+if (breakBeforeStatus != Status.OK) {
+return breakBeforeStatus;
+}
+}
+
BlockArea blockArea;
if (!anythingLaidOut) {
@@ -190,14 +201,6 @@
}
this.marker = 0;
-
-// no break if first in area tree, or leading in context
-// area
-int breakBeforeStatus = propMgr.checkBreakBefore(area);
-if (breakBeforeStatus != Status.OK) {
-return breakBeforeStatus;
-}
-
}
if ((spaceBefore != 0) && (this.marker == 0)) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/layout BodyAreaContainer.java
pietsch 2003/03/06 15:55:31
Modified:src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain
Footnote.java
src/org/apache/fop/fo/pagination Tag: fop-0_20_2-maintain
PageSequence.java
src/org/apache/fop/layout Tag: fop-0_20_2-maintain
BodyAreaContainer.java
Log:
Implemented footnote separator.
Revision ChangesPath
No revision
No revision
1.6.2.6 +21 -1 xml-fop/src/org/apache/fop/fo/flow/Footnote.java
Index: Footnote.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Footnote.java,v
retrieving revision 1.6.2.5
retrieving revision 1.6.2.6
diff -u -r1.6.2.5 -r1.6.2.6
--- Footnote.java 25 Feb 2003 12:57:01 - 1.6.2.5
+++ Footnote.java 6 Mar 2003 23:55:30 - 1.6.2.6
@@ -129,6 +129,26 @@
footArea.setMaxHeight(bac.getMaxHeight()
+ footArea.getHeight());
}
+if (!footArea.hasChildren()) {
+StaticContent separator = bac.getPage().getPageSequence()
+.getStaticContent("xsl-footnote-separator");
+if (separator!=null) {
+footArea.setIDReferences(bac.getIDReferences());
+separator.layout(footArea, null);
+int diff = footArea.getHeight() - oldHeight;
+if (area != null) {
+area.setMaxHeight(area.getMaxHeight() - diff);
+}
+if (bac.getFootnoteState() == 0) {
+Area ar = bac.getMainReferenceArea();
+decreaseMaxHeight(ar, diff);
+footArea.setYPosition(basePos + footArea.getHeight());
+}
+ basePos = footArea.getCurrentYPosition()
+ - footArea.getHeight();
+ oldHeight = footArea.getHeight();
+}
+}
int status = fb.layout(footArea);
if (Status.isIncomplete(status)) {
// add as a pending footnote
No revision
No revision
1.39.2.15 +9 -2 xml-fop/src/org/apache/fop/fo/pagination/PageSequence.java
Index: PageSequence.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/PageSequence.java,v
retrieving revision 1.39.2.14
retrieving revision 1.39.2.15
diff -u -r1.39.2.14 -r1.39.2.15
--- PageSequence.java 6 Mar 2003 23:06:14 - 1.39.2.14
+++ PageSequence.java 6 Mar 2003 23:55:30 - 1.39.2.15
@@ -234,7 +234,10 @@
if (flowMap.containsKey(staticContent.getFlowName())) {
throw new FOPException("flow-names must be unique within an
fo:page-sequence");
}
-if (!this.layoutMasterSet.regionNameExists(staticContent.getFlowName())) {
+String flowName = staticContent.getFlowName();
+if (!this.layoutMasterSet.regionNameExists(flowName)
+&& !flowName.equals("xsl-before-float-separator")
+&& !flowName.equals("xsl-footnote-separator")) {
log.error("region-name '"
+ staticContent.getFlowName()
+ "' doesn't exist in the layout-master-set.");
@@ -480,6 +483,10 @@
//+ flow.getFlowName() + "'");
}
+public StaticContent getStaticContent(String regionName) {
+return (StaticContent)flowMap.get(regionName);
+}
+
public int getCurrentPageNumber() {
return currentPageNumber;
}
No revision
No revision
1.10.2.4 +7 -13 xml-fop/src/org/apache/fop/layout/Attic/BodyAreaContainer.java
Index: BodyAreaContainer.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/Attic/BodyAreaContainer.java,v
retrieving revision 1.10.2.3
retrieving revision 1.10.2.4
diff -u -r1.10.2.3 -r1.10.2.4
--- BodyAreaContainer.java25 Feb 2003 14:07:02 - 1.10.2.3
+++ BodyAreaContainer.java6 Mar 2003 23:55:31 - 1.10.2.4
@@ -82,8 +82,6 @@
// current heights
private int mainRefAreaHeight;
-private int beforeFloatRefAreaHeight;
-private int footnoteRefAreaHeight;
// reference area yPositions
private int mainYPosition;
@@ -109,13 +107,11 @@
this.columnGap
cvs commit: xml-fop/src/org/apache/fop/layout LineArea.java
pietsch 2003/03/09 03:49:56
Modified:src/org/apache/fop/layout Tag: fop-0_20_2-maintain
LineArea.java
Log:
Corrected word area length for leader-pattern="dots" and insert inline
space for adjustment if necessary.
Revision ChangesPath
No revision
No revision
1.53.2.17 +13 -6 xml-fop/src/org/apache/fop/layout/Attic/LineArea.java
Index: LineArea.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/Attic/LineArea.java,v
retrieving revision 1.53.2.16
retrieving revision 1.53.2.17
diff -u -r1.53.2.16 -r1.53.2.17
--- LineArea.java 2 Mar 2003 16:55:15 - 1.53.2.16
+++ LineArea.java 9 Mar 2003 11:49:56 - 1.53.2.17
@@ -181,9 +181,9 @@
}
void expand() {
char dot = '.';
-int dotWidth = currentFontState.getCharWidth(dot);
+int dotWidth = fontState.getCharWidth(dot);
char space = ' ';
-int spaceWidth = currentFontState.getCharWidth(space);
+int spaceWidth = fontState.getCharWidth(space);
int idx=children.indexOf(this);
children.remove(this);
switch (leaderPattern) {
@@ -242,12 +242,19 @@
for (int i = 0; i < factor; i++) {
leaderChars[i] = dot;
}
+String leaderWord = new String(leaderChars);
+int leaderWordWidth = fontState.getWordWidth(leaderWord);
WordArea leaderPatternArea =
-new WordArea(currentFontState, red, green, blue,
- new String(leaderChars),
- leaderLengthOptimum);
+new WordArea(fontState, red, green, blue,
+ leaderWord,leaderWordWidth);
leaderPatternArea.setYOffset(placementOffset);
children.add(idx, leaderPatternArea);
+int spaceAfterLeader = leaderLengthOptimum
+- leaderWordWidth;
+if (spaceAfterLeader!=0) {
+children.add(idx+1, new InlineSpace(spaceAfterLeader,
+false));
+}
} else {
// if leader-alignment is used, calculate space to
// insert before leader so that all dots will be
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop build.sh
pietsch 2003/03/09 13:21:46 Modified:.build.sh Log: Quote some variable referenes in order to protect against spaces in build.sh. Revision ChangesPath 1.23 +8 -8 xml-fop/build.sh Index: build.sh === RCS file: /home/cvs/xml-fop/build.sh,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- build.sh 22 Nov 2002 18:07:13 - 1.22 +++ build.sh 9 Mar 2003 21:21:45 - 1.23 @@ -26,16 +26,16 @@ fi 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 +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" -ANT_HOME=$LIBDIR +ANT_HOME="$LIBDIR" # antRun must be executable (can't do this in build.xml because Ant uses antRun # to do the chmod) -chmod +rx $LIBDIR/bin/antRun +chmod +rx "$LIBDIR/bin/antRun" # For Cygwin, switch paths to Windows format before running java @@ -49,5 +49,5 @@ echo Starting Ant... echo -$JAVA_HOME/bin/java -Dant.home=$ANT_HOME -classpath "$LOCALCLASSPATH" org.apache.tools.ant.Main $* +"$JAVA_HOME"/bin/java -Dant.home="$ANT_HOME" -classpath "$LOCALCLASSPATH" org.apache.tools.ant.Main "$@" - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop build.xml
pietsch 2003/03/13 13:55:09 Modified:.Tag: fop-0_20_2-maintain build.xml Log: Make compiling of PDF encryption support dependent on a JCE class rather than the JDK1.4 test. Revision ChangesPath No revision No revision 1.44.2.39 +17 -12xml-fop/build.xml Index: build.xml === RCS file: /home/cvs/xml-fop/build.xml,v retrieving revision 1.44.2.38 retrieving revision 1.44.2.39 diff -u -r1.44.2.38 -r1.44.2.39 --- build.xml 5 Mar 2003 18:58:14 - 1.44.2.38 +++ build.xml 13 Mar 2003 21:55:09 - 1.44.2.39 @@ -293,29 +293,21 @@ - - + - - - - - - - @@ -346,7 +338,7 @@ - + @@ -356,7 +348,7 @@ - + @@ -370,11 +362,24 @@ + + + + + + + + + + + + + - +
cvs commit: xml-fop/src/documentation/content/xdocs gethelp.xml pdfencryption.xml running.xml
pietsch 2003/03/13 16:12:11 Modified:src/documentation/content/xdocs gethelp.xml pdfencryption.xml running.xml Log: Took pdfencryption autorship back. Fixed some weak formulations and spelling errors. Added documentation for xalan scripts. Added a few short guidelines for posting to the mailing lists. Revision ChangesPath 1.3 +68 -44xml-fop/src/documentation/content/xdocs/gethelp.xml Index: gethelp.xml === RCS file: /home/cvs/xml-fop/src/documentation/content/xdocs/gethelp.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gethelp.xml 19 Nov 2002 07:57:27 - 1.2 +++ gethelp.xml 14 Mar 2003 00:12:10 - 1.3 @@ -1,50 +1,74 @@ http://cvs.apache.org/viewcvs.cgi/*checkout*/xml-forrest/src/resources/schema/dtd/document-v11.dtd";> - - - - -How to Get Help -Solving problems - - - - - How to get Help - - - Have a look at the documentation pages on this site. You can find information on how to run FOP, - how to embed it, how to add custom fonts etc. - - - Consult the FAQ to see if your question has already been answered before. - - - If you have a question concerning XSL:FO that is not related to FOP directly, please consult the various - resources on the net. See Resources for some interesting links. - - - Before you post your questions to one of the mailing lists, please search the mailing list archives, since it's - possible that your question has already been answered but it may not have found its way into the FAQ. You'll - find links to the mailing list archive in the Resources. - - - If you still can't solve your problem subscribe to FOP's user mailing list and post your question there. Please - don't forget to supply the version you're using, detailed error messages etc. This makes it easier to help you. - The instructions on how to subscribe can be found in the Resources - - -You should probably read ESR's -http://www.tuxedo.org/~esr/faqs/smart-questions.html";>"How to Ask Questions the Smart Way" - - - - Please don't use Bugzilla to post questions and please ask on the user mailing list first, if you think you've - found a bug. - - - + +How to Get Help +Solving problems + + + + How to get Help + + + Have a look at the documentation pages on this site. You can find + information on how to run FOP, how to embed it, how to add custom + fonts etc. + + + Consult the FAQ to see if your question + has already been answered before. + + + If you have a question concerning XSLFO that is not related to FOP + directly or regarding XSLT, please consult the various resources on + the net. See Resources for some + interesting links. + + + Before you post your questions to one of the mailing lists, please + search the mailing list archives, since it's possible that your + question has already been answered but it may not have found its way + into the FAQ. You'll find links to the mailing list archive in the + Resources. + + + If you still can't solve your problem subscribe to FOP's user mailing + list and post your question there. Your question is likely to be + handled more favorably the further down the following checklist + you get: + +State the version of FOP you're using. +Include detailed error messages, if there are any. +Provide FO code instead of XSLT snippets or DocBook source. + See Running Xalan + for how to produce FO from your XML+XSLT. +Provide complete, self-contained FO code. + This includes images. Be careful with confidential material + though. +Provide short, self-contained FO code. Cut + out everything unnecessary to demonstrate the effect, in + particular images. +Prune stack traces sensibly instead of dumping the whole + shebang. +Instead of attaching large PDF files or screen shots, use a + small B&W GIF, JPG or PNG of the area of interest. + + This makes it easier to help you. The instructions on how to + subscribe to the mailin lists can be found i
cvs commit: xml-fop/src/documentation/content/xdocs fonts.xml
pietsch 2003/06/14 10:43:09 Modified:src/documentation/content/xdocs fonts.xml Log: Made XML well formed in font config code samples. Submitted by: Johannes Fiala Revision ChangesPath 1.10 +2 -2 xml-fop/src/documentation/content/xdocs/fonts.xml Index: fonts.xml === RCS file: /home/cvs/xml-fop/src/documentation/content/xdocs/fonts.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- fonts.xml 1 May 2003 19:47:05 - 1.9 +++ fonts.xml 14 Jun 2003 17:43:09 - 1.10 @@ -79,7 +79,7 @@ Starting from FOP version 0.20.5 you can use URLs for the paths to the font files. Relative URLs are resolved @@ -157,7 +157,7 @@ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/pagination Root.java
pietsch 2003/06/26 17:16:28 Modified:src/java/org/apache/fop/fo/pagination Root.java Log: Test commit from Eclipse: removed unused import. Revision ChangesPath 1.3 +3 -5 xml-fop/src/java/org/apache/fop/fo/pagination/Root.java Index: Root.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Root.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Root.java 25 Mar 2003 23:34:11 - 1.2 +++ Root.java 27 Jun 2003 00:16:28 - 1.3 @@ -51,12 +51,10 @@ package org.apache.fop.fo.pagination; // FOP -import org.apache.fop.fo.FObj; -import org.apache.fop.fo.FONode; -import org.apache.fop.fo.FOText; - -// Java import java.util.List; + +import org.apache.fop.fo.FONode; +import org.apache.fop.fo.FObj; /** * The fo:root formatting object. Contains page masters, page-sequences. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java-1.3/org/apache/fop/svg - New directory
pietsch 2003/06/29 14:11:20 xml-fop/src/java-1.3/org/apache/fop/svg - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java-1.4/org/apache/fop/svg - New directory
pietsch 2003/06/29 14:11:20 xml-fop/src/java-1.4/org/apache/fop/svg - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java-1.3/org/apache/fop/svg GraphicsConfiguration.java
pietsch 2003/06/29 14:11:39
Modified:.build.xml
Added: src/java/org/apache/fop/svg PDFGraphicsConfiguration.java
src/java-1.4/org/apache/fop/svg GraphicsConfiguration.java
src/java-1.3/org/apache/fop/svg GraphicsConfiguration.java
Removed: src/java/org/apache/fop/svg PDFGraphicsConfiguration.javat
Log:
Made source more friendly for Eclipse (and IDEs in general)
by using conditionally different files instead of source copy
with filtering. Add either src/java-1.3 or src/java1.4 to
your build path, depending on your JDK.
Ant build should automatically choose the correct
file - if the right files are comitted in the current mess, that is.
Revision ChangesPath
1.1
xml-fop/src/java/org/apache/fop/svg/PDFGraphicsConfiguration.java
Index: PDFGraphicsConfiguration.java
===
/*
* $Id: PDFGraphicsConfiguration.java,v 1.1 2003/06/29 21:11:39 pietsch Exp $
*
*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 modifica-
* tion, 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 acknowledgment: "This product includes software
*developed by the Apache Software Foundation (http://www.apache.org/)."
*Alternately, this acknowledgment may appear in the software itself, if
*and wherever such third-party acknowledgments normally appear.
*
* 4. The names "FOP" 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 name, without prior written permission of the
*Apache Software Foundation.
*
* 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 (INCLU-
* DING, 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 and was originally created by
* James Tauber <[EMAIL PROTECTED]>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>.
*/
package org.apache.fop.svg;
import java.awt.Rectangle;
import java.awt.GraphicsDevice;
import java.awt.Transparency;
import java.awt.image.ColorModel;
import java.awt.geom.AffineTransform;
import java.awt.image.BufferedImage;
/**
* Our implementation of the class that returns information about
* roughly what we can handle and want to see (alpha for example).
*/
class PDFGraphicsConfiguration extends GraphicsConfiguration {
// We use this to get a good colormodel..
private static final BufferedImage BI_WITH_ALPHA =
new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
// We use this to get a good colormodel..
private static final BufferedImage BI_WITHOUT_ALPHA =
new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB);
/**
* Construct a buffered image with an alpha channel, unless
* transparencty is OPAQUE (no alpha at all).
*
* @param width the width of the image
* @par
cvs commit: xml-fop/src/java/org/apache/fop/fo FOTreeBuilder.java
pietsch 2003/06/30 14:04:06
Modified:src/java/org/apache/fop/rtf/rtflib/rtfdoc RtfPage.java
src/java/org/apache/fop/rtf/renderer RTFHandler.java
src/java/org/apache/fop/datatypes FixedLength.java
src/java/org/apache/fop/svg PDFTranscoder.java
src/java/org/apache/fop/pdf PDFText.java
src/java/org/apache/fop/fo FOTreeBuilder.java
Log:
Got some low hanging style errors as reported by eclipse.
Revision ChangesPath
1.4 +4 -5 xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPage.java
Index: RtfPage.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RtfPage.java 30 Jun 2003 00:20:07 - 1.3
+++ RtfPage.java 30 Jun 2003 21:04:06 - 1.4
@@ -58,12 +58,11 @@
package org.apache.fop.rtf.rtflib.rtfdoc;
-import java.io.Writer;
-import java.io.*;
-import java.util.*;
import java.io.IOException;
+import java.io.Writer;
+
/** Specifies rtf control words. Is the container for page attributes.
- *Overrides okToWriteRtf.
+ * Overrides okToWriteRtf.
* @author Christopher Scott, [EMAIL PROTECTED]
*/
1.8 +8 -14 xml-fop/src/java/org/apache/fop/rtf/renderer/RTFHandler.java
Index: RTFHandler.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/rtf/renderer/RTFHandler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RTFHandler.java 29 Jun 2003 19:34:34 - 1.7
+++ RTFHandler.java 30 Jun 2003 21:04:06 - 1.8
@@ -51,23 +51,15 @@
package org.apache.fop.rtf.renderer;
// Java
+import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
-import java.io.IOException;
-// XML
-import org.xml.sax.SAXException;
-
-// FOP
-import org.apache.fop.layout.FontInfo;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.StructureHandler;
-import org.apache.fop.fo.pagination.PageSequence;
-import org.apache.fop.fo.properties.Constants;
import org.apache.fop.fo.flow.Block;
-import org.apache.fop.fo.flow.Flow;
import org.apache.fop.fo.flow.ExternalGraphic;
+import org.apache.fop.fo.flow.Flow;
import org.apache.fop.fo.flow.InstreamForeignObject;
import org.apache.fop.fo.flow.Leader;
import org.apache.fop.fo.flow.ListBlock;
@@ -76,14 +68,16 @@
import org.apache.fop.fo.flow.TableBody;
import org.apache.fop.fo.flow.TableCell;
import org.apache.fop.fo.flow.TableRow;
-
-// JFOR
+import org.apache.fop.fo.pagination.PageSequence;
+import org.apache.fop.fo.properties.Constants;
+import org.apache.fop.layout.FontInfo;
import org.apache.fop.rtf.rtflib.rtfdoc.RtfAttributes;
+import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea;
import org.apache.fop.rtf.rtflib.rtfdoc.RtfFile;
+import org.apache.fop.rtf.rtflib.rtfdoc.RtfParagraph;
import org.apache.fop.rtf.rtflib.rtfdoc.RtfSection;
import org.apache.fop.rtf.rtflib.rtfdoc.RtfText;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfParagraph;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea;
+import org.xml.sax.SAXException;
/**
* RTF Handler: generates RTF output using the structure events from
1.2 +2 -1 xml-fop/src/java/org/apache/fop/datatypes/FixedLength.java
Index: FixedLength.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/datatypes/FixedLength.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FixedLength.java 11 Mar 2003 13:05:36 - 1.1
+++ FixedLength.java 30 Jun 2003 21:04:06 - 1.2
@@ -94,7 +94,8 @@
} else if (unit.equals("mm")) {
dvalue = dvalue * 2.83464567;
} else if (unit.equals("pt")) {
-dvalue = dvalue;
+// Do nothing.
+// dvalue = dvalue;
} else if (unit.equals("pc")) {
dvalue = dvalue * 12;
/*
1.3 +5 -29 xml-fop/src/java/org/apache/fop/svg/PDFTranscoder.java
Index: PDFTranscoder.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/svg/PDFTranscoder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PDFTranscoder.java27 Mar 2003 11:24:40 - 1.2
+++ PDFTranscoder.java30 Jun 2003 21:04:06 - 1.3
@@ -50,53 +50,29 @@
*/
package org.apache.fop.svg;
-import jav
cvs commit: xml-fop/src/org/apache/fop/layout/inline PageNumberInlineArea.java
pietsch 2003/07/20 12:53:34
Modified:src/org/apache/fop/layout Tag: fop-0_20_2-maintain
LineArea.java
src/org/apache/fop/layout/inline Tag: fop-0_20_2-maintain
PageNumberInlineArea.java
Log:
Fixed text setting and width recalculation for forward page
number references.
Revision ChangesPath
No revision
No revision
1.53.2.20 +3 -4 xml-fop/src/org/apache/fop/layout/Attic/LineArea.java
Index: LineArea.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/Attic/LineArea.java,v
retrieving revision 1.53.2.19
retrieving revision 1.53.2.20
diff -u -r1.53.2.19 -r1.53.2.20
--- LineArea.java 6 Jun 2003 07:27:59 - 1.53.2.19
+++ LineArea.java 20 Jul 2003 19:53:34 - 1.53.2.20
@@ -378,10 +378,9 @@
Object o = children.get(i);
if ( o instanceof PageNumberInlineArea) {
PageNumberInlineArea pia = (PageNumberInlineArea)o;
-FontState piaFontState = pia.getFontState();
-finalWidth-=piaFontState.getWordWidth(pia.getText());
+finalWidth-=pia.getContentWidth();
pia.resolve(idReferences);
-finalWidth+=piaFontState.getWordWidth(pia.getText());
+finalWidth+=pia.getContentWidth();
}
}
}
No revision
No revision
1.3.2.3 +3 -2
xml-fop/src/org/apache/fop/layout/inline/Attic/PageNumberInlineArea.java
Index: PageNumberInlineArea.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/layout/inline/Attic/PageNumberInlineArea.java,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- PageNumberInlineArea.java 2 Mar 2003 16:55:16 - 1.3.2.2
+++ PageNumberInlineArea.java 20 Jul 2003 19:53:34 - 1.3.2.3
@@ -59,7 +59,7 @@
public PageNumberInlineArea(FontState fontState, float red, float green,
float blue, String refid, int width) {
-super(fontState, red, green, blue, "?", width);
+super(fontState, red, green, blue, " ", width);
this.pageNumberId = refid;
}
@@ -68,5 +68,6 @@
if (text == null) {
text = "";
}
+contentRectangleWidth = getFontState().getWordWidth(text);
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo/flow AbstractTableBody.java Table.java TableCell.java TableFooter.java TableRow.java
pietsch 2003/07/20 13:49:28
Modified:src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain
AbstractTableBody.java Table.java TableCell.java
TableFooter.java TableRow.java
Log:
Added fix (hackery) to release pointers to areas held by
table elements, thereby allowing (hopefully) rendering
of large tables.
Revision ChangesPath
No revision
No revision
1.1.2.10 +12 -9 xml-fop/src/org/apache/fop/fo/flow/Attic/AbstractTableBody.java
Index: AbstractTableBody.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/AbstractTableBody.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- AbstractTableBody.java11 Apr 2003 00:24:38 - 1.1.2.9
+++ AbstractTableBody.java20 Jul 2003 20:49:28 - 1.1.2.10
@@ -69,7 +69,8 @@
ArrayList columns;
RowSpanMgr rowSpanMgr;// manage information about spanning rows
-AreaContainer areaContainer;
+// public AreaContainer areaContainer;
+public java.lang.ref.WeakReference areaContainerRef;
public AbstractTableBody(FObj parent, PropertyList propertyList,
String systemId, int line, int column)
@@ -87,15 +88,15 @@
}
public void setYPosition(int value) {
-areaContainer.setYPosition(value);
+((AreaContainer)areaContainerRef.get()).setYPosition(value);
}
public int getYPosition() {
-return areaContainer.getCurrentYPosition();
+return ((AreaContainer)areaContainerRef.get()).getCurrentYPosition();
}
public int getHeight() {
-return areaContainer.getHeight() + spaceBefore + spaceAfter;
+ return ((AreaContainer)areaContainerRef.get()).getHeight() + spaceBefore +
spaceAfter;
}
public int layout(Area area) throws FOPException {
@@ -170,7 +171,7 @@
* of the containing table area, and its relative position is 0,0.
* Strictly speaking (CR), this FO should generate no areas!
*/
-this.areaContainer =
+AreaContainer areaContainer =
new AreaContainer(propMgr.getFontState(area.getFontInfo()), 0,
area.getContentHeight(),
area.getContentWidth(),// IPD
@@ -185,6 +186,8 @@
areaContainer.setAbsoluteHeight(area.getAbsoluteHeight());
areaContainer.setIDReferences(area.getIDReferences());
+this.areaContainerRef = new java.lang.ref.WeakReference(areaContainer);
+
ArrayList keepWith = new ArrayList();
int numChildren = this.children.size();
TableRow lastRow = null;
@@ -292,7 +295,7 @@
}
lastRow = row;
area.setMaxHeight(area.getMaxHeight() - spaceLeft
- + this.areaContainer.getMaxHeight());
+ + areaContainer.getMaxHeight());
spaceLeft = area.spaceLeft();
}
area.addChild(areaContainer);
@@ -313,8 +316,8 @@
}
public void removeLayout(Area area) {
-if (areaContainer != null) {
-area.removeChild(areaContainer);
+if (areaContainerRef != null) {
+area.removeChild((AreaContainer)areaContainerRef.get());
}
if (spaceBefore != 0) {
area.increaseHeight(-spaceBefore);
1.39.2.12 +22 -13xml-fop/src/org/apache/fop/fo/flow/Attic/Table.java
Index: Table.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/Table.java,v
retrieving revision 1.39.2.11
retrieving revision 1.39.2.12
diff -u -r1.39.2.11 -r1.39.2.12
--- Table.java11 Apr 2003 00:24:39 - 1.39.2.11
+++ Table.java20 Jul 2003 20:49:28 - 1.39.2.12
@@ -99,7 +99,8 @@
/** Maximum inline-progression-dimension */
private int maxIPD;
-AreaContainer areaContainer;
+// public AreaContainer areaContainer;
+public java.lang.ref.WeakReference areaContainerRef;
public Table(FObj parent, PropertyList propertyList,
String systemId, int line, int column) {
@@ -179,7 +180,7 @@
area.end();
}
// check if anything was previously laid out
-if (this.areaContainer == null) {
+if (this.areaContainerRef == null) {
try {
area.getIDReferences().createID(id);
}
@@ -212,13 +213,14 @@
area.addDisplaySpace(spaceBefore);
}
-if (marker == 0 && areaC
cvs commit: xml-fop/src/documentation/content/xdocs hyphenation.xml
pietsch 2003/07/20 15:27:13
Modified:src/documentation/content/xdocs hyphenation.xml
Log:
Added comments about pattern file structure and conversion
of TeX patterns
Revision ChangesPath
1.6 +146 -36 xml-fop/src/documentation/content/xdocs/hyphenation.xml
Index: hyphenation.xml
===
RCS file: /home/cvs/xml-fop/src/documentation/content/xdocs/hyphenation.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hyphenation.xml 15 Jul 2003 18:16:30 - 1.5
+++ hyphenation.xml 20 Jul 2003 22:27:13 - 1.6
@@ -62,40 +62,79 @@
Custom Hyphenation Support
Introduction
- FOP uses an XML-based TeX-like hyphenation pattern scheme.
-However, because of licensing issues, there are
currently some significant holes in FOP's hyphenation support.
-The information in this section is intended to help you work around these
limitations, if possible, add support for other languages, or enhance FOP's support of
current languages.
- If you have access to hyphenation patterns that are licensed in an
Apache-compatible way, or if you have made improvements to an existing FOP hyphenation
pattern, or if you have created one from scratch, please consider contributing these
to FOP so that they can benefit other FOP users as well. Please inquire on the FOP User mailing list.
+ FOP uses Liang's hyphenation algorithm, well known from TeX. It needs
+ language specific pattern and other data for operation.
+ Because of licensing issues,
+ there are currently some significant holes in FOP's hyphenation support.
+ The information in this section is intended to help you work around these
+ limitations, if possible, add support for other languages, or enhance FOP's
+ support of current languages.
+ If you have access to hyphenation patterns that are licensed in an
+ Apache-compatible way, or if you have made improvements to an existing FOP
+ hyphenation pattern, or if you have created one from scratch, please
+ consider contributing these to FOP so that they can benefit other FOP users
+ as well. Please inquire on the FOP User
+ mailing list.
License Issues
- Many of the hyphenation files distributed with TeX and its offspring are
licenced under the http://www.latex-project.org/lppl.html";>LaTeX Project
Public License (LPPL), which prevents them from being distributed with Apache
software.
-Although Apache FOP cannot redistribute hyphenation pattern files that do not
conform with its license scheme, that does not necessarily prevent users from using
such hyphenation patterns with FOP.
-However, it does place on the user the responsibility for determining whether the
user can rightly use such hyphenation patterns under the hyphenation pattern
license.
- The user is responsible to settle license issues for hyphenation
pattern files that are obtained from non-Apache sources.
+ Many of the hyphenation files distributed with TeX and its offspring are
+ licenced under the http://www.latex-project.org/lppl.html";>LaTeX
+ Project Public License (LPPL), which prevents them from being
+ distributed with Apache software. The LPPL puts restrictions on file names
+ in redistributed derived works which we feel can't guarantee. Some
+ hyphenation pattern files have other or additional restrictions, for
+ example against use for commercial purposes.
+ Although Apache FOP cannot redistribute hyphenation pattern files that do
+ not conform with its license scheme, that does not necessarily prevent users
+ from using such hyphenation patterns with FOP. However, it does place on
+ the user the responsibility for determining whether the user can rightly use
+ such hyphenation patterns under the hyphenation pattern license.
+ The user is responsible to settle license issues for hyphenation
+ pattern files that are obtained from non-Apache sources.
Sources of Custom Hyphenation Pattern Files
- The most important source of hyphenation pattern files is the http://www.ctan.org/tex-archive/language/hyphenation/";>CTAN TeX
Archive.
+ The most important source of hyphenation pattern files is the
+ http://www.ctan.org/tex-archive/language/hyphenation/";>CTAN TeX
+Archive.
Installing Custom Hyphenation Patterns
To install custom a custom hyphenation pattern for use with FOP:
-Convert the TeX hyphenation pattern file to the FOP format. The FOP
format is an xml file conforming to the DTD found at
{fop-dir}/src/hyph/hyphen
cvs commit: xml-fop/src/documentation/content/xdocs running.xml
pietsch 2003/07/20 15:27:54
Modified:src/documentation/content/xdocs running.xml
Log:
Rework the "out of memory" theme a bit.
Revision ChangesPath
1.13 +6 -15 xml-fop/src/documentation/content/xdocs/running.xml
Index: running.xml
===
RCS file: /home/cvs/xml-fop/src/documentation/content/xdocs/running.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- running.xml 15 May 2003 16:06:38 - 1.12
+++ running.xml 20 Jul 2003 22:27:54 - 1.13
@@ -136,30 +136,21 @@
Examples include page number citations which refer to pages which follow the
citation, tables of contents at the beginning of a document, and page numbering
schemes that include the total number of pages in the document ("page N of TOTAL").
Forward references cause all subsequent pages to be held in memory until the
reference can be resolved, i.e. until the page with the referenced element is
encountered.
Forward references may be required by the task, but if you are getting a memory
overflow, at least consider the possibility of eliminating them.
-A table of contents might be eliminated, relying on PDF bookmarks instead.
-Or it might be moved to the end of the document without dimishing its value very
much.
-Or, in some circumstances, the paper could even be reshuffled after printing.
+A table of contents could be replaced by PDF bookmarks instead or moved to the end
of the document (reshuffle the paper could after printing).
Avoid large images, especially if they are scaled down.
If they need to be scaled, scale them in another application upstream from FOP.
For many image formats, memory consumption is driven mainly by the size of the
image file itself, not its dimensions (width*height), so increasing the compression
rate may help.
+If FOP is running embedded, clearing the image from time to time cache might
prevent memory exhaustion, you can call
+org.apache.fop.image.FopImageFactory.resetCache() to empty the
+image cache.
Use multiple page sequences.
FOP starts rendering after the end of a page sequence is encountered.
-While the actual rendering is done page-by-page, some additional memory allocated
for other purposes could be freed after the page sequence has been rendered.
-
-
-Break down large tables.
-If you don't use table headers and footers, just start a new table every N rows.
-With headers and footers, consider integrating them as normal table rows, or, if
they are used at page breaks, try to put the information into static content.
-You can then use markers to change them.
-
-
-Clear the image cache. At the moment, images in the cache are not released
automatically when an OutOfMemoryError is imminent.
-Starting with version 0.20.5 however, you can call
org.apache.fop.image.FopImageFactory.resetCache() to empty the
-image cache.
+While the actual rendering is done page-by-page, some additional memory is freed
after the page sequence has been rendered.
+This can be substantial if the page sequence contains lots of FO elements.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo/flow TableRow.java
pietsch 2003/07/27 13:09:24
Modified:src/org/apache/fop/fo Tag: fop-0_20_2-maintain FObj.java
src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain
TableRow.java
Log:
Better error messages if table cells don't fit available
columns for any reason.
Revision ChangesPath
No revision
No revision
1.20.2.10 +13 -1 xml-fop/src/org/apache/fop/fo/Attic/FObj.java
Index: FObj.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FObj.java,v
retrieving revision 1.20.2.9
retrieving revision 1.20.2.10
diff -u -r1.20.2.9 -r1.20.2.10
--- FObj.java 11 Apr 2003 00:24:37 - 1.20.2.9
+++ FObj.java 27 Jul 2003 20:09:23 - 1.20.2.10
@@ -91,6 +91,18 @@
setWritingMode();
}
+public String getSystemId() {
+return systemId;
+}
+
+public int getLine() {
+return line;
+}
+
+public int getColumn() {
+return column;
+}
+
protected PropertyManager makePropertyManager(PropertyList propertyList) {
return new PropertyManager(propertyList);
}
No revision
No revision
1.51.2.13 +10 -9 xml-fop/src/org/apache/fop/fo/flow/Attic/TableRow.java
Index: TableRow.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/TableRow.java,v
retrieving revision 1.51.2.12
retrieving revision 1.51.2.13
diff -u -r1.51.2.12 -r1.51.2.13
--- TableRow.java 20 Jul 2003 20:49:28 - 1.51.2.12
+++ TableRow.java 27 Jul 2003 20:09:23 - 1.51.2.13
@@ -501,7 +501,7 @@
* Before starting layout for the first time, initialize information
* about spanning rows, empty cells and spanning columns.
*/
-private void initCellArray() {
+private void initCellArray() throws FOPException {
cellArray = new CellArray(rowSpanMgr, columns.size());
int colNum = 1;
for (int i = 0; i< children.size(); i++) {
@@ -519,30 +519,31 @@
// cell.setColumnNumber(colNum);
// If cellColNum "off the end", this cell is in limbo!
if (colNum < 1) {
-// ERROR!!!
-continue;
+throw new FOPException("Cell (#"+i+") implicitely positioned
beyond number of columns", cell.getSystemId(), cell.getLine(), cell.getColumn());
} else
cellColNum = colNum;
} else if (cellColNum > columns.size()) {
-// Explicit specification out of range!
-// Skip it and print an ERROR MESSAGE
+// Explicit colomn number specification out of range, skip it.
+log.error(" "+systemId+':'+cell.getLine()+':'+cell.getColumn()+":
Cell (#"+ i +") explicitely positioned beyond number of columns, dropped");
continue;
}
// see if it fits and doesn't overwrite anything
if (cellColNum + numCols - 1 > columns.size()) {
-// MESSAGE: TOO MANY COLUMNS SPANNED!
+// Too many columns spanned.
+log.error(" "+systemId+':'+cell.getLine()+':'+cell.getColumn()+":
Cell (#"+i+") spans columns beyond available number, clipped");
numCols = columns.size() - cellColNum + 1;
}
// Check for overwriting other cells (returns false)
if (cellArray.storeCell(cell, cellColNum, numCols) == false) {
-// Print out some kind of warning message.
+log.error(" "+systemId+':'+cell.getLine()+':'+cell.getColumn()+":
Cell +(#"+i+") overwrites other cells");
}
if (cellColNum > colNum) {
// Cells are initialized as empty already
colNum = cellColNum;
} else if (cellColNum < colNum) {
-// MESSAGE ? cells out of order?
+// Cells out of order
colNum = cellColNum;// CR "to the letter"!
+log.debug(" "+systemId+':'+line+':'+column+": Cell positioned out
of order");
}
int cellWidth = getCellWidth(cellColNum, numCols);
cell.setWidth(cellWidth);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/tools TestConverter.java
pietsch 2003/09/15 11:29:15 Modified:src/java/org/apache/fop/tools TestConverter.java Log: Removed apparent patching problem Revision ChangesPath 1.7 +7 -10 xml-fop/src/java/org/apache/fop/tools/TestConverter.java Index: TestConverter.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/tools/TestConverter.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- TestConverter.java22 Aug 2003 17:42:42 - 1.6 +++ TestConverter.java15 Sep 2003 18:29:15 - 1.7 @@ -50,16 +50,6 @@ */ package org.apache.fop.tools; -import org.apache.fop.apps.Driver; -import org.apache.fop.apps.FOFileHandler; -import org.apache.fop.apps.FOPException; -import org.apache.fop.apps.InputHandler; -import org.apache.fop.apps.XSLTInputHandler; -import org.apache.fop.apps.FOUserAgent; - -import org.apache.avalon.framework.logger.ConsoleLogger; -import org.apache.avalon.framework.logger.AbstractLogEnabled; - import java.io.File; import java.io.InputStream; import java.util.Map; @@ -67,6 +57,13 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; +import org.apache.avalon.framework.logger.AbstractLogEnabled; +import org.apache.avalon.framework.logger.ConsoleLogger; +import org.apache.fop.apps.Driver; +import org.apache.fop.apps.FOFileHandler; +import org.apache.fop.apps.FOUserAgent; +import org.apache.fop.apps.InputHandler; +import org.apache.fop.apps.XSLTInputHandler; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/mif MIFHandler.java
pietsch 2003/09/19 07:33:16
Modified:src/java/org/apache/fop/servlet FopPrintServlet.java
src/java/org/apache/fop/fo FObj.java FOTreeBuilder.java
src/java/org/apache/fop/fo/extensions/svg
BatikExtensionElementMapping.java
src/java/org/apache/fop/render/awt AWTRenderer.java
src/java/org/apache/fop/area CTM.java
src/java/org/apache/fop/layoutmgr BidiLayoutManager.java
LayoutManagerLS.java
src/java/org/apache/fop/fo/flow Footnote.java Leader.java
PageNumber.java PageNumberCitation.java
InstreamForeignObject.java ListItem.java
src/java/org/apache/fop/pdf PDFInfo.java
src/java/org/apache/fop/fo/pagination RegionBody.java
Region.java
src/java/org/apache/fop/mif MIFHandler.java
Log:
Organize imports.
A bit of JavaDoc cosmetics.
Revision ChangesPath
1.8 +1 -9 xml-fop/src/java/org/apache/fop/servlet/FopPrintServlet.java
Index: FopPrintServlet.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/servlet/FopPrintServlet.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FopPrintServlet.java 2 Aug 2003 21:26:53 - 1.7
+++ FopPrintServlet.java 19 Sep 2003 14:33:15 - 1.8
@@ -51,10 +51,8 @@
package org.apache.fop.servlet;
import java.io.File;
-import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
-import java.util.List;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -62,18 +60,12 @@
import javax.servlet.http.HttpServletResponse;
import javax.xml.transform.TransformerFactory;
-import org.xml.sax.InputSource;
-
-// Avalon
import org.apache.avalon.framework.logger.ConsoleLogger;
import org.apache.avalon.framework.logger.Logger;
-
-// FOP
import org.apache.fop.apps.Driver;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.area.PageViewport;
import org.apache.fop.apps.XSLTInputHandler;
import org.apache.fop.render.awt.AWTPrintRenderer;
+import org.xml.sax.InputSource;
/**
* Example servlet to generate a fop printout from a servlet.
1.19 +6 -9 xml-fop/src/java/org/apache/fop/fo/FObj.java
Index: FObj.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FObj.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- FObj.java 16 Sep 2003 05:21:04 - 1.18
+++ FObj.java 19 Sep 2003 14:33:15 - 1.19
@@ -50,23 +50,20 @@
*/
package org.apache.fop.fo;
-// Java
-import java.util.Iterator;
-import java.util.ListIterator;
import java.util.ArrayList;
-import java.util.List;
import java.util.HashMap;
-import java.util.Set;
+import java.util.Iterator;
+import java.util.ListIterator;
import java.util.Map;
-import org.xml.sax.Attributes;
+import java.util.Set;
-// FOP
import org.apache.fop.apps.FOPException;
-import org.apache.fop.fo.properties.FOPropertyMapping;
import org.apache.fop.fo.flow.Marker;
+import org.apache.fop.fo.properties.FOPropertyMapping;
+import org.xml.sax.Attributes;
/**
- * base class for representation of formatting objects and their processing
+ * Base class for representation of formatting objects and their processing.
*/
public class FObj extends FONode {
private static final String FO_URI = "http://www.w3.org/1999/XSL/Format";;
1.19 +10 -25xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java
Index: FOTreeBuilder.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- FOTreeBuilder.java13 Sep 2003 22:55:16 - 1.18
+++ FOTreeBuilder.java19 Sep 2003 14:33:15 - 1.19
@@ -50,46 +50,31 @@
*/
package org.apache.fop.fo;
-// FOP
-import java.util.HashMap;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.fop.fo.pagination.Root;
-// SAX
import org.apache.avalon.framework.logger.Logger;
import org.apache.fop.apps.FOPException;
+import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.fo.ElementMapping.Maker;
+import org.apache.fop.fo.pagin
cvs commit: xml-fop/src/java/org/apache/fop/render/pdf PDFRenderer.java
pietsch 2003/09/19 09:46:43
Modified:src/java/org/apache/fop/render Renderer.java
AbstractRenderer.java
src/java/org/apache/fop/pdf PDFDocument.java
src/java/org/apache/fop/render/pdf PDFRenderer.java
Log:
Add possibility to set creation date.
Revision ChangesPath
1.5 +13 -2 xml-fop/src/java/org/apache/fop/render/Renderer.java
Index: Renderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/Renderer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Renderer.java 22 Aug 2003 17:42:42 - 1.4
+++ Renderer.java 19 Sep 2003 16:46:43 - 1.5
@@ -53,6 +53,7 @@
// Java
import java.io.OutputStream;
import java.io.IOException;
+import java.util.Date;
import java.util.Map;
// FOP
@@ -142,13 +143,23 @@
void setProducer(String producer);
/**
- * Set the creator of the document to be rendered. If this method
- * isn't called the renderer uses a default.
+ * Set the creator of the document to be rendered.
+ * If this method isn't called the renderer uses a default.
* Note: Not all renderers support this feature.
*
* @param creator The name of the document creator
*/
void setCreator(String creator);
+
+/**
+ * Set the creator date/timeof the document to be rendered.
+ * If this method isn't called the renderer uses the current date/time
+ * as default.
+ * Note: Not all renderers support this feature.
+ *
+ * @param date The name of the document creator
+ */
+void setCreationDate(Date date);
/**
* Reports if out of order rendering is supported.
1.15 +19 -2 xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java
Index: AbstractRenderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AbstractRenderer.java 14 Sep 2003 19:32:44 - 1.14
+++ AbstractRenderer.java 19 Sep 2003 16:46:43 - 1.15
@@ -54,6 +54,7 @@
import java.awt.geom.Rectangle2D;
import java.io.IOException;
import java.io.OutputStream;
+import java.util.Date;
import java.util.Map;
import java.util.List;
import java.util.Iterator;
@@ -125,6 +126,11 @@
protected String creator = null;
/**
+ * creation time
+ */
+protected Date creationDate = null;
+
+/**
* renderer configuration
*/
protected Map options;
@@ -172,12 +178,23 @@
creator = inCreator;
}
-/** @see org.apache.fop.render.Renderer */
+/**
+ * @see org.apache.fop.render.Renderer
+ */
public abstract void setupFontInfo(FOTreeControl foTreeControl);
-/** @see org.apache.fop.render.Renderer */
+/**
+ * @see org.apache.fop.render.Renderer
+ */
public void setUserAgent(FOUserAgent agent) {
userAgent = agent;
+}
+
+/**
+ * @param date
+ */
+public void setCreationDate(Date date) {
+creationDate = date;
}
/** @see org.apache.fop.render.Renderer */
1.6 +76 -47xml-fop/src/java/org/apache/fop/pdf/PDFDocument.java
Index: PDFDocument.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/pdf/PDFDocument.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PDFDocument.java 24 Apr 2003 02:48:08 - 1.5
+++ PDFDocument.java 19 Sep 2003 16:46:43 - 1.6
@@ -55,6 +55,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
+import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Iterator;
@@ -159,7 +160,8 @@
/**
* the colorspace (0=RGB, 1=CMYK)
*/
-protected PDFColorSpace colorspace = new
PDFColorSpace(PDFColorSpace.DEVICE_RGB);
+protected PDFColorSpace colorspace =
+new PDFColorSpace(PDFColorSpace.DEVICE_RGB);
/**
* the counter for Pattern name numbering (e.g. 'Pattern1')
@@ -232,7 +234,6 @@
*/
protected List gotos = new java.util.ArrayList();
-
private PDFFactory factory;
private boolean encodingOnTheFly = true;
@@ -325,10 +326,19 @@
}
/**
- * set the creator of the document
- *
- * @param creator string indicating application creating the document
- */
+ * Set the crea
cvs commit: xml-fop/test/java/org/apache/fop DigestFilterTestCase.java
pietsch 2003/09/19 09:50:56
Added: test/java/org/apache/fop/util DigestFilter.java
test/java/org/apache/fop DigestFilterTestCase.java
Log:
SAX filter providing a MD5 checksum for ensuring XML input integrity.
Revision ChangesPath
1.1 xml-fop/test/java/org/apache/fop/util/DigestFilter.java
Index: DigestFilter.java
===
/*
* $Id: DigestFilter.java,v 1.1 2003/09/19 16:50:56 pietsch Exp $
*
*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 modifica-
* tion, 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 acknowledgment: "This product includes software
*developed by the Apache Software Foundation (http://www.apache.org/)."
*Alternately, this acknowledgment may appear in the software itself, if
*and wherever such third-party acknowledgments normally appear.
*
* 4. The names "FOP" 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 name, without prior written permission of the
*Apache Software Foundation.
*
* 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 (INCLU-
* DING, 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 and was originally created by
* James Tauber <[EMAIL PROTECTED]>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>.
*/
package org.apache.fop.util;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Iterator;
import java.util.Map;
import java.util.TreeMap;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.SAXNotRecognizedException;
import org.xml.sax.SAXNotSupportedException;
import org.xml.sax.helpers.XMLFilterImpl;
/**
* SAX filter which produces a digest over the XML elements.
* Insignificant whitespace as determined by the, comments and
* processing instructions are not part of the digest.
* If the filter is namespace aware, the URI and local name for
* each element is digested, otherwise the QName. Attributes are
* sorted before the name-value pairs are digested.
*
*/
public class DigestFilter extends XMLFilterImpl {
private MessageDigest digest;
private byte value[];
private boolean isNamespaceAware;
public DigestFilter(String algorithm) throws NoSuchAlgorithmException {
digest = MessageDigest.getInstance(algorithm);
}
public byte[] getDigestValue() {
return value;
}
public String getDigestString() {
if (value != null) {
StringBuffer buffer = new StringBuffer(2 * value.length);
for (int i = 0; i < value.length; i++) {
int val = value[i];
int hi = (val >> 4) & 0xF;
int lo = val &
cvs commit: xml-fop/src/java/org/apache/fop/render/ps PSRenderer.java
pietsch 2003/09/19 09:51:16
Modified:src/java/org/apache/fop/render/ps PSRenderer.java
Log:
Revision ChangesPath
1.16 +1 -0 xml-fop/src/java/org/apache/fop/render/ps/PSRenderer.java
Index: PSRenderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/ps/PSRenderer.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- PSRenderer.java 1 Sep 2003 14:19:35 - 1.15
+++ PSRenderer.java 19 Sep 2003 16:51:16 - 1.16
@@ -264,6 +264,7 @@
public void setupFontInfo(FOTreeControl foTreeControl) {
/* use PDF's font setup to get PDF metrics */
org.apache.fop.render.pdf.FontSetup.setup((Document)foTreeControl, null);
+// TODO: what's this?
this.fontInfo = fontInfo;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo EnumProperty.java
pietsch 2003/09/27 13:57:48
Modified:test/java/org/apache/fop BasicDriverTestCase.java
src/java/org/apache/fop/rtf/renderer RTFHandler.java
src/java/org/apache/fop/area/extensions BookmarkData.java
src/java/org/apache/fop/fo/extensions/svg SVGElement.java
src/java/org/apache/fop/render/ps PSXMLHandler.java
src/java/org/apache/fop/fo EnumProperty.java
Log:
Fixed Testcase.
Some style changes.
Replace FIXME with TODO
Revision ChangesPath
1.2 +2 -23 xml-fop/test/java/org/apache/fop/BasicDriverTestCase.java
Index: BasicDriverTestCase.java
===
RCS file: /home/cvs/xml-fop/test/java/org/apache/fop/BasicDriverTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BasicDriverTestCase.java 4 Jul 2003 20:50:29 - 1.1
+++ BasicDriverTestCase.java 27 Sep 2003 20:57:48 - 1.2
@@ -71,7 +71,6 @@
import org.apache.commons.io.output.ByteArrayOutputStream;
import org.apache.fop.apps.Driver;
import org.apache.fop.apps.InputHandler;
-import org.apache.fop.apps.TraxInputHandler;
import org.apache.fop.apps.XSLTInputHandler;
import org.w3c.dom.Document;
@@ -207,29 +206,9 @@
driver.setRenderer(Driver.RENDER_PDF);
InputHandler handler = new XSLTInputHandler(xmlFile, xsltFile);
-handler.run(driver);
+driver.render(handler);
assertTrue("Generated PDF has zero length", baout.size() > 0);
}
-
-/**
- * Tests Driver with TraxInputHandler and OutputStream.
- * @throws Exception if anything fails
- */
-public void testFO2PDFWithTraxInputHandler() throws Exception {
-File xmlFile = new File(getBaseDir(), "test/xml/1.xml");
-File xsltFile = new File(getBaseDir(), "test/xsl/doc.xsl");
-ByteArrayOutputStream baout = new ByteArrayOutputStream();
-Driver driver = new Driver();
-ContainerUtil.enableLogging(driver, this.logger);
-driver.setOutputStream(baout);
-driver.setRenderer(Driver.RENDER_PDF);
-
-InputHandler handler = new TraxInputHandler(xmlFile, xsltFile);
-handler.run(driver);
-
-assertTrue("Generated PDF has zero length", baout.size() > 0);
-}
-
}
1.25 +8 -8 xml-fop/src/java/org/apache/fop/rtf/renderer/RTFHandler.java
Index: RTFHandler.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/rtf/renderer/RTFHandler.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- RTFHandler.java 21 Sep 2003 22:21:11 - 1.24
+++ RTFHandler.java 27 Sep 2003 20:57:48 - 1.25
@@ -151,13 +151,13 @@
* @see org.apache.fop.fo.FOInputHandler#startDocument()
*/
public void startDocument() throws SAXException {
-// FIXME sections should be created
+// TODO sections should be created
try {
rtfFile = new RtfFile(new OutputStreamWriter(os));
docArea = rtfFile.startDocumentArea();
} catch (IOException ioe) {
-// FIXME could we throw Exception in all FOInputHandler events?
-throw new SAXException("IOException: " + ioe);
+// TODO could we throw Exception in all FOInputHandler events?
+throw new SAXException(ioe);
}
}
@@ -168,8 +168,8 @@
try {
rtfFile.flush();
} catch (IOException ioe) {
-// FIXME could we throw Exception in all FOInputHandler events?
-throw new SAXException("IOException: " + ioe);
+// TODO could we throw Exception in all FOInputHandler events?
+throw new SAXException(ioe);
}
}
@@ -184,9 +184,9 @@
bHeaderSpecified = false;
bFooterSpecified = false;
} catch (IOException ioe) {
-// FIXME could we throw Exception in all FOInputHandler events?
+// TODO could we throw Exception in all FOInputHandler events?
log.error("startPageSequence: " + ioe.getMessage());
-throw new Error("IOException: " + ioe);
+//TODO throw new FOPException(ioe);
}
}
@@ -311,7 +311,7 @@
builderContext.pushContainer(para);
} catch (IOException ioe) {
-// FIXME could we throw Exception in all FOInputHandler events?
+// TODO could we throw Exception in all FOInputHandler events?
log.error("startBlock: " + ioe.getMe
cvs commit: xml-fop/test/java/org/apache/fop GenericFOPTestCase.java
pietsch 2003/09/27 15:22:18
Added: test/java/org/apache/fop GenericFOPTestCase.java
Log:
Redfactored generic FOP test to self-contained JUnit test.
More to add.
Revision ChangesPath
1.1 xml-fop/test/java/org/apache/fop/GenericFOPTestCase.java
Index: GenericFOPTestCase.java
===
/*
* $Id: GenericFOPTestCase.java,v 1.1 2003/09/27 22:22:18 pietsch Exp $
*
*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 modifica-
* tion, 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 acknowledgment: "This product includes software
*developed by the Apache Software Foundation (http://www.apache.org/)."
*Alternately, this acknowledgment may appear in the software itself, if
*and wherever such third-party acknowledgments normally appear.
*
* 4. The names "FOP" 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 name, without prior written permission of the
*Apache Software Foundation.
*
* 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 (INCLU-
* DING, 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 and was originally created by
* James Tauber <[EMAIL PROTECTED]>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>.
*/
package org.apache.fop;
import java.io.ByteArrayOutputStream;
import java.io.StringReader;
import java.security.DigestOutputStream;
import java.security.MessageDigest;
import java.util.Date;
import javax.xml.parsers.SAXParserFactory;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.fop.apps.Driver;
import org.apache.fop.render.pdf.PDFRenderer;
import org.apache.fop.util.DigestFilter;
import org.xml.sax.InputSource;
/**
* Framework for simple regression testing.
* The testcase reads a control XML file which specifies a FO source,
* a MD5 for the source to help diferentiating failures caused by causal
* source modification from failures caused by regression, a renderer (only
* PDF currently supported) and a MD5 for the result.
*
*/
public final class GenericFOPTestCase extends TestCase {
protected SAXParserFactory parserFactory;
public static Test suite() {
TestSuite suite = new TestSuite(GenericFOPTestCase.class);
suite.setName("Fop regression tests");
return suite;
}
/**
* Constructor for FopTest.
* @param name the name of the test suite
*/
public GenericFOPTestCase(String name) {
super(name);
}
/* (non-Javadoc)
* @see junit.framework.TestCase#setUp()
*/
protected void setUp() throws Exception {
parserFactory = SAXParserFactory.newInstance();
cvs commit: xml-fop/src/org/apache/fop/layout LineArea.java
pietsch 2002/07/06 13:17:32
Modified:src/org/apache/fop/layout Tag: fop-0_20_2-maintain
LineArea.java
Log:
Flush pending areas and space before adding first part of
hyphenated word. Pass text decoration and link set and
use it at the point the word area is created.
Delete wrong return value in case the word could not be
hyphenated in doHyphenate
PR: 2106, 6042, 10374, 4511
Revision ChangesPath
No revision
No revision
1.53.2.6 +100 -101 xml-fop/src/org/apache/fop/layout/Attic/LineArea.java
Index: LineArea.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/Attic/LineArea.java,v
retrieving revision 1.53.2.5
retrieving revision 1.53.2.6
diff -u -r1.53.2.5 -r1.53.2.6
--- LineArea.java 11 Feb 2002 00:43:45 - 1.53.2.5
+++ LineArea.java 6 Jul 2002 20:17:31 - 1.53.2.6
@@ -155,7 +155,9 @@
else
b = null;
}
-pendingWidth = prevLineArea.getPendingWidth() - eatenWidth;
+pendingWidth = prevLineArea.pendingWidth - eatenWidth;
+prevLineArea.pendingWidth=0;
+prevLineArea.pendingAreas=null;
}
}
@@ -166,12 +168,14 @@
public int addPageNumberCitation(String refid, LinkSet ls) {
/*
- * We should add code here to handle the case where the page number doesn't
fit on the current line
+ * We should add code here to handle the case where the page
+ * number doesn't fit on the current line
*/
-// Space must be alloted to the page number, so currently we give it 3
spaces
+// Space must be allocated for the page number, so currently we
+// give it 3 spaces
-int width = currentFontState.width(currentFontState.mapChar(' '));
+int width = 3*getCharWidth(' ');
PageNumberInlineArea pia = new PageNumberInlineArea(currentFontState,
@@ -191,7 +195,7 @@
*
* @return int character position
*/
-public int addText(char odata[], int start, int end, LinkSet ls,
+public int addText(char data[], int start, int end, LinkSet ls,
TextState textState) {
// this prevents an array index out of bounds
// which occurs when some text is laid out again.
@@ -205,11 +209,6 @@
// With CID fonts, space isn't neccesary currentFontState.width(32)
int whitespaceWidth = getCharWidth(' ');
-char[] data = new char[odata.length];
-char[] dataCopy = new char[odata.length];
-System.arraycopy(odata, 0, data, 0, odata.length);
-System.arraycopy(odata, 0, dataCopy, 0, odata.length);
-
boolean isText = false;
boolean isMultiByteChar = false;
@@ -498,11 +497,14 @@
if (hyphProps.hyphenate == Hyphenate.TRUE) {
int ret = wordStart;
-ret = this.doHyphenation(dataCopy, i, wordStart,
+ret = this.doHyphenation(data, i, wordStart,
this.getContentWidth()
- (finalWidth
+ spaceWidth
-+ pendingWidth));
++ pendingWidth),
+ finalWidth + spaceWidth
+ + embeddedLinkStart,
+ ls, textState);
// current word couldn't be hypenated
// couldn't fit first word
@@ -514,8 +516,7 @@
MessageHandler.log("area contents overflows area");
addSpacedWord(new String(data, wordStart,
wordLength - 1),
ls,
- finalWidth + spaceWidth
- + embeddedLinkStart,
+ embeddedLinkStart,
spaceWidth, textState, false);
finalWidth += wordWidth;
@@ -586,12 +587,10 @@
int leaderPatternWidth, int leaderAlignment) {
WordArea leaderPatternArea;
int leaderLength = 0;
-char dotIndex = '.'; // currentFontState.ma
cvs commit: xml-fop build.xml
pietsch 2002/07/06 13:20:52 Modified:.Tag: fop-0_20_2-maintain build.xml Log: Incremented FOP version do 0.20.5cvs Revision ChangesPath No revision No revision 1.44.2.21 +1 -1 xml-fop/build.xml Index: build.xml === RCS file: /home/cvs/xml-fop/build.xml,v retrieving revision 1.44.2.20 retrieving revision 1.44.2.21 diff -u -r1.44.2.20 -r1.44.2.21 --- build.xml 5 Jul 2002 16:44:10 - 1.44.2.20 +++ build.xml 6 Jul 2002 20:20:52 - 1.44.2.21 @@ -183,7 +183,7 @@ - + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/apps Driver.java
pietsch 2002/07/09 13:34:11
Modified:src/org/apache/fop/apps Tag: fop-0_20_2-maintain Driver.java
Log:
Corrected comment describing usage
Removed some cruft
Revision ChangesPath
No revision
No revision
1.36.2.5 +12 -28xml-fop/src/org/apache/fop/apps/Driver.java
Index: Driver.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/Driver.java,v
retrieving revision 1.36.2.4
retrieving revision 1.36.2.5
diff -u -r1.36.2.4 -r1.36.2.5
--- Driver.java 6 Jul 2002 16:38:45 - 1.36.2.4
+++ Driver.java 9 Jul 2002 20:34:11 - 1.36.2.5
@@ -10,7 +10,6 @@
// FOP
import org.apache.fop.fo.FOTreeBuilder;
import org.apache.fop.fo.ElementMapping;
-import org.apache.fop.layout.AreaTree;
import org.apache.fop.render.Renderer;
import org.apache.fop.configuration.ConfigurationReader;
import org.apache.fop.configuration.Configuration;
@@ -25,16 +24,12 @@
// DOM
import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Attr;
// SAX
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
// Java
import java.io.*;
@@ -56,26 +51,22 @@
* driver.run();
*
* If neccessary, calling classes can call into the lower level
- * methods to setup and
- * render. Methods can be called to set the
- * Renderer to use, the (possibly multiple) ElementMapping(s) to
- * use and the OutputStream to use to output the results of the
- * rendering (where applicable). In the case of the Renderer and
+ * methods to setup and render. Methods can be called to set the
+ * Renderer to use, the (possibly multiple) ElementMapping(s) to use
+ * and the OutputStream to use to output the results of the rendering
+ * (where applicable). In the case of the Renderer and
* ElementMapping(s), the Driver may be supplied either with the
* object itself, or the name of the class, in which case Driver will
* instantiate the class itself. The advantage of the latter is it
* enables runtime determination of Renderer and ElementMapping(s).
*
- * Once the Driver is set up, the render method
- * is called. Depending on whether DOM or SAX is being used, the
- * invocation of the method is either render(Document) or
- * buildFOTree(Parser, InputSource) respectively.
+ * Once the Driver is set up, the render method is called. Depending
+ * on whether DOM or SAX is being used, the invocation of the method
+ * is either render(Document) or render(Parser, InputSource)
+ * respectively.
*
- * A third possibility may be used to build the FO Tree, namely
- * calling getContentHandler() and firing the SAX events yourself.
- *
- * Once the FO Tree is built, the format() and render() methods may be
- * called in that order.
+ * A third possibility is to call getContentHandler() and firing
+ * the SAX events yourself.
*
* Here is an example use of Driver which outputs to AWT:
*
@@ -83,8 +74,7 @@
* Driver driver = new Driver();
* driver.setRenderer(new org.apache.fop.render.awt.AWTRenderer(translator));
* driver.render(parser, fileInputSource(args[0]));
- *
- */
+ * */
public class Driver {
/**
@@ -138,11 +128,6 @@
private FOTreeBuilder _treeBuilder;
/**
- * the area tree that is the result of formatting the FO tree
- */
-private AreaTree _areaTree;
-
-/**
* the renderer to use to output the area tree
*/
private Renderer _renderer;
@@ -216,7 +201,6 @@
* The output stream is cleared. The renderer is cleared.
*/
public synchronized void reset() {
-_areaTree = null;
_source = null;
_stream = null;
_reader = null;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo/pagination PageSequence.java Root.java
pietsch 2002/07/11 18:15:33
Modified:src/org/apache/fop/fo/pagination Tag: fop-0_20_2-maintain
PageSequence.java Root.java
Log:
Rearranged and simplified calculations related to page
numbering and forced pages.
Fixed force-page-count="auto"
Removed some cruft.
Revision ChangesPath
No revision
No revision
1.39.2.3 +97 -134 xml-fop/src/org/apache/fop/fo/pagination/PageSequence.java
Index: PageSequence.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/PageSequence.java,v
retrieving revision 1.39.2.2
retrieving revision 1.39.2.3
diff -u -r1.39.2.2 -r1.39.2.3
--- PageSequence.java 3 Jan 2002 10:39:56 - 1.39.2.2
+++ PageSequence.java 12 Jul 2002 01:15:33 - 1.39.2.3
@@ -101,10 +101,12 @@
private Page currentPage;
// page number and related formatting variables
-private String ipnValue;
-private int currentPageNumber = 0;
+//private String ipnValue;
+private int firstPageNumber = 0;
private PageNumberGenerator pageNumberGenerator;
+private int currentPageNumber = 0;
+
private int forcePageCount = 0;
private int pageCount = 0;
private boolean isForcing = false;
@@ -115,11 +117,6 @@
private int pageNumberType;
/**
- * used to determine whether to calculate auto, auto-even, auto-odd
- */
-private boolean thisIsFirstPage;
-
-/**
* the current subsequence while formatting a given page sequence
*/
private SubSequenceSpecifier currentSubsequence;
@@ -143,7 +140,6 @@
if (parent.getName().equals("fo:root")) {
this.root = (Root)parent;
-// this.root.addPageSequence(this);
}
else {
throw new FOPException("page-sequence must be child of root, not "
@@ -157,21 +153,22 @@
_flowMap = new Hashtable();
-thisIsFirstPage =
-true;// we are now on the first page of the page sequence
-ipnValue = this.properties.get("initial-page-number").getString();
+String ipnValue = this.properties.get("initial-page-number").getString();
if (ipnValue.equals("auto")) {
pageNumberType = AUTO;
+this.firstPageNumber = 1;
} else if (ipnValue.equals("auto-even")) {
pageNumberType = AUTO_EVEN;
+this.firstPageNumber = 2;
} else if (ipnValue.equals("auto-odd")) {
pageNumberType = AUTO_ODD;
+this.firstPageNumber = 1;
} else {
pageNumberType = EXPLICIT;
try {
int pageStart = new Integer(ipnValue).intValue();
-this.currentPageNumber = (pageStart > 0) ? pageStart - 1 : 0;
+this.firstPageNumber = (pageStart > 0) ? pageStart : 1;
} catch (NumberFormatException nfe) {
throw new FOPException("\"" + ipnValue
+ "\" is not a valid value for
initial-page-number");
@@ -219,68 +216,71 @@
this.layoutMasterSet.resetPageMasters();
-int firstAvailPageNumber = 0;
-do {
-// makePage() moved to after the page-number computations,
-// but store the page-number at this point for that method,
-// since we want the 'current' current page-number...
-firstAvailPageNumber = this.root.getRunningPageNumberCounter();
-boolean tempIsFirstPage = false;
-
-if (thisIsFirstPage) {
-tempIsFirstPage = thisIsFirstPage;
-if (pageNumberType == AUTO) {
-this.currentPageNumber =
-this.root.getRunningPageNumberCounter();
-} else if (pageNumberType == AUTO_ODD) {
-this.currentPageNumber =
-this.root.getRunningPageNumberCounter();
-if (this.currentPageNumber % 2 == 1) {
-this.currentPageNumber++;
+PageSequence previousPageSequence=this.root.getPageSequence();
+if( previousPageSequence!=null ) {
+currentPageNumber = previousPageSequence.currentPageNumber;
+if (previousPageSequence.forcePageCount == ForcePageCount.AUTO) {
+if (pageNumberType == AUTO_ODD) {
+if (currentPageNumber % 2 == 0) {
+makeBlankPage(areaTree);
+}
+} else if (pageNumberT
cvs commit: xml-fop/src/org/apache/fop/apps CommandLineOptions.java CommandLineStarter.java Driver.java
pietsch 2002/07/14 08:23:47
Modified:.build.sh
src/org/apache/fop/apps CommandLineOptions.java
CommandLineStarter.java Driver.java
Log:
Removed traces of buffermanager
A few cosmetical changes in CommandLineOptions
Revision ChangesPath
1.19 +19 -0 xml-fop/build.sh
Index: build.sh
===
RCS file: /home/cvs/xml-fop/build.sh,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- build.sh 28 Jun 2002 07:52:51 - 1.18
+++ build.sh 14 Jul 2002 15:23:47 - 1.19
@@ -12,11 +12,30 @@
echo "location of the Java Virtual Machine you want to use."
exit 1
fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$JAVA_HOME" ] &&
+JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
LIBDIR=lib
LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/batik.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.4.3.jar:$LIBDIR/xalan-2.3.1.jar:$LIBDIR/xml-apis.jar
LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/jimi-1.0.jar:$LIBDIR/avalon-framework-cvs-20020315.jar
ANT_HOME=$LIBDIR
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"`
+fi
echo
echo Building with classpath $LOCALCLASSPATH
1.17 +15 -42xml-fop/src/org/apache/fop/apps/CommandLineOptions.java
Index: CommandLineOptions.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/CommandLineOptions.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- CommandLineOptions.java 11 Apr 2002 09:33:26 - 1.16
+++ CommandLineOptions.java 14 Jul 2002 15:23:47 - 1.17
@@ -49,39 +49,31 @@
private static final int TXT_OUTPUT = 7;
/* output: svg file */
private static final int SVG_OUTPUT = 8;
-
-/* System buffers */
-private static final int BUFFER_FILE = 8;
-
-/* System buffers */
+/* output: XML area tree */
private static final int AREA_OUTPUT = 9;
/* use debug mode */
-Boolean errorDump = new Boolean(false);
+Boolean errorDump = Boolean.FALSE;
/* show configuration information */
-Boolean dumpConfiguration = new Boolean(false);
+Boolean dumpConfiguration = Boolean.FALSE;
/* suppress any progress information */
-Boolean quiet = new Boolean(false);
+Boolean quiet = Boolean.FALSE;
/* for area tree XML output, only down to block area level */
-Boolean suppressLowLevelAreas = new Boolean(false);
-/* name of user configuration file */
+Boolean suppressLowLevelAreas = Boolean.FALSE;
+/* user configuration file */
File userConfigFile = null;
-/* name of input fo file */
+/* input fo file */
File fofile = null;
-/* name of xsltfile (xslt transformation as input) */
+/* xsltfile (xslt transformation as input) */
File xsltfile = null;
-/* name of xml file (xslt transformation as input) */
+/* xml file (xslt transformation as input) */
File xmlfile = null;
-/* name of output file */
+/* output file */
File outfile = null;
-/* name of buffer file */
-File bufferFile = null;
/* input mode */
int inputmode = NOT_SET;
/* output mode */
int outputmode = NOT_SET;
-/* buffer mode */
-int buffermode = NOT_SET;
/* language for user information */
String language = null;
@@ -122,13 +114,13 @@
private boolean parseOptions(String args[]) throws FOPException {
for (int i = 0; i < args.length; i++) {
if (args[i].equals("-d") || args[i].equals("--full-error-dump")) {
-errorDump = new Boolean(true);
+errorDump = Boolean.TRUE;
log = new ConsoleLogger(ConsoleLogger.LEVEL_DEBUG);
} else if (args[i].equals("-x")
|| args[i].equals("--dump-config")) {
-dumpConfiguration = new Boolean(true);
+dumpConfiguration = Boolean.TRUE;
} else if (args[i].equals("-q") || args[i].equals("--quiet")) {
-quiet = new Boolean(true);
+quiet = Boolean.TRUE;
log = new ConsoleLogger(ConsoleLogg
cvs commit: xml-fop/src/org/apache/fop/render/txt TXTRenderer.java TXTStream.java
pietsch 2002/07/14 08:34:33
Modified:src/org/apache/fop/apps Tag: fop-0_20_2-maintain
CommandLineOptions.java
src/org/apache/fop/render/txt Tag: fop-0_20_2-maintain
TXTRenderer.java TXTStream.java
Log:
Command line option for setting encoding of the output
file for text renderer.
Submitted by: Oleg Tkachenko [EMAIL PROTECTED]
Reviewed by: J.Pietschmann
Revision ChangesPath
No revision
No revision
1.14.2.5 +17 -4 xml-fop/src/org/apache/fop/apps/CommandLineOptions.java
Index: CommandLineOptions.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/CommandLineOptions.java,v
retrieving revision 1.14.2.4
retrieving revision 1.14.2.5
diff -u -r1.14.2.4 -r1.14.2.5
--- CommandLineOptions.java 6 Jul 2002 16:43:45 - 1.14.2.4
+++ CommandLineOptions.java 14 Jul 2002 15:34:32 - 1.14.2.5
@@ -16,6 +16,7 @@
import org.apache.fop.configuration.Configuration;
import org.apache.fop.apps.FOPException;
import org.apache.fop.messaging.MessageHandler;
+import org.apache.fop.render.txt.TXTRenderer;
// Avalon
import org.apache.avalon.framework.logger.ConsoleLogger;
@@ -78,7 +79,7 @@
/* language for user information */
String language = null;
-private java.util.Hashtable rendererOptions;
+private java.util.HashMap rendererOptions;
private Logger log;
@@ -88,7 +89,7 @@
setLogger(new ConsoleLogger(ConsoleLogger.LEVEL_INFO));
boolean optionsParsed = true;
-rendererOptions = new java.util.Hashtable();
+rendererOptions = new java.util.HashMap();
try {
optionsParsed = parseOptions(args);
if (optionsParsed) {
@@ -252,6 +253,14 @@
outfile = new File(args[i + 1]);
i++;
}
+} else if (args[i].equals("-" + TXTRenderer.encodingOptionName)) {
+if ((i + 1 == args.length)
+|| (args[i + 1].charAt(0) == '-')) {
+throw new FOPException("you must specify text renderer
encoding");
+} else {
+rendererOptions.put(TXTRenderer.encodingOptionName, args[i +
1]);
+i++;
+}
} else {
printUsage();
return false;
@@ -375,7 +384,7 @@
}
}
-public java.util.Hashtable getRendererOptions() {
+public java.util.HashMap getRendererOptions() {
return rendererOptions;
}
@@ -505,6 +514,8 @@
+ " -pcl outfile input will be rendered as pcl
file (outfile req'd) \n"
+ " -ps outfile input will be rendered as
PostScript file (outfile req'd) \n"
+ " -txt outfile input will be rendered as
text file (outfile req'd) \n"
+ + "-"+TXTRenderer.encodingOptionName+" encoding
use the encoding for the output file.\n"
+ + "the encoding must be a valid
java encoding.\n"
+ " -svg outfile input will be rendered as an
svg slides file (outfile req'd) \n"
+ " -at outfile representation of area tree
as XML (outfile req'd) \n"
+ " -printinput file will be rendered
and sent to the printer \n"
@@ -587,6 +598,8 @@
case TXT_OUTPUT:
log.debug("txt");
log.debug("output file: " + outfile.toString());
+if (rendererOptions.containsKey(TXTRenderer.encodingOptionName))
+log.debug("output encoding: " +
rendererOptions.get(TXTRenderer.encodingOptionName));
break;
case SVG_OUTPUT:
log.debug("svg");
No revision
No revision
1.12.2.3 +10 -1 xml-fop/src/org/apache/fop/render/txt/TXTRenderer.java
Index: TXTRenderer.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/txt/TXTRenderer.java,v
retrieving revision 1.12.2.2
retrieving revision 1.12.2.3
diff -u -r1.12.2.2 -r1.12.2.3
--- TXTRenderer.java 23 Apr 2002 22:33:40 - 1.12.2.2
+++ TXTRenderer.java 14 Jul 2002 15:34:32 - 1.12.2.3
@@ -46,6 +46,7 @@
* the current stream to add Text commands
cvs commit: xml-fop/src/org/apache/fop/render/xml XMLRenderer.java
pietsch 2002/07/15 12:28:08
Modified:src/org/apache/fop/render Tag: fop-0_20_2-maintain
Renderer.java
src/org/apache/fop/render/awt Tag: fop-0_20_2-maintain
AWTRenderer.java
src/org/apache/fop/render/mif Tag: fop-0_20_2-maintain
MIFRenderer.java
src/org/apache/fop/render/pcl Tag: fop-0_20_2-maintain
PCLRenderer.java
src/org/apache/fop/render/pdf Tag: fop-0_20_2-maintain
PDFRenderer.java
src/org/apache/fop/render/ps Tag: fop-0_20_2-maintain
PSRenderer.java
src/org/apache/fop/render/svg Tag: fop-0_20_2-maintain
SVGRenderer.java
src/org/apache/fop/render/txt Tag: fop-0_20_2-maintain
TXTRenderer.java
src/org/apache/fop/render/xml Tag: fop-0_20_2-maintain
XMLRenderer.java
Log:
Replaced options Hashtable by HashMap
Reproted by: Oleg Tkachenko
Revision ChangesPath
No revision
No revision
1.19.2.3 +2 -2 xml-fop/src/org/apache/fop/render/Renderer.java
Index: Renderer.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/Renderer.java,v
retrieving revision 1.19.2.2
retrieving revision 1.19.2.3
diff -u -r1.19.2.2 -r1.19.2.3
--- Renderer.java 11 Jun 2002 00:01:14 - 1.19.2.2
+++ Renderer.java 15 Jul 2002 19:28:06 - 1.19.2.3
@@ -41,7 +41,7 @@
/**
* set up renderer options
*/
-public void setOptions(java.util.Hashtable options);
+public void setOptions(java.util.HashMap options);
/**
* set the producer of the rendering
No revision
No revision
1.38.2.5 +3 -3 xml-fop/src/org/apache/fop/render/awt/AWTRenderer.java
Index: AWTRenderer.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/awt/AWTRenderer.java,v
retrieving revision 1.38.2.4
retrieving revision 1.38.2.5
diff -u -r1.38.2.4 -r1.38.2.5
--- AWTRenderer.java 11 Jun 2002 00:01:14 - 1.38.2.4
+++ AWTRenderer.java 15 Jul 2002 19:28:07 - 1.38.2.5
@@ -115,12 +115,12 @@
/**
* options
*/
-protected Hashtable options;
+protected java.util.HashMap options;
/**
* set up renderer options
*/
-public void setOptions(Hashtable options) {
+public void setOptions(java.util.HashMap options) {
this.options = options;
}
No revision
No revision
1.11.2.2 +3 -3 xml-fop/src/org/apache/fop/render/mif/Attic/MIFRenderer.java
Index: MIFRenderer.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/mif/Attic/MIFRenderer.java,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -r1.11.2.1 -r1.11.2.2
--- MIFRenderer.java 23 Apr 2002 22:33:39 - 1.11.2.1
+++ MIFRenderer.java 15 Jul 2002 19:28:07 - 1.11.2.2
@@ -80,7 +80,7 @@
/**
* options
*/
-protected Hashtable options;
+protected java.util.HashMap options;
/**
* create the MIF renderer
@@ -92,7 +92,7 @@
/**
* set up renderer options
*/
-public void setOptions(Hashtable options) {
+public void setOptions(java.util.HashMap options) {
this.options = options;
}
No revision
No revision
1.13.2.2 +3 -3 xml-fop/src/org/apache/fop/render/pcl/PCLRenderer.java
Index: PCLRenderer.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/pcl/PCLRenderer.java,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -r1.13.2.1 -r1.13.2.2
--- PCLRenderer.java 23 Apr 2002 22:33:39 - 1.13.2.1
+++ PCLRenderer.java 15 Jul 2002 19:28:07 - 1.13.2.2
@@ -58,7 +58,7 @@
private int xoffset =
-180; // X Offset to allow for PCL implicit 1/4" left
margin.
-private java.util.Hashtable options;
+private java.util.HashMap options;
/**
* Create the PCL renderer
@@ -68,7 +68,7 @@
/**
* set up renderer options
*/
-public void setOptions(java.util.Hashtable options) {
+public void setOptions(java.util.HashMap options) {
this.options = options;
}
No revision
cvs commit: xml-fop/src/org/apache/fop/render/xml XMLRenderer.java
pietsch 2002/07/16 12:13:26
Modified:src/org/apache/fop/fo/pagination Tag: fop-0_20_2-maintain
RegionAfter.java RegionBefore.java RegionEnd.java
RegionStart.java SimplePageMaster.java
src/org/apache/fop/layout Tag: fop-0_20_2-maintain
AreaContainer.java RegionArea.java
src/org/apache/fop/render Tag: fop-0_20_2-maintain
AbstractRenderer.java Renderer.java
src/org/apache/fop/render/awt Tag: fop-0_20_2-maintain
AWTRenderer.java
src/org/apache/fop/render/mif Tag: fop-0_20_2-maintain
MIFRenderer.java
src/org/apache/fop/render/pcl Tag: fop-0_20_2-maintain
PCLRenderer.java
src/org/apache/fop/render/pdf Tag: fop-0_20_2-maintain
PDFRenderer.java
src/org/apache/fop/render/ps Tag: fop-0_20_2-maintain
PSRenderer.java
src/org/apache/fop/render/svg Tag: fop-0_20_2-maintain
SVGRenderer.java
src/org/apache/fop/render/txt Tag: fop-0_20_2-maintain
TXTRenderer.java
src/org/apache/fop/render/xml Tag: fop-0_20_2-maintain
XMLRenderer.java
Log:
Implementes background properties for all regions and precedence
of regions (lr-tb writing mode only)
Submitted by: Oleg Tkachenko [EMAIL PROTECTED]
Reviewed by: J.Pietschmann
Revision ChangesPath
No revision
No revision
1.9.2.2 +18 -1 xml-fop/src/org/apache/fop/fo/pagination/RegionAfter.java
Index: RegionAfter.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/RegionAfter.java,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -r1.9.2.1 -r1.9.2.2
--- RegionAfter.java 23 Apr 2002 22:25:25 - 1.9.2.1
+++ RegionAfter.java 16 Jul 2002 19:13:23 - 1.9.2.2
@@ -65,6 +65,20 @@
return area;
}
+RegionArea makeRegionArea(int allocationRectangleXPosition,
+ int allocationRectangleYPosition,
+ int allocationRectangleWidth,
+ int allocationRectangleHeight,
+ int startExtent, int endExtent) {
+if (getPrecedence() == false) {
+allocationRectangleXPosition += startExtent;
+allocationRectangleWidth -= startExtent + endExtent;
+}
+return makeRegionArea(allocationRectangleXPosition,
+ allocationRectangleYPosition,
+ allocationRectangleWidth,
+ allocationRectangleHeight);
+}
protected String getDefaultRegionName() {
return "xsl-region-after";
@@ -82,4 +96,7 @@
return (precedence == Precedence.TRUE ? true : false);
}
+public int getExtent() {
+return properties.get("extent").getLength().mvalue();
+}
}
1.9.2.2 +18 -1 xml-fop/src/org/apache/fop/fo/pagination/RegionBefore.java
Index: RegionBefore.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/RegionBefore.java,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -r1.9.2.1 -r1.9.2.2
--- RegionBefore.java 23 Apr 2002 22:25:25 - 1.9.2.1
+++ RegionBefore.java 16 Jul 2002 19:13:23 - 1.9.2.2
@@ -65,6 +65,20 @@
return area;
}
+RegionArea makeRegionArea(int allocationRectangleXPosition,
+ int allocationRectangleYPosition,
+ int allocationRectangleWidth,
+ int allocationRectangleHeight,
+ int startExtent, int endExtent) {
+if (getPrecedence() == false) {
+allocationRectangleXPosition += startExtent;
+allocationRectangleWidth -= startExtent + endExtent;
+}
+return makeRegionArea(allocationRectangleXPosition,
+ allocationRectangleYPosition,
+ allocationRectangleWidth,
+ allocationRectangleHeight);
+}
protected String getDefaultRegionName() {
return "xsl-region-before";
@@ -82,4 +96,7 @@
return (precedence == Precedence.TRUE ? true : false);
}
+public int getExtent() {
+return properties.get("extent").getLength().mvalue();
+}
}
1.3.2.2 +9 -6 xml-fop/src/org/apache/fop
cvs commit: xml-fop/src/org/apache/fop/fo XMLObj.java
pietsch 2002/07/16 13:04:44
Modified:src/org/apache/fop/extensions Tag: fop-0_20_2-maintain
Label.java
src/org/apache/fop/fo Tag: fop-0_20_2-maintain XMLObj.java
Log:
Fixed some remaining problems with the TextBuffer patch for
FObjMixed
Slightly Optimized extensions.Label
Revision ChangesPath
No revision
No revision
1.2.2.1 +8 -5 xml-fop/src/org/apache/fop/extensions/Label.java
Index: Label.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/extensions/Label.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- Label.java30 Jul 2001 20:29:20 - 1.2
+++ Label.java16 Jul 2002 20:04:43 - 1.2.2.1
@@ -11,7 +11,7 @@
public class Label extends ExtensionObj {
-private String _label = "";
+private StringBuffer textBuffer;
public static class Maker extends FObj.Maker {
public FObj make(FObj parent, PropertyList propertyList) {
@@ -28,12 +28,15 @@
super(parent, propertyList);
}
-protected void addCharacters(char data[], int start, int end) {
-_label += new String(data, start, end - start);
+protected void addCharacters(char data[], int start, int length) {
+if (textBuffer==null) {
+textBuffer = new StringBuffer();
+}
+textBuffer.append(data,start,length);
}
public String toString() {
-return _label;
+return textBuffer.toString();
}
No revision
No revision
1.2.2.1 +2 -2 xml-fop/src/org/apache/fop/fo/XMLObj.java
Index: XMLObj.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/XMLObj.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- XMLObj.java 8 Oct 2001 09:56:38 - 1.2
+++ XMLObj.java 16 Jul 2002 20:04:44 - 1.2.2.1
@@ -128,7 +128,7 @@
}
protected void addCharacters(char data[], int start, int length) {
-String str = new String(data, start, length - start);
+String str = new String(data, start, length);
org.w3c.dom.Text text = doc.createTextNode(str);
element.appendChild(text);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/apps StreamRenderer.java
pietsch 2002/07/18 15:47:41
Modified:src/org/apache/fop/apps Tag: fop-0_20_2-maintain
StreamRenderer.java
Log:
Fixed a class cast error with retrieve-marker
Submitted by: Trond Aasan [EMAIL PROTECTED]
Revision ChangesPath
No revision
No revision
1.6.2.5 +5 -7 xml-fop/src/org/apache/fop/apps/Attic/StreamRenderer.java
Index: StreamRenderer.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/Attic/StreamRenderer.java,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -u -r1.6.2.4 -r1.6.2.5
--- StreamRenderer.java 26 Jun 2002 20:37:49 - 1.6.2.4
+++ StreamRenderer.java 18 Jul 2002 22:47:41 - 1.6.2.5
@@ -327,7 +327,8 @@
else
pageIndex = renderQueue.indexOf(current);
if ((pageIndex + 1) < renderQueue.size()) {
-nextPage = (Page)renderQueue.elementAt(pageIndex + 1);
+nextPage = ((RenderQueueEntry)renderQueue
+.elementAt(pageIndex + 1)).getPage();
if (isWithinPageSequence
&&!nextPage.getPageSequence().equals(current.getPageSequence())) {
nextPage = null;
@@ -344,15 +345,12 @@
pageIndex = renderQueue.size();
else
pageIndex = renderQueue.indexOf(current);
-// System.out.println("Page index = " + pageIndex);
if ((pageIndex - 1) >= 0) {
-previousPage = (Page)renderQueue.elementAt(pageIndex - 1);
+previousPage = ((RenderQueueEntry)renderQueue
+.elementAt(pageIndex - 1)).getPage();
PageSequence currentPS = current.getPageSequence();
-// System.out.println("Current PS = '" + currentPS + "'");
PageSequence previousPS = previousPage.getPageSequence();
-// System.out.println("Previous PS = '" + previousPS + "'");
if (isWithinPageSequence &&!previousPS.equals(currentPS)) {
-// System.out.println("Outside page sequence");
previousPage = null;
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo/flow RetrieveMarker.java
pietsch 2002/07/18 17:30:14
Modified:src/org/apache/fop/apps Tag: fop-0_20_2-maintain
StreamRenderer.java
src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain
RetrieveMarker.java
Log:
Fixed marker retrival to a large degree. It works
now for arbitrary retrival boundaries as long as
the referenced page is still in the renderer queue
(could be enforced by forward referencing page
number citation)
Markers which are immediate children of a flow
still don't work.
Revision ChangesPath
No revision
No revision
1.6.2.6 +46 -33xml-fop/src/org/apache/fop/apps/Attic/StreamRenderer.java
Index: StreamRenderer.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/Attic/StreamRenderer.java,v
retrieving revision 1.6.2.5
retrieving revision 1.6.2.6
diff -u -r1.6.2.5 -r1.6.2.6
--- StreamRenderer.java 18 Jul 2002 22:47:41 - 1.6.2.5
+++ StreamRenderer.java 19 Jul 2002 00:30:13 - 1.6.2.6
@@ -318,42 +318,55 @@
}
}
- public Page getNextPage(Page current, boolean isWithinPageSequence,
-boolean isFirstCall) {
-Page nextPage = null;
-int pageIndex = 0;
-if (isFirstCall)
-pageIndex = renderQueue.size();
-else
-pageIndex = renderQueue.indexOf(current);
-if ((pageIndex + 1) < renderQueue.size()) {
-nextPage = ((RenderQueueEntry)renderQueue
-.elementAt(pageIndex + 1)).getPage();
-if (isWithinPageSequence
-
&&!nextPage.getPageSequence().equals(current.getPageSequence())) {
-nextPage = null;
-}
-}
-return nextPage;
-}
+ // unused and broken
+// public Page getNextPage(Page current, boolean isWithinPageSequence,
+// boolean isFirstCall) {
+// Page nextPage = null;
+// int pageIndex = 0;
+// if (isFirstCall)
+// pageIndex = renderQueue.size();
+// else
+// pageIndex = renderQueue.indexOf(current);
+// if ((pageIndex + 1) < renderQueue.size()) {
+// nextPage = ((RenderQueueEntry)renderQueue
+// .elementAt(pageIndex + 1)).getPage();
+// if (isWithinPageSequence
+//
&&!nextPage.getPageSequence().equals(current.getPageSequence())) {
+// nextPage = null;
+// }
+// }
+// return nextPage;
+// }
public Page getPreviousPage(Page current, boolean isWithinPageSequence,
boolean isFirstCall) {
-Page previousPage = null;
-int pageIndex = 0;
-if (isFirstCall)
-pageIndex = renderQueue.size();
-else
-pageIndex = renderQueue.indexOf(current);
-if ((pageIndex - 1) >= 0) {
-previousPage = ((RenderQueueEntry)renderQueue
-.elementAt(pageIndex - 1)).getPage();
-PageSequence currentPS = current.getPageSequence();
-PageSequence previousPS = previousPage.getPageSequence();
-if (isWithinPageSequence &&!previousPS.equals(currentPS)) {
-previousPage = null;
+if (isFirstCall) {
+int pageIndex = renderQueue.size();
+if (pageIndex > 0) {
+Page previousPage = ((RenderQueueEntry)renderQueue
+ .elementAt(pageIndex - 1)).getPage();
+PageSequence currentPS = current.getPageSequence();
+PageSequence previousPS = previousPage.getPageSequence();
+if (!isWithinPageSequence || previousPS.equals(currentPS)) {
+ return previousPage;
+}
+}
+} else {
+for (int pageIndex=renderQueue.size()-1;pageIndex>0;pageIndex--) {
+Page page = ((RenderQueueEntry)renderQueue
+ .elementAt(pageIndex)).getPage();
+if (current.equals(page)) {
+Page previousPage = ((RenderQueueEntry)renderQueue
+ .elementAt(pageIndex - 1)).getPage();
+PageSequence currentPS = current.getPageSequence();
+PageSequence previousPS = previousPage.getPageSequence();
+if (!isWithinPageSequence || previousPS.equals(currentPS)) {
+return previousPage;
+
cvs commit: xml-fop/src/org/apache/fop/svg SVGObj.java
pietsch 2002/07/23 18:06:26
Modified:src/org/apache/fop/extensions Tag: fop-0_20_2-maintain
Label.java Outline.java
src/org/apache/fop/fo Tag: fop-0_20_2-maintain
ColorProfile.java Declarations.java FObj.java
FObjMixed.java Title.java
ToBeImplementedElement.java Unknown.java
UnknownXMLObj.java XMLElement.java XMLObj.java
src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain
BasicLink.java BidiOverride.java Block.java
BlockContainer.java Character.java
ExternalGraphic.java Float.java Flow.java
Footnote.java FootnoteBody.java
InitialPropertySet.java Inline.java
InlineContainer.java InstreamForeignObject.java
Leader.java ListBlock.java ListItem.java
ListItemBody.java ListItemLabel.java Marker.java
MultiCase.java MultiProperties.java
MultiPropertySet.java MultiSwitch.java
MultiToggle.java PageNumber.java
PageNumberCitation.java RetrieveMarker.java
StaticContent.java Table.java TableAndCaption.java
TableBody.java TableCaption.java TableCell.java
TableColumn.java TableFooter.java TableHeader.java
TableRow.java Wrapper.java
src/org/apache/fop/fo/pagination Tag: fop-0_20_2-maintain
ConditionalPageMasterReference.java
LayoutMasterSet.java PageSequence.java
PageSequenceMaster.java Region.java
RegionAfter.java RegionBefore.java RegionBody.java
RegionEnd.java RegionStart.java
RepeatablePageMasterAlternatives.java
RepeatablePageMasterReference.java Root.java
SimplePageMaster.java
SinglePageMasterReference.java
src/org/apache/fop/svg Tag: fop-0_20_2-maintain SVGObj.java
Log:
Removed 'name' field and diverse getElementName() methods,
replaced by getName() returning a string constant.
A few minor cosmetic changes.
Revision ChangesPath
No revision
No revision
1.2.2.2 +4 -1 xml-fop/src/org/apache/fop/extensions/Label.java
Index: Label.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/extensions/Label.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- Label.java16 Jul 2002 20:04:43 - 1.2.2.1
+++ Label.java24 Jul 2002 01:06:21 - 1.2.2.2
@@ -39,5 +39,8 @@
return textBuffer.toString();
}
+public String getName() {
+return "fop:label";
+}
}
1.4.2.1 +4 -1 xml-fop/src/org/apache/fop/extensions/Outline.java
Index: Outline.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/extensions/Outline.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- Outline.java 21 Aug 2001 08:26:11 - 1.4
+++ Outline.java 24 Jul 2002 01:06:21 - 1.4.2.1
@@ -103,6 +103,9 @@
return _internalDestination;
}
+public String getName() {
+return "fop:outline";
+}
}
No revision
No revision
1.4.2.1 +6 -10 xml-fop/src/org/apache/fop/fo/ColorProfile.java
Index: ColorProfile.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/ColorProfile.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- ColorProfile.java 20 Aug 2001 11:19:22 - 1.4
+++ ColorProfile.java 24 Jul 2002 01:06:21 - 1.4.2.1
@@ -11,21 +11,15 @@
import org.apache.fop.fo.*;
import org.apache.fop.fo.flow.*;
import org.apache.fop.fo.properties.*;
-import org.apache.fop.layout.AreaTree;
import org.apache.fop.apps.FOPException;
-/**
- * The fo:root formatting object. Contains page masters, root extensions,
- * page-sequences.
- */
-public class ColorProfile extends ToBeImplementedElement {
+public class ColorProfile extends FObj {
public static class Maker extends FObj.Maker {
public FObj make(FObj parent,
PropertyList propertyList) throws FOPException {
return new Col
cvs commit: xml-fop/src/org/apache/fop/fo/pagination PageSequence.java
pietsch 2002/07/23 19:39:45
Modified:src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain
Flow.java StaticContent.java
src/org/apache/fop/fo/pagination Tag: fop-0_20_2-maintain
PageSequence.java
Added: src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain
AbstractFlow.java
Log:
Removed fo:flow hackery. Simplified structure checking and
page layout loop.
Some minor cosmetic changes.
Revision ChangesPath
No revision
No revision
1.24.2.3 +2 -181xml-fop/src/org/apache/fop/fo/flow/Flow.java
Index: Flow.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Flow.java,v
retrieving revision 1.24.2.2
retrieving revision 1.24.2.3
diff -u -r1.24.2.2 -r1.24.2.3
--- Flow.java 24 Jul 2002 01:06:22 - 1.24.2.2
+++ Flow.java 24 Jul 2002 02:39:44 - 1.24.2.3
@@ -12,82 +12,25 @@
import org.apache.fop.fo.properties.*;
import org.apache.fop.fo.pagination.*;
import org.apache.fop.layout.Area;
-import org.apache.fop.layout.BodyAreaContainer;
import org.apache.fop.apps.FOPException;
-// Java
-import java.util.Hashtable;
-import java.util.Enumeration;
-import java.util.Vector;
-
-public class Flow extends FObj {
+public class Flow extends AbstractFlow {
public static class Maker extends FObj.Maker {
public FObj make(FObj parent,
PropertyList propertyList) throws FOPException {
return new Flow(parent, propertyList);
}
-
}
public static FObj.Maker maker() {
return new Flow.Maker();
}
-/**
- * PageSequence container
- */
-private PageSequence pageSequence;
-
-/**
- * Area in which we lay out our kids
- */
-private Area area;
-
-/**
- * Vector to store snapshot
- */
-private Vector markerSnapshot;
-
-/**
- * flow-name attribute
- */
-private String _flowName;
-
-/**
- * Content-width of current column area during layout
- */
-private int contentWidth;
-
-private Status _status = new Status(Status.AREA_FULL_NONE);
-
-
protected Flow(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
-
-if (parent.getName().equals("fo:page-sequence")) {
-this.pageSequence = (PageSequence)parent;
-} else {
-throw new FOPException("flow must be child of page-sequence, not "
- + parent.getName());
-}
setFlowName(getProperty("flow-name").getString());
-
-// according to communication from Paul Grosso (XSL-List,
-// 001228, Number 406), confusion in spec section 6.4.5 about
-// multiplicity of fo:flow in XSL 1.0 is cleared up - one (1)
-// fo:flow per fo:page-sequence only.
-
-if (pageSequence.isFlowSet()) {
-if (getName().equals("fo:flow")) {
-throw new FOPException("Only a single fo:flow permitted"
- + " per fo:page-sequence");
-} else {
-throw new FOPException(getName()
- + " not allowed after fo:flow");
-}
-}
pageSequence.addFlow(this);
}
@@ -105,128 +48,6 @@
_flowName = name;
}
-}
-
-public String getFlowName() {
-return _flowName;
-}
-
-public Status layout(Area area) throws FOPException {
-return layout(area, null);
-
-}
-
-public Status layout(Area area, Region region) throws FOPException {
-if (this.marker == START) {
-this.marker = 0;
-}
-
-// flow is *always* laid out into a BodyAreaContainer
-BodyAreaContainer bac = (BodyAreaContainer)area;
-
-boolean prevChildMustKeepWithNext = false;
-Vector pageMarker = this.getMarkerSnapshot(new Vector());
-
-int numChildren = this.children.size();
-if (numChildren == 0) {
-throw new FOPException("fo:flow must contain block-level children");
-}
-for (int i = this.marker; i < numChildren; i++) {
-FObj fo = (FObj)children.elementAt(i);
-
-if (bac.isBalancingRequired(fo)) {
-// reset the the just-done span area in preparation
-// for a backtrack for balancing
-bac.resetSpanArea();
-
-this.rollback(markerSnaps
cvs commit: xml-fop/src/org/apache/fop/fo/pagination PageSequence.java
pietsch 2002/07/27 03:50:19
Modified:src/org/apache/fop/fo/pagination Tag: fop-0_20_2-maintain
PageSequence.java
Log:
Check whether there is a flow in a page sequence.
Revision ChangesPath
No revision
No revision
1.39.2.7 +7 -4 xml-fop/src/org/apache/fop/fo/pagination/PageSequence.java
Index: PageSequence.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/PageSequence.java,v
retrieving revision 1.39.2.6
retrieving revision 1.39.2.7
diff -u -r1.39.2.6 -r1.39.2.7
--- PageSequence.java 24 Jul 2002 02:39:44 - 1.39.2.6
+++ PageSequence.java 27 Jul 2002 10:50:18 - 1.39.2.7
@@ -202,6 +202,9 @@
* Runs the formatting of this page sequence into the given area tree
*/
public void format(AreaTree areaTree) throws FOPException {
+if (flow == null) {
+throw new FOPException("No flow in page-sequence");
+}
PageSequence previousPageSequence=this.root.getPageSequence();
if( previousPageSequence!=null ) {
if (previousPageSequence.forcePageCountType == ForcePageCount.AUTO) {
@@ -310,11 +313,11 @@
* @return a Page layout object based on the page master selected from the
params
*/
private Page makePage(AreaTree areaTree,
- boolean isBlankPage,
- Page currentPage)
+ boolean isBlankPage,
+ Page currentPage)
throws FOPException {
if (this.pageSequenceMaster!=null) {
-this.currentSimplePageMaster=this.pageSequenceMaster
+this.currentSimplePageMaster = this.pageSequenceMaster
.getNextSimplePageMaster(((this.currentPageNumber % 2)==1),
isBlankPage);
Region region = currentSimplePageMaster
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo/flow Block.java Table.java
pietsch 2002/07/27 13:08:29
Modified:src/org/apache/fop/fo Tag: fop-0_20_2-maintain FONode.java
src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain
Block.java Table.java
Log:
Removed some unused code
Revision ChangesPath
No revision
No revision
1.21.2.4 +1 -12 xml-fop/src/org/apache/fop/fo/FONode.java
Index: FONode.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FONode.java,v
retrieving revision 1.21.2.3
retrieving revision 1.21.2.4
diff -u -r1.21.2.3 -r1.21.2.4
--- FONode.java 19 Jul 2002 20:41:00 - 1.21.2.3
+++ FONode.java 27 Jul 2002 20:08:28 - 1.21.2.4
@@ -61,9 +61,6 @@
protected int forcedStartOffset = 0;
protected int forcedWidth = 0;
-protected int widows = 0;
-protected int orphans = 0;
-
protected LinkSet linkSet;
// count of areas generated-by/returned-by
@@ -117,14 +114,6 @@
for (int i = 0; i < numChildren; i++) {
((FONode)children.elementAt(i)).resetMarker();
}
-}
-
-public void setWidows(int wid) {
-widows = wid;
-}
-
-public void setOrphans(int orph) {
-orphans = orph;
}
public void removeAreas() {
No revision
No revision
1.41.2.6 +1 -68 xml-fop/src/org/apache/fop/fo/flow/Block.java
Index: Block.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Block.java,v
retrieving revision 1.41.2.5
retrieving revision 1.41.2.6
diff -u -r1.41.2.5 -r1.41.2.6
--- Block.java24 Jul 2002 01:06:22 - 1.41.2.5
+++ Block.java27 Jul 2002 20:08:28 - 1.41.2.6
@@ -53,8 +53,6 @@
int spaceAfter;
int textIndent;
int keepWithNext;
-int blockWidows;
-int blockOrphans;
int areaHeight = 0;
int contentWidth = 0;
@@ -111,34 +109,6 @@
// Common Relative Position Properties
RelativePositionProps mRelProps = propMgr.getRelativePositionProps();
-// this.properties.get("break-after");
-// this.properties.get("break-before");
-// this.properties.get("color");
-// this.properties.get("text-depth");
-// this.properties.get("text-altitude");
-// this.properties.get("hyphenation-keep");
-// this.properties.get("hyphenation-ladder-count");
-// this.properties.get("id");
-// this.properties.get("keep-together");
-// this.properties.get("keep-with-next");
-// this.properties.get("keep-with-previous");
-// this.properties.get("last-line-end-indent");
-// this.properties.get("linefeed-treatment");
-// this.properties.get("line-height");
-// this.properties.get("line-height-shift-adjustment");
-// this.properties.get("line-stacking-strategy");
-// this.properties.get("orphans");
-// this.properties.get("white-space-treatment");
-// this.properties.get("span");
-// this.properties.get("text-align");
-// this.properties.get("text-align-last");
-// this.properties.get("text-indent");
-// this.properties.get("visibility");
-// this.properties.get("white-space-collapse");
-// this.properties.get("widows");
-// this.properties.get("wrap-option");
-// this.properties.get("z-index");
-
this.align = this.properties.get("text-align").getEnum();
this.alignLast = this.properties.get("text-align-last").getEnum();
this.breakAfter = this.properties.get("break-after").getEnum();
@@ -157,13 +127,6 @@
this.keepWithNext =
this.properties.get("keep-with-next").getEnum();
-this.blockWidows =
-this.properties.get("widows").getNumber().intValue();
-this.blockOrphans =
-this.properties.get("orphans").getNumber().intValue();
-
-
-
this.id = this.properties.get("id").getString();
if (area instanceof BlockArea) {
@@ -182,36 +145,6 @@
return new Status(breakBeforeStatu
cvs commit: xml-fop/src/org/apache/fop/pdf ASCII85Filter.java
pietsch 2002/08/01 07:52:49
Modified:src/org/apache/fop/pdf Tag: fop-0_20_2-maintain
ASCII85Filter.java
Log:
Simplified ASCII85Filter computation, thereby hopefully
working around JVM bugs
Revision ChangesPath
No revision
No revision
1.3.2.2 +30 -18xml-fop/src/org/apache/fop/pdf/ASCII85Filter.java
Index: ASCII85Filter.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/pdf/ASCII85Filter.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- ASCII85Filter.java31 May 2002 00:17:16 - 1.3.2.1
+++ ASCII85Filter.java1 Aug 2002 14:52:49 - 1.3.2.2
@@ -17,9 +17,9 @@
private static final String ASCII85_EOD = "~>";
private static final long base85_4 = 85;
-private static final long base85_3 = base85_4 * base85_4;
-private static final long base85_2 = base85_3 * base85_4;
-private static final long base85_1 = base85_2 * base85_4;
+// private static final long base85_3 = base85_4 * base85_4;
+// private static final long base85_2 = base85_3 * base85_4;
+// private static final long base85_1 = base85_2 * base85_4;
@@ -131,22 +131,34 @@
};
return result;
} else {
-byte c1 = (byte)((word / base85_1) & 0xFF);
-byte c2 = (byte)(((word - (c1 * base85_1)) / base85_2) & 0xFF);
-byte c3 =
-(byte)(((word - (c1 * base85_1) - (c2 * base85_2)) / base85_3)
- & 0xFF);
-byte c4 =
-(byte)(((word - (c1 * base85_1) - (c2 * base85_2) - (c3 *
base85_3)) / base85_4)
- & 0xFF);
-byte c5 =
-(byte)(((word - (c1 * base85_1) - (c2 * base85_2) - (c3 * base85_3)
- (c4 * base85_4)))
- & 0xFF);
+// byte c1 = (byte)((word / base85_1) & 0xFF);
+// byte c2 = (byte)(((word - (c1 * base85_1)) / base85_2) & 0xFF);
+// byte c3 =
+// (byte)(((word - (c1 * base85_1) - (c2 * base85_2)) / base85_3)
+// & 0xFF);
+// byte c4 =
+// (byte)(((word - (c1 * base85_1) - (c2 * base85_2) - (c3 *
base85_3)) / base85_4)
+// & 0xFF);
+// byte c5 =
+// (byte)(((word - (c1 * base85_1) - (c2 * base85_2) - (c3 *
base85_3) - (c4 * base85_4)))
+// & 0xFF);
+
+// byte[] ret = {
+// (byte)(c1 + ASCII85_START), (byte)(c2 + ASCII85_START),
+// (byte)(c3 + ASCII85_START), (byte)(c4 + ASCII85_START),
+// (byte)(c5 + ASCII85_START)
+byte c5 = (byte)((word % base85_4) + ASCII85_START);
+word = word / base85_4;
+byte c4 = (byte)((word % base85_4) + ASCII85_START);
+word = word / base85_4;
+byte c3 = (byte)((word % base85_4) + ASCII85_START);
+word = word / base85_4;
+byte c2 = (byte)((word % base85_4) + ASCII85_START);
+word = word / base85_4;
+byte c1 = (byte)((word % base85_4) + ASCII85_START);
byte[] ret = {
-(byte)(c1 + ASCII85_START), (byte)(c2 + ASCII85_START),
-(byte)(c3 + ASCII85_START), (byte)(c4 + ASCII85_START),
-(byte)(c5 + ASCII85_START)
+ c1 , c2, c3, c4, c5
};
for (int i = 0; i < ret.length; i++) {
if (ret[i] < 33 || ret[i] > 117) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/layout LineArea.java
pietsch 2002/08/09 14:28:56
Modified:src/org/apache/fop/layout Tag: fop-0_20_2-maintain
LineArea.java
Log:
Fixed width calculation for spaces which are not mapped
by the current font. The calculation will still fail
under certain circumstances (embedded user fonts).
Revision ChangesPath
No revision
No revision
1.53.2.9 +69 -45xml-fop/src/org/apache/fop/layout/Attic/LineArea.java
Index: LineArea.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/Attic/LineArea.java,v
retrieving revision 1.53.2.8
retrieving revision 1.53.2.9
diff -u -r1.53.2.8 -r1.53.2.9
--- LineArea.java 2 Aug 2002 20:28:52 - 1.53.2.8
+++ LineArea.java 9 Aug 2002 21:28:56 - 1.53.2.9
@@ -1208,6 +1208,29 @@
return ret;
}
+private final int getEmWidth() {
+char mappedChar = currentFontState.mapChar('m');
+// the mapping returns '#' for unmapped characters in standard fonts
+// what happens for other fonts?
+if (mappedChar == '#') {
+return 500 * currentFontState.getFontSize();
+} else {
+return currentFontState.width(mappedChar);
+}
+}
+
+private final int getEnWidth() {
+char mappedChar = currentFontState.mapChar('n');
+// the mapping returns '#' for unmapped characters in standard fonts
+// what happens for other fonts?
+if (mappedChar != '#') {
+ // should do something to discover non-proportional fonts
+return (getEmWidth()*9)/10;
+} else {
+return currentFontState.width(mappedChar);
+}
+}
+
/**
* Helper method for getting the width of a unicode char
* from the current fontstate.
@@ -1215,55 +1238,56 @@
* versions of space that might not exists in the font.
*/
private int getCharWidth(char c) {
-int width;
-
-if ((c == '\n') || (c == '\r') || (c == '\t') || (c == '\u00A0')) {
-width = getCharWidth(' ');
+if ((c == '\n') || (c == '\r') || (c == '\t')) {
+return getCharWidth(' ');
} else {
-width = currentFontState.width(currentFontState.mapChar(c));
-if (width <= 0) {
+char mappedChar = currentFontState.mapChar(c);
+if (mappedChar == '#' || mappedChar == 0) {
// Estimate the width of spaces not represented in
// the font
-int em = currentFontState.width(currentFontState.mapChar('m'));
-int en = currentFontState.width(currentFontState.mapChar('n'));
-if (em <= 0)
-em = 500 * currentFontState.getFontSize();
-if (en <= 0)
-en = em - 10;
-
-if (c == ' ')
-width = em;
-if (c == '\u2000')
-width = en;
-if (c == '\u2001')
-width = em;
-if (c == '\u2002')
-width = em / 2;
-if (c == '\u2003')
-width = currentFontState.getFontSize();
-if (c == '\u2004')
-width = em / 3;
-if (c == '\u2005')
-width = em / 4;
-if (c == '\u2006')
-width = em / 6;
-if (c == '\u2007')
-width = getCharWidth(' ');
-if (c == '\u2008')
-width = getCharWidth('.');
-if (c == '\u2009')
-width = em / 5;
-if (c == '\u200A')
-width = 5;
-if (c == '\u200B')
-width = 100;
-if (c == '\u202F')
-width = getCharWidth(' ') / 2;
-if (c == '\u3000')
-width = getCharWidth(' ') * 2;
+if (c == '#') {
+return currentFontState.width(mappedChar);
+} else if (c == ' ') {
+return getEmWidth();
+} else if (c == '\u00A0') {
+
cvs commit: xml-fop/src/org/apache/fop/fo/flow Wrapper.java
pietsch 2002/08/10 11:39:08
Modified:src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain
Wrapper.java
Log:
Wrapper does now set the TextState.
Revision ChangesPath
No revision
No revision
1.4.2.3 +4 -2 xml-fop/src/org/apache/fop/fo/flow/Wrapper.java
Index: Wrapper.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Wrapper.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- Wrapper.java 24 Jul 2002 01:06:23 - 1.4.2.2
+++ Wrapper.java 10 Aug 2002 18:39:08 - 1.4.2.3
@@ -38,9 +38,11 @@
return "fo:wrapper";
}
-public Wrapper(FObj parent, PropertyList propertyList) {
+public Wrapper(FObj parent, PropertyList propertyList)
+ throws FOPException {
super(parent, propertyList);
// check that this occurs inside an fo:flow
+ts = propMgr.getTextDecoration(parent);
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo/flow Block.java Inline.java Leader.java Marker.java Wrapper.java
pietsch 2002/08/10 13:09:40
Modified:src/org/apache/fop/fo Tag: fop-0_20_2-maintain FONode.java
FOText.java FObj.java FObjMixed.java
PropertyManager.java
src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain
Block.java Inline.java Leader.java Marker.java
Wrapper.java
Log:
Better fix for setting TextDecoration.
Changed error handling and detection of markers which
are not initial children of their parent.
Revision ChangesPath
No revision
No revision
1.21.2.6 +6 -1 xml-fop/src/org/apache/fop/fo/FONode.java
Index: FONode.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FONode.java,v
retrieving revision 1.21.2.5
retrieving revision 1.21.2.6
diff -u -r1.21.2.5 -r1.21.2.6
--- FONode.java 2 Aug 2002 20:28:47 - 1.21.2.5
+++ FONode.java 10 Aug 2002 20:09:40 - 1.21.2.6
@@ -202,4 +202,9 @@
((FONode)children.get(this.marker)).rollback(snapshot);
}
+
+public boolean mayPrecedeMarker() {
+return false;
+}
+
}
1.24.2.4 +29 -38xml-fop/src/org/apache/fop/fo/FOText.java
Index: FOText.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FOText.java,v
retrieving revision 1.24.2.3
retrieving revision 1.24.2.4
diff -u -r1.24.2.3 -r1.24.2.4
--- FOText.java 6 Jul 2002 19:05:29 - 1.24.2.3
+++ FOText.java 10 Aug 2002 20:09:40 - 1.24.2.4
@@ -22,53 +22,38 @@
*/
public class FOText extends FONode {
-protected char[] ca;
-protected int length;
+private char[] ca;
-FontState fs;
-float red;
-float green;
-float blue;
-int wrapOption;
-int whiteSpaceCollapse;
-int verticalAlign;
+private FontState fs;
+private float red;
+private float green;
+private float blue;
+private int wrapOption;
+private int whiteSpaceCollapse;
+private int verticalAlign;
// Textdecoration
-protected boolean underlined = false;
-protected boolean overlined = false;
-protected boolean lineThrough = false;
-
-TextState ts;
+private TextState ts;
public FOText(StringBuffer b, FObj parent) {
super(parent);
-this.length = b.length();
-this.ca = new char[this.length];
-b.getChars(0,length,ca,0);
-}
-
-public void setUnderlined(boolean ul) {
-this.underlined = ul;
+this.ca = new char[b.length()];
+b.getChars(0,b.length(),ca,0);
}
-public void setOverlined(boolean ol) {
-this.overlined = ol;
+public void setTextState(TextState ts) {
+this.ts = ts;
}
-public void setLineThrough(boolean lt) {
-this.lineThrough = lt;
-}
-
-
public boolean willCreateArea() {
this.whiteSpaceCollapse =
this.parent.properties.get("white-space-collapse").getEnum();
if (this.whiteSpaceCollapse == WhiteSpaceCollapse.FALSE
-&& length > 0) {
+&& ca.length > 0) {
return true;
}
-for (int i = 0; i < length; i++) {
+for (int i = 0; i < ca.length; i++) {
char ch = ca[i];
if (!((ch == ' ') || (ch == '\n') || (ch == '\r')
|| (ch == '\t'))) {// whitespace
@@ -78,10 +63,21 @@
return false;
}
+public boolean mayPrecedeMarker() {
+for (int i = 0; i < ca.length; i++) {
+char ch = ca[i];
+if ((ch != ' ') || (ch != '\n') || (ch != '\r')
+|| (ch != '\t')) {// whitespace
+return true;
+}
+}
+return false;
+}
+
public Status layout(Area area) throws FOPException {
if (!(area instanceof BlockArea)) {
log.error("text outside block area"
- + new String(ca, 0, length));
+ + new String(ca, 0, ca.length));
return new Status(Status.OK);
}
if (this.marker == START) {
@@ -116,17 +112,12 @@
this.parent.properties.get("wrap-option").getEnum();
this.whiteSpaceCollapse =
this.parent.properties.get("white-space-collapse").getEnum();
-this.ts = new TextState();
-ts.
cvs commit: xml-fop/src/org/apache/fop/layoutmgr StaticContentLayoutManager.java PageLayoutManager.java
pietsch 2002/08/17 16:51:08
Modified:src/org/apache/fop/area RegionReference.java
src/org/apache/fop/fo/flow StaticContent.java
src/org/apache/fop/fo/pagination
ConditionalPageMasterReference.java
LayoutMasterSet.java PageMasterReference.java
PageSequence.java PageSequenceMaster.java
Region.java RepeatablePageMasterAlternatives.java
RepeatablePageMasterReference.java
SimplePageMaster.java
SinglePageMasterReference.java
SubSequenceSpecifier.java
src/org/apache/fop/layoutmgr PageLayoutManager.java
Added: src/org/apache/fop/layoutmgr StaticContentLayoutManager.java
Log:
Attempt at adding static content.
Moved subsequence handling to PageSequenceMaster.
Revision ChangesPath
1.5 +2 -2 xml-fop/src/org/apache/fop/area/RegionReference.java
Index: RegionReference.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/area/RegionReference.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RegionReference.java 17 May 2002 14:47:12 - 1.4
+++ RegionReference.java 17 Aug 2002 23:51:07 - 1.5
@@ -39,7 +39,6 @@
return this.ctm;
}
-
// the list of block areas from the static flow
ArrayList blocks = new ArrayList();
@@ -61,4 +60,5 @@
rr.setIPD(getIPD());
return rr;
}
+
}
1.24 +11 -1 xml-fop/src/org/apache/fop/fo/flow/StaticContent.java
Index: StaticContent.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/StaticContent.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- StaticContent.java20 Jun 2002 09:14:13 - 1.23
+++ StaticContent.java17 Aug 2002 23:51:07 - 1.24
@@ -12,6 +12,7 @@
import org.apache.fop.fo.properties.*;
import org.apache.fop.fo.pagination.*;
import org.apache.fop.apps.FOPException;
+import org.apache.fop.layoutmgr.StaticContentLayoutManager;
public class StaticContent extends Flow {
@@ -32,6 +33,15 @@
super.setFlowName(name);
}
+}
+
+private StaticContentLayoutManager lm;
+
+public StaticContentLayoutManager getLayoutManager() {
+if (lm == null) {
+lm = new StaticContentLayoutManager(this);
+}
+return lm;
}
}
1.11 +40 -68
xml-fop/src/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
Index: ConditionalPageMasterReference.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ConditionalPageMasterReference.java 7 Aug 2002 16:54:57 - 1.10
+++ ConditionalPageMasterReference.java 17 Aug 2002 23:51:07 - 1.11
@@ -43,9 +43,9 @@
validateParent(parent);
-setPagePosition(this.properties.get("page-position").getEnum());
-setOddOrEven(this.properties.get("odd-or-even").getEnum());
-setBlankOrNotBlank(this.properties.get("blank-or-not-blank").getEnum());
+this.pagePosition = this.properties.get("page-position").getEnum();
+this.oddOrEven = this.properties.get("odd-or-even").getEnum();
+this.blankOrNotBlank = this.properties.get("blank-or-not-blank").getEnum();
}
protected void setMasterName(String masterName) {
@@ -64,77 +64,49 @@
* checks the page number and emptyness to determine if this
* matches.
*/
-protected boolean isValid(int currentPageNumber, boolean thisIsFirstPage,
+protected boolean isValid(boolean isOddPage, boolean isFirstPage,
boolean isEmptyPage) {
// page-position
-boolean okOnPagePosition = true;// default is 'any'
-switch (getPagePosition()) {
-case PagePosition.FIRST:
-if (!thisIsFirstPage)
-okOnPagePosition = false;
-break;
-case PagePosition.LAST:
-// how the hell do you know at this point?
-getLogger().warn("LAST PagePosition NYI");
-okOnPagePosition = true;
-break;
-case PagePosition.REST:
-if (thisIsFirstPage)
-okOnPagePosition = false;
-break;
-
cvs commit: xml-fop/src/org/apache/fop/fo/pagination PageSequence.java
pietsch 2002/08/21 15:10:53
Modified:src/org/apache/fop/fo/pagination Tag: fop-0_20_2-maintain
PageSequence.java
Log:
Fixed page number setup for consecutive page sequences.
Revision ChangesPath
No revision
No revision
1.39.2.9 +3 -1 xml-fop/src/org/apache/fop/fo/pagination/PageSequence.java
Index: PageSequence.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/PageSequence.java,v
retrieving revision 1.39.2.8
retrieving revision 1.39.2.9
diff -u -r1.39.2.8 -r1.39.2.9
--- PageSequence.java 2 Aug 2002 20:28:50 - 1.39.2.8
+++ PageSequence.java 21 Aug 2002 22:10:52 - 1.39.2.9
@@ -224,6 +224,8 @@
previousPageSequence.makePage(areaTree,true,null);
}
currentPageNumber = firstPageNumber;
+} else {
+currentPageNumber = previousPageSequence.currentPageNumber;
}
} else {
currentPageNumber = previousPageSequence.currentPageNumber;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/image FopImageFactory.java
pietsch 2002/09/17 13:19:29
Modified:src/org/apache/fop/image Tag: fop-0_20_2-maintain
FopImageFactory.java
Log:
Added method to clear the image cache to FopImageFactory.
Revision ChangesPath
No revision
No revision
1.25.2.4 +7 -1 xml-fop/src/org/apache/fop/image/Attic/FopImageFactory.java
Index: FopImageFactory.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/image/Attic/FopImageFactory.java,v
retrieving revision 1.25.2.3
retrieving revision 1.25.2.4
diff -u -r1.25.2.3 -r1.25.2.4
--- FopImageFactory.java 2 Aug 2002 20:28:51 - 1.25.2.3
+++ FopImageFactory.java 17 Sep 2002 20:19:29 - 1.25.2.4
@@ -197,5 +197,11 @@
return (FopImage)imageInstance;
}
+/**
+ * Clear the image cache.
+ */
+public static synchronized void resetCache() {
+m_urlMap.clear();
+}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo FObjMixed.java
pietsch 2002/09/17 13:21:32
Modified:src/org/apache/fop/fo Tag: fop-0_20_2-maintain
FObjMixed.java
Log:
Fixed problem with empty text buffer.
Revision ChangesPath
No revision
No revision
1.12.2.8 +2 -2 xml-fop/src/org/apache/fop/fo/FObjMixed.java
Index: FObjMixed.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FObjMixed.java,v
retrieving revision 1.12.2.7
retrieving revision 1.12.2.8
diff -u -r1.12.2.7 -r1.12.2.8
--- FObjMixed.java10 Aug 2002 20:09:40 - 1.12.2.7
+++ FObjMixed.java17 Sep 2002 20:21:32 - 1.12.2.8
@@ -41,7 +41,7 @@
}
private final void finalizeText() {
-if (textBuffer!=null) {
+if (textBuffer != null && textBuffer.length() > 0) {
FOText ft = new FOText(textBuffer, this);
ft.setTextState(textState);
super.addChild(ft);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/apps CommandLineOptions.java FOInputHandler.java InputHandler.java Options.java TraxInputHandler.java XSLTInputHandler.java
pietsch 2002/09/17 15:01:07
Modified:src/org/apache/fop/apps Tag: fop-0_20_2-maintain
CommandLineOptions.java FOInputHandler.java
InputHandler.java Options.java
TraxInputHandler.java XSLTInputHandler.java
Log:
Preliminarily added additional constructors to Options
and InputHandlers to provide more flexibility for
data and XSLT input sources.
Revision ChangesPath
No revision
No revision
1.14.2.7 +3 -2 xml-fop/src/org/apache/fop/apps/CommandLineOptions.java
Index: CommandLineOptions.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/CommandLineOptions.java,v
retrieving revision 1.14.2.6
retrieving revision 1.14.2.7
diff -u -r1.14.2.6 -r1.14.2.7
--- CommandLineOptions.java 2 Aug 2002 20:28:46 - 1.14.2.6
+++ CommandLineOptions.java 17 Sep 2002 22:01:04 - 1.14.2.7
@@ -370,7 +370,8 @@
/**
*
*/
-public InputHandler getInputHandler() {
+public InputHandler getInputHandler()
+ throws FOPException {
switch (inputmode) {
case FO_INPUT:
return new FOInputHandler(fofile);
1.6.2.1 +5 -1 xml-fop/src/org/apache/fop/apps/FOInputHandler.java
Index: FOInputHandler.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/FOInputHandler.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- FOInputHandler.java 21 Aug 2001 06:18:54 - 1.6
+++ FOInputHandler.java 17 Sep 2002 22:01:05 - 1.6.2.1
@@ -40,5 +40,9 @@
return super.createParser();
}
+public void run(Driver driver) throws FOPException {
+throw new FOPException("not implemented: FOInputHandler.run(Driver)");
+}
+
}
1.5.2.2 +2 -1 xml-fop/src/org/apache/fop/apps/InputHandler.java
Index: InputHandler.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/InputHandler.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- InputHandler.java 25 Mar 2002 18:08:27 - 1.5.2.1
+++ InputHandler.java 17 Sep 2002 22:01:05 - 1.5.2.2
@@ -26,6 +26,7 @@
abstract public InputSource getInputSource();
abstract public XMLReader getParser() throws FOPException;
+abstract public void run(Driver driver) throws FOPException;
static public InputSource urlInputSource(URL url) {
1.9.2.1 +34 -17xml-fop/src/org/apache/fop/apps/Attic/Options.java
Index: Options.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/Attic/Options.java,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- Options.java 10 Aug 2001 08:18:43 - 1.9
+++ Options.java 17 Sep 2002 22:01:06 - 1.9.2.1
@@ -31,6 +31,16 @@
initOptions();
}
+public Options(InputStream userConfig) throws FOPException {
+this();
+this.loadUserconfiguration(userConfig);
+}
+
+public Options(InputSource userConfig) throws FOPException {
+this();
+this.loadUserconfiguration(userConfig);
+}
+
public Options(File userConfigFile) throws FOPException {
this();
this.loadUserconfiguration(userConfigFile);
@@ -147,24 +157,31 @@
}
public void loadUserconfiguration(File userConfigFile) {
-// read user configuration file
if (userConfigFile != null) {
-MessageHandler.logln("reading user configuration file");
-ConfigurationReader reader =
-new
ConfigurationReader(InputHandler.fileInputSource(userConfigFile));
+loadUserconfiguration(InputHandler.fileInputSource(userConfigFile));
+}
+}
+
+public void loadUserconfiguration(InputStream userConfig) {
+loadUserconfiguration(new InputSource(userConfig));
+}
+
+public void loadUserconfiguration(InputSource userConfigSource) {
+// read user configuration
+ConfigurationReader reader =
+new ConfigurationReader(userConfigSource);
+if (errorDump) {
+reader.setDumpError(true);
+}
+try {
+reader.start();
+} catch (org.apache.fop.apps.FOPException error) {
+MessageHandler.errorln("Could not load user configuration "
+ + userConfigSo
cvs commit: xml-fop/src/org/apache/fop/fo/flow TableRow.java
pietsch 2002/09/26 15:17:59
Modified:src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain
TableRow.java
Log:
Moved table row ID creation so that the ID will always be created
if the row layout restarts.
PR: 12876
Revision ChangesPath
No revision
No revision
1.51.2.6 +3 -6 xml-fop/src/org/apache/fop/fo/flow/TableRow.java
Index: TableRow.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableRow.java,v
retrieving revision 1.51.2.5
retrieving revision 1.51.2.6
diff -u -r1.51.2.5 -r1.51.2.6
--- TableRow.java 26 Sep 2002 21:09:19 - 1.51.2.5
+++ TableRow.java 26 Sep 2002 22:17:58 - 1.51.2.6
@@ -209,8 +209,6 @@
}
public Status layout(Area area) throws FOPException {
-boolean configID = false;
-
if (this.marker == BREAK_AFTER) {
return new Status(Status.OK);
}
@@ -226,9 +224,9 @@
initCellArray();
// check to make sure this row hasn't been partially
// laid out yet (with an id created already)
-area.getIDReferences().createID(id);
-configID = true;
}
+// create ID also in case the row has been reset
+area.getIDReferences().createID(id);
this.marker = 0;
int breakStatus = propMgr.checkBreakBefore(area);
@@ -236,7 +234,6 @@
return new Status(breakStatus);
}
-// if (marker == 0 && configID) {
if (marker == 0) {// KDL: need to do this if thrown or if split?
// configure id
area.getIDReferences().configureID(id, area);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/datatypes IDNode.java IDReferences.java
pietsch 2002/09/30 13:54:23
Modified:src/org/apache/fop/datatypes Tag: fop-0_20_2-maintain
IDNode.java IDReferences.java
Log:
Use the formatted page number string instead of the
raw number in IDReferences/IDNode, so that a
page-number citation gets the formatted number.
Revision ChangesPath
No revision
No revision
1.4.2.2 +7 -6 xml-fop/src/org/apache/fop/datatypes/Attic/IDNode.java
Index: IDNode.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/IDNode.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- IDNode.java 2 Aug 2002 20:28:47 - 1.4.2.1
+++ IDNode.java 30 Sep 2002 20:54:23 - 1.4.2.2
@@ -15,8 +15,9 @@
private PDFGoTo internalLinkGoTo;
-private int pageNumber = -1, xPosition = 0,// x position on page
-yPosition = 0; // y position on page
+private String pageNumber;
+private int xPosition = 0;// x position on page
+private int yPosition = 0;// y position on page
/**
@@ -34,8 +35,8 @@
*
* @param number page number of node
*/
-protected void setPageNumber(int number) {
-pageNumber = number;
+protected void setPageNumber(String pageNumber) {
+this.pageNumber = pageNumber;
}
@@ -45,7 +46,7 @@
* @return page number of this node
*/
public String getPageNumber() {
-return (pageNumber != -1) ? new Integer(pageNumber).toString() : null;
+return pageNumber;
}
1.14.2.2 +3 -3 xml-fop/src/org/apache/fop/datatypes/Attic/IDReferences.java
Index: IDReferences.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/IDReferences.java,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -u -r1.14.2.1 -r1.14.2.2
--- IDReferences.java 2 Aug 2002 20:28:47 - 1.14.2.1
+++ IDReferences.java 30 Sep 2002 20:54:23 - 1.14.2.2
@@ -145,7 +145,7 @@
+ area.getTableCellXOffset() - ID_PADDING,
area.getPage().getBody().getYPosition()
- area.getAbsoluteHeight() + ID_PADDING);
-setPageNumber(id, area.getPage().getNumber());
+setPageNumber(id, area.getPage().getFormattedNumber());
area.getPage().addToIDList(id);
}
}
@@ -307,7 +307,7 @@
* @param id The id whose page number is being set
* @param pageNumber The page number of the specified id
*/
-public void setPageNumber(String id, int pageNumber) {
+public void setPageNumber(String id, String pageNumber) {
IDNode node = (IDNode)idReferences.get(id);
node.setPageNumber(pageNumber);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/render/ps PSRenderer.java
pietsch 2002/10/09 12:30:21
Modified:src/org/apache/fop/render/ps Tag: fop-0_20_2-maintain
PSRenderer.java
Log:
Fixed sloppy passing of StringBuffer which causes problems if
debug information is generated.
PR:13433
Submitted by: [EMAIL PROTECTED]
Revision ChangesPath
No revision
No revision
1.15.2.10 +5 -4 xml-fop/src/org/apache/fop/render/ps/PSRenderer.java
Index: PSRenderer.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/ps/PSRenderer.java,v
retrieving revision 1.15.2.9
retrieving revision 1.15.2.10
diff -u -r1.15.2.9 -r1.15.2.10
--- PSRenderer.java 12 Aug 2002 17:05:09 - 1.15.2.9
+++ PSRenderer.java 9 Oct 2002 19:30:20 - 1.15.2.10
@@ -724,10 +724,11 @@
if (area.getFontState().getLetterSpacing() > 0) {
//float f = area.getFontState().getLetterSpacing() * 1000 /
this.currentFontSize;
float f = area.getFontState().getLetterSpacing();
-psString = (new StringBuffer().append(f).append(" 0.0 (").append(sb).
-append(") A")).toString();
+psString = (new StringBuffer().append(f).append(" 0.0 (")
+ .append(sb.toString()).append(") A")).toString();
} else {
-psString = (new StringBuffer("(").append(sb).append(") t")).toString();
+psString = (new StringBuffer("(").append(sb.toString())
+ .append(") t")).toString();
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/apps FOPException.java
pietsch 2003/01/02 12:59:08
Modified:src/org/apache/fop/apps FOPException.java
Log:
Fixed printing Execption delimiters to wrong stream.
Revision ChangesPath
1.10 +3 -3 xml-fop/src/org/apache/fop/apps/FOPException.java
Index: FOPException.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/FOPException.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FOPException.java 30 Jul 2001 20:29:18 - 1.9
+++ FOPException.java 2 Jan 2003 20:59:07 - 1.10
@@ -85,7 +85,7 @@
_exception.printStackTrace(stream);
}
if (getRootException() != null) {
-System.err.println(EXCEPTION_SEPARATOR);
+stream.println(EXCEPTION_SEPARATOR);
getRootException().printStackTrace(stream);
}
}
@@ -99,7 +99,7 @@
_exception.printStackTrace(writer);
}
if (getRootException() != null) {
-System.err.println(EXCEPTION_SEPARATOR);
+writer.println(EXCEPTION_SEPARATOR);
getRootException().printStackTrace(writer);
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/documentation/content/xdocs faq.xml output.xml
pietsch 2003/01/05 11:43:57 Modified:.build.xml src/documentation/content/xdocs faq.xml output.xml Log: Added Ant target for validating xdocs. Some FAQ enhancments. Minor edits to output.xml. Revision ChangesPath 1.69 +62 -0 xml-fop/build.xml Index: build.xml === RCS file: /home/cvs/xml-fop/build.xml,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- build.xml 30 Nov 2002 08:54:25 - 1.68 +++ build.xml 5 Jan 2003 19:43:56 - 1.69 @@ -148,6 +148,7 @@ + @@ -706,5 +707,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.7 +250 -109 xml-fop/src/documentation/content/xdocs/faq.xml Index: faq.xml === RCS file: /home/cvs/xml-fop/src/documentation/content/xdocs/faq.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- faq.xml 12 Dec 2002 10:59:33 - 1.6 +++ faq.xml 5 Jan 2003 19:43:57 - 1.7 @@ -78,9 +78,10 @@ XSLFO is an XML vocabulary that is used to specify a pagination and - other styling for page layout output. The acronym “FO” stands for + other styling for page layout output. The acronym “FO” + stands for Formatting Objects. XSLFO can be - used in conjunction with XSLT to convert + used in conjunction with XSLT to convert from any XML format into a paginated layout ready for printing or displaying. @@ -100,9 +101,9 @@ XSLT describes the transformation of arbitrary XML input into other - XML (like XSLFO), HTML or plain text. The “T” comes from + XML (like XSLFO), HTML or plain text. The “T” comes from Transformation. For historical reasons, a - transformation is often also called a “style sheet”. + transformation is often also called a “style sheet”. Synonyms: XSL transformation, XSL:T, XSL style sheet. @@ -147,9 +148,10 @@ My PNG images don't work. - The Jimi image library, which is used for processing images in PNG and - other formats, was removed from the distribution for licensing - reasons. You have to http://java.sun.com";>download + The Jimi image library, which is by default used for processing + images in PNG and other formats, was removed from the distribution + for licensing reasons. You have to http://java.sun.com";>download and install it by yourself. @@ -157,7 +159,9 @@ I get a NoClassDefFound exception. -This is typically a problem with your classpath. + + This is typically a problem with your classpath. If you are running FOP from the command line: @@ -207,16 +211,23 @@ -Avoid forward references. Forward references cause all -pages from the page with the reference on to be held in memory until -the page with the referenced element is encountered. Common forward +Increase memory settings of the JVM, see for example http://java.sun.com/j2se/1.3/docs/tooldocs/solaris/java.html";>the + -Xmx option. Be aware that it is usually unwise to +increase the memory allocated to the JVM beyond the amount of +physical RAM, it will significantly slow down. YMMV. + + +Avoid forward references. Forward references cause all pages from +the page with the reference on to be held in memory until the +page with the referenced element is encountered. Common forward references are table of contents at the beginning of the document -and the "page N of TOTAL" in footers. Forward -references may be required by the task, however, if you are getting -a memory overflow you should at least check whether this is really -as necessary as claimed. A TOC, for example, could often be placed -at the end of the document without dimishing it's value too much
cvs commit: xml-fop CHANGES
pietsch 2003/01/11 10:24:04 Modified:.Tag: fop-0_20_2-maintain CHANGES Log: Added changes for 0.20.5 Revision ChangesPath No revision No revision 1.10.2.39 +19 -0 xml-fop/CHANGES Index: CHANGES === RCS file: /home/cvs/xml-fop/CHANGES,v retrieving revision 1.10.2.38 retrieving revision 1.10.2.39 diff -u -r1.10.2.38 -r1.10.2.39 --- CHANGES 9 Jan 2003 13:47:25 - 1.10.2.38 +++ CHANGES 11 Jan 2003 18:24:04 - 1.10.2.39 @@ -52,6 +52,25 @@ Submitted by: Stephen Wolke <[EMAIL PROTECTED]> - Added a property on the PostScript renderer for switching between PostScript Level 2 and 3. Default is Level 3. (Jeremias Maerki) +- Improved standard conformance for forced page counts (J.Pietschmann) +- Better error reporting for common problems (invalid page master references, + missing table-body elements) (J.Pietschmann) +- Improved handling of text containing entity references. (J.Pietschmann) +- Made marker references work for markers not from the current page, + with some caveats (J.Pietschmann) +- Simplification of ASCII85 computation, work around for a JVM bug on Linux + (J.Pietschmann) +- Fixed width calculation for spaces (J.Pietschmann) +- Fixed problems with setting text decorations on fo:wrapper. (J.Pietschmann) +- Automatic compilation on Java1.4 (J.Pietschmann) +- More possiblities to pass data to FOP (J.Pietschmann) +- Fixed missing Ids for table rows (#12876) (J.Pietschmann) +- Page number citations are now correctly formatted (#13691) (J.Pietschmann) +- Text decoration and links now work with hyphenated words. (#4511) + (J.Pietschmann) +- Fixed problems with scrambled and lost related to hyphenation (#6042 + and a few others). (J.Pietschmann) +- Fixed wrong space generation related to hyphenation. (J.Pietschmann) == Done since 0.20.3 release - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/render AbstractRenderer.java
pietsch 2003/01/11 10:43:04
Modified:src/org/apache/fop/layout Tag: fop-0_20_2-maintain
LineArea.java
src/org/apache/fop/render Tag: fop-0_20_2-maintain
AbstractRenderer.java
Log:
Added diagnostic for probably dropped text due to unhandled pending inline areas.
Revision ChangesPath
No revision
No revision
1.53.2.12 +3 -2 xml-fop/src/org/apache/fop/layout/Attic/LineArea.java
Index: LineArea.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/Attic/LineArea.java,v
retrieving revision 1.53.2.11
retrieving revision 1.53.2.12
diff -u -r1.53.2.11 -r1.53.2.12
--- LineArea.java 19 Nov 2002 01:04:08 - 1.53.2.11
+++ LineArea.java 11 Jan 2003 18:43:04 - 1.53.2.12
@@ -92,7 +92,8 @@
protected ArrayList pendingAreas = new ArrayList();
/* the width of the pendingAreas */
-protected int pendingWidth = 0;
+/* public for problem check in AbstractRenderer */
+public int pendingWidth = 0;
/* text-decoration of the previous text */
protected boolean prevUlState = false;
No revision
No revision
1.4.2.7 +6 -1 xml-fop/src/org/apache/fop/render/AbstractRenderer.java
Index: AbstractRenderer.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/AbstractRenderer.java,v
retrieving revision 1.4.2.6
retrieving revision 1.4.2.7
diff -u -r1.4.2.6 -r1.4.2.7
--- AbstractRenderer.java 8 Nov 2002 10:25:27 - 1.4.2.6
+++ AbstractRenderer.java 11 Jan 2003 18:43:04 - 1.4.2.7
@@ -451,6 +451,11 @@
* @param area area to render
*/
public void renderLineArea(LineArea area) {
+if (area.pendingWidth>0) {
+log.error("Areas pending, text probably lost. Check Page " +
+ area.getPage().getFormattedNumber() +
+ " and following page.");
+}
int rx = this.currentAreaContainerXPosition + area.getStartIndent();
int ry = this.currentYPosition;
int w = area.getContentWidth();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/apps AWTStarter.java CommandLineOptions.java CommandLineStarter.java Driver.java ErrorHandler.java FOInputHandler.java FOPException.java Fop.java InputHandler.java LayoutHandler.java
pietsch 2003/01/13 13:05:13
Modified:src/org/apache/fop/apps AWTStarter.java
CommandLineOptions.java CommandLineStarter.java
Driver.java ErrorHandler.java FOInputHandler.java
FOPException.java Fop.java InputHandler.java
LayoutHandler.java
Log:
Fixed more style problems.
Revision ChangesPath
1.17 +15 -7 xml-fop/src/org/apache/fop/apps/AWTStarter.java
Index: AWTStarter.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/AWTStarter.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- AWTStarter.java 6 Nov 2002 14:30:15 - 1.16
+++ AWTStarter.java 13 Jan 2003 21:05:12 - 1.17
@@ -1,6 +1,6 @@
/*
* $Id$
- * Copyright (C) 2001-2002 The Apache Software Foundation. All rights reserved.
+ * Copyright (C) 2001-2003 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
*/
@@ -13,8 +13,8 @@
import org.apache.fop.viewer.Translator;
//Java
-import javax.swing.UIManager;
-import java.awt.*;
+import java.awt.Dimension;
+import java.awt.Toolkit;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.util.Locale;
@@ -36,7 +36,13 @@
private Driver driver;
private XMLReader parser;
-public AWTStarter(CommandLineOptions commandLineOptions) throws FOPException {
+/**
+ * Construct an AWTStarter
+ * @param commandLineOptions the parsed command line options
+ * @throws FOPException if anything goes wrong during initialization.
+ */
+public AWTStarter(CommandLineOptions commandLineOptions)
+throws FOPException {
super(commandLineOptions);
init();
}
@@ -44,10 +50,11 @@
private void init() throws FOPException {
//Creates Translator according to the language
String language = commandLineOptions.getLanguage();
-if (language == null)
+if (language == null) {
translator = new Translator(Locale.getDefault());
-else
+} else {
translator = new Translator(new Locale(language, ""));
+}
AWTRenderer renderer = new AWTRenderer(translator);
frame = createPreviewDialog(renderer, translator);
renderer.setComponent(frame);
@@ -61,6 +68,7 @@
/**
* Runs formatting.
+ * @throws FOPException FIXME should not happen.
*/
public void run() throws FOPException {
driver.reset();
1.21 +82 -96xml-fop/src/org/apache/fop/apps/CommandLineOptions.java
Index: CommandLineOptions.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/CommandLineOptions.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- CommandLineOptions.java 31 Oct 2002 17:26:04 - 1.20
+++ CommandLineOptions.java 13 Jan 2003 21:05:12 - 1.21
@@ -1,6 +1,6 @@
/*
* $Id$
- * Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
+ * Copyright (C) 2001-2003 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
*/
@@ -8,19 +8,13 @@
package org.apache.fop.apps;
// java
-import java.util.Vector;
import java.io.File;
import java.io.FileNotFoundException;
-// FOP
-import org.apache.fop.apps.FOPException;
-
// Avalon
import org.apache.avalon.framework.logger.ConsoleLogger;
import org.apache.avalon.framework.logger.Logger;
-import java.io.*;
-
/**
* Options parses the commandline arguments
*/
@@ -54,32 +48,38 @@
private static final int RTF_OUTPUT = 10;
/* show configuration information */
-Boolean dumpConfiguration = Boolean.FALSE;
+private Boolean dumpConfiguration = Boolean.FALSE;
/* suppress any progress information */
-Boolean quiet = Boolean.FALSE;
+private Boolean quiet = Boolean.FALSE;
/* for area tree XML output, only down to block area level */
-Boolean suppressLowLevelAreas = Boolean.FALSE;
+private Boolean suppressLowLevelAreas = Boolean.FALSE;
/* user configuration file */
-File userConfigFile = null;
+private File userConfigFile = null;
/* input fo file */
-File fofile = null;
+private File fofile = null;
/* xsltfile (xslt transformation as input) */
-File xsltfile = null;
+private File xsltfile = null;
/* xml file (xslt transformation as input) */
FOP performance on Win98/JRE 1.3.1
Hello,
(I asked this question on the [EMAIL PROTECTED] list first, but was told to better go
here with it.)
I'm new to xsl-fo and related matters and I've just managed to set up FOP (0.20.2) and
make a few test runs. I'm now wondering a bit about its performance. Parsing a single
test xml document (a docbook chapter) with just a few words in it, transforming it
with the docbook xsl stylesheets and outputting to pdf takes more than 40 seconds.
It's fifteen seconds before I even get the debug line ("[DEBUG]: using SAX parser
org.apache.xerces.parsers.SAXParser"). Afterwards, it says "[DEBUG]: Avg render time:
10600ms/page".
Is this considered normal? It makes me wonder if my FOP installation (or indeed my
Java installation) is set up correctly. Cyril Rognon on the www-xsl-fo list confirmed
he found it rather too slow.
This is on Windows 98, with a 500MHz AMD-K6 processor and 128 MB memory, using FOP
0.20.2 (sorry, I wrongly said 0.20.0 in the earlier mail) and the Java JRE 1.3.1.
What could I do to diagnose the problem better?
Thanks for any pointers,
Lukas Pietsch
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
Re: FOP performance on Win98/JRE 1.3.1
Thanks, James, for the detailed comments. Not that I understood everything of it--I'm afraid I'm rather unexperienced with Java in general. Your suggestions sound quite convincing, only I don't know how to actually carry them out. Now maybe what follows is terribly boring newbie stuff. In that case, perhaps somebody could point me to some relevant tutorial or similar stuff on the web? (1) making the JVM survive a single FOP run or a single document conversion. How? The only way I know of invoking FOP is by saying "java org.apache.fop.apps.Fop" in a .bat program. (2) Adjusting JVM memory settings. How? Okay, I've found something about -Xms and -Xmx commandline parameters, but how do I find out what the present default values are? (3) Eden heap space settings. No idea what those are, let alone how I could change them... (4) Increasing physical memory. Well, okay, I do understand how I could achieve this--just spend a couple of hundred bucks. ;-) But are you really suggesting it's hopeless to run FOP on a 128MB machine? Lukas - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: FOP performance on Win98/JRE 1.3.1
> I use FOP with Xalan and I have noticed that the performance is really > better with the last version of Xalan (the speed is multiply by 10) !!! That sounds interesting. FOP 0.20.2 is being distributed with a file called xalan-2.0.0.jar. Is it technically okay to just go and grab a newer version of a Xalan jar file somwhere and put it in that directory instead of the old one? Lukas (with some revived hope...) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: FOP performance on Win98/JRE 1.3.1
Hello,
okay, here's the result:
with the new version of Xalan (2.2.D14), the .fo to .pdf part of the conversion is
really a good deal faster. ("[DEBUG]: Avg render time: 1050ms/page"). What's still
slow is the preceding docbook-to-.fo conversion. And I've also found out that it makes
no big difference whether I do this with FOP or with xt. It takes about 25 seconds for
the same (tiny) test document either way. So maybe it's really the complexity of the
docbook xsl stylesheets that's the main culprit?
Lukas
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
