Re: FOP Servlet, contrib stuff and tutorial
On Sun, 2002-12-01 at 20:58, J.Pietschmann wrote: - move contrib/servlet to examples/servlet - move contrib/plan to examples/plan - move contrib/mathml to examples/mathml Unless license restrictions get in the way, I'd rather move them to src/java/org/apache/fop/* One of the purposes that these serve is to demonstrate how to write an extension and for FOP to pick it up in the classpath. This might take away that. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: Using Apache FOP to create multiple-page PDFs usingPDFDocumentGraphics2D
On Mon, 2002-12-02 at 03:40, jcplerm wrote: Is it possible, by any means, to use PDFDocumentGraphics2D (or any other FOP class) to generate a PDF document with multiple pages, so that each page contains a slice of a larger graph created using Graphics2D methods? Hi Julio, Not directly. It may be possible to subclass the PDFDocumentGraphics2D to achieve this. Could you give a brief outline of how such a class would work so we can add it to a to do list. This has been requested a few times and could be a useful addition. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: white-space line-ending changes
J.Pietschmann wrote:
I had the same problem when I commited for the first time. As far as I
found out, you have to be subscribed to fop-cvs mail list using your
*apache email address* + first message may be postponed a little bit
by moderator (nobody knows who is it though :).
BTW I'm subscribed to fop-cvs with my spam-filtered address and have no
problems.
But your commit messages nevertheless are sent only from [EMAIL PROTECTED]
My conclusion was based on a quick analysis of $CVSROOT/CVSROOT/loginfo file
at cvs.apache.org. This one usually defines an action being performed on each
commit into a cvs repository. Our one runs $CVSROOT/CVSROOT/log_accum.pl
script, which in turn (I should admit I'm not perl expert) actually
consolidates message and sends it to the mail list through sendmail program
from $ENV{'USER'}@apache.org address.
And if commit messages are always sent from $ENV{'USER'}@apache.org address,
this one should be subscribed to the list.
May be there is another door though.
--
Oleg Tkachenko
eXperanto team
Multiconn Technologies, Israel
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
Re: Getting breaks: revisited
J.Pietschmann wrote: There are layouts for which it is very hard to decide what to do. Consider the following: fo:root xmlns:fo=http://www.w3.org/1999/XSL/Format; fo:layout-master-set fo:simple-page-master master-name=thin page-width=110mm page-height=297mm fo:region-body/ /fo:simple-page-master fo:simple-page-master master-name=thick page-width=210mm page-height=297mm fo:region-body/ /fo:simple-page-master fo:page-sequence-master master-name=master fo:repeatable-page-master-reference maximum-repeats=100 master-reference=thin/ fo:repeatable-page-master-reference master-reference=thick/ /fo:page-sequence-master /fo:layout-master-set fo:page-sequence master-reference=master fo:flow flow-name=xsl-region-body fo:block width=150mmblabla../fo:block /fo:flow /fo:page-sequence /fo:root Should this create 100 empty pages and render the text onto the 101st page, or should it squeeze it onto the first page, thereby violating the advised width constraint of the block? btw, how does such a case addressed by the spec? Apparently FOP, antenna and xep do squeeze content. Isn't it an example of overconstrained geometry (5.3.4)? -- Oleg Tkachenko eXperanto team Multiconn Technologies, Israel - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 14356] - *NOT* embedding TrueTypeFont in PDF causes AcrobatReader displaying only dots
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=14356. 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=14356 *NOT* embedding TrueTypeFont in PDF causes AcrobatReader displaying only dots --- Additional Comments From [EMAIL PROTECTED] 2002-12-02 11:28 --- We have the same problem as MM. We use ARIALUNI.TTF font which contains several Asian languages and has been installed in the server. However, even we generate the metric file with -enc ansi option, only English character can be viewed. All other Asian language characters are displayed as '#'. In short, how can we generate a pdf file for Asian language without embeding fonts? SL - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: Extension to write continued label in table headers
J.Pietschmann wrote: How? Karen is about table header/footer, not static content. As described in another mail today... Do you mean http://marc.theaimsgroup.com/?l=fop-userm=103260578416087w=2? Surely markers can help here, but it's only when continued label may be placed in static content, which is actually serious restriction and not always the case altogether. The problem is exactly about table header/footer. And that's allowed only in table header/footer content, right? No, I'd like to allow it for every element which can generate more than one regular area due to page breaks, i.e. for block, inline, block-container, table, table-cell, list-block, list-block-item etc. Well, some of them make less sense than others, but clever code reuse will probably give most of it for free. It makes sense for example if you have a lengthy blockquote or list and you want to make the reader aware that its continued on the next page. Makes sense. +1 EXSLFO Yes, please. I subscribed to the discussion list, let's see what happens next. It's almost dead right now. Eliot is XSL WG member since last week, David from RenderX want exslfo to concentrate primary on use cases instead of extensions, antenna guys as usual keep silence. Anyway I believe we should support exslfo effort. -- Oleg Tkachenko eXperanto team Multiconn Technologies, Israel - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: xml-fop/src/documentation/content/xdocs/design/alt.design alt-properties.xml AbsolutePosition.png.xml BorderCommonStyle.png.xml PropNames.png.xml Properties.png.xml PropertyConsts.png.xml VerticalAlign.png.xml book.xml classes-overview.xml coroutines.xml footnotes.xml galleys.xml keeps.xml properties-classes.xml spaces.xml user-agent-refs.xml xml-parsing.xml alt.properties.xml
keiron 2002/12/02 04:00:12 Modified:src/documentation/content/xdocs/design/alt.design AbsolutePosition.png.xml BorderCommonStyle.png.xml PropNames.png.xml Properties.png.xml PropertyConsts.png.xml VerticalAlign.png.xml book.xml classes-overview.xml coroutines.xml footnotes.xml galleys.xml keeps.xml properties-classes.xml spaces.xml user-agent-refs.xml xml-parsing.xml Added: src/documentation/content/xdocs/design/alt.design alt-properties.xml Removed: src/documentation/content/xdocs/design/alt.design alt.properties.xml Log: fixed some errors Revision ChangesPath 1.2 +1 -1 xml-fop/src/documentation/content/xdocs/design/alt.design/AbsolutePosition.png.xml Index: AbsolutePosition.png.xml === RCS file: /home/cvs/xml-fop/src/documentation/content/xdocs/design/alt.design/AbsolutePosition.png.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- AbsolutePosition.png.xml 2 Dec 2002 10:19:42 - 1.1 +++ AbsolutePosition.png.xml 2 Dec 2002 12:00:11 - 1.2 @@ -13,7 +13,7 @@ body section titleProperties$AbsolutePosition/title - figure src=AbsolutePosition.png alt=AbsolutePosition diagram/ + figure src=images/design/alt.design/AbsolutePosition.png alt=AbsolutePosition diagram/ /section /body 1.2 +1 -1 xml-fop/src/documentation/content/xdocs/design/alt.design/BorderCommonStyle.png.xml Index: BorderCommonStyle.png.xml === RCS file: /home/cvs/xml-fop/src/documentation/content/xdocs/design/alt.design/BorderCommonStyle.png.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- BorderCommonStyle.png.xml 2 Dec 2002 10:19:42 - 1.1 +++ BorderCommonStyle.png.xml 2 Dec 2002 12:00:11 - 1.2 @@ -13,7 +13,7 @@ body section titleProperties$BorderCommonStyle/title - figure src=BorderCommonStyle.png alt=BorderCommonStyle diagram/ + figure src=images/design/alt.design/BorderCommonStyle.png alt=BorderCommonStyle diagram/ /section /body /document 1.2 +2 -1 xml-fop/src/documentation/content/xdocs/design/alt.design/PropNames.png.xml Index: PropNames.png.xml === RCS file: /home/cvs/xml-fop/src/documentation/content/xdocs/design/alt.design/PropNames.png.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- PropNames.png.xml 2 Dec 2002 10:19:42 - 1.1 +++ PropNames.png.xml 2 Dec 2002 12:00:11 - 1.2 @@ -5,6 +5,7 @@ document header title..fo.PropNames diagram/title +authors person id=pbw name=Peter B. West email=[EMAIL PROTECTED]/ /authors @@ -12,7 +13,7 @@ body section titlePropNames.class/title - figure src=PropNames.png alt=PropNames.class diagram/ + figure src=images/design/alt.design/PropNames.png alt=PropNames.class diagram/ /section /body /document 1.2 +1 -1 xml-fop/src/documentation/content/xdocs/design/alt.design/Properties.png.xml Index: Properties.png.xml === RCS file: /home/cvs/xml-fop/src/documentation/content/xdocs/design/alt.design/Properties.png.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Properties.png.xml2 Dec 2002 10:19:42 - 1.1 +++ Properties.png.xml2 Dec 2002 12:00:11 - 1.2 @@ -13,7 +13,7 @@ body section titleProperties.class/title - figure src=Properties.png alt=Properties.class diagram/ + figure src=images/design/alt.design/Properties.png alt=Properties.class diagram/ /section /body /document 1.2 +1 -1 xml-fop/src/documentation/content/xdocs/design/alt.design/PropertyConsts.png.xml Index: PropertyConsts.png.xml === RCS file: /home/cvs/xml-fop/src/documentation/content/xdocs/design/alt.design/PropertyConsts.png.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- PropertyConsts.png.xml2 Dec 2002 10:19:42 - 1.1 +++ PropertyConsts.png.xml2 Dec 2002 12:00:11 - 1.2 @@ -13,7 +13,7 @@ body section titlePropertyConsts.class/title - figure src=PropertyConsts.png alt=PropertyConsts.class diagram/ +
cvs commit: xml-fop/src/documentation/resources/images/design/alt.design AbsolutePosition.png BorderCommonStyle.png PropNames.png Properties.png PropertyClasses.png PropertyConsts.png PropertyStaticsOverview.png SAXParsing.png VerticalAlign.png XML-event-buffer.png XMLEventQueue.png block-stacking-constraints.png block-stacking-keeps.png block-stacking.png coroutines.png galley-preprocessing.png initial-column-values.png line-area-5.png line-area-6.png parserPersistence.png processPlumbing.png property-super-classes-full.png xmlevent-queue.png
keiron 2002/12/02 04:01:04 Added: src/documentation/resources/images/design/alt.design AbsolutePosition.png BorderCommonStyle.png PropNames.png Properties.png PropertyClasses.png PropertyConsts.png PropertyStaticsOverview.png SAXParsing.png VerticalAlign.png XML-event-buffer.png XMLEventQueue.png block-stacking-constraints.png block-stacking-keeps.png block-stacking.png coroutines.png galley-preprocessing.png initial-column-values.png line-area-5.png line-area-6.png parserPersistence.png processPlumbing.png property-super-classes-full.png xmlevent-queue.png Log: added design images Revision ChangesPath 1.1 xml-fop/src/documentation/resources/images/design/alt.design/AbsolutePosition.png Binary file 1.1 xml-fop/src/documentation/resources/images/design/alt.design/BorderCommonStyle.png Binary file 1.1 xml-fop/src/documentation/resources/images/design/alt.design/PropNames.png Binary file 1.1 xml-fop/src/documentation/resources/images/design/alt.design/Properties.png Binary file 1.1 xml-fop/src/documentation/resources/images/design/alt.design/PropertyClasses.png Binary file 1.1 xml-fop/src/documentation/resources/images/design/alt.design/PropertyConsts.png Binary file 1.1 xml-fop/src/documentation/resources/images/design/alt.design/PropertyStaticsOverview.png Binary file 1.1 xml-fop/src/documentation/resources/images/design/alt.design/SAXParsing.png Binary file 1.1 xml-fop/src/documentation/resources/images/design/alt.design/VerticalAlign.png Binary file 1.1 xml-fop/src/documentation/resources/images/design/alt.design/XML-event-buffer.png Binary file 1.1 xml-fop/src/documentation/resources/images/design/alt.design/XMLEventQueue.png Binary file 1.1 xml-fop/src/documentation/resources/images/design/alt.design/block-stacking-constraints.png Binary file 1.1 xml-fop/src/documentation/resources/images/design/alt.design/block-stacking-keeps.png Binary file 1.1 xml-fop/src/documentation/resources/images/design/alt.design/block-stacking.png Binary file 1.1 xml-fop/src/documentation/resources/images/design/alt.design/coroutines.png Binary file 1.1 xml-fop/src/documentation/resources/images/design/alt.design/galley-preprocessing.png Binary file 1.1 xml-fop/src/documentation/resources/images/design/alt.design/initial-column-values.png Binary file 1.1 xml-fop/src/documentation/resources/images/design/alt.design/line-area-5.png Binary file 1.1 xml-fop/src/documentation/resources/images/design/alt.design/line-area-6.png Binary file 1.1 xml-fop/src/documentation/resources/images/design/alt.design/parserPersistence.png Binary file 1.1 xml-fop/src/documentation/resources/images/design/alt.design/processPlumbing.png Binary file 1.1 xml-fop/src/documentation/resources/images/design/alt.design/property-super-classes-full.png Binary file 1.1 xml-fop/src/documentation/resources/images/design/alt.design/xmlevent-queue.png Binary file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/docs/design/understanding area_tree.xml book.xml fo_tree.xml handling_attributes.xml images.xml layout_managers.xml layout_process.xml pdf_library.xml properties.xml renderers.xml status.xml svg.xml understanding.xml xml_parsing.xml
keiron 2002/12/02 04:59:12 Removed: docs/design float.svg page.svg docs/design/alt.design AbsolutePosition.png AbsolutePosition.png.xml BorderCommonStyle.png BorderCommonStyle.png.xml PropNames.png PropNames.png.xml Properties.png Properties.png.xml PropertyClasses.png PropertyConsts.png PropertyConsts.png.xml PropertyStaticsOverview.png SAXParsing.png VerticalAlign.png VerticalAlign.png.xml XML-event-buffer.png XMLEventQueue.png alt.properties.xml block-stacking-constraints.png block-stacking-keeps.png block-stacking.png book.xml classes-overview.xml compound-properties.xml coroutines.png coroutines.xml footnotes.xml galley-preprocessing.png galleys.xml initial-column-values.png intro.xml keeps.xml line-area-5.png line-area-6.png parserPersistence.png processPlumbing.png properties-classes.xml property-super-classes-full.png propertyExpressions.xml spaces.xml traits.xml user-agent-refs.xml xml-parsing.xml xmlevent-queue.png docs/design/understanding area_tree.xml book.xml fo_tree.xml handling_attributes.xml images.xml layout_managers.xml layout_process.xml pdf_library.xml properties.xml renderers.xml status.xml svg.xml understanding.xml xml_parsing.xml Log: no longer needed, moved to src/documentation/content/xdocs/design/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop status.xml
keiron 2002/12/02 05:20:33 Modified:.status.xml Log: added Victor and updated some tasks Revision ChangesPath 1.19 +10 -0 xml-fop/status.xml Index: status.xml === RCS file: /home/cvs/xml-fop/status.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- status.xml30 Nov 2002 08:54:25 - 1.18 +++ status.xml2 Dec 2002 13:20:33 - 1.19 @@ -8,6 +8,7 @@ person name=Karen Lease email=[EMAIL PROTECTED] id=KL/ person name=Keiron Liddle email=[EMAIL PROTECTED] id=KLL/ person name=Jeremias Maerki email=[EMAIL PROTECTED] id=JM/ + person name=Victor Mote email=[EMAIL PROTECTED] id=VM/ person name=Joerg Pietschmann email=[EMAIL PROTECTED] id=JP/ person name=Arved Sandstrom email=[EMAIL PROTECTED] id=AS/ person name=Oleg Tkachenko email=[EMAIL PROTECTED] id=OT/ @@ -92,6 +93,10 @@ Integrate with Jakarta Avalon: logging, configuration, URI resolver, component management, image caching etc. /action +action context=code dev=open + Make it possible to redo static regions by determining which + areas need a new layout for new page. +/action /actions actions priority=low @@ -118,6 +123,11 @@ action context=code dev=KL type=fix fixes-bug=14290 Correct ordering of loca table in embedded true type fonts. Fix taken over from maintenance branch. +/action +action context=docs dev=KLL type=update +due-to=Victor Mote due-to-email=[EMAIL PROTECTED] + New dev fonts.xml file to store some useful links and information + about font work /action action context=docs dev=KLL type=update due-to=Victor Mote due-to-email=[EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Style guide (2nd update)
On Sunday 01 December 2002 22:26, Oleg Tkachenko wrote: . . . J.Pietschmann wrote: I think we should leverage final more often in FOP. At http://codeconsult.ch/wiki/index.php/FopDevelopersStyleGuide we've got +2 vs -2 on this point, so taking into acount your opinion it's +3 vs -2 now. I think the +2 vs -2 that you mention refer to declaring variables in the inner scope, not precisely to using final or not. This thing about final is really minor IMHO, I think it's a good practice and should be mentioned as such, but I wouldn't make any checks on it. -Bertrand - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 14356] - *NOT* embedding TrueTypeFont in PDF causes AcrobatReader displaying only dots
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=14356. 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=14356 *NOT* embedding TrueTypeFont in PDF causes AcrobatReader displaying only dots --- Additional Comments From [EMAIL PROTECTED] 2002-12-02 13:51 --- I'm afraid you cannot. See http://marc.theaimsgroup.com/?l=fop-devm=103839237726705w=2. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fonts/type1 PFBParser.java PFBData.java
jeremias2002/12/02 06:04:16
Modified:src/org/apache/fop/fonts/type1 Tag: fop-0_20_2-maintain
PFBParser.java PFBData.java
Log:
Added missing APL header
Improved style
Revision ChangesPath
No revision
No revision
1.1.2.2 +40 -18xml-fop/src/org/apache/fop/fonts/type1/Attic/PFBParser.java
Index: PFBParser.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fonts/type1/Attic/PFBParser.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- PFBParser.java29 Nov 2002 08:40:54 - 1.1.2.1
+++ PFBParser.java2 Dec 2002 14:04:16 - 1.1.2.2
@@ -1,3 +1,9 @@
+/*
+ * $Id$
+ * Copyright (C) 2002 The Apache Software Foundation. All rights reserved.
+ * For details on use and redistribution please refer to the
+ * LICENSE file included with these sources.
+ */
package org.apache.fop.fonts.type1;
import java.io.IOException;
@@ -10,7 +16,7 @@
/**
* This class represents a parser for Adobe Type 1 PFB files.
- *
+ *
* @see PFBData
*/
public class PFBParser {
@@ -85,11 +91,10 @@
private static int swapInteger(final int value) {
-return
-(((value 0) 0xff ) 24) +
-(((value 8) 0xff ) 16) +
-(((value 16) 0xff ) 8) +
-(((value 24) 0xff ) 0);
+return (((value 0) 0xff) 24)
+ + (((value 8) 0xff) 16)
+ + (((value 16) 0xff) 8)
+ + (((value 24) 0xff) 0);
}
@@ -100,45 +105,61 @@
//Read first segment
segmentHead = din.readUnsignedByte();
-if (segmentHead != 128) throw new IOException(Invalid file format.
Expected ASCII 80hex);
+if (segmentHead != 128) {
+throw new IOException(Invalid file format. Expected ASCII 80hex);
+}
segmentType = din.readUnsignedByte(); //Read
int len1 = swapInteger(din.readInt());
byte[] headerSegment = new byte[len1];
bytesRead = din.read(headerSegment);
-if (bytesRead != len1) throw new IOException(Could not load the whole
segment);
+if (bytesRead != len1) {
+throw new IOException(Could not load the whole segment);
+}
pfb.setHeaderSegment(headerSegment);
//Read second segment
segmentHead = din.readUnsignedByte();
-if (segmentHead != 128) throw new IOException(Invalid file format.
Expected ASCII 80hex);
+if (segmentHead != 128) {
+throw new IOException(Invalid file format. Expected ASCII 80hex);
+}
segmentType = din.readUnsignedByte();
int len2 = swapInteger(din.readInt());
byte[] encryptedSegment = new byte[len2];
bytesRead = din.read(encryptedSegment);
-if (bytesRead != len2) throw new IOException(Could not load the whole
segment);
+if (bytesRead != len2) {
+throw new IOException(Could not load the whole segment);
+}
pfb.setEncryptedSegment(encryptedSegment);
//Read third segment
segmentHead = din.readUnsignedByte();
-if (segmentHead != 128) throw new IOException(Invalid file format.
Expected ASCII 80hex);
+if (segmentHead != 128) {
+throw new IOException(Invalid file format. Expected ASCII 80hex);
+}
segmentType = din.readUnsignedByte();
int len3 = swapInteger(din.readInt());
byte[] trailerSegment = new byte[len3];
bytesRead = din.read(trailerSegment);
-if (bytesRead != len3) throw new IOException(Could not load the whole
segment);
+if (bytesRead != len3) {
+throw new IOException(Could not load the whole segment);
+}
pfb.setTrailerSegment(trailerSegment);
//Read EOF indicator
segmentHead = din.readUnsignedByte();
-if (segmentHead != 128) throw new IOException(Invalid file format.
Expected ASCII 80hex);
+if (segmentHead != 128) {
+throw new IOException(Invalid file format. Expected ASCII 80hex);
+}
segmentType = din.readUnsignedByte();
-if (segmentType != 3) throw new IOException(Expected segment type 3, but
found: +segmentType);
+if (segmentType != 3) {
+throw new IOException(Expected segment type 3, but found: +
segmentType);
+}
}
-private final static boolean byteCmp(byte[] src, int srcOffset, byte[] cmp) {
+private static final boolean byteCmp(byte[] src, int srcOffset, byte[] cmp) {
for (int i = 0; i cmp.length; i++) {
-//
cvs commit: xml-fop/src/org/apache/fop/fonts/type1 PFMFile.java
jeremias2002/12/02 06:04:43 Modified:src/org/apache/fop/fonts/type1 Tag: fop-0_20_2-maintain PFMFile.java Log: Removed semicolon Revision ChangesPath No revision No revision 1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fonts/type1/Attic/PFMFile.java Index: PFMFile.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/fonts/type1/Attic/PFMFile.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- PFMFile.java 29 Nov 2002 08:40:54 - 1.1.2.1 +++ PFMFile.java 2 Dec 2002 14:04:43 - 1.1.2.2 @@ -44,8 +44,8 @@ // Extent table private int[] extentTable; -private Map kerningTab = new java.util.HashMap();; - +private Map kerningTab = new java.util.HashMap(); + /** * Parses a PFM file * - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/util StreamUtilities.java
jeremias2002/12/02 06:15:08
Modified:src/org/apache/fop/util StreamUtilities.java
Log:
style and javadocs
added new method toByteArray()
Revision ChangesPath
1.2 +62 -10xml-fop/src/org/apache/fop/util/StreamUtilities.java
Index: StreamUtilities.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/util/StreamUtilities.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StreamUtilities.java 27 May 2002 10:59:08 - 1.1
+++ StreamUtilities.java 2 Dec 2002 14:15:08 - 1.2
@@ -8,6 +8,7 @@
import java.io.InputStream;
import java.io.OutputStream;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.EOFException;
import java.io.DataInput;
@@ -29,6 +30,10 @@
* The process is buffered, so you shouldn't need
* BufferedInput/OutputStreams. Flushes when it's finished, but does
* not close either stream. Returns the number of bytes copied.
+ * @param source InputStream to read from
+ * @param sink OutputStream to write to
+ * @return long the total number of bytes copied
+ * @throws IOException In case of an I/O problem
*/
public static long streamCopy(InputStream source,
OutputStream sink) throws IOException {
@@ -39,8 +44,9 @@
// trough
int scoop;
while ((scoop = source.read(buffer)) = 0) {
-if (scoop == 0)
+if (scoop == 0) {
System.out.println(zero scoop!);
+}
sink.write(buffer, 0, scoop);
total += scoop;
}
@@ -52,13 +58,20 @@
}
/**
+ * Method streamCopy.
+ */
+/**
* Binary copies up to the given number of bytes from an input
* stream to an output stream. The process is buffered, so you
* shouldn't need BufferedInput/OutputStreams.
* Flushes when it's finished, but does not close either stream.
* Throws an EOFExeption if there aren't enough bytes available to
* transfer the requested amount.
- * Returns the total number of bytes copied.
+ * @param source InputStream to read from
+ * @param sink OutputStream to write to
+ * @param howMany requested amount of bytes that are to be copied
+ * @return long the total number of bytes copied
+ * @throws IOException In case of an I/O problem
*/
public static long streamCopy(InputStream source,
OutputStream sink, int howMany) throws
IOException {
@@ -70,10 +83,12 @@
int scoop;
while (left 0) {
scoop = source.read(buffer, 0, Math.min(BUFFER_SIZE, left));
-if (scoop 0)
+if (scoop 0) {
throw new EOFException(
- Not enough bytes to feed you in IOLib.streamCopy(source, sink,
howMany); you asked for +
- howMany + and I only have + (howMany - left));
+ Not enough bytes to feed you in
+ + IOLib.streamCopy(source, sink, howMany); you asked for
+ + howMany + and I only have + (howMany - left));
+}
sink.write(buffer, 0, scoop);
left -= scoop;
@@ -86,13 +101,20 @@
}
/**
+ * Method streamCopyWithChecksum.
+ */
+/**
* Binary copies up to the given number of bytes from an input
* stream to an output stream. The process is buffered, so you
* shouldn't need BufferedInput/OutputStreams.
* Flushes when it's finished, but does not close either stream.
* Throws an EOFExeption if there aren't enough bytes available
* to transfer the requested amount.
- * Returns the checksum of the bytes copied.
+ * @param source InputStream to read from
+ * @param sink OutputStream to write to
+ * @param howMany requested amount of bytes that are to be copied
+ * @return long the checksum of the bytes copied
+ * @throws IOException In case of an I/O problem
*/
public static long streamCopyWithChecksum(InputStream source,
OutputStream sink, int howMany) throws IOException {
@@ -105,8 +127,10 @@
int scoop;
while (left 0) {
scoop = source.read(buffer, 0, Math.min(BUFFER_SIZE, left));
-if (scoop 0)
-throw new EOFException(Not enough bytes to feed you in
IOLib.streamCopy(source, sink, howMany));
+if (scoop 0) {
+throw new EOFException(Not enough bytes to feed you in
++ IOLib.streamCopy(source, sink, howMany));
+}
cvs commit: xml-fop/src/org/apache/fop/fonts/type1 PFBData.java PFBParser.java PFMFile.java PFMInputStream.java package.html
jeremias2002/12/02 06:24:07 Added: src/org/apache/fop/fonts/type1 PFBData.java PFBParser.java PFMFile.java PFMInputStream.java package.html Log: Moved PFM classes to type1 subpackage Added PFB classes (taken from branch) Revision ChangesPath 1.2 +148 -0xml-fop/src/org/apache/fop/fonts/type1/PFBData.java 1.2 +232 -0xml-fop/src/org/apache/fop/fonts/type1/PFBParser.java 1.2 +425 -0xml-fop/src/org/apache/fop/fonts/type1/PFMFile.java 1.2 +96 -0 xml-fop/src/org/apache/fop/fonts/type1/PFMInputStream.java 1.2 +6 -0 xml-fop/src/org/apache/fop/fonts/type1/package.html - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop .cvsignore
jeremias2002/12/02 06:30:08 Modified:..cvsignore Log: Add an entry for checkstyle-noframes.xsl stylesheet Revision ChangesPath 1.4 +1 -0 xml-fop/.cvsignore Index: .cvsignore === RCS file: /home/cvs/xml-fop/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore31 Oct 2002 17:16:18 - 1.3 +++ .cvsignore2 Dec 2002 14:30:08 - 1.4 @@ -1,3 +1,4 @@ build jpfop-0.17.0 build-local.properties +checkstyle-noframes.xsl \ No newline at end of file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/documentation/content/xdocs/design/alt.design classes-overview.xml
keiron 2002/12/02 06:34:04 Modified:src/documentation/content/xdocs/design/alt.design classes-overview.xml Log: use proper character reference Revision ChangesPath 1.3 +1 -1 xml-fop/src/documentation/content/xdocs/design/alt.design/classes-overview.xml Index: classes-overview.xml === RCS file: /home/cvs/xml-fop/src/documentation/content/xdocs/design/alt.design/classes-overview.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- classes-overview.xml 2 Dec 2002 12:00:11 - 1.2 +++ classes-overview.xml 2 Dec 2002 14:34:04 - 1.3 @@ -27,7 +27,7 @@ codestatic final int/code, the set of individual property stacks can be collected together into one array. Where to put such an overall collection? Creating an -über-class to accommodate everything that applies to +#xFC;ber-class to accommodate everything that applies to property classes as a whole allows this array to be defined as a emcodestatic final/code something[]/em. /p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/lib .cvsignore
jeremias2002/12/02 06:36:20 Added: lib .cvsignore Log: Ignore checkstyle*.jar as we support it but can't/won't redistribute it. Revision ChangesPath 1.1 xml-fop/lib/.cvsignore Index: .cvsignore === checkstyle*.jar - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop status.xml
jeremias2002/12/02 06:40:18 Modified:.status.xml Log: Comment on latest changes Revision ChangesPath 1.20 +5 -0 xml-fop/status.xml Index: status.xml === RCS file: /home/cvs/xml-fop/status.xml,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- status.xml2 Dec 2002 13:20:33 - 1.19 +++ status.xml2 Dec 2002 14:40:18 - 1.20 @@ -115,6 +115,11 @@ changes release version=? date=2002 +action context=code dev=JM type=update + Moved all Adobe Type 1 font related classes to + org.apache.fop.fonts.type1. Added a PFB parser for proper decoding of + PFB files. +/action action context=build dev=JM type=update Updated to Xerces 2.2.1 and Xalan 2.4.1. Updated all the related files and made sure all contrib builds work again. Removed necessity for a - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [maintenance branch] FOP servlet doubled
J.Pietschmann wrote:
web.xml: keep it with the *.java.
servlet.jar: provide a property for the location, defaulting
to lib/servlet.jar. Conditionalize the servlet compilation
on availability of ${servlet.jar}. Users can either copy a
servlet.jar to the lib directory, or use a
-Dservlet.jar=/foo/bar/servlet-2.3.jar
on the command line (or whatever the proper Ant syntax is for
defining properties for the CLI)
Looks ok to me, +1. We should be in time for 0.20.5rc (no CLI of course).
Other opinions?
--
Oleg Tkachenko
eXperanto team
Multiconn Technologies, Israel
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
Re: cvs commit: xml-fop/src/documentation/content/xdocs/design/alt.design classes-overview.xml
Keiron, is that really necessary? If proper UTF-8 encoding would be used (as declared implicitly), these cryptic character references would not be necessary, right? On 02.12.2002 15:34:04 keiron wrote: -über-class to accommodate everything that applies to +#xFC;ber-class to accommodate everything that applies to Jeremias Maerki - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: cvs commit:xml-fop/src/documentation/content/xdocs/design/alt.designclasses-overview.xml
On Mon, 2002-12-02 at 15:49, Jeremias Maerki wrote: Keiron, is that really necessary? If proper UTF-8 encoding would be used (as declared implicitly), these cryptic character references would not be necessary, right? I kept getting errors with validation and conversion with cocoon. The error message where usually something like: unkown error. I don't know what is causing the problem. At least this works with forrest now. A normal character would be preferrable if the problems can be solved. On 02.12.2002 15:34:04 keiron wrote: -über-class to accommodate everything that applies to +#xFC;ber-class to accommodate everything that applies to Jeremias Maerki - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 13866] - [PATCH] Support for CCITT encoding of TIFF images in PDF output
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=13866. 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=13866 [PATCH] Support for CCITT encoding of TIFF images in PDF output [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2002-12-02 15:54 --- Ok, discussion is moved to bug 14948, but this one we can close happily. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 14248] - 51-page FO example, could be added to the samples
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=14248. 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=14248 51-page FO example, could be added to the samples --- Additional Comments From [EMAIL PROTECTED] 2002-12-02 16:01 --- So, what should we do with this stuff? Bertrand, can you please clean it further? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 14444] - [PATCH] a performance patch for PDFInfo class
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=1. 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=1 [PATCH] a performance patch for PDFInfo class --- Additional Comments From [EMAIL PROTECTED] 2002-12-02 16:06 --- So, what should we do? Laszlo, can you please fix your diff as Jeremias suggested? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: cvs commit: xml-fop/src/documentation/content/xdocs/design/alt.design classes-overview.xml
On Mon, Dec 02, 2002 at 03:57:48PM +0100, Keiron Liddle wrote: On Mon, 2002-12-02 at 15:49, Jeremias Maerki wrote: Keiron, is that really necessary? If proper UTF-8 encoding would be used (as declared implicitly), these cryptic character references would not be necessary, right? I kept getting errors with validation and conversion with cocoon. The error message where usually something like: unkown error. I don't know what is causing the problem. xmllint doesn't like ü either: classes-overview.xml:30: error: Input is not proper UTF-8, indicate encoding ! über-class to accommodate everything that applies to Declaring the encoding properly makes it valid XML: ?xml version=1.0 encoding=iso-8859-1 standalone=no? Ant had a bug where (I gather) docs were forcibly processed as UTF-8: http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11279 As of yesterday, Forrest uses an Ant with that bug fixed. --Jeff At least this works with forrest now. A normal character would be preferrable if the problems can be solved. On 02.12.2002 15:34:04 keiron wrote: -über-class to accommodate everything that applies to +#xFC;ber-class to accommodate everything that applies to Jeremias Maerki - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 14659] - [PATCH] spurious (nuisance) errors on print/awt renderers
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=14659. 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=14659 [PATCH] spurious (nuisance) errors on print/awt renderers [EMAIL PROTECTED] changed: What|Removed |Added Summary|spurious (nuisance) errors |[PATCH] spurious (nuisance) |on print/awt renderers |errors on print/awt ||renderers - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 14657] - [PATCH] Awt measuring/rendering problems
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=14657. 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=14657 [PATCH] Awt measuring/rendering problems [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2002-12-02 17:22 --- Verified the changes are committed correctly. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: Using Apache FOP to create multiple-page PDFs usingPDFDocumentGraphics2D
Actually, I managed to find a solution late last night that apparently works. It should be further refined by the FOP team, of course. I am sending attached two files: MultipagePDFDocumentGraphics2D.java: Subclass of PDFDocumentGraphics2D. Adds a method makePage and others to enable creation of multiple pages. TestPDFGen.java:Illustrates the use of MultipagePDFDocumentGraphics2D. It uses a combination of AWT clipping and translation, plus MultipagePDFDocumentGraphics2D added methods to achieve the result of multiple pages. Basically, the same AWT drawing is repainted, but on different clipping areas and PDF pages. If you have any questions, please let me know. Thanks, Julio Lerm Chicago, IL - Original Message - From: Keiron Liddle [EMAIL PROTECTED] To: FOP [EMAIL PROTECTED] Sent: Monday, December 02, 2002 2:59 AM Subject: Re: Using Apache FOP to create multiple-page PDFs usingPDFDocumentGraphics2D On Mon, 2002-12-02 at 03:40, jcplerm wrote: Is it possible, by any means, to use PDFDocumentGraphics2D (or any other FOP class) to generate a PDF document with multiple pages, so that each page contains a slice of a larger graph created using Graphics2D methods? Hi Julio, Not directly. It may be possible to subclass the PDFDocumentGraphics2D to achieve this. Could you give a brief outline of how such a class would work so we can add it to a to do list. This has been requested a few times and could be a useful addition. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED] TestPDFGen.java Description: Binary data MultipagePDFDocumentGraphics2D.java Description: Binary data - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: xml-fop/src/documentation/content/xdocs fonts.xml
jeremias2002/12/02 11:31:00 Modified:src/documentation/content/xdocs fonts.xml Log: Correct classpaths Improve text structure Some notes Revision ChangesPath 1.3 +76 -52xml-fop/src/documentation/content/xdocs/fonts.xml Index: fonts.xml === RCS file: /home/cvs/xml-fop/src/documentation/content/xdocs/fonts.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fonts.xml 19 Nov 2002 07:57:27 - 1.2 +++ fonts.xml 2 Dec 2002 19:31:00 - 1.3 @@ -6,23 +6,21 @@ header titleFonts/title authors - person name=Jeremias Maerki email=/ + person name=Jeremias Märki email=/ person name=Tore Engvig email=/ /authors /header body -section - titleFont Support/title section titleStatus/title pFOP (building PDF files) normally supports only the base 14 font package defined in the Adobe PDF specification. That includes the following fonts: Helvetica, Times, Courier, Symbol and ZapfDingbats. /p pFont support in FOP can be extended by the addition of font metric files (written in XML) created from Adobe -Type 1 fonts and Truetype fonts. No other font types (Type 3, etc.) are supported at this time. +Type 1 fonts and TrueType fonts. No other font types (Type 3, etc.) are supported at this time. /p note -The Font is simply embedded into the PDF file, it is not converted. +The font is simply embedded into the PDF file, it is not converted. /note /section section @@ -35,18 +33,26 @@ p Run the class org.apache.fop.fonts.apps.PFMReader to generate the XML file. /p pWindows:/p -p - codejava -cp build\fop.jar;lib\xercesImpl-2.0.1.jar;lib\xml-apis.jar;lib\xalan-2.3.1.jar;lib\batik.jar - org.apache.fop.fonts.apps.PFMReader pfm-file xml-file/code - /p +source + + java -cp build\fop.jar;lib\avalon-framework.jar;lib\xml-apis.jar;lib\xercesImpl.jar;lib\xalan.jar org.apache.fop.fonts.apps.PFMReader pfm-file xml-file + +/source pUnix:/p - p -codejava -cp build/fop.jar:lib/xercesImpl-2.0.1.jar:lib/xml-apis.jar:lib/xalan-2.3.1.jar:lib/batik.jar -org.apache.fop.fonts.apps.PFMReader pfm-file xml-file/code - /p +source + + java -cp build/fop.jar:lib/avalon-framework.jar:lib/xml-apis.jar:lib/xercesImpl.jar:lib/xalan.jar org.apache.fop.fonts.apps.PFMReader pfm-file xml-file + +/source + note +The classpath in the above example has been simplified for readibity. +You will have to adjust the classpath to the names of the actual JAR files in the lib directory. +avalon-framework.jar is necessary only for versions 0.20.5 or later. +xml-apis.jar, xercesImpl.jar and xalan.jar are not necessary for JDK version 1.4 or later. + /note noteThe tool will construct some values (FontBBox, StemV and ItalicAngle) based on assumptions and calculations which are only an approximation to the real values. FontBBox and Italic Angle can be found in - the human-readable part of the PFB file. The PFMReader tool does not yet interpret PFB files, so if you want + the human-readable part of the PFB file or in the AFM file. The PFMReader tool does not yet interpret PFB or AFM files, so if you want to be correct, you may have to adjust the values in the XML file manually. The constructed values however appear to have no visible influence. /note @@ -57,30 +63,38 @@ Edit conf/userconfig.xml and add entries for the font if the fonts section, ie: -/p -p -code![CDATA[ -font metrics-file=cyberbit.xml kerning=yes embed-file=C:\WINNT\Fonts\Cyberbit.ttf - font-triplet name=Cyberbit style=normal weight=normal -/font]] -/code -/p -note + /p +source +![CDATA[ + font metrics-file=FTL_.xml kerning=yes embed-file=C:\myfonts\FTL_.pfb +font-triplet name=FrutigerLight style=normal weight=normal + /font]] + +/source + note +Starting from FOP version 0.20.5 you can use URLs for the paths to the font files. Relative URLs are resolved +relative to the fontBaseDir property (or baseDir) if available. + /note + note +Make sure you specify the PFB file in the embed-file attribute +and not the PFM you used to generate the XML font metrics file. + /note + note If you do not want the font embedded in the PDF then remove the embed-file attribute. The PDF will then contain text using the font with the font metrics and to view it properly the
DO NOT REPLY [Bug 14468] - broken link when using image xlink:href=... to try resizing SVG external graphics
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=14468. 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=14468 broken link when using image xlink:href=... to try resizing SVG external graphics [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2002-12-02 19:59 --- That broken logo with 'i' is batik's image-not-found placeholder (recall what shows your favorite browser when an image not found). Therefore make sure URI is ok. The following fo works fine for me in 0.20.5cvs: fo:instream-foreign-object svg width=250 height=250 xmlns=http://www.w3.org/2000/svg; xmlns:xlink=http://www.w3.org/1999/xlink; image xlink:href=file:///d:/logo.svg x=0 y=0 width=40mm height=60mm/ /svg /fo:instream-foreign-object - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 14527] - ArrayIndexOutOfBoundsException when rendering to TEXT
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=14527. 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=14527 ArrayIndexOutOfBoundsException when rendering to TEXT [EMAIL PROTECTED] changed: What|Removed |Added Summary|table text generation |ArrayIndexOutOfBoundsExcepti ||on when rendering to TEXT - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
website
I see that Keiron has republished the web site. Here are some comments: 1. Keiron, would it help any, now that you have gotten the basic flow going, for one of us to take the web-site publication burden from you? I know Christian is involved in doc. If he does not wish to do it, I would be happy to run that. If reasonable, I would make an effort to publish it daily. What steps are required? Should we put the steps in a document (which would be visible from the web)? I realize that long-term Forrest does this automatically. 2. The new Compliance document is now visible at http://xml.apache.org/fop/compliance.html. It refers to color-coding which, by passing through Forrest, we don't have yet. I'll work on either removing the color-coding reference or getting the color-coding to work. 3. I envision the Compliance document to be a replacement for the Implemented and Limitations documents. It was built from information on those two pages, as well as a complete listing of objects properties, and the information about standard compliance levels. Is there any objection to removing these documents? I'll double-check to make sure no useful information falls through the cracks. 4. The information in Compliance is probably not complete or accurate. I'm going to be culling through the mailing lists to try to get some of it cleaned up. If you see something that is not right, please either 1) fix it, 2) submit a patch, or 3) send me an email I'll fix it. Thanks. Victor Mote - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: cvs commit: xml-fop/src/documentation/content/xdocs/design/alt.designclasses-overview.xml
Keiron Liddle wrote: On Mon, 2002-12-02 at 15:49, Jeremias Maerki wrote: Keiron, is that really necessary? If proper UTF-8 encoding would be used (as declared implicitly), these cryptic character references would not be necessary, right? I kept getting errors with validation and conversion with cocoon. The error message where usually something like: unkown error. I don't know what is causing the problem. At least this works with forrest now. A normal character would be preferrable if the problems can be solved. Keiron, I will be updating this documentation in the next few days, and I will fix the encoding at the same time, unless there is a more urgent need. Peter -- Peter B. West [EMAIL PROTECTED] http://www.powerup.com.au/~pbwest/ Lord, to whom shall we go? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 14569] - basic-link problem
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=14569. 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=14569 basic-link problem [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2002-12-02 21:22 --- Please, provide *reproducible* example of the problem. Your 450+Kb document screwed up and is useless, sorry. Please, always *attach* such a big documents, don't paste half of mega Kb into a bug description. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 14569] - basic-link problem
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=14569. 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=14569 basic-link problem --- Additional Comments From [EMAIL PROTECTED] 2002-12-02 21:37 --- Oleg, I appreciate the advice, but I was actually creating an attachment to #14248 when Mozilla went down in a screaming heap. This mess is presumably the result. I'll try again. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 14569] - basic-link problem
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=14569. 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=14569 basic-link problem --- Additional Comments From [EMAIL PROTECTED] 2002-12-02 21:51 --- Does anyone have any idea of how to clean this up? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 14248] - 51-page FO example, could be added to the samples
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=14248. 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=14248 51-page FO example, could be added to the samples --- Additional Comments From [EMAIL PROTECTED] 2002-12-02 22:15 --- Bertrand, I am using this for testing at the moment. The main propblem I found with this is the presence of short-form empty fo:table-cell elements. I think there are seven in the file. The fo:footnotes in static-content are not strictly legal, but they are not strictly illegal either. The spec, in 6.10.3 fo:footnote Constraints, has: It is an error if the fo:footnote occurs as a descendant of a flow that is not assigned to a region-body, or of an fo:block-container that generates absolutely positioned areas. In either case, the block-areas generated by the fo:footnote-body child of the fo:footnote shall be returned to the parent of the fo:footnote and placed in the area tree as though they were normal block-level areas. In the end, I left these fo:footnotes in, because, as I read the spec, I am obliged to return the block areas of fo:footnote-body elements. How should we handle the example? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 14248] - 51-page FO example, could be added to the samples
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=14248. 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=14248 51-page FO example, could be added to the samples --- Additional Comments From [EMAIL PROTECTED] 2002-12-02 22:19 --- One other thing I forgot. There is one fo:external-graphic with a src attribute that look like: src=file:///d:/apps/messaging_service/sig_LA.jpg which is illegal, although the example fo's are full of them. It should be: src=url(file:///d:/apps/messaging_service/sig_LA.jpg) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 15010] New: - Logkit-1.0.jar missing from Fop 0.20.4
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=15010. 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=15010 Logkit-1.0.jar missing from Fop 0.20.4 Summary: Logkit-1.0.jar missing from Fop 0.20.4 Product: Fop Version: 0.20.4 Platform: All OS/Version: Windows XP Status: NEW Severity: Normal Priority: Other Component: general AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] I wrote a program in Java using the package org.apache.log. The program would compile under Fop 0.20.3 but not 0.20.4. Then I relize the logkit-1.0.jar is missing from the Fop0.20.4.zip. Michellea - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: The organization of xml.apache.org
Ted Leung wrote: 4. Some option that hasn't been thought of yet. Based initially on the reorg discussions, and then a number of F2F discussions at ApacheCon, I am planning on proposing something radical within Jakarta, but it applies equally well here. I provided some foreshadowing for this proposal in an e-mail to [EMAIL PROTECTED], with the subject of Convergence, vetoes, forks, and projects. Specifically, I said: Separate code bases with separate communities should be separate projects. Independent of the size of the codebase, if the size of the community is only a few people, then it is not an ASF project. Such efforts can be pursued outside of the ASF, be pursued inside the Incubator, or be incorporated inside an existing community as long as all participants in that larger community are treated as peers. With respect to XML, I honestly don't know how many communities we have. But the above provides a recipe to find out. Without changing any physical layout of mailing lists or cvs repositories, we can begin to phase out the karma and voting boundaries between various subprojects. Those that don't wish to participate will be encouraged to form their own separate projects (or move into incubation). What I like most about such a proposal is that it is completely up to the commiters to decide whether they want opt in or opt out. What do others think? - Sam Ruby - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: xml-fop/src/documentation/resources/schema/dtd compliance-v10.dtd
vmote 2002/12/02 22:10:41 Modified:src/documentation/resources/schema/dtd compliance-v10.dtd Log: add URL extensions for hyperlinks to DTD Revision ChangesPath 1.2 +6 -4 xml-fop/src/documentation/resources/schema/dtd/compliance-v10.dtd Index: compliance-v10.dtd === RCS file: /home/cvs/xml-fop/src/documentation/resources/schema/dtd/compliance-v10.dtd,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- compliance-v10.dtd13 Nov 2002 12:21:39 - 1.1 +++ compliance-v10.dtd3 Dec 2002 06:10:41 - 1.2 @@ -1,7 +1,5 @@ ?xml version=1.0 encoding=UTF-8? - !-- $Id$ -- - !ELEMENT compliance (head, body) !ELEMENT head (title) !ELEMENT title (#PCDATA) @@ -9,7 +7,7 @@ !ELEMENT standard (explanatory?, level-1+) !ATTLIST standard name CDATA #REQUIRED - baseURL CDATA #REQUIRED + baseURL CDATA #IMPLIED compliance-level-1-desc CDATA #REQUIRED compliance-level-2-desc CDATA #REQUIRED compliance-level-3-desc CDATA #REQUIRED @@ -17,19 +15,23 @@ !ELEMENT level-1 (explanatory?, level-2+) !ATTLIST level-1 name CDATA #REQUIRED + extURL CDATA #IMPLIED compliance-item-desc CDATA #REQUIRED !ELEMENT explanatory (p*) !ELEMENT level-2 (level-3+) !ATTLIST level-2 name CDATA #REQUIRED + extURL CDATA #IMPLIED !ELEMENT level-3 (comment*) !ATTLIST level-3 name CDATA #REQUIRED + extURL CDATA #IMPLIED compliance-level (1 | 2 | 3) #REQUIRED comply (yes | no | na | partial) #REQUIRED !ELEMENT comment (#PCDATA) !ELEMENT p (#PCDATA) +!-- Last Line of $RCSfile$ -- \ No newline at end of file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/documentation/resources/schema/dtd compliance-v10.dtd
vmote 2002/12/02 22:44:04 Modified:src/documentation/resources/schema/dtd compliance-v10.dtd Log: add citation to DTD Revision ChangesPath 1.3 +6 -3 xml-fop/src/documentation/resources/schema/dtd/compliance-v10.dtd Index: compliance-v10.dtd === RCS file: /home/cvs/xml-fop/src/documentation/resources/schema/dtd/compliance-v10.dtd,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- compliance-v10.dtd3 Dec 2002 06:10:41 - 1.2 +++ compliance-v10.dtd3 Dec 2002 06:44:04 - 1.3 @@ -8,6 +8,7 @@ !ATTLIST standard name CDATA #REQUIRED baseURL CDATA #IMPLIED + citation CDATA #IMPLIED compliance-level-1-desc CDATA #REQUIRED compliance-level-2-desc CDATA #REQUIRED compliance-level-3-desc CDATA #REQUIRED @@ -16,6 +17,7 @@ !ATTLIST level-1 name CDATA #REQUIRED extURL CDATA #IMPLIED + citation CDATA #IMPLIED compliance-item-desc CDATA #REQUIRED !ELEMENT explanatory (p*) @@ -23,15 +25,16 @@ !ATTLIST level-2 name CDATA #REQUIRED extURL CDATA #IMPLIED + citation CDATA #IMPLIED !ELEMENT level-3 (comment*) !ATTLIST level-3 name CDATA #REQUIRED extURL CDATA #IMPLIED + citation CDATA #IMPLIED compliance-level (1 | 2 | 3) #REQUIRED comply (yes | no | na | partial) #REQUIRED !ELEMENT comment (#PCDATA) !ELEMENT p (#PCDATA) - -!-- Last Line of $RCSfile$ -- \ No newline at end of file +!-- Last Line of $RCSfile$ -- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 15010] - Logkit-1.0.jar missing from Fop 0.20.4
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=15010. 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=15010 Logkit-1.0.jar missing from Fop 0.20.4 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WORKSFORME --- Additional Comments From [EMAIL PROTECTED] 2002-12-03 06:54 --- Right, because we got rid of the dependency on LogKit in version 0.20.4. We're using the Avalon Logger interface now. If you had something like this before... driver.setLogger(Hierarchy.getDefaultHierarchy().getLoggerFor(FOP)); then what you have to change now is this: import org.apache.avalon.framework.logger.*; import org.apache.log.Hierarchy; Logger log = new LogKitLogger(Hierarchy.getDefaultHierarchy().getLoggerFor (FOP)); driver.setLogger(log); Just make sure you add logkit.jar to the classpath yourself if you still want to use it. See these links for more information: http://jakarta.apache.org/avalon/api/org/apache/avalon/framework/logger/package- summary.html http://xml.apache.org/fop/embedding.html (Here's an more complete example how to work with LogKit Logger) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/apps Fop.java
pbwest 2002/12/02 23:17:00
Modified:src/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design Fop.java
Log:
Output format changes.
Revision ChangesPath
No revision
No revision
1.6.2.4 +9 -8 xml-fop/src/org/apache/fop/apps/Fop.java
Index: Fop.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/Fop.java,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -u -r1.6.2.3 -r1.6.2.4
--- Fop.java 1 Dec 2002 14:54:24 - 1.6.2.3
+++ Fop.java 3 Dec 2002 07:17:00 - 1.6.2.4
@@ -50,16 +50,17 @@
+ (gctotal - startTotal));
System.out.println(Diff after/GC total :
+ (gctotal - endtotal));
- System.out.println(Free memory before run : + startFree);
- System.out.println(Free memory after run : + endfree);
- System.out.println(Free memory after GC : + gcfree);
- System.out.println(Diff before/after free :
+ System.out.println(Free memory before run : + startFree);
+ System.out.println(Free memory after run : + endfree);
+ System.out.println(Free memory after GC: + gcfree);
+ System.out.println(Diff before/after free :
+ (endfree - startFree));
- System.out.println(Diff before/GC free:
+ System.out.println(Diff before/GC free :
+ (gcfree - startFree));
- System.out.println(Diff after/GC free :
+ System.out.println(Diff after/GC free :
+ (gcfree - endfree));
- System.out.println(cg() freed : + (gcfree - endfree));
+ System.out.println(cg() freed :
++ (gcfree - endfree));
//System.out.println(PC time : + (endPCi - startPCi));
} catch (FOPException e) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/datastructs Node.java
pbwest 2002/12/02 23:19:18
Modified:src/org/apache/fop/datastructs Tag: FOP_0-20-0_Alt-Design
Node.java
Log:
Iterator classes made public.
Revision ChangesPath
No revision
No revision
1.1.2.3 +7 -7 xml-fop/src/org/apache/fop/datastructs/Attic/Node.java
Index: Node.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datastructs/Attic/Node.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Node.java 5 Nov 2002 14:42:36 - 1.1.2.2
+++ Node.java 3 Dec 2002 07:19:18 - 1.1.2.3
@@ -565,7 +565,7 @@
* containing Tree instance.
*/
-class PreOrder implements Iterator {
+public class PreOrder implements Iterator {
private boolean selfNotReturned = true;
private int nextChildIndex = 0; // N.B. this must be kept as
// the index of the active child until that child is exhausted.
@@ -709,7 +709,7 @@
* containing Tree instance.
*/
-class PostOrder implements Iterator {
+public class PostOrder implements Iterator {
private boolean selfReturned = false;
private int nextChildIndex = 0; // N.B. this must be kept as
// the index of the active child until that child is exhausted.
@@ -827,7 +827,7 @@
* containing Tree instance.
*/
-class Ancestor implements Iterator {
+public class Ancestor implements Iterator {
private Node nextAncestor;
private int age;
@@ -896,7 +896,7 @@
* behaviour.
*/
-class FollowingSibling implements ListIterator {
+public class FollowingSibling implements ListIterator {
private ListIterator listIterator;
private ArrayList rootDummy = new ArrayList();
@@ -1008,7 +1008,7 @@
* behaviour.
*/
-class PrecedingSibling implements ListIterator {
+public class PrecedingSibling implements ListIterator {
private ListIterator listIterator;
private ArrayList rootDummy = new ArrayList();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/datastructs SyncedCircularBuffer.java
pbwest 2002/12/02 23:21:00
Modified:src/org/apache/fop/datastructs Tag: FOP_0-20-0_Alt-Design
SyncedCircularBuffer.java
Log:
Default buffer size set to 64.
Revision ChangesPath
No revision
No revision
1.1.2.5 +3 -3
xml-fop/src/org/apache/fop/datastructs/Attic/SyncedCircularBuffer.java
Index: SyncedCircularBuffer.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/datastructs/Attic/SyncedCircularBuffer.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- SyncedCircularBuffer.java 24 Oct 2002 14:22:15 - 1.1.2.4
+++ SyncedCircularBuffer.java 3 Dec 2002 07:21:00 - 1.1.2.5
@@ -28,7 +28,7 @@
*/
public class SyncedCircularBuffer {
-private final static int DEFAULTBUFSIZE = 128;
+public final static int DEFAULTBUFSIZE = 64;
private Object[] buf;
private int size = 0;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo FONode.java
pbwest 2002/12/02 23:22:24
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FONode.java
Log:
sparsePropsMap changed from HashMap to int[].
Revision ChangesPath
No revision
No revision
1.19.2.30 +9 -10 xml-fop/src/org/apache/fop/fo/FONode.java
Index: FONode.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FONode.java,v
retrieving revision 1.19.2.29
retrieving revision 1.19.2.30
diff -u -r1.19.2.29 -r1.19.2.30
--- FONode.java 29 Nov 2002 16:09:16 - 1.19.2.29
+++ FONode.java 3 Dec 2002 07:22:23 - 1.19.2.30
@@ -16,6 +16,7 @@
import org.apache.fop.datatypes.indirect.Inherit;
import org.apache.fop.datatypes.indirect.IndirectValue;
import org.apache.fop.datastructs.Node;
+import org.apache.fop.datastructs.Node.*;
import org.apache.fop.datastructs.TreeException;
import org.apache.fop.datastructs.ROBitSet;
import org.apache.fop.apps.FOPException;
@@ -157,7 +158,7 @@
/** Map of ttInteger/tt indices of isparsePropsSet/i array.
It is indexed by the FO index of the FO associated with a given
position in the ipropertySet/i array. */
-private final HashMap sparsePropsMap;
+private final int[] sparsePropsMap;
/** An array of of the applicable property indices, in property index
order. */
@@ -206,7 +207,7 @@
* @param stateFlags - the set of states relevant at this point in the
* tree. Includes the state information necessaryto select an attribute
* set for this node.
- * @param sparsePropsMap - a ttHashMap/tt mapping the property indices
+ * @param sparsePropsMap - an ttint[]/tt mapping the property indices
* to their offsets in the set of properties applicable to this node.
* @param sparseindices - an ttint[]/tt holding the set of property
* indices applicable to this node, in ascending order.
@@ -216,7 +217,7 @@
*/
public FONode
(FOTree foTree, int type, FONode parent, FoXMLEvent event,
- int stateFlags, HashMap sparsePropsMap, int[] sparseIndices)
+ int stateFlags, int[] sparsePropsMap, int[] sparseIndices)
throws TreeException, FOPException, PropertyException
{
super(foTree, parent);
@@ -478,7 +479,7 @@
PropertyValue pval;
if (propertySet == null) {
return IndirectValue.adjustedPropertyValue
-(getSparsePropValue(property));
+(sparsePropsSet[ sparsePropsMap[property] ]);
}
if ((pval = propertySet[property]) != null)
return IndirectValue.adjustedPropertyValue(pval);
@@ -499,9 +500,7 @@
* @return the ttPropertyValue/tt for the specified property.
*/
public PropertyValue getSparsePropValue(int prop) {
-return sparsePropsSet[
-((Integer)(sparsePropsMap.get(Ints.consts.get(prop.intValue()
-];
+return sparsePropsSet[ sparsePropsMap[prop] ];
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo FOTree.java
pbwest 2002/12/02 23:24:29
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FOTree.java
Log:
Added some instrumentation for the FO tree build.
Elapsed time before preorder scan calculated.
Preorder scan to derive and display node count.
Revision ChangesPath
No revision
No revision
1.1.2.28 +18 -3 xml-fop/src/org/apache/fop/fo/Attic/FOTree.java
Index: FOTree.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FOTree.java,v
retrieving revision 1.1.2.27
retrieving revision 1.1.2.28
diff -u -r1.1.2.27 -r1.1.2.28
--- FOTree.java 1 Dec 2002 14:57:30 - 1.1.2.27
+++ FOTree.java 3 Dec 2002 07:24:29 - 1.1.2.28
@@ -1,6 +1,8 @@
package org.apache.fop.fo;
import org.apache.fop.datastructs.Tree;
+import org.apache.fop.datastructs.Node;
+import org.apache.fop.datastructs.Node.*;
import org.apache.fop.datatypes.Ints;
import org.apache.fop.datatypes.Numeric;
import org.apache.fop.datatypes.CountryLanguageScript;
@@ -141,6 +143,19 @@
// Now propagate a Runtime exception
throw new RuntimeException(e);
}
+
+// DEBUG
+System.out.println(Elapsed time: +
+(System.currentTimeMillis() -
+org.apache.fop.apps.Fop.startTime)); // DEBUG
+
+FONode.PreOrder preorder = foRoot.new PreOrder(getModCount());
+int nodecount = 0;
+while (preorder.hasNext()) {
+nodecount++;
+FONode next = (FONode) preorder.next();
+}
+System.out.println(# of FONodes: + nodecount);
}
}// FOTree
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo FoRoot.java
pbwest 2002/12/02 23:25:20
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FoRoot.java
Log:
sparsePropsMap changed from HashMap to int[].
Revision ChangesPath
No revision
No revision
1.1.2.20 +9 -7 xml-fop/src/org/apache/fop/fo/Attic/FoRoot.java
Index: FoRoot.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FoRoot.java,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -u -r1.1.2.19 -r1.1.2.20
--- FoRoot.java 1 Dec 2002 14:56:26 - 1.1.2.19
+++ FoRoot.java 3 Dec 2002 07:25:20 - 1.1.2.20
@@ -27,6 +27,7 @@
import org.xml.sax.Attributes;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.NoSuchElementException;
@@ -49,7 +50,7 @@
position in the isparsePropsSet/i array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
-private static final HashMap sparsePropsMap;
+private static final int[] sparsePropsMap;
/** An ttint/tt array of of the applicable property indices, in
property index order. */
@@ -63,11 +64,12 @@
// applicableProps is a HashMap containing the indicies of the
// sparsePropsSet array, indexed by the FO index of the FO slot
// in sparsePropsSet.
-sparsePropsMap = new HashMap(1);
+sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+Arrays.fill(sparsePropsMap, -1);
numProps = 1;
sparseIndices = new int[] { PropNames.MEDIA_USAGE };
-sparsePropsMap.put
-(Ints.consts.get(PropNames.MEDIA_USAGE), Ints.consts.get(0));
+sparsePropsMap
+[PropNames.MEDIA_USAGE] = 0;
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/documentation/content/xdocs compliance.xml
vmote 2002/12/02 23:26:11 Modified:src/documentation/content/xdocs compliance.xml Log: 1. add citations URLs for objects 2. rearrange order of objects to match body of standard Revision ChangesPath 1.4 +75 -75xml-fop/src/documentation/content/xdocs/compliance.xml Index: compliance.xml === RCS file: /home/cvs/xml-fop/src/documentation/content/xdocs/compliance.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- compliance.xml29 Nov 2002 22:00:31 - 1.3 +++ compliance.xml3 Dec 2002 07:26:11 - 1.4 @@ -1,102 +1,102 @@ ?xml version=1.0 encoding=UTF-8? !DOCTYPE compliance PUBLIC -//APACHE//DTD Compliance V1.0//EN - http://cvs.apache.org/viewcvs.cgi/*checkout*/xml-fop/src/documentation/resources/schema/dtd/compliance-v10.dtd?rev=1.1; + http://cvs.apache.org/viewcvs.cgi/*checkout*/xml-fop/src/documentation/resources/schema/dtd/compliance-v10.dtd?rev=1.3; compliance head titleFOP 0.20.4 Standards Compliance/title /head body -standard name=W3C XSL-FO 1.0 Standard baseURL= compliance-level-1-desc=Basic compliance-level-2-desc=Extended compliance-level-3-desc=Complete +standard name=W3C XSL-FO 1.0 Standard baseURL=http://www.w3.org/TR/xsl/; compliance-level-1-desc=Basic compliance-level-2-desc=Extended compliance-level-3-desc=Complete explanatory pFOP's goal is to be compliant with the W3C XSL-FO 1.0 standard. There are three levels of compliance specified in the standard: basic, extended, and complete. In the tables below, blue indicates support at the specified level of compliance, and red indicates a lack of support./p /explanatory - level-1 name=XSL-FO Object Support compliance-item-desc=Object Name + level-1 name=XSL-FO Object Support citation=§6 extURL=slice6.html#fo-section compliance-item-desc=Object Name explanatory pThe following is a summary of FOP's current support for the standard XSL-FO objects./p /explanatory -level-2 name=Declarations and Pagination and Layout Objects - level-3 name=root compliance-level=1 comply=yes/ - level-3 name=page-sequence compliance-level=1 comply=yes/ - level-3 name=page-sequence-master compliance-level=1 comply=yes/ - level-3 name=single-page-master-reference compliance-level=1 comply=yes/ - level-3 name=repeatable-page-master-reference compliance-level=1 comply=yes/ - level-3 name=repeatable-page-master-alternatives compliance-level=2 comply=yes/ - level-3 name=conditional-page-master-reference compliance-level=2 comply=yes/ - level-3 name=layout-master-set compliance-level=1 comply=yes/ - level-3 name=simple-page-master compliance-level=1 comply=yes/ - level-3 name=region-body compliance-level=1 comply=yes/ - level-3 name=region-before compliance-level=2 comply=yes/ - level-3 name=region-after compliance-level=2 comply=yes/ - level-3 name=region-start compliance-level=2 comply=yes/ - level-3 name=region-end compliance-level=2 comply=yes/ - level-3 name=flow compliance-level=1 comply=yes/ - level-3 name=static-content compliance-level=2 comply=yes/ - level-3 name=declarations compliance-level=1 comply=no/ - level-3 name=color-profile compliance-level=2 comply=no/ - level-3 name=title compliance-level=2 comply=no/ -/level-2 -level-2 name=Block-level Formatting Objects - level-3 name=block compliance-level=1 comply=yes/ - level-3 name=block-container compliance-level=2 comply=partial/ -/level-2 -level-2 name=Inline-level Formatting Objects - level-3 name=character compliance-level=1 comply=yes/ - level-3 name=external-graphic compliance-level=1 comply=yes/ - level-3 name=inline compliance-level=1 comply=yes/ - level-3 name=instream-foreign-object compliance-level=2 comply=yes/ - level-3 name=leader compliance-level=1 comply=partial/ - level-3 name=page-number compliance-level=1 comply=yes/ - level-3 name=page-number-citation compliance-level=2 comply=partial +level-2 name=Declarations and Pagination and Layout Formatting Objects citation=§6.4 extURL=slice6.html#section-N10029-Declarations-and-Pagination-and-Layout-Formatting-Objects + level-3 name=root citation=§6.4.2 extURL=slice6.html#fo_root compliance-level=1 comply=yes/ + level-3 name=declarations citation=§6.4.3 extURL=slice6.html#fo_declarations compliance-level=1 comply=no/ + level-3 name=color-profile citation=§6.4.4 extURL=slice6.html#fo_color-profile compliance-level=2 comply=no/ +
cvs commit: xml-fop/src/org/apache/fop/fo PropNames.java
pbwest 2002/12/02 23:26:58
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
PropNames.java
Log:
Add PropertyException to getPropertyIndex when name is unknown.
Revision ChangesPath
No revision
No revision
1.1.2.10 +10 -4 xml-fop/src/org/apache/fop/fo/Attic/PropNames.java
Index: PropNames.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/PropNames.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- PropNames.java31 Oct 2002 01:56:47 - 1.1.2.9
+++ PropNames.java3 Dec 2002 07:26:58 - 1.1.2.10
@@ -773,13 +773,19 @@
}
/**
+ * Get the property index of a property name.
* @param propindex ttint/tt index of the FO property.
* @return ttString/tt name of the indexd FO property.
* @exception PropertyException if the property index is invalid.
*/
public static int getPropertyIndex(String name)
+throws PropertyException
{
-return ((Integer)(toIndex.get(name))).intValue();
+Integer intg = (Integer)(toIndex.get(name));
+if (intg == null)
+throw new PropertyException
+(Property name ' + name + ' is unknown.);
+return intg.intValue();
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo/declarations FoColorProfile.java FoDeclarations.java
pbwest 2002/12/02 23:31:26
Modified:src/org/apache/fop/fo/declarations Tag:
FOP_0-20-0_Alt-Design FoColorProfile.java
FoDeclarations.java
Log:
sparsePropsMap changed from HashMap to int[].
Revision ChangesPath
No revision
No revision
1.1.2.3 +6 -6
xml-fop/src/org/apache/fop/fo/declarations/Attic/FoColorProfile.java
Index: FoColorProfile.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/declarations/Attic/FoColorProfile.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoColorProfile.java 22 Nov 2002 02:17:22 - 1.1.2.2
+++ FoColorProfile.java 3 Dec 2002 07:31:25 - 1.1.2.3
@@ -38,7 +38,7 @@
position in the isparsePropsSet/i array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
-private static final HashMap sparsePropsMap;
+private static final int[] sparsePropsMap;
/** An ttint/tt array of of the applicable property indices, in
property index order. */
@@ -59,7 +59,7 @@
// sparsePropsSet is a HashMap containing the indicies of the
// sparsePropsSet array, indexed by the FO index of the FO slot
// in sparsePropsSet.
-sparsePropsMap = new HashMap();
+sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -67,8 +67,8 @@
next = 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
-sparsePropsMap.put
-(Ints.consts.get(next), Ints.consts.get(propx++));
+sparsePropsMap
+[next] = propx++;
}
}
1.1.2.4 +8 -5
xml-fop/src/org/apache/fop/fo/declarations/Attic/FoDeclarations.java
Index: FoDeclarations.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/declarations/Attic/FoDeclarations.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- FoDeclarations.java 1 Dec 2002 14:42:04 - 1.1.2.3
+++ FoDeclarations.java 3 Dec 2002 07:31:25 - 1.1.2.4
@@ -1,10 +1,12 @@
package org.apache.fop.fo.declarations;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.NoSuchElementException;
import org.apache.fop.apps.FOPException;
+import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.FOTree;
import org.apache.fop.fo.FONode;
@@ -39,7 +41,7 @@
position in the isparsePropsSet/i array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
-private static final HashMap sparsePropsMap;
+private static final int[] sparsePropsMap;
/** An ttint/tt array of of the applicable property indices, in
property index order. */
@@ -53,7 +55,8 @@
// applicableProps is a HashMap containing the indicies of the
// sparsePropsSet array, indexed by the FO index of the FO slot
// in sparsePropsSet.
-sparsePropsMap = new HashMap(0);
+sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+Arrays.fill(sparsePropsMap, -1);
numProps = 0;
sparseIndices = new int[] {};
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo/flow FoBasicLink.java FoBidiOverride.java FoBlockContainer.java FoBlock.java FoCharacter.java FoExternalGraphic.java FoFloat.java FoFlow.java FoFootnoteBody.java FoFootnote.java FoInitialPropertySet.java FoInlineContainer.java FoInline.java FoInstreamForeignObject.java FoLeader.java FoListBlock.java FoListItemBody.java FoListItem.java FoListItemLabel.java FoMarker.java FoMultiCase.java FoMultiProperties.java FoMultiPropertySet.java FoMultiSwitch.java FoMultiToggle.java FoNoFo.java FoPageNumberCitation.java FoPageNumber.java FoPageSequence.java FoPcdata.java FoRetrieveMarker.java FoStaticContent.java FoTableAndCaption.java FoTableBody.java FoTableCaption.java FoTableCell.java FoTableColumn.java FoTableFooter.java FoTableHeader.java FoTable.java FoTableRow.java FoTitle.java FoWrapper.java
pbwest 2002/12/02 23:41:05
Modified:src/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design
FoBasicLink.java FoBidiOverride.java
FoBlockContainer.java FoBlock.java FoCharacter.java
FoExternalGraphic.java FoFloat.java FoFlow.java
FoFootnoteBody.java FoFootnote.java
FoInitialPropertySet.java FoInlineContainer.java
FoInline.java FoInstreamForeignObject.java
FoLeader.java FoListBlock.java FoListItemBody.java
FoListItem.java FoListItemLabel.java FoMarker.java
FoMultiCase.java FoMultiProperties.java
FoMultiPropertySet.java FoMultiSwitch.java
FoMultiToggle.java FoNoFo.java
FoPageNumberCitation.java FoPageNumber.java
FoPageSequence.java FoPcdata.java
FoRetrieveMarker.java FoStaticContent.java
FoTableAndCaption.java FoTableBody.java
FoTableCaption.java FoTableCell.java
FoTableColumn.java FoTableFooter.java
FoTableHeader.java FoTable.java FoTableRow.java
FoTitle.java FoWrapper.java
Log:
sparsePropsMap changed from HashMap to int[].
Revision ChangesPath
No revision
No revision
1.1.2.11 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBasicLink.java
Index: FoBasicLink.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBasicLink.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoBasicLink.java 1 Dec 2002 14:40:52 - 1.1.2.10
+++ FoBasicLink.java 3 Dec 2002 07:41:02 - 1.1.2.11
@@ -25,6 +25,7 @@
import org.apache.fop.datatypes.Ints;
import org.apache.fop.messaging.MessageHandler;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -41,7 +42,7 @@
position in the isparsePropsSet/i array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
-private static final HashMap sparsePropsMap;
+private static final int[] sparsePropsMap;
/** An ttint/tt array of of the applicable property indices, in
property index order. */
@@ -83,7 +84,8 @@
// sparsePropsSet is a HashMap containing the indicies of the
// sparsePropsSet array, indexed by the FO index of the FO slot
// in sparsePropsSet.
-sparsePropsMap = new HashMap();
+sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -91,8 +93,7 @@
next = 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
-sparsePropsMap.put
-(Ints.consts.get(next), Ints.consts.get(propx++));
+sparsePropsMap[next] = propx++;
}
}
1.1.2.11 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBidiOverride.java
Index: FoBidiOverride.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBidiOverride.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoBidiOverride.java 1 Dec 2002 14:40:52 - 1.1.2.10
+++ FoBidiOverride.java 3 Dec 2002 07:41:03 - 1.1.2.11
@@ -25,6 +25,7 @@
import org.apache.fop.datatypes.Ints;
import org.apache.fop.messaging.MessageHandler;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -41,7 +42,7 @@
position in the isparsePropsSet/i array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
-private static final HashMap sparsePropsMap;
+private static final int[] sparsePropsMap;
/** An ttint/tt array of of the applicable property indices, in
property index order. */
@@ -70,7 +71,8 @@
// sparsePropsSet is a HashMap containing the indicies of the
// sparsePropsSet array, indexed by the FO index of the FO slot
// in sparsePropsSet.
-sparsePropsMap = new HashMap();
+sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -78,8
cvs commit: xml-fop/src/org/apache/fop/fo/pagination FoRegionBody.java FoRegionStartEnd.java FoSimplePageMaster.java FoRegionBeforeAfter.java FoLayoutMasterSet.java FoPageSequenceMaster.java
pbwest 2002/12/02 23:47:44
Modified:src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoRegionBody.java FoRegionStartEnd.java
FoSimplePageMaster.java FoRegionBeforeAfter.java
FoLayoutMasterSet.java FoPageSequenceMaster.java
Log:
Changed sparsePropsMap from HashMap to int[].
Revision ChangesPath
No revision
No revision
1.1.2.5 +7 -6 xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionBody.java
Index: FoRegionBody.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionBody.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoRegionBody.java 13 Nov 2002 04:15:19 - 1.1.2.4
+++ FoRegionBody.java 3 Dec 2002 07:47:44 - 1.1.2.5
@@ -22,6 +22,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -38,7 +39,7 @@
position in the isparsePropsSet/i array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
-private static final HashMap sparsePropsMap;
+private static final int[] sparsePropsMap;
/** An ttint/tt array of of the applicable property indices, in
property index order. */
@@ -67,7 +68,8 @@
// sparsePropsSet is a HashMap containing the indicies of the
// sparsePropsSet array, indexed by the FO index of the FO slot
// in sparsePropsSet.
-sparsePropsMap = new HashMap();
+sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -75,8 +77,7 @@
next = 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
-sparsePropsMap.put
-(Ints.consts.get(next), Ints.consts.get(propx++));
+sparsePropsMap[next] = propx++;
}
}
1.1.2.5 +7 -6
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionStartEnd.java
Index: FoRegionStartEnd.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionStartEnd.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoRegionStartEnd.java 13 Nov 2002 04:15:19 - 1.1.2.4
+++ FoRegionStartEnd.java 3 Dec 2002 07:47:44 - 1.1.2.5
@@ -22,6 +22,7 @@
import org.apache.fop.datastructs.TreeException;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -38,7 +39,7 @@
position in the isparsePropsSet/i array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
-protected static final HashMap sparsePropsMap;
+protected static final int[] sparsePropsMap;
/** An ttint/tt array of of the applicable property indices, in
property index order. */
@@ -66,15 +67,15 @@
// sparsePropsSet is a HashMap containing the indicies of the
// sparsePropsSet array, indexed by the FO index of the FO slot
// in sparsePropsSet.
-sparsePropsMap = new HashMap();
+sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
for (int next = propsets.nextSetBit(0);
next = 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
-sparsePropsMap.put
-(Ints.consts.get(next), Ints.consts.get(propx++));
+sparsePropsMap[next] = propx++;
}
}
1.1.2.14 +7 -6
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java
Index: FoSimplePageMaster.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- FoSimplePageMaster.java 1 Dec 2002 14:44:55 - 1.1.2.13
+++ FoSimplePageMaster.java 3 Dec 2002 07:47:44 - 1.1.2.14
@@ -25,6 +25,7 @@
import org.apache.fop.datatypes.NCName;
import org.apache.fop.datatypes.Ints;
+import
