DO NOT REPLY [Bug 22391] - endless loop [INFO] area contents overflows area in line
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22391. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22391 endless loop [INFO] area contents overflows area in line --- Additional Comments From [EMAIL PROTECTED] 2003-08-14 17:16 --- This is a topic that I have been spending some of my free time working on without many good answers yet. General spotting of constraint violations of this nature is something that's on the drawing board, though. As the layout system matures, I will be continuing the process of resolving these issues in a general way. Of course, more minds on the issue would help. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
testing DOM input
I created a ExampleDOM2PDF class for general testing and demonstration of FOP's DOM Document handling abilities. It's in the same examples/embedded/java/embedded directory as the other embedded examples. Going against 1.0, the code appears to work fine, so Victor's recent Document-handling changes in Driver doesn't appear to have raised any problems. Glen __ Do you Yahoo!? Yahoo! SiteBuilder - Free, easy-to-use web site design software http://sitebuilder.yahoo.com - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22391] - endless loop [INFO] area contents overflows area in line
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22391. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22391 endless loop [INFO] area contents overflows area in line [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Additional Comments From [EMAIL PROTECTED] 2003-08-13 21:11 --- The problem is this setting generated by DocBookXSL: provisional-distance-between-starts=2em provisional-label-separation=0.25in on the list-block. This leaves just 2pt for the text, which is to small to hold even an 'e'. I'm not sure whether we can do anything about this (except detecting and breaking out of the loop). - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: xml-fop/examples/embedding/java/embedding ExampleDOM2PDF.java
gmazza 2003/08/13 16:16:14
Added: examples/embedding/java/embedding ExampleDOM2PDF.java
Log:
Created a simple example using the DOM Level 2 API for testing/demonstrating FOP's
DOM Document-processing capabilities.
Revision ChangesPath
1.1 xml-fop/examples/embedding/java/embedding/ExampleDOM2PDF.java
Index: ExampleDOM2PDF.java
===
/*
* $Id
*
*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 embedding;
//Java
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
//JAXP
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.DocumentBuilder;
// DOM
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.Text;
// Avalon
import org.apache.avalon.framework.ExceptionUtil;
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;
/**
* This class demonstrates the conversion of a DOM Document to PDF
* using JAXP (XSLT) and FOP (XSL-FO).
*/
public class ExampleDOM2PDF {
/** xsl-fo namespace URI */
protected static String foNS = http://www.w3.org/1999/XSL/Format;;
/**
* Converts a DOM Document to a PDF file using FOP.
* @param doc the DOM Document
* @param pdf the target PDF file
* @throws IOException In case of an I/O problem
* @throws FOPException In case of a FOP problem
*/
public void convertDOM2PDF(Document xslfoDoc, File pdf)
throws IOException, FOPException {
//Construct driver
Driver driver = new Driver();
//Setup logger
Logger logger = new ConsoleLogger(ConsoleLogger.LEVEL_INFO);
driver.enableLogging(logger);
driver.initialize();
//Setup Renderer (output format)
Driver / FOTreeHandler changes
I just committed another relatively high-risk change, although on this one I was able to see that it seems to work fine for my basic testing after the change. The essence of the change is that the logic that starts layout and rendering now lives in Driver instead of FOTreeHandler. FOTreeHandler fires events when it comes to the end of a page-sequence or document, and Driver now receives those events and fires up layout. In other words FOTreeHandler now works in a SAX-like way, streaming page-sequence objects to whomever cares to implement the appropriate interface. This gets us a large step closer to having FO Tree building be a standalone process. The bad news is that some of the stuff moved to Driver will need to be moved again after we get the Control objects aligned. Please let me know if you see any problems. Victor Mote - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/apps Driver.java
vmote 2003/08/11 10:44:15
Modified:src/java/org/apache/fop/apps Driver.java
Log:
some javadoc changes
Revision ChangesPath
1.18 +7 -7 xml-fop/src/java/org/apache/fop/apps/Driver.java
Index: Driver.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Driver.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Driver.java 5 Aug 2003 22:39:51 - 1.17
+++ Driver.java 11 Aug 2003 17:44:15 - 1.18
@@ -197,7 +197,7 @@
private Renderer renderer;
/**
- * the structure handler
+ * the SAX ContentHandler
*/
private FOInputHandler foInputHandler;
@@ -510,12 +510,12 @@
}
/**
- * Returns the tree builder (a SAX ContentHandler).
- *
- * Used in situations where SAX is used but not via a FOP-invoked
- * SAX parser. A good example is an XSLT engine that fires SAX
- * events but isn't a SAX Parser itself.
- * @return a content handler for handling the SAX events.
+ * Determines which SAX ContentHandler is appropriate for the rendererType.
+ * Structure renderers (e.g. MIF RTF) each have a specialized
+ * ContentHandler that directly place data into the output stream. Layout
+ * renderers (e.g. PDF PostScript) use a ContentHandler that builds an FO
+ * Tree.
+ * @return a SAX ContentHandler for handling the SAX events.
*/
public ContentHandler getContentHandler() {
if (!isInitialized()) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo FOTreeEvent.java FOTreeListener.java
vmote 2003/08/12 22:32:54
Modified:src/java/org/apache/fop/apps Driver.java
src/java/org/apache/fop/fo FOTreeEvent.java
FOTreeListener.java
Log:
clean up documentation of new code and some checkstyle problems
Revision ChangesPath
1.23 +29 -4 xml-fop/src/java/org/apache/fop/apps/Driver.java
Index: Driver.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Driver.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Driver.java 12 Aug 2003 21:17:44 - 1.22
+++ Driver.java 13 Aug 2003 05:32:54 - 1.23
@@ -594,6 +594,19 @@
//this.atModel = new CachedRenderPagesModel(renderer);
areaTree.setTreeModel(atModel);
}
+/**
+ The following statement triggers virtually all of the processing
+ for this document. The SAX parser fires events that are handled by
+ the appropriate InputHandler object, which means that you will need
+ to look in those objects to see where FOP picks up control of
+ processing again. For Structure Renderers (e.g. MIF RTF), the SAX
+ events are handled directly. For Layout Renderers (e.g. PDF
+ PostScript), an FO Tree is built by the FOTreeHandler, which in
+ turn fires events when a PageSequence object is complete. This
+ allows higher-level control objects (such as this class) to work
+ directly with PageSequence objects. See foPageSequenceComplete()
+ where this level of control is implemented.
+ */
parser.parse(source);
if (foInputHandler instanceof FOTreeHandler) {
FOTreeHandler foTreeHandler = (FOTreeHandler)foInputHandler;
@@ -659,7 +672,13 @@
}
}
-public void foPageSequenceComplete (FOTreeEvent event) throws FOPException{
+/**
+ * Required by the FOTreeListener interface. It handles an
+ * FOTreeEvent that is fired when a PageSequence object has been completed.
+ * @param event the FOTreeEvent that was fired
+ * @throws FOPException for errors in building the PageSequence
+ */
+public void foPageSequenceComplete (FOTreeEvent event) throws FOPException {
PageSequence pageSeq = event.getPageSequence();
Title title = null;
if (pageSeq.getTitleFO() != null) {
@@ -669,13 +688,19 @@
pageSeq.format(areaTree);
}
-public void foDocumentComplete (FOTreeEvent event) throws SAXException{
+/**
+ * Required by the FOTreeListener interface. It handles an FOTreeEvent that
+ * is fired when the Document has been completely parsed.
+ * @param event the FOTreeEvent that was fired
+ * @throws SAXException for parsing errors
+ */
+public void foDocumentComplete (FOTreeEvent event) throws SAXException {
//processAreaTree(atModel);
try {
areaTree.endDocument();
renderer.stopRenderer();
-}
-catch (IOException ex) {
+} catch (IOException ex) {
+throw new SAXException(ex);
}
}
1.2 +13 -1 xml-fop/src/java/org/apache/fop/fo/FOTreeEvent.java
Index: FOTreeEvent.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOTreeEvent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FOTreeEvent.java 12 Aug 2003 06:30:04 - 1.1
+++ FOTreeEvent.java 13 Aug 2003 05:32:54 - 1.2
@@ -66,13 +66,25 @@
private PageSequence pageSeq;
+/**
+ * Constructor captures the object that fired the event.
+ * @param source the Object that fired the event.
+ */
public FOTreeEvent (Object source) {
super(source);
}
+/**
+ * Sets the PageSequence object for this event.
+ * @param pageSeq the PageSequence object attached to this event.
+ */
public void setPageSequence(PageSequence pageSeq) {
this.pageSeq = pageSeq;
}
+
+/**
+ * @return the PageSequence object attached to this event.
+ */
public PageSequence getPageSequence () {
return pageSeq;
}
1.2 +20 -6 xml-fop/src/java/org/apache/fop/fo/FOTreeListener.java
Index: FOTreeListener.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOTreeListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FOTreeListener.java 12 Aug 2003
DO NOT REPLY [Bug 22391] New: - endless loop [INFO] area contents overflows area in line
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22391. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22391 endless loop [INFO] area contents overflows area in line Summary: endless loop [INFO] area contents overflows area in line Product: Fop Version: 0.20.5 Platform: PC OS/Version: Other Status: NEW Severity: Blocker Priority: Other Component: general AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] I have a DocBook document from which I generate XSLFO which I feed to FOP. It worked more or less so far, but now, since I added some content, FOP hangs in an endless loop printing [INFO] area contents overflows area in line The FO is here: http://www.pinkjuice.com/howto/vimxml/print/nwalsh_fop.fo When I comment out the following in http://www.pinkjuice.com/howto/vimxml/docbook/ch04.xml variablelist varlistentry termliteraled/literal/term listitem simparaliteraledit/literal/simpara [...] ... then FOP generates the PDF. But the content needs to be included, so I downgraded to 0.20.4. I'm looking forward to FOP 1.0 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/render/awt AWTRenderer.java
gmazza 2003/08/08 13:43:25
Modified:src/java/org/apache/fop/render/awt AWTRenderer.java
Log:
Removed empty setProducer() from AWTRenderer; can rely on base class.
Revision ChangesPath
1.2 +0 -3 xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java
Index: AWTRenderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AWTRenderer.java 11 Mar 2003 13:05:34 - 1.1
+++ AWTRenderer.java 8 Aug 2003 20:43:25 - 1.2
@@ -126,9 +126,6 @@
res = aRes;
}
-public void setProducer(String producer) {
-}
-
public int getPageCount() {
return 0;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22391] - endless loop [INFO] area contents overflows area in line
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22391. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22391 endless loop [INFO] area contents overflows area in line --- Additional Comments From [EMAIL PROTECTED] 2003-08-13 21:32 --- ... and as said FOP 0.20.4 generates a PDF, from the same source. So there seems to be a way of dealing with this. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22391] - endless loop [INFO] area contents overflows area in line
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22391. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22391 endless loop [INFO] area contents overflows area in line --- Additional Comments From [EMAIL PROTECTED] 2003-08-14 17:06 --- I can fix this particular problem in the Docbook XSL stylesheets. But I think you should look at the FOP code as well. The situation of having too much text for the designated size of an area is likely to come up with other stylesheets too. Certainly FOP should issue an error message, but one message is sufficient. Going into an infinite loop in such a case seems like the wrong response. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Background tiff image
Thanks J.Pietschmann This document solved my problem. And I want to ask another question. I must use tif images. I can put tif images into external-graphic, but when I put it as a background image, it does not work Sorry for mail confirmation Sometimes my mails don't go Mehmet evket ZDEMR *** Bu elektronik posta ve onunla iletilen btn dosyalar sadece gndericisi tarafndan almas amalanan yetkili gerek ya da tzel kiinin kullanm iindir.Eer sz konusu yetkili alc deilseniz bu elektronik postann ieriini aklamanz,kopyalamanz, ynlendirmeniz ve kullanmanz kesinlikle yasaktr ve bu elektronik postay derhal silmeniz gerekmektedir TURKCELL bu mesajn ierdii bilgilerin doruluu veya eksiksiz olduu konusunda herhangi bir garanti vermemektedir. Bu nedenle bu bilgilerin ne ekilde olursa olsun ieriinden, iletilmesinden, alnmasndan ve saklanmasndan sorumlu deildir. Bu mesajdaki grler yalnzca gnderen kiiye aittir ve TURKCELL'in grlerini yanstmayabilir Bu e-posta bilinen btn bilgisayar virslerine kar taranmtr. *** This e-mail and any files transmitted with it are confidential and intended solely for the use of the individual or entity to whom they are addressed. If you are not the intended recipient you are hereby notified that any dissemination, forwarding, copying or use of any of the information is strictly prohibited, and the e-mail should immediately be deleted. TURKCELL makes no warranty as to the accuracy or completeness of any information contained in this message and hereby excludes any liability of any kind for the information contained therein or for the information transmission, reception, storage or use of such in any way whatsoever.The opinions expressed in this message belong to sender alone and may not necessarily reflect the opinions of TURKCELL. This e-mail has been scanned for all known computer viruses. *** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr/table Body.java Cell.java Column.java Row.java TableLayoutManager.java
vmote 2003/08/12 11:02:46 Modified:src/java/org/apache/fop/fo InlineCharIterator.java PropertyManager.java src/java/org/apache/fop/fo/flow BasicLink.java BidiOverride.java Block.java BlockContainer.java Character.java ExternalGraphic.java InitialPropertySet.java Inline.java InlineContainer.java Leader.java ListBlock.java ListItem.java ListItemBody.java ListItemLabel.java MultiCase.java MultiProperties.java MultiSwitch.java MultiToggle.java PageNumber.java PageNumberCitation.java Table.java TableAndCaption.java TableBody.java TableCaption.java TableCell.java TableColumn.java TableRow.java src/java/org/apache/fop/fo/pagination Region.java RegionBody.java SimplePageMaster.java Title.java src/java/org/apache/fop/layoutmgr BlockContainerLayoutManager.java BlockLayoutManager.java InlineStackingLayoutManager.java LineLayoutManager.java TraitSetter.java src/java/org/apache/fop/layoutmgr/list Item.java ListBlockLayoutManager.java ListItemLayoutManager.java src/java/org/apache/fop/layoutmgr/table Body.java Cell.java Column.java Row.java TableLayoutManager.java Added: src/java/org/apache/fop/fo/properties CommonAbsolutePosition.java CommonAccessibility.java CommonAural.java CommonBackground.java CommonBorderAndPadding.java CommonHyphenation.java CommonMarginBlock.java CommonMarginInline.java CommonRelativePosition.java Removed: src/java/org/apache/fop/layout AbsolutePositionProps.java AccessibilityProps.java AuralProps.java BackgroundProps.java BorderAndPadding.java HyphenationProps.java MarginInlineProps.java MarginProps.java RelativePositionProps.java Log: move the common property classes from layout to fo.properties, renaming them with a Common prefix Revision ChangesPath 1.3 +3 -3 xml-fop/src/java/org/apache/fop/fo/InlineCharIterator.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/InlineCharIterator.java.diff?r1=1.2r2=1.3 1.4 +33 -33xml-fop/src/java/org/apache/fop/fo/PropertyManager.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/PropertyManager.java.diff?r1=1.3r2=1.4 1.3 +12 -12xml-fop/src/java/org/apache/fop/fo/flow/BasicLink.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/BasicLink.java.diff?r1=1.2r2=1.3 1.3 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/BidiOverride.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/BidiOverride.java.diff?r1=1.2r2=1.3 1.4 +14 -14xml-fop/src/java/org/apache/fop/fo/flow/Block.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Block.java.diff?r1=1.3r2=1.4 1.3 +8 -8 xml-fop/src/java/org/apache/fop/fo/flow/BlockContainer.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/BlockContainer.java.diff?r1=1.2r2=1.3 1.3 +12 -12xml-fop/src/java/org/apache/fop/fo/flow/Character.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Character.java.diff?r1=1.2r2=1.3 1.3 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/ExternalGraphic.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/ExternalGraphic.java.diff?r1=1.2r2=1.3 1.3 +10 -10xml-fop/src/java/org/apache/fop/fo/flow/InitialPropertySet.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/InitialPropertySet.java.diff?r1=1.2r2=1.3 1.3 +12 -12xml-fop/src/java/org/apache/fop/fo/flow/Inline.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Inline.java.diff?r1=1.2r2=1.3 1.3 +8 -8 xml-fop/src/java/org/apache/fop/fo/flow/InlineContainer.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/InlineContainer.java.diff?r1=1.2r2=1.3 1.5 +12 -12xml-fop/src/java/org/apache/fop/fo/flow/Leader.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Leader.java.diff?r1=1.4r2=1.5 1.3 +12 -12xml-fop/src/java/org/apache/fop/fo/flow/ListBlock.java
cvs commit: xml-fop/src/java/org/apache/fop/control - New directory
vmote 2003/08/14 00:40:13 xml-fop/src/java/org/apache/fop/control - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/tools AreaTreeBuilder.java
vmote 2003/08/14 12:16:41
Modified:src/java/org/apache/fop/control Document.java
src/java/org/apache/fop/fonts Font.java
src/java/org/apache/fop/render/awt FontSetup.java
src/java/org/apache/fop/render/pdf FontSetup.java
src/java/org/apache/fop/render/ps PSTextPainter.java
src/java/org/apache/fop/svg PDFGraphics2D.java
PDFTextPainter.java
src/java/org/apache/fop/tools AreaTreeBuilder.java
Log:
move font constants from control.Document to fonts.Font
Revision ChangesPath
1.2 +17 -23xml-fop/src/java/org/apache/fop/control/Document.java
Index: Document.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/control/Document.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Document.java 14 Aug 2003 07:42:57 - 1.1
+++ Document.java 14 Aug 2003 19:16:41 - 1.2
@@ -3,34 +3,34 @@
*
*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
@@ -42,18 +42,19 @@
* (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.control;
// Java
import java.util.Map;
// FOP
+import org.apache.fop.fonts.Font;
import org.apache.fop.fonts.FontMetrics;
/**
@@ -66,20 +67,13 @@
* implemented.
*/
public class Document {
-
-/** Default fallback key */
-public static final String DEFAULT_FONT = any,normal,400;
-/** Normal font weight */
-public static final int NORMAL = 400;
-/** Bold font weight */
-public static final int BOLD = 700;
/** Map containing fonts that have been used */
private Map usedFonts;
-
+
/** look up a font-triplet to find a font-name */
private Map triplets;
-
+
/** look up a font-name to get a font (that implements FontMetrics at least) */
private Map fonts;
@@ -93,12 +87,12 @@
}
/**
- * Checks if the font setup is valid (At least the ultimate fallback font
+ * Checks if the font setup is valid (At least the ultimate fallback font
* must be registered.)
* @return True if valid
*/
public boolean isSetupValid() {
-return triplets.containsKey(DEFAULT_FONT);
+return triplets.containsKey(Font.DEFAULT_FONT);
}
/**
@@ -165,7 +159,7 @@
DO NOT REPLY [Bug 22216] - bug in processMessage(), doesn't work for ERROR
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22216.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND
INSERTED IN THE BUG DATABASE.
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22216
bug in processMessage(), doesn't work for ERROR
--- Additional Comments From [EMAIL PROTECTED] 2003-08-08 11:14 ---
A 2nd solution is to stop the processing.
This may be more useful in many cases.
I changed org.apache.fop.fo.flow.ExternalGraphic.layout():
...
catch (MalformedURLException urlex) {
// bad URL
log.error(Error while creating area : + urlex.getMessage());
throw new FOPException (Error while creating area : + urlex.getMessage());
}
catch (FopImageException imgex) {
// image error
log.error(Error while creating area : + imgex.getMessage());
throw new FOPException (Error while creating area : + imgex.getMessage());
}
...
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/apps CommandLineOptions.java Fop.java CommandLineStarter.java
gmazza 2003/08/12 15:40:49
Modified:src/java/org/apache/fop/apps CommandLineOptions.java
Fop.java
Removed: src/java/org/apache/fop/apps CommandLineStarter.java
Log:
1.) CommandLineStarter removed, its functionality placed directly into Fop.main().
Fop.main() now responsible for taking command-line input as provided from
CommandLineOptions, and activating a Driver instance with that data.
2.) Minor cleanup of error messages in CommandLineOptions.
Revision ChangesPath
1.12 +5 -5 xml-fop/src/java/org/apache/fop/apps/CommandLineOptions.java
Index: CommandLineOptions.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/CommandLineOptions.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- CommandLineOptions.java 12 Aug 2003 21:17:44 - 1.11
+++ CommandLineOptions.java 12 Aug 2003 22:40:49 - 1.12
@@ -407,10 +407,10 @@
if (inputmode == XSLT_INPUT) {
// check whether xml *and* xslt file have been set
if (xmlfile == null) {
-throw new FOPException(XML file must be specified for the tranform
mode);
+throw new FOPException(XML file must be specified for the
transform mode);
}
if (xsltfile == null) {
-throw new FOPException(XSLT file must be specified for the
tranform mode);
+throw new FOPException(XSLT file must be specified for the
transform mode);
}
// warning if fofile has been set in xslt mode
@@ -424,12 +424,12 @@
+ fofile.getAbsolutePath());
}
if (!xmlfile.exists()) {
-throw new FileNotFoundException(xml file
+throw new FileNotFoundException(Error: xml file
+ xmlfile.getAbsolutePath()
+ not found );
}
if (!xsltfile.exists()) {
-throw new FileNotFoundException(xsl file
+throw new FileNotFoundException(Error: xsl file
+ xsltfile.getAbsolutePath()
+ not found );
}
@@ -441,7 +441,7 @@
log.error(xslt file: + xsltfile.toString());
}
if (!fofile.exists()) {
-throw new FileNotFoundException(fo file
+throw new FileNotFoundException(Error: fo file
+ fofile.getAbsolutePath()
+ not found );
}
1.5 +39 -7 xml-fop/src/java/org/apache/fop/apps/Fop.java
Index: Fop.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Fop.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Fop.java 12 Aug 2003 21:36:43 - 1.4
+++ Fop.java 12 Aug 2003 22:40:49 - 1.5
@@ -50,8 +50,17 @@
*/
package org.apache.fop.apps;
+// Java
+import java.io.BufferedOutputStream;
+import java.io.FileOutputStream;
+
+// Avalon
import org.apache.avalon.framework.logger.ConsoleLogger;
+// FOP
+import org.apache.fop.render.awt.AWTRenderer;
+
+
/**
* The main application class for the FOP command line interface (CLI).
*/
@@ -63,13 +72,37 @@
*/
public static void main(String[] args) {
CommandLineOptions options = null;
-CommandLineStarter starter = null;
+InputHandler inputHandler = null;
+BufferedOutputStream bos = null;
+String version = Version.getVersion();
try {
+Driver driver = new Driver();
+driver.enableLogging(new ConsoleLogger(ConsoleLogger.LEVEL_INFO));
+driver.getLogger().info(version);
options = new CommandLineOptions(args);
-starter = new CommandLineStarter(options);
-starter.enableLogging(new ConsoleLogger(ConsoleLogger.LEVEL_INFO));
-starter.run();
+inputHandler = options.getInputHandler();
+
+try {
+if (options.getOutputMode() == CommandLineOptions.AWT_OUTPUT) {
+driver.setRenderer(new AWTRenderer(inputHandler));
+} else {
+driver.setRenderer(options.getRenderer());
+
+if (options.getOutputFile() != null) {
+bos = new BufferedOutputStream(new FileOutputStream(
+
cvs commit: xml-fop/src/java/org/apache/fop/viewer PreviewDialog.java
gmazza 2003/08/11 16:47:22
Modified:src/java/org/apache/fop/apps CommandLineStarter.java
Fop.java
src/java/org/apache/fop/render/awt AWTRenderer.java
src/java/org/apache/fop/viewer PreviewDialog.java
Removed: src/java/org/apache/fop/apps AWTStarter.java
Log:
1. AWT PreviewDialog creation shifted from AWTStarter to AWTRenderer.
2. New AWTRenderer constructor -- takes an InputHandler object which
is used for the document refreshing/reloading.
3. PreviewDialog's reload() functionality now handled via Driver instead of
AWTStarter.
4. Class AWTStarter removed: AWT generation now activated via CommandLineStarter.
Revision ChangesPath
1.6 +7 -2 xml-fop/src/java/org/apache/fop/apps/CommandLineStarter.java
Index: CommandLineStarter.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/CommandLineStarter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CommandLineStarter.java 27 Jul 2003 20:16:03 - 1.5
+++ CommandLineStarter.java 11 Aug 2003 23:47:22 - 1.6
@@ -54,6 +54,8 @@
import java.io.BufferedOutputStream;
import java.io.FileOutputStream;
+// FOP
+import org.apache.fop.render.awt.AWTRenderer;
/**
* super class for all classes which start Fop from the commandline
@@ -88,7 +90,11 @@
setupLogger(driver);
try {
-driver.setRenderer(commandLineOptions.getRenderer());
+if (commandLineOptions.getOutputMode() ==
CommandLineOptions.AWT_OUTPUT) {
+driver.setRenderer(new AWTRenderer(inputHandler));
+} else {
+driver.setRenderer(commandLineOptions.getRenderer());
+}
try {
if (commandLineOptions.getOutputFile() != null) {
@@ -107,7 +113,6 @@
bos.close();
}
}
-System.exit(0);
} catch (Exception e) {
if (e instanceof FOPException) {
throw (FOPException) e;
1.3 +1 -5 xml-fop/src/java/org/apache/fop/apps/Fop.java
Index: Fop.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Fop.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Fop.java 29 Jul 2003 22:08:54 - 1.2
+++ Fop.java 11 Aug 2003 23:47:22 - 1.3
@@ -67,11 +67,7 @@
try {
options = new CommandLineOptions(args);
-if (options.getOutputMode() == CommandLineOptions.AWT_OUTPUT) {
-starter = new AWTStarter(options);
-} else {
-starter = new CommandLineStarter(options);
-}
+starter = new CommandLineStarter(options);
starter.enableLogging(new ConsoleLogger(ConsoleLogger.LEVEL_INFO));
starter.run();
} catch (FOPException e) {
1.4 +44 -9 xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java
Index: AWTRenderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AWTRenderer.java 10 Aug 2003 15:43:13 - 1.3
+++ AWTRenderer.java 11 Aug 2003 23:47:22 - 1.4
@@ -57,10 +57,15 @@
* Stanislav Gorkhover: [EMAIL PROTECTED]
*/
+// Java
import java.awt.Color;
import java.awt.Component;
+import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Graphics2D;
+import java.awt.Toolkit;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
import java.awt.image.BufferedImage;
import java.awt.print.PageFormat;
import java.awt.print.Pageable;
@@ -70,6 +75,8 @@
import java.util.List;
import java.util.Map;
+// FOP
+import org.apache.fop.apps.InputHandler;
import org.apache.fop.layout.FontInfo;
import org.apache.fop.render.AbstractRenderer;
import org.apache.fop.viewer.PreviewDialog;
@@ -87,6 +94,12 @@
protected List pageList = new java.util.Vector();
//protected ProgressListener progressListener = null;
+/**
+The InputHandler associated with this Renderer.
+Sent to the PreviewDialog for document reloading.
+*/
+protected InputHandler inputHandler;
+
/**
* The resource bundle used for AWT messages.
*/
@@ -127,8 +140,15 @@
*/
protected PreviewDialog frame;
+public AWTRenderer(InputHandler handler) {
+inputHandler = handler;
+translator = new
cvs commit: xml-fop/src/documentation/content/xdocs extensions.xml
vmote 2003/08/11 16:37:38 Modified:src/documentation/content/xdocs extensions.xml Log: add some doc for fox:continued-label Revision ChangesPath 1.11 +18 -4 xml-fop/src/documentation/content/xdocs/extensions.xml Index: extensions.xml === RCS file: /home/cvs/xml-fop/src/documentation/content/xdocs/extensions.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- extensions.xml11 Aug 2003 23:18:08 - 1.10 +++ extensions.xml11 Aug 2003 23:37:38 - 1.11 @@ -67,10 +67,24 @@ fox:destination./warning /section section id=table-continue-label -titleContinued-label (for table-header/-footer)/title -p -Please see examples/fo/basic/contlabel.fo -/p +titleTable Continuation Label/title +pUse the fox:continued-label element to create content in table-header and +table-footer cells that will appear only on pages after the first page that the table +appears. fox:continued-label is itself inline content, and is a container of fo:inline +content. This content will be laid out only if the table does not fit on a single page and flows +to following pages. Here is an example of FO code creating such a table-header:/p +source![CDATA[fo:table-header + fo:table-row +fo:table-cell + fo:blockHeader column 1 with continued label + fox:continued-labelfo:inline (cont.)/fo:inline/fox:continued-label + /fo:block +/fo:table-cell +fo:table-cell + fo:blockHeader column 2 with no continued label/fo:block +/fo:table-cell + /fo:table-row +/fo:table-header]]/source /section /section /body - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr LMFOTreeExternal.java LayoutManagerLS.java
vmote 2003/08/14 11:53:29
Added: src/java/org/apache/fop/fo FOTreeExternal.java
src/java/org/apache/fop/layout LayoutStrategy.java
src/java/org/apache/fop/layoutmgr LMFOTreeExternal.java
LayoutManagerLS.java
Log:
1. add infrastructure for LayoutStrategy
2. add infrastructure for move of layoutmgr logic out of fo package
Revision ChangesPath
1.1 xml-fop/src/java/org/apache/fop/fo/FOTreeExternal.java
Index: FOTreeExternal.java
===
/*
* $Id: FOTreeExternal.java,v 1.1 2003/08/14 18:53:29 vmote 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.fo;
/**
* Default class for handling external calls as an FO Tree is being built.
* External calls are processes that are not directly related to building
* the FO Tree, but that are convenient to do while the tree is being built.
* This allows the FO Tree to be built without any knowledge of its eventual
* use, but allows the flexibility of having some additional processing related
* to that eventual use take place in parallel with the FO Tree construction.
* The default behavior is that no external processing takes place. Subclasses
* should override individual methods as needed.
* TODO: this should probably be a true singleton
*/
public class FOTreeExternal {
}
1.1 xml-fop/src/java/org/apache/fop/layout/LayoutStrategy.java
Index: LayoutStrategy.java
===
/*
* $Id: LayoutStrategy.java,v 1.1 2003/08/14 18:53:29 vmote 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
cvs commit: xml-fop/src/java/org/apache/fop/rtf/renderer RTFHandler.java
vmote 2003/08/11 23:18:43
Modified:src/java/org/apache/fop/apps Driver.java
src/java/org/apache/fop/extensions Bookmarks.java
src/java/org/apache/fop/fo FOInputHandler.java
FOTreeHandler.java
src/java/org/apache/fop/mif MIFHandler.java
src/java/org/apache/fop/rtf/renderer RTFHandler.java
Log:
1. convert fo.FOTreeHandler to fire events when it completes a PageSequence or
document object
2. move logic that starts layout from fo.FOTreeHandler to apps.Driver.
3. add logic to apps.Driver to handle the events fired from fo.FOTreeHandler
4. end result is that FOTreeHandler now allows other objects to handle page-sequence
and document objects in a manner similar to the way SAX allows them to handle XML
elements.
Revision ChangesPath
1.21 +58 -4 xml-fop/src/java/org/apache/fop/apps/Driver.java
Index: Driver.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Driver.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Driver.java 11 Aug 2003 18:08:06 - 1.20
+++ Driver.java 12 Aug 2003 06:18:43 - 1.21
@@ -51,11 +51,17 @@
package org.apache.fop.apps;
// FOP
+import org.apache.fop.area.AreaTree;
+import org.apache.fop.area.AreaTreeModel;
import org.apache.fop.fo.ElementMapping;
import org.apache.fop.fo.FOTreeBuilder;
import org.apache.fop.fo.FOUserAgent;
import org.apache.fop.fo.FOInputHandler;
import org.apache.fop.fo.FOTreeHandler;
+import org.apache.fop.fo.FOTreeListener;
+import org.apache.fop.fo.FOTreeEvent;
+import org.apache.fop.area.Title;
+import org.apache.fop.fo.pagination.PageSequence;
import org.apache.fop.mif.MIFHandler;
import org.apache.fop.render.Renderer;
import org.apache.fop.render.awt.AWTRenderer;
@@ -128,7 +134,7 @@
* driver.render(parser, fileInputSource(args[0]));
* /PRE
*/
-public class Driver implements LogEnabled {
+public class Driver implements LogEnabled, FOTreeListener {
/**
* Render to PDF. OutputStream must be set
@@ -222,6 +228,12 @@
private FOUserAgent userAgent = null;
/**
+ * The current AreaTree for the PageSequence being rendered.
+ */
+private AreaTree areaTree;
+private AreaTreeModel atModel;
+
+/**
* Main constructor for the Driver class.
*/
public Driver() {
@@ -528,15 +540,15 @@
// TODO: - do this stuff in a better way
// PIJ: I guess the structure handler should be created by the renderer.
if (rendererType == RENDER_MIF) {
-foInputHandler = new MIFHandler(stream);
+foInputHandler = new MIFHandler(this, stream);
} else if (rendererType == RENDER_RTF) {
-foInputHandler = new RTFHandler(stream);
+foInputHandler = new RTFHandler(this, stream);
} else {
if (renderer == null) {
throw new IllegalStateException(
Renderer not set when using standard foInputHandler);
}
-foInputHandler = new FOTreeHandler(stream, renderer, true);
+foInputHandler = new FOTreeHandler(this, stream, renderer, true);
}
foInputHandler.enableLogging(getLogger());
@@ -574,7 +586,19 @@
}
parser.setContentHandler(getContentHandler());
try {
+if (foInputHandler instanceof FOTreeHandler) {
+FOTreeHandler foTreeHandler = (FOTreeHandler)foInputHandler;
+foTreeHandler.addFOTreeListener(this);
+this.areaTree = new AreaTree();
+this.atModel = AreaTree.createRenderPagesModel(renderer);
+//this.atModel = new CachedRenderPagesModel(renderer);
+areaTree.setTreeModel(atModel);
+}
parser.parse(source);
+if (foInputHandler instanceof FOTreeHandler) {
+FOTreeHandler foTreeHandler = (FOTreeHandler)foInputHandler;
+foTreeHandler.removeFOTreeListener(this);
+}
} catch (SAXException e) {
if (e.getException() instanceof FOPException) {
// Undo exception tunneling.
@@ -635,5 +659,35 @@
render(reader, source);
}
}
+
+public void foPageSequenceComplete (FOTreeEvent event) throws FOPException{
+PageSequence pageSeq = event.getPageSequence();
+Title title = null;
+if (pageSeq.getTitleFO() != null) {
+title = pageSeq.getTitleFO().getTitleArea();
+}
+areaTree.startPageSequence(title);
+pageSeq.format(areaTree);
+}
+
+public void
cvs commit: xml-fop/src/java/org/apache/fop/render/pdf FontReader.java
vmote 2003/08/12 11:27:35
Modified:src/java/org/apache/fop/fonts LazyFont.java
Added: src/java/org/apache/fop/fonts FontReader.java
Removed: src/java/org/apache/fop/render/pdf FontReader.java
Log:
move render.pdf.FontReader to fonts.FontReader
Revision ChangesPath
1.3 +1 -1 xml-fop/src/java/org/apache/fop/fonts/LazyFont.java
Index: LazyFont.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fonts/LazyFont.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LazyFont.java 15 Mar 2003 16:50:56 - 1.2
+++ LazyFont.java 12 Aug 2003 18:27:35 - 1.3
@@ -54,7 +54,7 @@
import java.util.Map;
//FOP
-import org.apache.fop.render.pdf.FontReader;
+
/**
* This class is used to defer the loading of a font until it is really used.
1.1 xml-fop/src/java/org/apache/fop/fonts/FontReader.java
Index: FontReader.java
===
/*
* $Id: FontReader.java,v 1.1 2003/08/12 18:27:35 vmote 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.fonts;
//Java
import java.util.List;
import java.util.Map;
import java.io.IOException;
import javax.xml.parsers.SAXParserFactory;
//SAX
import org.xml.sax.XMLReader;
import org.xml.sax.SAXException;
import org.xml.sax.Locator;
import org.xml.sax.Attributes;
import org.xml.sax.helpers.DefaultHandler;
//FOP
import org.apache.fop.apps.FOPException;
/**
* Class for reading a metric.xml file and creating a font object.
* Typical usage:
* pre
* FontReader reader = new FontReader(path til metrics.xml);
* reader.setFontEmbedPath(path to a .ttf or .pfb file or null to diable
embedding);
* reader.useKerning(true);
* Font f = reader.getFont();
* /pre
*/
public class FontReader extends DefaultHandler {
private Locator locator = null;
private boolean isCID = false;
private CustomFont returnFont = null;
cvs commit: xml-fop/src/documentation/content/xdocs/dev release.xml
chrisg 2003/08/11 17:00:52 Modified:src/documentation/content/xdocs download.xml news.xml src/documentation/content/xdocs/dev release.xml Log: removed info about old download location fixed broken links to archives.apache.org Revision ChangesPath 1.12 +3 -7 xml-fop/src/documentation/content/xdocs/download.xml Index: download.xml === RCS file: /home/cvs/xml-fop/src/documentation/content/xdocs/download.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- download.xml 17 Jul 2003 16:29:37 - 1.11 +++ download.xml 12 Aug 2003 00:00:52 - 1.12 @@ -19,13 +19,9 @@ /section section id=binary titleBinary Download/title -pBinary distributions include -bin in their names, and can be downloaded from the - link href=http://www.apache.org/dyn/closer.cgi/xml/fop;FOP Distribution/link directory. +pBinary distributions include -bin in their names, and can be downloaded from a + link href=http://www.apache.org/dyn/closer.cgi/xml/fop;FOP Distribution mirror/link. /p -noteWe're in the process of moving the download location. If you're looking for old - distributions please check the - link href=http://xml.apache.org/dist/fop/;old download location/link. -/note /section section id=source titleSource Download/title @@ -33,7 +29,7 @@ See link href=dev/index.htmlDevelopment Introduction/link for more details on the choices, and for the CVS tags to use when downloading the maintenance branch./p pThere are three ways to obtain a source distribution. Please note that they are listed from least current to most current:/p ul - liDownload a released version from the link href=http://www.apache.org/dyn/closer.cgi/xml/fop;FOP Distribution/link directory. Source distributions include -src in their names. Please note that official releases currently are emonly/em made from the maintenance branch./li + liDownload a released version from a link href=http://www.apache.org/dyn/closer.cgi/xml/fop;FOP Distribution mirror/link. Source distributions include -src in their names. Please note that official releases currently are emonly/em made from the maintenance branch./li liDownload a CVS snapshot from the cvs files link href=http://xml.apache.org/from-cvs/xml-fop/;here/link. These snapshots are built approximately every six hours, and have the GMT of their creation time embedded in their names. Please note that CVS snapshots are made only for the redesign branch./li liDownload directly from the CVS repository. Anyone can do this using the link href=http://xml.apache.org/cvs.html#AnonCVS;Anonymous CVS Server/link. By default, the CVS code is up-to-the-minute, the same code that the developers are modifying. See the link href=dev/tools.html#cvsCVS section of Developer Tools/link for more information on using CVS./li 1.14 +3 -3 xml-fop/src/documentation/content/xdocs/news.xml Index: news.xml === RCS file: /home/cvs/xml-fop/src/documentation/content/xdocs/news.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- news.xml 24 Jul 2003 01:10:10 - 1.13 +++ news.xml 12 Aug 2003 00:00:52 - 1.14 @@ -29,7 +29,7 @@ /ul p See also the full text of the - link href=http://archives.apache.org/eyebrowse/[EMAIL PROTECTED]amp;msgNo=6067 + link href=http://nagoya.apache.org/eyebrowse/[EMAIL PROTECTED]amp;msgNo=6067 announcement/link and the link href=relnotes.html#FOP+0.20.5release notes/link. /p /section @@ -41,14 +41,14 @@ title23 May 2003 - FOP 0.20.5 Release Candidate 3 available/title p See the full text of the link - href=http://archives.apache.org/eyebrowse/[EMAIL PROTECTED]amp;msgNo=5429announcement/link. + href=http://nagoya.apache.org/eyebrowse/[EMAIL PROTECTED]amp;msgNo=5429announcement/link. /p /section section title18 February 2003 - FOP 0.20.5 Release Candidate 2 available/title p See the full text of the link - href=http://archives.apache.org/eyebrowse/[EMAIL PROTECTED]amp;msgNo=4509announcement/link. + href=http://nagoya.apache.org/eyebrowse/[EMAIL PROTECTED]amp;msgNo=4509announcement/link. /p /section section 1.3 +1 -1 xml-fop/src/documentation/content/xdocs/dev/release.xml Index: release.xml === RCS file: /home/cvs/xml-fop/src/documentation/content/xdocs/dev/release.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3
cvs commit: xml-fop/src/java/org/apache/fop/util CharUtilities.java
vmote 2003/08/14 08:31:10
Modified:src/java/org/apache/fop/fo PropertyManager.java
TextInfo.java
src/java/org/apache/fop/fo/flow Leader.java PageNumber.java
PageNumberCitation.java
src/java/org/apache/fop/fo/pagination Title.java
src/java/org/apache/fop/layoutmgr BlockLayoutManager.java
TextLayoutManager.java
src/java/org/apache/fop/render/pdf PDFRenderer.java
src/java/org/apache/fop/render/ps PSGraphics2D.java
PSTextPainter.java
src/java/org/apache/fop/svg PDFGraphics2D.java
PDFTextPainter.java
src/java/org/apache/fop/tools AreaTreeBuilder.java
src/java/org/apache/fop/util CharUtilities.java
Added: src/java/org/apache/fop/fonts Font.java
Removed: src/java/org/apache/fop/layout FontState.java
Log:
move layout.FontState to fonts.Font
Revision ChangesPath
1.6 +4 -4 xml-fop/src/java/org/apache/fop/fo/PropertyManager.java
Index: PropertyManager.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/PropertyManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PropertyManager.java 14 Aug 2003 07:42:58 - 1.5
+++ PropertyManager.java 14 Aug 2003 15:31:09 - 1.6
@@ -57,7 +57,7 @@
// FOP
import org.apache.fop.area.CTM;
import org.apache.fop.datatypes.FODimension;
-import org.apache.fop.layout.FontState;
+import org.apache.fop.fonts.Font;
import org.apache.fop.control.Document;
import org.apache.fop.fo.properties.CommonBorderAndPadding;
import org.apache.fop.fo.properties.CommonMarginBlock;
@@ -84,7 +84,7 @@
private PropertyList properties;
private Document fontInfo = null;
-private FontState fontState = null;
+private Font fontState = null;
private CommonBorderAndPadding borderAndPadding = null;
private CommonHyphenation hyphProps = null;
private TextInfo textInfo = null;
@@ -133,7 +133,7 @@
* @param fontInfo FontInfo to work with
* @return a FontState object
*/
-public FontState getFontState(Document fontInfo) {
+public Font getFontState(Document fontInfo) {
if (fontState == null) {
if (fontInfo == null) {
fontInfo = this.fontInfo;
@@ -170,7 +170,7 @@
String fname = fontInfo.fontLookup(fontFamily, fontStyle,
fontWeight);
FontMetrics metrics = fontInfo.getMetricsFor(fname);
-fontState = new FontState(fname, metrics, fontSize);
+fontState = new Font(fname, metrics, fontSize);
}
return fontState;
}
1.4 +2 -2 xml-fop/src/java/org/apache/fop/fo/TextInfo.java
Index: TextInfo.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/TextInfo.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TextInfo.java 15 Jul 2003 16:18:50 - 1.3
+++ TextInfo.java 14 Aug 2003 15:31:09 - 1.4
@@ -51,7 +51,7 @@
package org.apache.fop.fo;
// FOP
-import org.apache.fop.layout.FontState;
+import org.apache.fop.fonts.Font;
import org.apache.fop.datatypes.ColorType;
import org.apache.fop.traits.SpaceVal;
import org.apache.fop.fo.properties.TextTransform;
@@ -61,7 +61,7 @@
*/
public class TextInfo {
/** object containing the font information */
-public FontState fs;
+public Font fs;
/** fo:color property */
public ColorType color;
/** fo:wrap-option property */
1.7 +2 -2 xml-fop/src/java/org/apache/fop/fo/flow/Leader.java
Index: Leader.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Leader.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Leader.java 14 Aug 2003 07:42:58 - 1.6
+++ Leader.java 14 Aug 2003 15:31:09 - 1.7
@@ -71,7 +71,7 @@
import org.apache.fop.fo.properties.CommonBackground;
import org.apache.fop.fo.properties.CommonBorderAndPadding;
import org.apache.fop.control.Document;
-import org.apache.fop.layout.FontState;
+import org.apache.fop.fonts.Font;
import org.apache.fop.fo.properties.CommonMarginInline;
import org.apache.fop.fo.properties.CommonRelativePosition;
import org.apache.fop.layoutmgr.ContentLayoutManager;
@@ -96,7 +96,7 @@
/** FontInfo for this object */
protected Document fontInfo = null;
/** FontState for this object */
-
Re: Background tiff image
[EMAIL PROTECTED] wrote: I can put tif images into external-graphic, but when I put it as a background image, it does not work What FOP version are you using? Do background images work for you with other image formats? It could also be that the image is too large, background images are not automatically scaled. Try with a resolution reduced version. Sorry for mail confirmation Sometimes my mails don't go Mail confirmations on mailing lists are just silly. Think about this. J.Pietschmann - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22391] - endless loop [INFO] area contents overflows area in line
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22391. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22391 endless loop [INFO] area contents overflows area in line --- Additional Comments From [EMAIL PROTECTED] 2003-08-13 21:18 --- So you say the FO generated by the docbook.sf.net XSLTs is erratic? What's the error? Should I file a bug report? Since I don't really see what the problem is: What exactly should I write? Please check what XEP does (if you can), I suspect it deals with this in a sensible way (Norm uses it). - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22391] - endless loop [INFO] area contents overflows area in line
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22391. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22391 endless loop [INFO] area contents overflows area in line --- Additional Comments From [EMAIL PROTECTED] 2003-08-13 22:10 --- sorry for posting so many comments, but I just received additional info: http://sourceforge.net/tracker/index.php?func=detailaid=713422group_id=21935atid=373747 The issue seems to be related to variablelists, but this post http://sources.redhat.com/ml/docbook-apps/2003-q3/msg00116.html says that the same FOP error occurs with tables as well ... http://lists.oasis-open.org/archives/docbook-apps/200303/msg00378.html says the there is an issue with both the docbook.sf.net XSLTs and FOP. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 1180] - Problem with monospaced font
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=1180. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=1180 Problem with monospaced font --- Additional Comments From [EMAIL PROTECTED] 2003-08-12 14:52 --- Created an attachment (id=7771) fix monospaced wide spaceing in AWT - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22341] New: - fo:leader not filling space with dots rule or other
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22341. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22341 fo:leader not filling space with dots rule or other Summary: fo:leader not filling space with dots rule or other Product: Fop Version: 0.20.5 Platform: PC OS/Version: Windows NT/2K Status: NEW Severity: Major Priority: Other Component: page-master/layout AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] I'am using XMLSPY to create pfd's and use the 0.205 version of FOP. The fo:leader works fine. Now I embedded FOP 0.205 in my Java program to do the same thing (same xml-file and the same xslt-file). The fo:leader doesn't work well. With XMLSPY I had the white space filled up with fo:leader leader- pattern=rule rule-style=dotted (=perfect), but with the same FOP version in my Java program I have only 3 dots ?? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
control/Document
I just committed a change that creates a control package, and moves layout.FontInfo to control.Document. I had hoped to avoid getting into the control stuff (hence my statement about moving into Driver), but in order to get FO Tree and layout cleaned up for Layout Strategy, some of this global stuff needs to be, well, global. The good news is that some of Driver logic can be (carefully, with deprecation in mind) moved out of Driver and into Document. I mention this because I know that Glen is trying to get apps cleaned up. I think creation of control should help. Also, some of the font-related logic that is in FontInfo will eventually get moved to the font package, but I think the font collections themselves belong to the Document. I'll be doing more in this shortly as I really have to clean the Font mess up to move forward. Please let me know if you see problems. Victor Mote - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo FOTreeEvent.java FOTreeListener.java
vmote 2003/08/11 23:30:04
Added: src/java/org/apache/fop/fo FOTreeEvent.java
FOTreeListener.java
Log:
1. convert fo.FOTreeHandler to fire events when it completes a PageSequence or
document object
2. move logic that starts layout from fo.FOTreeHandler to apps.Driver.
3. add logic to apps.Driver to handle the events fired from fo.FOTreeHandler
4. end result is that FOTreeHandler now allows other objects to handle page-sequence
and document objects in a manner similar to the way SAX allows them to handle XML
elements.
Revision ChangesPath
1.1 xml-fop/src/java/org/apache/fop/fo/FOTreeEvent.java
Index: FOTreeEvent.java
===
/*
* $Id: FOTreeEvent.java,v 1.1 2003/08/12 06:30:04 vmote 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.fo;
//java
import java.util.EventObject;
//fop
import org.apache.fop.fo.pagination.PageSequence;
/**
* An Event used for notification that various stages of the building of an
* FO tree have been completed. Specifically, these are currently used to
* notify Driver when a PageSequence has been completed.
*/
public class FOTreeEvent extends EventObject {
private PageSequence pageSeq;
public FOTreeEvent (Object source) {
super(source);
}
public void setPageSequence(PageSequence pageSeq) {
this.pageSeq = pageSeq;
}
public PageSequence getPageSequence () {
return pageSeq;
}
}
1.1 xml-fop/src/java/org/apache/fop/fo/FOTreeListener.java
Index: FOTreeListener.java
===
/*
* $Id: FOTreeListener.java,v 1.1 2003/08/12 06:30:04 vmote Exp $
*
*The Apache Software License, Version 1.1
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All
cvs commit: xml-fop/src/java/org/apache/fop/tools/anttasks Fop.java
gmazza 2003/08/12 14:36:43
Modified:src/java/org/apache/fop/apps CommandLineStarter.java
Fop.java
src/java/org/apache/fop/tools/anttasks Fop.java
Removed: src/java/org/apache/fop/apps Starter.java
Log:
1. FOPTaskStarter separated from Starter class (was not using latter's InputHandler).
2. CommandLineStarter made a top-level class, and abstract Starter class removed.
(only one starter being used for command line, regardless of renderer.)
Revision ChangesPath
1.7 +8 -2 xml-fop/src/java/org/apache/fop/apps/CommandLineStarter.java
Index: CommandLineStarter.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/CommandLineStarter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CommandLineStarter.java 11 Aug 2003 23:47:22 - 1.6
+++ CommandLineStarter.java 12 Aug 2003 21:36:43 - 1.7
@@ -54,6 +54,9 @@
import java.io.BufferedOutputStream;
import java.io.FileOutputStream;
+// Avalon
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+
// FOP
import org.apache.fop.render.awt.AWTRenderer;
@@ -62,11 +65,14 @@
*
* Modified to use new streaming API by Mark Lillywhite, [EMAIL PROTECTED]
*/
-public class CommandLineStarter extends Starter {
+public class CommandLineStarter extends AbstractLogEnabled {
/** the command-line options associated with this starter */
protected CommandLineOptions commandLineOptions;
+/** InputHandler associated with this Starter */
+protected InputHandler inputHandler;
+
/**
* Main constructor
* @param commandLineOptions command-line options to use
@@ -75,7 +81,7 @@
public CommandLineStarter(CommandLineOptions commandLineOptions)
throws FOPException {
this.commandLineOptions = commandLineOptions;
-super.setInputHandler(commandLineOptions.getInputHandler());
+inputHandler = commandLineOptions.getInputHandler();
}
/**
1.4 +1 -1 xml-fop/src/java/org/apache/fop/apps/Fop.java
Index: Fop.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Fop.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Fop.java 11 Aug 2003 23:47:22 - 1.3
+++ Fop.java 12 Aug 2003 21:36:43 - 1.4
@@ -63,7 +63,7 @@
*/
public static void main(String[] args) {
CommandLineOptions options = null;
-Starter starter = null;
+CommandLineStarter starter = null;
try {
options = new CommandLineOptions(args);
1.8 +3 -3 xml-fop/src/java/org/apache/fop/tools/anttasks/Fop.java
Index: Fop.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/tools/anttasks/Fop.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Fop.java 12 Aug 2003 21:17:44 - 1.7
+++ Fop.java 12 Aug 2003 21:36:43 - 1.8
@@ -66,7 +66,6 @@
import java.util.List;
// FOP
-import org.apache.fop.apps.Starter;
import org.apache.fop.apps.InputHandler;
import org.apache.fop.apps.FOFileHandler;
import org.apache.fop.apps.Driver;
@@ -74,6 +73,7 @@
import org.apache.fop.fo.FOUserAgent;
// Avalon
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.ConsoleLogger;
import org.apache.avalon.framework.logger.Logger;
@@ -299,7 +299,7 @@
}
Logger log = new ConsoleLogger(logLevel);
try {
-Starter starter = new FOPTaskStarter(this);
+FOPTaskStarter starter = new FOPTaskStarter(this);
starter.enableLogging(log);
starter.run();
} catch (FOPException ex) {
@@ -310,7 +310,7 @@
}
-class FOPTaskStarter extends Starter {
+class FOPTaskStarter extends AbstractLogEnabled {
private Fop task;
private String baseURL = null;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 20868] - max external graphic height depends on region-body
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=20868. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=20868 max external graphic height depends on region-body --- Additional Comments From [EMAIL PROTECTED] 2003-08-14 08:36 --- Created an attachment (id=7813) Some fo files to illustrate the problem. (zip) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/tools/anttasks Fop.java
gmazza 2003/08/12 14:17:44
Modified:src/java/org/apache/fop/apps CommandLineOptions.java
Driver.java XSLTInputHandler.java
src/java/org/apache/fop/image XMLImage.java
src/java/org/apache/fop/svg SVGElementMapping.java
SVGUserAgent.java
src/java/org/apache/fop/tools TestConverter.java
src/java/org/apache/fop/tools/anttasks Fop.java
Added: src/java/org/apache/fop/apps FOFileHandler.java
Removed: src/java/org/apache/fop/apps FOInputHandler.java
Log:
Renamed apps.FOInputHandler to apps.FOFileHandler to reduce confusion with the new
FOInputHandler in the fo package.
Revision ChangesPath
1.11 +1 -1 xml-fop/src/java/org/apache/fop/apps/CommandLineOptions.java
Index: CommandLineOptions.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/CommandLineOptions.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CommandLineOptions.java 4 Aug 2003 18:53:17 - 1.10
+++ CommandLineOptions.java 12 Aug 2003 21:17:44 - 1.11
@@ -491,7 +491,7 @@
public InputHandler getInputHandler() throws FOPException {
switch (inputmode) {
case FO_INPUT:
-return new FOInputHandler(fofile);
+return new FOFileHandler(fofile);
case XSLT_INPUT:
return new XSLTInputHandler(xmlfile, xsltfile);
default:
1.22 +1 -2 xml-fop/src/java/org/apache/fop/apps/Driver.java
Index: Driver.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Driver.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Driver.java 12 Aug 2003 06:18:43 - 1.21
+++ Driver.java 12 Aug 2003 21:17:44 - 1.22
@@ -648,8 +648,7 @@
if (reader == null) {
if (!(source instanceof DocumentInputSource)) {
-//TODO: (gm) rename to FOFileHandler or similar
-reader = org.apache.fop.apps.FOInputHandler.createParser();
+reader = FOFileHandler.createParser();
}
}
1.9 +1 -1 xml-fop/src/java/org/apache/fop/apps/XSLTInputHandler.java
Index: XSLTInputHandler.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/XSLTInputHandler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XSLTInputHandler.java 4 Aug 2003 00:52:16 - 1.8
+++ XSLTInputHandler.java 12 Aug 2003 21:17:44 - 1.9
@@ -170,7 +170,7 @@
saxTFactory.newXMLFilter(xsltSource);
// Create an XMLReader.
-XMLReader parser = FOInputHandler.createParser();
+XMLReader parser = FOFileHandler.createParser();
if (parser == null) {
throw new FOPException(Unable to create SAX parser);
}
1.1 xml-fop/src/java/org/apache/fop/apps/FOFileHandler.java
Index: FOFileHandler.java
===
/*
* $Id: FOFileHandler.java,v 1.1 2003/08/12 21:17:44 gmazza 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
cvs commit: xml-fop/src/java/org/apache/fop/svg PDFGraphics2D.java
vmote 2003/08/14 07:59:56
Modified:src/java/org/apache/fop/fonts CustomFont.java
FontReader.java LazyFont.java
src/java/org/apache/fop/layout FontState.java
src/java/org/apache/fop/pdf PDFFactory.java
src/java/org/apache/fop/render/pdf FontSetup.java
PDFRenderer.java
src/java/org/apache/fop/render/ps PSProcSets.java
PSRenderer.java
src/java/org/apache/fop/svg PDFGraphics2D.java
Added: src/java/org/apache/fop/fonts Typeface.java
Removed: src/java/org/apache/fop/fonts Font.java
Log:
move fonts.Font to fonts.Typeface (in preparation for moving layout.FontState to
fonts.Font)
Revision ChangesPath
1.3 +1 -1 xml-fop/src/java/org/apache/fop/fonts/CustomFont.java
Index: CustomFont.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fonts/CustomFont.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CustomFont.java 25 Apr 2003 07:06:42 - 1.2
+++ CustomFont.java 14 Aug 2003 14:59:56 - 1.3
@@ -56,7 +56,7 @@
/**
* Abstract base class for custom fonts loaded from files, for example.
*/
-public abstract class CustomFont extends Font
+public abstract class CustomFont extends Typeface
implements FontDescriptor, MutableFont {
private String fontName = null;
1.2 +2 -2 xml-fop/src/java/org/apache/fop/fonts/FontReader.java
Index: FontReader.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fonts/FontReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FontReader.java 12 Aug 2003 18:27:35 - 1.1
+++ FontReader.java 14 Aug 2003 14:59:56 - 1.2
@@ -148,7 +148,7 @@
* Get the generated font object
* @return the font
*/
-public Font getFont() {
+public Typeface getFont() {
return returnFont;
}
1.4 +3 -3 xml-fop/src/java/org/apache/fop/fonts/LazyFont.java
Index: LazyFont.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fonts/LazyFont.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LazyFont.java 12 Aug 2003 18:27:35 - 1.3
+++ LazyFont.java 14 Aug 2003 14:59:56 - 1.4
@@ -59,14 +59,14 @@
/**
* This class is used to defer the loading of a font until it is really used.
*/
-public class LazyFont extends Font implements FontDescriptor {
+public class LazyFont extends Typeface implements FontDescriptor {
private String metricsFileName = null;
private String fontEmbedPath = null;
private boolean useKerning = false;
private boolean isMetricsLoaded = false;
-private Font realFont = null;
+private Typeface realFont = null;
private FontDescriptor realFontDescriptor = null;
/**
@@ -109,7 +109,7 @@
* Gets the real font.
* @return the real font
*/
-public Font getRealFont() {
+public Typeface getRealFont() {
load();
return realFont;
}
1.1 xml-fop/src/java/org/apache/fop/fonts/Typeface.java
Index: Typeface.java
===
/*
* $Id: Typeface.java,v 1.1 2003/08/14 14:59:56 vmote 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
cvs commit: xml-fop/src/java/org/apache/fop/tools AreaTreeBuilder.java
vmote 2003/08/14 00:42:59 Modified:src/java/org/apache/fop/fo FOInputHandler.java FOTreeHandler.java FObjMixed.java PropertyManager.java src/java/org/apache/fop/fo/flow Leader.java PageNumber.java PageNumberCitation.java src/java/org/apache/fop/mif MIFHandler.java src/java/org/apache/fop/render AbstractRenderer.java PrintRenderer.java Renderer.java src/java/org/apache/fop/render/awt AWTRenderer.java FontSetup.java src/java/org/apache/fop/render/pdf FontSetup.java PDFRenderer.java PDFXMLHandler.java src/java/org/apache/fop/render/ps PSDocumentGraphics2D.java PSGraphics2D.java PSProcSets.java PSRenderer.java PSTextElementBridge.java PSTextPainter.java PSTranscoder.java PSXMLHandler.java src/java/org/apache/fop/render/svg SVGRenderer.java src/java/org/apache/fop/render/xml XMLRenderer.java src/java/org/apache/fop/rtf/renderer RTFHandler.java src/java/org/apache/fop/svg PDFDocumentGraphics2D.java PDFGraphics2D.java PDFTextElementBridge.java PDFTextPainter.java PDFTranscoder.java src/java/org/apache/fop/tools AreaTreeBuilder.java Added: src/java/org/apache/fop/control Document.java Removed: src/java/org/apache/fop/layout FontInfo.java Log: 1. create control package 2. move layout.FontInfo to control.Document Revision ChangesPath 1.1 xml-fop/src/java/org/apache/fop/control/Document.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/control/Document.java?rev=1.1 1.4 +3 -3 xml-fop/src/java/org/apache/fop/fo/FOInputHandler.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/FOInputHandler.java.diff?r1=1.3r2=1.4 1.4 +4 -4 xml-fop/src/java/org/apache/fop/fo/FOTreeHandler.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/FOTreeHandler.java.diff?r1=1.3r2=1.4 1.6 +2 -2 xml-fop/src/java/org/apache/fop/fo/FObjMixed.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/FObjMixed.java.diff?r1=1.5r2=1.6 1.5 +5 -5 xml-fop/src/java/org/apache/fop/fo/PropertyManager.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/PropertyManager.java.diff?r1=1.4r2=1.5 1.6 +2 -2 xml-fop/src/java/org/apache/fop/fo/flow/Leader.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Leader.java.diff?r1=1.5r2=1.6 1.7 +2 -2 xml-fop/src/java/org/apache/fop/fo/flow/PageNumber.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/PageNumber.java.diff?r1=1.6r2=1.7 1.7 +2 -2 xml-fop/src/java/org/apache/fop/fo/flow/PageNumberCitation.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/PageNumberCitation.java.diff?r1=1.6r2=1.7 1.9 +3 -3 xml-fop/src/java/org/apache/fop/mif/MIFHandler.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/mif/MIFHandler.java.diff?r1=1.8r2=1.9 1.5 +2 -2 xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java.diff?r1=1.4r2=1.5 1.3 +3 -3 xml-fop/src/java/org/apache/fop/render/PrintRenderer.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/render/PrintRenderer.java.diff?r1=1.2r2=1.3 1.2 +2 -2 xml-fop/src/java/org/apache/fop/render/Renderer.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/render/Renderer.java.diff?r1=1.1r2=1.2 1.5 +2 -2 xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java.diff?r1=1.4r2=1.5 1.2 +61 -61xml-fop/src/java/org/apache/fop/render/awt/FontSetup.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/render/awt/FontSetup.java.diff?r1=1.1r2=1.2 1.5 +63 -63xml-fop/src/java/org/apache/fop/render/pdf/FontSetup.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/render/pdf/FontSetup.java.diff?r1=1.4r2=1.5 1.6 +21 -21xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java.diff?r1=1.5r2=1.6 1.2 +18 -16xml-fop/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java
trees and performance
This question is partially for the JVM gurus, and partially for anyone
interested in performance vs. clarity issues.
All of our data structures either are or should be tree structures. We have
an FO Tree and an Area Tree, and the control structures can tie them
together into one tree as well, so that everything is in a hierarchy. One
benefit of this is that we have potential to eliminate the amount of
parameters that must be passed around, which I think will be a good thing
from a clarity standpoint. We could, for example, create the following in
fo.FONode:
public PageSequence getPageSequence() {
return this.parent.getPageSequence();
}
which could then be overridden in fo.pagination.PageSequence with:
public FONode getParent() {
return this;
}
This means that if you have an object from the FO Tree, you can easily find
out which PageSequence it is associated with.
A similar thing could be done to obtain the soon-to-be-created Document
object (which is either a parent or a grandparent of the PageSequence,
depending on implementation decisions), which in turn can contain the Logger
object, and will contain information about what fonts have been used, etc.
This means that none of this information has to be carried around, but can
be obtained on-the-fly as needed. If later we decide to allow multiple
documents to be processed in a Session, the Session ties the Documents
together, and the Session can be reached from the Document (which will point
to it). In other words, virtually every data object that we have has a
parent, and should know who that parent is. Similar things can be done in
the Area tree also, I think. While this makes life nice from a programming
standpoint, and I think will help a lot in simplifying our code, I want to
make sure that it doesn't create an unacceptable performance hit. So, if you
are 12 levels deep in an FO Tree, you would have to go up 12 levels to get
the answer, then return through the 12 levels to get the answer delivered.
Another thing to consider is that even if we didn't want to use this scheme
forever, it might help us get the code untangled in the short term, and then
we would want to use parameters more, perhaps in some judiciously-chosen
profiler-signalled places only. What are your thoughts on this?
Victor Mote
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
RE: testing DOM input
Glen Mazza wrote: Going against 1.0, the code appears to work fine, so Victor's recent Document-handling changes in Driver doesn't appear to have raised any problems. Thanks for checking that. Someday I'll try to mess with the embedded stuff more Victor Mote - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: xml-fop/examples/embedding/java/embedding ExampleDOM2PDF.java
gmazza 2003/08/13 16:19:57 Modified:examples/embedding/java/embedding ExampleDOM2PDF.java Log: $Id$ added to get header printed at top of file. Revision ChangesPath 1.2 +1 -1 xml-fop/examples/embedding/java/embedding/ExampleDOM2PDF.java Index: ExampleDOM2PDF.java === RCS file: /home/cvs/xml-fop/examples/embedding/java/embedding/ExampleDOM2PDF.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ExampleDOM2PDF.java 13 Aug 2003 23:16:14 - 1.1 +++ ExampleDOM2PDF.java 13 Aug 2003 23:19:57 - 1.2 @@ -1,5 +1,5 @@ /* - * $Id + * $Id$ * *The Apache Software License, Version 1.1 * - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Wrong image height calculation in region-start and region-end
Hello list,
i wrote the following problem last december to this list
(http://marc.theaimsgroup.com/?l=fop-devm=103917590532646w=2) and
posted a very quickdirty solution that worked for me.
I have now updated my patched version to the current 0.20.5 release.
During the update i took a little deeper look at my past problem and
fixed the code of ExternalGraphic.java more properly (hope so). Maybe
some of the main developers can take a quick look at it and patch it
into the 0.20.x branch.
I changed the code of the layout function in ExternalGraphic.java from:
int pageHeight = area.getPage().getBody().getMaxHeight()
- spaceBefore;
if (height pageHeight) {
height = pageHeight;
width = (int)(ratio * ((double)height));
}
to:
int areaHeight = area.getMaxHeight() - spaceBefore;
if (height areaHeight) {
height = areaHeight;
width = (int)(ratio * ((double)height));
}
--
best regards
Timo Haberkern
EMEDIA OFFICE GmbH
http://www.emedia-office.com
thaberkern at emedia-office.de
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: xml-fop/src/documentation/content/xdocs extensions.xml
vmote 2003/08/11 16:18:08 Modified:src/documentation/content/xdocs extensions.xml Log: 1. add documentation of fox:destination 2. break explanation of fox: namespace into a separate section so that it is clear that it applies to all of the fox: extensions 3. some other minor cleanup Revision ChangesPath 1.10 +30 -8 xml-fop/src/documentation/content/xdocs/extensions.xml Index: extensions.xml === RCS file: /home/cvs/xml-fop/src/documentation/content/xdocs/extensions.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- extensions.xml21 Jul 2003 13:15:20 - 1.9 +++ extensions.xml11 Aug 2003 23:18:08 - 1.10 @@ -17,21 +17,25 @@ Please see the link href=graphics.html#svgSVG documentation/link for more details. /p /section +section id=fo-extensions + titleFO Extentions/title + section id=fox-namespace +titleNamespace/title +pBy convention, FO extensions in FOP use the fox: namespace identifier. +To use any of the FO extensions, add a namespace entry for http://xml.apache.org/fop/extensions +to the root element:/p +source![CDATA[fo:root xmlns:fo=http://www.w3.org/1999/XSL/Format; + xmlns:fox=http://xml.apache.org/fop/extensions;]]/source + /section section id=bookmarks titlePDF Bookmarks/title p -To use this standard FOP extension, you need to add a namespace entry for -http://xml.apache.org/fop/extensions on the root element. -/p -p You can provide outlines inside the root object (but outside any page-sequences or other formatting objects). Here's an example of an outline entry: /p source -![CDATA[fo:root xmlns:fo=http://www.w3.org/1999/XSL/Format; - xmlns:fox=http://xml.apache.org/fop/extensions; - fox:outline internal-destination=sec3 +![CDATA[fox:outline internal-destination=sec3 fox:labelRunning FOP/fox:label fox:outline internal-destination=sec3-1 @@ -45,12 +49,30 @@ examples/fo/basic for a more complete example. /p /section + section id=named-destinations +titleAnchors or Named Destinations/title +pUse the fox:destination element to define named destinations inside a PDF document. +These are useful as fragment identifiers, e.g. http://server/document.pdf#anchor-name;. +fox:destination elements can be placed almost anywhere in the fo document, including a child of +root, a block-level element, or an inline-level element. +For the destination to actually work, it must correspond to an id attribute on some fo element +within the document. In other words, the id attribute actually creates the view within the +PDF document. The fox:destination simply gives that view an independent name. +/p +source![CDATA[fox:destination internal-destination=table-of-contents/ +... +fo:block id=table-of-contentsTable of Contents/fo:block]]/source +warningIt is possible that in some future release of FOP, emall /emelements with +id attributes will generate named-destinations, which will eliminate the need for +fox:destination./warning + /section section id=table-continue-label -titleContinued-label (for table-header/-footer/title +titleContinued-label (for table-header/-footer)/title p Please see examples/fo/basic/contlabel.fo /p /section +/section /body /document - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Driver change, review or test
I just committed a change to trunk related only to DOM input that is high-risk in the sense that I don't have a convenient way to test it. If anyone uses DOM in their workflow, and can verify that the change below hasn't messed it up, I would be grateful. Here is the change: http://cvs.apache.org/viewcvs.cgi/xml-fop/src/java/org/apache/fop/apps/Drive r.java.diff?r1=1.19r2=1.20diff_format=h Here is the log message: vmote 2003/08/11 11:08:06 Modified:src/java/org/apache/fop/apps Driver.java Log: set up render(XMLReader, InputSource) as the main render() method, and normalize render(Document document) to this form. Victor Mote - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22341] - fo:leader not filling space with dots rule or other
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22341. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22341 fo:leader not filling space with dots rule or other [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2003-08-12 10:24 --- See the FAQ http://xml.apache.org/fop/faq.html#leader-expansion Please use the mailing list to ask questions. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Bug report for Fop [2003/08/10]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=CriticalMAJ=Major | | | | MIN=Minor NOR=Normal ENH=Enhancement | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | | 635|Opn|Nor|2001-02-18|Doesn't support id= attribute in fo:page-sequence | | 953|Opn|Nor|2001-03-12|Incorrect hyperlinks area rendering in justified t| | 1063|New|Nor|2001-03-21|fop does not handle large fo files| | 1180|New|Maj|2001-04-02|Problem with monospaced font | | 1859|Opn|Min|2001-05-22|org.apache.fop.apps.Driver.reset() doesn't fully r| | 1998|New|Nor|2001-06-05|linefeed-treatment not understood | | 2150|Ass|Maj|2001-06-13|New page with a table-header but without any tabl| | 2475|Ass|Nor|2001-07-06|Borders don't appear to work in fo:table-row| | 2740|New|Maj|2001-07-23|multi-page tables sometimes render badly | | 2909|New|Maj|2001-07-30|Gradient render error | | 2964|Ass|Nor|2001-08-02|problems with height of cells in tables | | 2988|New|Maj|2001-08-03|0.19: list-item-label does not stick to list-item-| | 3044|Ass|Maj|2001-08-08|keep-together not functioning | | 3280|New|Nor|2001-08-27|PCL Renderer doesn't work | | 3305|Opn|Nor|2001-08-28|list-block overlapping footnote body | | 3497|New|Maj|2001-09-07|id already exists error when using span=all attr| | 3824|New|Blk|2001-09-25|MIF option with tables| | 4030|New|Nor|2001-10-08|IOException creating Postscript with graphics on S| | 4126|New|Nor|2001-10-12|FontState.width() returns pts instead of millipts | | 4226|New|Nor|2001-10-17|The orphans property doesn't seem to work | | 4388|New|Nor|2001-10-24|Nullpointer exception in the construction of new D| | 4415|New|Nor|2001-10-25|scaling=uniform does not work on images... | | 4510|New|Nor|2001-10-30|fo:inline common properties ignored? | | 4535|New|Maj|2001-10-31|PCL renderer 1.13 not rendering SVG | | 4614|New|Maj|2001-11-03|wrap property combined with Chinese | | 4767|New|Nor|2001-11-09|SVG text is distored in PDF output| | 5001|New|Nor|2001-11-21|content-width and content-height ignored? | | 5010|New|Enh|2001-11-21|Better error reporting needed | | 5047|Ass|Nor|2001-11-23|Dotted border style is not supported | | 5124|New|Maj|2001-11-27|fo:block-container is not rendered properly using | | 5335|Opn|Min|2001-12-10|Text with embedded CID fonts not retrievable from | | 5655|Ass|Nor|2002-01-02|text-decoration cannot take multiple values | | 6094|Opn|Maj|2002-01-29|0.20.3rc hangs in endless loop| | 6237|Opn|Nor|2002-02-05|#xFB01 (fi ligature) produces a sharp? | | 6305|New|Nor|2002-02-07|Using fo:table-and-caption results in empty output| | 6427|New|Enh|2002-02-13|Adding additional Type 1 fonts problem| | 6437|New|Maj|2002-02-13|Tables without fo:table-column don't render | | 6483|New|Nor|2002-02-15|Table, Loop, footer could not fit on page, moving| | 6844|New|Nor|2002-03-04|No line breaks inserted in list-item-label| | 6918|New|Enh|2002-03-06|reference-orientation has no effect | | 6929|New|Nor|2002-03-06|Cells border hidden by cells background | | 6997|New|Nor|2002-03-09|Row-spanned row data breaks over a page within a c| | 7140|New|Enh|2002-03-15|page-position attribute set to last on condition| | 7241|New|Nor|2002-03-19|keep-with-previous, keep-with-next only working on| | 7283|New|Nor|2002-03-20|Table border misaligned when using margin-left in | | 7337|New|Nor|2002-03-21|border around external image leaves empty space | | 7487|New|Nor|2002-03-26|break-before=page for table inserts empty page | | 7496|New|Nor|2002-03-26|The table header borders are not adjusted to the b| | 7525|New|Cri|2002-03-27|table with spans inside a list-block | | 7919|New|Cri|2002-04-10|problem to use attribute linefeed-treatment and li| | 8003|Ass|Maj|2002-04-12|FopImageFactory never releases cached images | |
DO NOT REPLY [Bug 22312] - FOP ignores CDATA formatting
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22312. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22312 FOP ignores CDATA formatting [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2003-08-11 18:21 --- This is by design. Check how space handling is defined in the FO spec and what the defaults are, specifically http://www.w3.org/TR/xsl/slice7.html#linefeed-treatment http://www.w3.org/TR/xsl/slice7.html#white-space-treatment http://www.w3.org/TR/xsl/slice7.html#white-space-collapse If you want to have whitespace preserved, look into the FOP FAQ for hints. BTW CDATA has absolutely nothing to to with this. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/apps Driver.java
vmote 2003/08/11 10:51:25 Modified:src/java/org/apache/fop/apps Driver.java Log: fix minor checkstyle errors Revision ChangesPath 1.19 +1 -2 xml-fop/src/java/org/apache/fop/apps/Driver.java Index: Driver.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Driver.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- Driver.java 11 Aug 2003 17:44:15 - 1.18 +++ Driver.java 11 Aug 2003 17:51:25 - 1.19 @@ -58,7 +58,6 @@ import org.apache.fop.fo.FOTreeHandler; import org.apache.fop.mif.MIFHandler; import org.apache.fop.render.Renderer; -import org.apache.fop.render.awt.AWTPrintRenderer; import org.apache.fop.render.awt.AWTRenderer; import org.apache.fop.rtf.renderer.RTFHandler; import org.apache.fop.tools.DocumentInputSource; @@ -550,7 +549,7 @@ /** * Render the FO document read by a SAX Parser from an InputHandler - * @param InputHandler the input handler containing the source and + * @param inputHandler the input handler containing the source and * parser information. * @throws FOPException if anything goes wrong. */ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/apps AWTStarter.java
gmazza 2003/08/08 15:56:15 Modified:src/java/org/apache/fop/apps AWTStarter.java Log: Fix: setOptions() for AWTRenderer not being called. Revision ChangesPath 1.7 +1 -0 xml-fop/src/java/org/apache/fop/apps/AWTStarter.java Index: AWTStarter.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/AWTStarter.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- AWTStarter.java 4 Aug 2003 18:53:17 - 1.6 +++ AWTStarter.java 8 Aug 2003 22:56:15 - 1.7 @@ -91,6 +91,7 @@ AWTRenderer renderer = new AWTRenderer(translator); frame = createPreviewDialog(renderer, translator); renderer.setComponent(frame); +renderer.setOptions(commandLineOptions.getRendererOptions()); driver = new Driver(); driver.setRenderer(renderer); } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
