cvs commit: xml-fop/src/org/apache/fop/render/pdf FopPDFImage.java
keiron 2002/11/22 02:32:21
Modified:src/org/apache/fop/pdf BitmapImage.java PDFDocument.java
PDFFileSpec.java PDFFunction.java PDFGoTo.java
PDFGoToRemote.java PDFLink.java PDFPattern.java
PDFShading.java PDFStream.java
src/org/apache/fop/render/pdf FopPDFImage.java
Log:
reuses duplicate link pdf objects
bit of a cleanup of collections using interface
Revision ChangesPath
1.3 +183 -91 xml-fop/src/org/apache/fop/pdf/BitmapImage.java
Index: BitmapImage.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/pdf/BitmapImage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BitmapImage.java 28 Jun 2002 10:09:06 - 1.2
+++ BitmapImage.java 22 Nov 2002 10:32:20 - 1.3
@@ -8,97 +8,189 @@
package org.apache.fop.pdf;
import java.io.IOException;
-import java.util.HashMap;
-public class BitmapImage implements PDFImage {
-int m_height;
-int m_width;
-int m_bitsPerPixel;
-PDFColorSpace m_colorSpace;
-byte[] m_bitmaps;
-String maskRef;
-PDFColor transparent = null;
-String key;
-HashMap filters;
+import java.util.Map;
-public BitmapImage(String k, int width, int height, byte[] result,
+/**
+ * Bitmap image.
+ * This is used to create a bitmap image that will be inserted
+ * into pdf.
+ */
+public class BitmapImage implements PDFImage {
+private int height;
+private int width;
+private int bitsPerPixel;
+private PDFColorSpace colorSpace;
+private byte[] bitmaps;
+private String maskRef;
+private PDFColor transparent = null;
+private String key;
+private Map filters;
+
+/**
+ * Create a bitmap image.
+ * Creates a new bitmap image with the given data.
+ *
+ * @param k the key to be used to lookup the image
+ * @param width the width of the image
+ * @param height the height of the image
+ * @param data the bitmap data
+ * @param mask the transparancy mask reference if any
+ */
+public BitmapImage(String k, int width, int height, byte[] data,
String mask) {
-this.key = k;
-this.m_height = height;
-this.m_width = width;
-this.m_bitsPerPixel = 8;
-this.m_colorSpace = new PDFColorSpace(PDFColorSpace.DEVICE_RGB);
-this.m_bitmaps = result;
-maskRef = mask;
-}
-
-public void setup(PDFDocument doc) {
-filters = doc.getFilterMap();
-}
-
-public String getKey() {
-return key;
-}
-
-// image size
-public int getWidth() {
-return m_width;
-}
-
-public int getHeight() {
-return m_height;
-}
-
-public void setColorSpace(PDFColorSpace cs) {
-m_colorSpace = cs;
-}
-
-// DeviceGray, DeviceRGB, or DeviceCMYK
-public PDFColorSpace getColorSpace() {
-return m_colorSpace;
-}
-
-// bits per pixel
-public int getBitsPerPixel() {
-return m_bitsPerPixel;
-}
-
-public void setTransparent(PDFColor t) {
-transparent = t;
-}
-
-// For transparent images
-public boolean isTransparent() {
-return transparent != null;
-}
-
-public PDFColor getTransparentColor() {
-return transparent;
-}
-
-public String getMask() {
-return null;
-}
-
-public String getSoftMask() {
-return maskRef;
-}
-
-public PDFStream getDataStream() throws IOException {
-// delegate the stream work to PDFStream
-PDFStream imgStream = new PDFStream(0);
-
-imgStream.setData(m_bitmaps);
-
-imgStream.addDefaultFilters(filters, PDFStream.CONTENT_FILTER);
-return imgStream;
-}
-
-public PDFICCStream getICCStream() {
-return null;
-}
-
-public boolean isPS() {
-return false;
-}
+this.key = k;
+this.height = height;
+this.width = width;
+this.bitsPerPixel = 8;
+this.colorSpace = new PDFColorSpace(PDFColorSpace.DEVICE_RGB);
+this.bitmaps = data;
+maskRef = mask;
+}
+
+/**
+ * Setup this image with the pdf document.
+ *
+ * @param doc the pdf document this will be inserted into
+ */
+public void setup(PDFDocument doc) {
+
cvs commit: xml-fop/src/org/apache/fop/render/pdf PDFRenderer.java
keiron 2002/11/22 03:49:26
Modified:src/org/apache/fop/render/pdf PDFRenderer.java
Log:
some minor optimisation: only close text or update colour when necessary
Revision ChangesPath
1.131 +49 -34xml-fop/src/org/apache/fop/render/pdf/PDFRenderer.java
Index: PDFRenderer.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/pdf/PDFRenderer.java,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- PDFRenderer.java 20 Nov 2002 07:51:35 - 1.130
+++ PDFRenderer.java 22 Nov 2002 11:49:26 - 1.131
@@ -64,6 +64,7 @@
// Java
import java.io.IOException;
import java.io.OutputStream;
+import java.awt.Color;
import java.awt.geom.Rectangle2D;
import java.awt.geom.AffineTransform;
import java.util.HashMap;
@@ -144,7 +145,8 @@
// drawing state
protected PDFState currentState = null;
-protected PDFColor currentColor;
+protected PDFColor currentFillColor = new PDFColor(255, 255, 255);
+protected PDFColor currentStrokeColor = new PDFColor(0, 0, 0);
protected String currentFontName = ;
protected int currentFontSize = 0;
protected int pageHeight;
@@ -464,15 +466,14 @@
protected void drawBackAndBorders(Area block, float startx, float starty, float
width, float height) {
// draw background then border
-closeText();
-
boolean started = false;
Trait.Background back;
back = (Trait.Background)block.getTrait(Trait.BACKGROUND);
if(back != null) {
started = true;
+closeText();
currentStream.add(ET\n);
-currentStream.add(q\n);
+//currentStream.add(q\n);
if (back.color != null) {
updateColor(back.color, true, null);
@@ -505,14 +506,16 @@
if(!started) {
started = true;
+closeText();
currentStream.add(ET\n);
-currentStream.add(q\n);
+//currentStream.add(q\n);
}
+float bwidth = bps.width / 1000f;
updateColor(bps.color, false, null);
-currentStream.add(bps.width / 1000f + w\n);
+currentStream.add(bwidth + w\n);
-drawLine(startx, starty, endx, starty);
+drawLine(startx, starty + bwidth / 2, endx, starty + bwidth / 2);
}
bps = (BorderProps)block.getTrait(Trait.BORDER_START);
if(bps != null) {
@@ -520,14 +523,16 @@
if(!started) {
started = true;
+closeText();
currentStream.add(ET\n);
-currentStream.add(q\n);
+//currentStream.add(q\n);
}
+float bwidth = bps.width / 1000f;
updateColor(bps.color, false, null);
-currentStream.add(bps.width / 1000f + w\n);
+currentStream.add(bwidth + w\n);
-drawLine(startx, starty, startx, endy);
+drawLine(startx + bwidth / 2, starty, startx + bwidth / 2, endy);
}
bps = (BorderProps)block.getTrait(Trait.BORDER_AFTER);
if(bps != null) {
@@ -536,14 +541,16 @@
if(!started) {
started = true;
+closeText();
currentStream.add(ET\n);
-currentStream.add(q\n);
+//currentStream.add(q\n);
}
+float bwidth = bps.width / 1000f;
updateColor(bps.color, false, null);
-currentStream.add(bps.width / 1000f + w\n);
+currentStream.add(bwidth + w\n);
-drawLine(startx, sy, endx, sy);
+drawLine(startx, sy - bwidth / 2, endx, sy - bwidth / 2);
}
bps = (BorderProps)block.getTrait(Trait.BORDER_END);
if(bps != null) {
@@ -552,16 +559,18 @@
if(!started) {
started = true;
+closeText();
currentStream.add(ET\n);
-currentStream.add(q\n);
+//currentStream.add(q\n);
}
+float bwidth = bps.width / 1000f;
updateColor(bps.color, false, null);
-currentStream.add(bps.width / 1000f + w\n);
-drawLine(sx, starty, sx, endy);
+currentStream.add(bwidth + w\n);
+drawLine(sx - bwidth / 2, starty, sx - bwidth / 2, endy);
}
if(started) {
-currentStream.add(Q\n);
+//currentStream.add(Q\n);
currentStream.add(BT\n);
// font last set out of scope in text section
RE: [VOTE] Victor as committer
Congratulations Victor! We have enough votes (only Joerg who is away, was missing). So welcome as a committer. Do you have any preference for a user name? Regards, Keiron. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 7815] - Hotspot of an fo:basic-link in fo:table-cell is positioned in row above
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=7815. 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=7815 Hotspot of an fo:basic-link in fo:table-cell is positioned in row above [EMAIL PROTECTED] changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED | --- Additional Comments From [EMAIL PROTECTED] 2002-11-22 12:06 --- Unfortunately this bug seems to be still alive - when rendering to PDF with 0.20.4 I still experience a wrong horizontal displacement (about 3.5cm to the left, as others reported) of the link hotspot. Though I didn't track down the exact setup, this displacement bug might be related to the embedding in a list item, which is in turn embedded in a (second column of a) table. The link hotspots within the third column are placed correctly. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 7815] - Hotspot of an fo:basic-link in fo:table-cell is positioned in row above
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=7815. 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=7815 Hotspot of an fo:basic-link in fo:table-cell is positioned in row above --- Additional Comments From [EMAIL PROTECTED] 2002-11-22 12:51 --- Created an attachment (id=3918) Testcase for Comment From Thilo Schwidurski 2002-11-22 12:06 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 14765] New: - Error using IE5
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=14765. 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=14765 Error using IE5 Summary: Error using IE5 Product: Fop Version: 0.20.4 Platform: PC OS/Version: Windows NT/2K Status: NEW Severity: Critical Priority: Other Component: pdf renderer AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] When using FOP and fo file to convert into PDF using Internet Explorer 5 I get a blank page. Any ideas? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 14768] New: - NullPointerException in XMLRenderer.isCoarseXML()
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=14768. 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=14768 NullPointerException in XMLRenderer.isCoarseXML() Summary: NullPointerException in XMLRenderer.isCoarseXML() Product: Fop Version: 0.20.4 Platform: Other OS/Version: Other Status: NEW Severity: Normal Priority: Other Component: general AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] When not setting the option fineDetail explicitly an NPE is thrown while rendering an xml file. This happens for example if you use XMLRenderer from your java code and not from command line. Proposed fix (XMLRenderer.java, Line 487): Check whether Hashtable.get() returns null, if so use a default value. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 14770] New: - PDF Renderer does not work with .bmp images.
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=14770. 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=14770 PDF Renderer does not work with .bmp images. Summary: PDF Renderer does not work with .bmp images. Product: Fop Version: 0.20.4 Platform: PC OS/Version: Windows NT/2K Status: NEW Severity: Major Priority: Other Component: images AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] The PDF Renderer issues a stack trace handling bitmap images. This also prohibits subsequent renderings of files without bitmap images. org.apache.fop.apps.FOPException: 921600 at org.apache.fop.apps.Driver.render(Unknown Source) at org.apache.fop.apps.Driver.run(Unknown Source) ... java.lang.ArrayIndexOutOfBoundsException: 921600 at org.apache.xerces.framework.XMLParser.parse(XMLParser.java:) at org.apache.fop.apps.Driver.render(Unknown Source) at org.apache.fop.apps.Driver.run(Unknown Source) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 14770] - PDF Renderer does not work with .bmp images.
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=14770. 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=14770 PDF Renderer does not work with .bmp images. [EMAIL PROTECTED] changed: What|Removed |Added Priority|Other |High - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 14013] - [PATCH] Performance tuning
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=14013. 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=14013 [PATCH] Performance tuning [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2002-11-22 15:15 --- Committed, thanks for your contribution! A quick test showed me a 10% speed increase (which isn't that bad either) and I'm sure memory usage is decreased due to less object creation. Please send your next patch as diff for current cvs (cvs diff -u cool.patch) as I had to changes some files manually and other have been already updated to ArrayList etc. And I noticed a problem with BorderAndPadding.java (a tablecell in tableunit.fo gets a wrong color) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 13867] - [PATCH] Updated examples/fo files to remove all errors and warnings during build
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=13867. 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=13867 [PATCH] Updated examples/fo files to remove all errors and warnings during build [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] AssignedTo|[EMAIL PROTECTED] |christian.geisert@isu- ||gmbh.de - 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 CC||[EMAIL PROTECTED] AssignedTo|[EMAIL PROTECTED] |christian.geisert@isu- ||gmbh.de - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: Bug 14290 strokeSVGText=false causes space characters to be rendered incorrectly
I've committed your change to the trunk. I hope I haven't crossed your path. I've had a few other things I wanted to do in this region. On 20.11.2002 22:40:50 Karen Lease wrote: Hi Keiron, Feels good to do a little FOP :-) It's mostly work-related right now which explains why I'm hacking around in the maintenance branch. But it's better than nothing. I think this particular patch should work in trunk too, assuming no major differences in the embedding logic. I'll look into it. -Karen Keiron Liddle wrote: Hi Karen, Welcome back. Well if it works it looks good to me but I'm no font expert. Could that also be applied to trunk? Be careful the style police might get onto you. Keiron. On Tue, 2002-11-19 at 23:38, Karen Lease wrote: Hi all (and especially Jeremias or other font experts), This bug seems to be due to the way we generate the 'loca' table in the embedded font subsets (CID fonts). In fact, it has offsets to the correct glyph descriptions, but the offsets are not in ascending order. Since it seems that the length of the glyph description is found by subtracting the offset to the glyph from the offset for the next glyph in the loca table, this does not work. For Acrobat, as long as there actually _is_ a glyph description, it seems to work anyway. However for space characters, there is no glyph. Acrobat thinks there is because of the offset, so it draws the glyph that _is_ stored at the offset. This only shows up with SVG text because it has embedded spaces. The spaces in normal text are generally turned into explicit offsets and not drawn as such. The attached diff fixes the bug; though there are perhaps more elegant ways to do it. Does anyone see anything wrong with this idea? If not, I'll commit asap. In fact, using this fix, xpdf now also works with embedded fonts, whereas before it produced garbage. Regards, Karen Lease (Lately very overworked) Senior Software Developer SPX Valley Forge Paris/Munich Jeremias Maerki - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 14290] - strokeSVGText=false causes space characters to be rendered incorrectly
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=14290. 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=14290 strokeSVGText=false causes space characters to be rendered incorrectly [EMAIL PROTECTED] changed: What|Removed |Added Status|ASSIGNED|RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2002-11-22 15:46 --- Karen has committed the fix to the maint branch. I've also committed it to the trunk. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 14770] - PDF Renderer does not work with .bmp images.
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=14770. 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=14770 PDF Renderer does not work with .bmp images. [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2002-11-22 16:07 --- Excuse me, but without seeing details (see http://nagoya.apache.org/bugzilla/bugwritinghelp.html) I would consider the bug as INVALID. Provide a reproducible example, please. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: xml-fop status.xml
jeremias2002/11/22 08:06:34 Modified:.status.xml Log: Update changes. Revision ChangesPath 1.16 +4 -0 xml-fop/status.xml Index: status.xml === RCS file: /home/cvs/xml-fop/status.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- status.xml19 Nov 2002 12:12:29 - 1.15 +++ status.xml22 Nov 2002 16:06:33 - 1.16 @@ -110,6 +110,10 @@ changes release version=? date=2002 +action context=fonts dev=KL type=fix + Correct ordering of loca table in embedded true type fonts (Bug 14290). + Fix taken over from maintenance branch. +/action action context=docs dev=KLL type=update due-to=Victor Mote due-to-email=[EMAIL PROTECTED] Added links to the Eyebrowse mail list archives. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: default page width
W. Eliot Kimber wrote: I'm about to fix bug #10158 and I wonder, why in FOP default page width is 8in although spec recommends 8.26in[1]. Well, actually in absence of User Agent page width is implementation-defined, so we can leave 8in happily (actually XEP also uses 8x11in defaults, but Antenna - 8,26x11). Opinions? 8.26--that gives you the A4 width and US length, that is, the universal page size that will give acceptable results on either US or A4 paper. So, if nobody complains I'll make it 8,26 x 11 in by default. -- Oleg Tkachenko eXperanto team Multiconn Technologies, Israel - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: org.apache.fop.viewer.PreviewDialog
IvanLatysh wrote: I wrote panelPreview which I am going to use instead of PreviewDialog. What is the difference? Actually awt viewer redesign task to get it reusable is in our todo list [1], so if you can help - share you ideas. And I am experience a major problem with AWTRenderer, this renderer couldn't be reused. Why? awt viewer succesfully reuse it while reloading fo document, it just cleans renderer by removing all rendered pages. [1] http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14349 -- Oleg Tkachenko eXperanto team Multiconn Technologies, Israel - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: default page width
Oleg Tkachenko wrote: W. Eliot Kimber wrote: [..] 8.26--that gives you the A4 width and US length, that is, the universal page size that will give acceptable results on either US or A4 paper. So, if nobody complains I'll make it 8,26 x 11 in by default. I'd only change the trunk and leave maintenance branch as it is (nobody has complained yet and it *might* cause problems with existing stlyesheets) Christian - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: default page width
Christian Geisert wrote: So, if nobody complains I'll make it 8,26 x 11 in by default. I'd only change the trunk and leave maintenance branch as it is (nobody has complained yet and it *might* cause problems with existing stlyesheets) Point taken, I agree. -- Oleg Tkachenko eXperanto team Multiconn Technologies, Israel - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
RE: [VOTE] Victor as committer
Keiron Liddle wrote: Congratulations Victor! We have enough votes (only Joerg who is away, was missing). So welcome as a committer. Do you have any preference for a user name? Thank you. This was unexpected. My deficiencies are getting a bit smaller each day, but still seem rather large. This is an awesome crew it is truly an honor to be a part of it. Unless there is some other convention, vmote will work fine for user name. Victor Mote - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
RE: Alt-Design status: XML handling
Victor Mote wrote: Oleg Tkachenko wrote: I think we should separate fo tree itself from the process of its building. fo tree structure is required and I agree with Keiron - it's not a DOM, it's just tree representation and I cherish the idea to make it an effectively small structure like saxon's internal tree. But any interim buffers should be avoided as much as it's possible (well, Piter's buffer seems not to be a burden). This is probably a philosophical difference. It seems to me that the area tree is built on the foundation of the fo tree, and that if we only get a brief glimpse of the fo tree as it goes by, not only does our foundation disappear, but we end up putting all of that weight into the superstructure, which tends to make the whole thing collapse. Oleg: After thinking about this a bit more, I think I confused this issue. I think what you were saying is that the existing FOP FO tree /is/ the lightweight data structure that you like. I see your point, and yes I agree, there is no need to replace it with something heavier. My train of thought was in a different direction -- ie. how to get that structure written to disk when necessary so that it doesn't all have to be in memory. I (think I) also had a wrong conception of how long the FO tree data persisted. My apologies for the confusion. Victor Mote - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: xml-fop/lib xalan-2.4.1.jar xalan.LICENSE.txt xercesImpl-2.2.1.jar xml-apis.jar buildtools.jar xalan-2.3.1.LICENSE.txt xalan-2.3.1.jar xercesImpl-2.0.1.jar
jeremias2002/11/22 10:01:04 Modified:lib xml-apis.jar Added: lib xalan-2.4.1.jar xalan.LICENSE.txt xercesImpl-2.2.1.jar Removed: lib buildtools.jar xalan-2.3.1.LICENSE.txt xalan-2.3.1.jar xercesImpl-2.0.1.jar Log: Update to Xerces 2.2.1 and Xalan 2.4.1. Removed buildtools.jar Revision ChangesPath 1.3 +376 -334 xml-fop/lib/xml-apis.jar Binary file 1.2 +3811 -0 xml-fop/lib/xalan-2.4.1.jar Binary file 1.2 +55 -0 xml-fop/lib/xalan.LICENSE.txt 1.2 +2998 -0 xml-fop/lib/xercesImpl-2.2.1.jar Binary file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/contrib/plan/src/org/apache/fop/plan PlanElement.java
jeremias2002/11/22 10:02:40
Modified:contrib/plan/src/org/apache/fop/plan PlanElement.java
Log:
Fixed compile error
Revision ChangesPath
1.4 +3 -3 xml-fop/contrib/plan/src/org/apache/fop/plan/PlanElement.java
Index: PlanElement.java
===
RCS file: /home/cvs/xml-fop/contrib/plan/src/org/apache/fop/plan/PlanElement.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PlanElement.java 21 Mar 2002 10:02:13 - 1.3
+++ PlanElement.java 22 Nov 2002 18:02:40 - 1.4
@@ -1,5 +1,5 @@
/* $Id$
- * Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
+ * Copyright (C) 2001-2002 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
*/
@@ -42,7 +42,7 @@
doc = svgDoc;
}
} catch(Throwable t) {
-log.error(Could not convert Plan to SVG, t);
+getLogger().error(Could not convert Plan to SVG, t);
width = 0;
height = 0;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: [maintenance branch] FOP servlet doubled
Jeremias Maerki wrote: Yes, dump that directory. That's redundancy. We just have to make sure, that the documentation points the right way, too. Hmmm, looks like Joerg sees it differently - http://marc.theaimsgroup.com/?l=fop-devm=103196215022751w=2 Contrib/servlet is not distributed, instead, the Java source and a war file is in docs/examples/embedding. The war file in the current distribution has still an old invalid web.xml in it. So, I'm gonna replace old buggy docs/examples/embedding/fop.war with a new one, generated using /contrib/servlet stuff. What about redundancy - lets wait Joerg is back. -- Oleg Tkachenko eXperanto team Multiconn Technologies, Israel - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: xml-fop/contrib/plan README build.bat build.sh build.xml
jeremias2002/11/22 10:04:45
Modified:contrib/plan build.sh build.xml
Added: contrib/plan README build.bat
Log:
Updated plan build
Revision ChangesPath
1.6 +5 -1 xml-fop/contrib/plan/build.sh
Index: build.sh
===
RCS file: /home/cvs/xml-fop/contrib/plan/build.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.sh 20 Aug 2002 08:08:59 - 1.5
+++ build.sh 22 Nov 2002 18:04:45 - 1.6
@@ -12,7 +12,11 @@
exit 1
fi
LIBDIR=../../lib
-LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/batik.jar:$LIBDIR/buildtools.jar:$LIBDIR/xercesImpl-2.0.1.jar:$LIBDIR/xalan-2.2D11.jar:$LIBDIR/xml-apis.jar:../../build/fop.jar:$LIBDIR/avalon-framework-cvs-20020806.jar
+LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/ant.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xml-apis.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xercesImpl-2.2.1.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xalan-2.4.1.jar
ANT_HOME=$LIBDIR
echo
1.3 +20 -26xml-fop/contrib/plan/build.xml
Index: build.xml
===
RCS file: /home/cvs/xml-fop/contrib/plan/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 8 Mar 2002 10:12:30 - 1.2
+++ build.xml 22 Nov 2002 18:04:45 - 1.3
@@ -6,6 +6,15 @@
project default=package basedir=.
+ path id=libs-build-classpath
+fileset dir=../../lib
+ include name=*.jar/
+/fileset
+fileset dir=../../build
+ include name=fop.jar/
+/fileset
+ /path
+
!-- === --
!-- Initialization target --
!-- === --
@@ -20,9 +29,9 @@
echo message=--- ${Name} ${version} [${year}]
/
property name=build.compiler value=classic/
-property name=debug value=off/
-property name=optimize value=on/
-property name=deprecation value=off/
+property name=debug value=on/
+property name=optimize value=off/
+property name=deprecation value=on/
property name=src.dir value=./src/
property name=lib.dir value=./lib/
@@ -35,10 +44,8 @@
property name=resource.dir value=resources/
property name=plan.dir value=org/apache/fop/plan/
-property name=xslt value=org.apache.xalan.xslt.Process/
-
property name=main.class value=org.apache.fop.plan.Main/
-property name=runtime.classpath value=fop.jar xerces-1.4.3.jar
xalan-2.4D11.jar batik.jar/
+property name=runtime.classpath value=fop.jar xml-apis.jar
xercesImpl-2.2.1.jar xalan-2.4.1.jar batik.jar/
/target
@@ -46,22 +53,7 @@
!-- Help on usage --
!-- === --
target name=usage
-echo message=/
-echo message=/
-echo message=${Name} Build file/
-echo message=-/
-echo message=/
-echo message= available targets are:/
-echo message=/
-echo message= package -- generates the ${name}.jar file (default)/
-echo message= compile -- compiles the source code/
-echo message= clean -- cleans up the directory/
-echo message= site -- generates the ${Name} web site (not yet
implemented)/
-echo message=/
-echo message= See the comments inside the build.xml file for more details./
-echo message=-/
-echo message=/
-echo message=/
+echo message=Use the -projecthelp option instead/
/target
!-- === --
@@ -92,7 +84,7 @@
!-- === --
!-- Compiles the source directory --
!-- === --
- target name=compile depends=prepare-src
+ target name=compile depends=prepare-src description=Compile the Java
sources
echo message=Compiling the sources /
!-- create directories --
mkdir dir=${build.dest}/
@@ -102,13 +94,15 @@
debug=${debug}
deprecation=${deprecation}
optimize=${optimize}
- excludes=/
+ excludes=
+ classpath refid=libs-build-classpath/
+/javac
/target
cvs commit: xml-fop/contrib/mathml build.bat build.sh build.xml
jeremias2002/11/22 10:05:26
Modified:contrib/mathml build.sh build.xml
Added: contrib/mathml build.bat
Log:
Updated MathML build
Revision ChangesPath
1.4 +6 -2 xml-fop/contrib/mathml/build.sh
Index: build.sh
===
RCS file: /home/cvs/xml-fop/contrib/mathml/build.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.sh 20 Aug 2002 08:08:59 - 1.3
+++ build.sh 22 Nov 2002 18:05:26 - 1.4
@@ -1,7 +1,7 @@
#!/bin/sh
echo
echo MathML Build System
-echo
+echo -
echo
if [ $JAVA_HOME = ] ; then
@@ -12,7 +12,11 @@
exit 1
fi
LIBDIR=../../lib
-LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/batik.jar:$LIBDIR/buildtools.jar:$LIBDIR/xercesImpl-2.0.1.jar:$LIBDIR/xalan-2.2D11.jar:$LIBDIR/xml-apis.jar:../../build/fop.jar:$LIBDIR/avalon-framework-cvs-20020806.jar:lib/jeuclid.jar
+LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/ant.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xml-apis.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xercesImpl-2.2.1.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xalan-2.4.1.jar
ANT_HOME=$LIBDIR
echo
1.2 +31 -26xml-fop/contrib/mathml/build.xml
Index: build.xml
===
RCS file: /home/cvs/xml-fop/contrib/mathml/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 23 Apr 2002 10:26:46 - 1.1
+++ build.xml 22 Nov 2002 18:05:26 - 1.2
@@ -6,6 +6,18 @@
project default=package basedir=.
+ path id=libs-build-classpath
+fileset dir=../../lib
+ include name=*.jar/
+/fileset
+fileset dir=../../build
+ include name=fop.jar/
+/fileset
+fileset dir=lib
+ include name=*.jar/
+/fileset
+ /path
+
!-- === --
!-- Initialization target --
!-- === --
@@ -20,9 +32,9 @@
echo message=--- ${Name} ${version} [${year}]
/
property name=build.compiler value=classic/
-property name=debug value=off/
-property name=optimize value=on/
-property name=deprecation value=off/
+property name=debug value=on/
+property name=optimize value=off/
+property name=deprecation value=on/
property name=src.dir value=./src/
property name=lib.dir value=./lib/
@@ -35,36 +47,27 @@
property name=resource.dir value=resources/
property name=mathml.dir value=org/apache/fop/mathml/
-property name=xslt value=org.apache.xalan.xslt.Process/
-
+available property=jeuclid.present
classname=net.sourceforge.jeuclid.MathBase classpathref=libs-build-classpath/
+ /target
+ target name=jeuclid-check depends=init unless=jeuclid.present
+echo
message==/
+echo message=jeuclid.jar is missing in the lib directory./
+echo message=You can download it at:
http://sourceforge.net/projects/jeuclid//
+echo
message==/
+fail message=Dependecy check failed./
/target
!-- === --
!-- Help on usage --
!-- === --
target name=usage
-echo message=/
-echo message=/
-echo message=${Name} Build file/
-echo message=-/
-echo message=/
-echo message= available targets are:/
-echo message=/
-echo message= package -- generates the ${name}.jar file (default)/
-echo message= compile -- compiles the source code/
-echo message= clean -- cleans up the directory/
-echo message= site -- generates the ${Name} web site (not yet
implemented)/
-echo message=/
-echo message= See the comments inside the build.xml file for more details./
-echo message=-/
-echo message=/
-echo message=/
+echo message=Use the -projecthelp option instead/
/target
!-- === --
!-- Prepares the build directory--
!--
cvs commit: xml-fop/contrib/servlet build.bat build.sh build.xml
jeremias2002/11/22 10:06:02 Modified:contrib/servlet build.bat build.sh build.xml Log: Updated FOP Servlet build Revision ChangesPath 1.2 +34 -30xml-fop/contrib/servlet/build.bat Index: build.bat === RCS file: /home/cvs/xml-fop/contrib/servlet/build.bat,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- build.bat 27 Mar 2002 11:55:52 - 1.1 +++ build.bat 22 Nov 2002 18:06:01 - 1.2 @@ -1,30 +1,34 @@ -@echo off - -echo Fop Build System -echo - -if %JAVA_HOME% == goto error - -set LIBDIR=../../lib -set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant.jar;%LIBDIR%\ant-1.3-optional.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.4.3.jar;%LIBDIR%\xalan-2.2D11.jar - -set ANT_HOME=%LIBDIR% - -echo Building with classpath %LOCALCLASSPATH% - -echo Starting Ant... - -%JAVA_HOME%\bin\java.exe -Dant.home=%ANT_HOME% -classpath %LOCALCLASSPATH% org.apache.tools.ant.Main %1 %2 %3 %4 %5 - -goto end - -:error - -echo ERROR: JAVA_HOME not found in your environment. -echo Please, set the JAVA_HOME variable in your environment to match the -echo location of the Java Virtual Machine you want to use. - -:end - -rem set LOCALCLASSPATH= - +@echo off + +echo Fop Servlet Build System +echo -- + +if %JAVA_HOME% == goto error + +set LIBDIR=../../lib +set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip +set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\ant.jar +set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xml-apis.jar +set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xercesImpl-2.2.1.jar +set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xalan-2.4.1.jar + +set ANT_HOME=%LIBDIR% + +echo Building with classpath %LOCALCLASSPATH% + +echo Starting Ant... + +%JAVA_HOME%\bin\java.exe -Dant.home=%ANT_HOME% -classpath %LOCALCLASSPATH% org.apache.tools.ant.Main %1 %2 %3 %4 %5 + +goto end + +:error + +echo ERROR: JAVA_HOME not found in your environment. +echo Please, set the JAVA_HOME variable in your environment to match the +echo location of the Java Virtual Machine you want to use. + +:end + +rem set LOCALCLASSPATH= + 1.2 +7 -4 xml-fop/contrib/servlet/build.sh Index: build.sh === RCS file: /home/cvs/xml-fop/contrib/servlet/build.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- build.sh 27 Mar 2002 11:55:52 - 1.1 +++ build.sh 22 Nov 2002 18:06:01 - 1.2 @@ -1,8 +1,8 @@ #!/bin/sh # This file should be executable. echo -echo Fop Build System -echo +echo Fop Servlet Build System +echo -- echo if [ $JAVA_HOME = ] ; then @@ -13,8 +13,11 @@ exit 1 fi LIBDIR=../../lib -LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/ant-1.3-optional.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.4.3.jar:$LIBDIR/xalan-2.2D11.jar - +LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip +LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/ant.jar +LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xml-apis.jar +LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xercesImpl-2.2.1.jar +LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xalan-2.4.1.jar ANT_HOME=$LIBDIR echo 1.4 +89 -83xml-fop/contrib/servlet/build.xml Index: build.xml === RCS file: /home/cvs/xml-fop/contrib/servlet/build.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- build.xml 7 Aug 2002 12:51:56 - 1.3 +++ build.xml 22 Nov 2002 18:06:01 - 1.4 @@ -1,86 +1,92 @@ ?xml version=1.0? project default=package basedir=. - property name=Name value=Fop Servlet/ - property name=name value=fopservlet/ - property name=version value=0.2cvs/ - !-- compiler switches -- - property name=build.compiler value=classic/ - property name=debug value=off/ - property name=optimize value=on/ - property name=deprecation value=off/ - !-- directories -- - property name=src.dir value=./src/ - property name=conf.dir value=./conf/ - property name=fop.lib.dir value=../../lib/ - property name=lib.dir value=./lib/ - property name=build.dir value=./build/ - property name=build.src value=./build/src/ - property name=build.dest value=./build/classes/ - property name=build.war value=./build/war/ - !-- stuff -- - property name=servlet.jar value=servlet.jar/ - property name=avalon-framework.jar
cvs commit: xml-fop/docs/examples runtests.sh runtests.bat
jeremias2002/11/22 10:06:45 Modified:docs/examples runtests.sh runtests.bat Log: Adjusted to new JARs Revision ChangesPath 1.9 +13 -1 xml-fop/docs/examples/runtests.sh Index: runtests.sh === RCS file: /home/cvs/xml-fop/docs/examples/runtests.sh,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- runtests.sh 20 Aug 2001 16:16:46 - 1.8 +++ runtests.sh 22 Nov 2002 18:06:45 - 1.9 @@ -13,7 +13,19 @@ exit 1 fi LIBDIR=../../lib -LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/batik.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.2.3.jar:$LIBDIR/xalan-2.0.0.jar:$LIBDIR/xalanj1compat.jar:$LIBDIR/bsf.jar:$LIBDIR/avalon-framework-4.0.jar:$LIBDIR/logkit-1.0b4.jar:$LIBDIR/jimi-1.0.jar:$LIBDIR/../build/fop.jar +LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip +LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/ant.jar +LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xml-apis.jar +LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xercesImpl-2.2.1.jar +LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xalan-2.4.1.jar +LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/batik.jar +LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/avalon-framework-cvs-20020806.jar +LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/bsf.jar +LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/jimi-1.0.jar +LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/jai_core.jar +LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/jai_codec.jar +LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/../build/fop.jar + ANT_HOME=$LIBDIR echo Building with classpath $CLASSPATH:$LOCALCLASSPATH 1.12 +13 -2 xml-fop/docs/examples/runtests.bat Index: runtests.bat === RCS file: /home/cvs/xml-fop/docs/examples/runtests.bat,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- runtests.bat 20 Aug 2001 16:16:46 - 1.11 +++ runtests.bat 22 Nov 2002 18:06:45 - 1.12 @@ -1,13 +1,24 @@ @echo off -echo Fop Test +echo Fop Test echo if %JAVA_HOME% == goto error set LIBDIR=..\..\lib -set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant.jar;%LIBDIR%\batik.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.2.3.jar;%LIBDIR%\xalan-2.0.0.jar;%LIBDIR%\xalanj1compat.jar;%LIBDIR%\bsf.jar;%LIBDIR%\avalon-framework-4.0.jar;%LIBDIR%\logkit-1.0b4.jar;%LIBDIR%\jimi-1.0.jar;%LIBDIR%\..\build\fop.jar +set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip +set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\ant.jar +set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xml-apis.jar +set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xercesImpl-2.2.1.jar +set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xalan-2.4.1.jar +set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\batik.jar +set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\avalon-framework-cvs-20020806.jar +set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\bsf.jar +set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jimi-1.0.jar +set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jai_core.jar +set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jai_codec.jar +set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\..\build\fop.jar set ANT_HOME=%LIBDIR% echo Starting Tests ... - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop status.xml fop.bat build.xml build.sh build.bat
jeremias2002/11/22 10:07:14
Modified:.status.xml fop.bat build.xml build.sh build.bat
Log:
Adjusted to new JARs
Revision ChangesPath
1.17 +7 -2 xml-fop/status.xml
Index: status.xml
===
RCS file: /home/cvs/xml-fop/status.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- status.xml22 Nov 2002 16:06:33 - 1.16
+++ status.xml22 Nov 2002 18:07:13 - 1.17
@@ -110,8 +110,13 @@
changes
release version=? date=2002
-action context=fonts dev=KL type=fix
- Correct ordering of loca table in embedded true type fonts (Bug 14290).
+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
+ buildtools.jar.
+/action
+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
1.7 +14 -1 xml-fop/fop.bat
Index: fop.bat
===
RCS file: /home/cvs/xml-fop/fop.bat,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fop.bat 7 Aug 2002 12:50:30 - 1.6
+++ fop.bat 22 Nov 2002 18:07:13 - 1.7
@@ -1 +1,14 @@
-java -cp
build\fop.jar;lib\batik.jar;lib\xml-apis.jar;lib\xalan-2.3.1.jar;lib\xercesImpl-2.0.1.jar;lib\avalon-framework-4.0.jar;lib\avalon-framework-cvs-20020806.jar;lib\jimi-1.0.jar
org.apache.fop.apps.Fop %1 %2 %3 %4 %5 %6 %7 %8
+@ECHO OFF
+
+set LIBDIR=lib
+set LOCALCLASSPATH=build/fop.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xml-apis.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xercesImpl-2.2.1.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xalan-2.4.1.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\batik.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\avalon-framework-cvs-20020806.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\bsf.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jimi-1.0.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jai_core.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jai_codec.jar
+java -cp %LOCALCLASSPATH% org.apache.fop.apps.Fop %1 %2 %3 %4 %5 %6 %7 %8
\ No newline at end of file
1.67 +21 -12xml-fop/build.xml
Index: build.xml
===
RCS file: /home/cvs/xml-fop/build.xml,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- build.xml 1 Nov 2002 06:44:14 - 1.66
+++ build.xml 22 Nov 2002 18:07:13 - 1.67
@@ -58,8 +58,8 @@
/fileset
fileset dir=${basedir} id=dist.bin.lib
-include name=lib/xercesImpl-2.0.1.jar/
-include name=lib/xalan-2.3.1.jar/
+include name=lib/xercesImpl-2.2.1.jar/
+include name=lib/xalan-2.4.1.jar/
include name=lib/xml-apis.jar/
include name=lib/batik.jar/
include name=lib/avalon-framework*.jar/
@@ -221,9 +221,6 @@
property name=tools.pkg value=org/apache/fop/tools/
-taskdef name=serHyph
classname=org.apache.fop.tools.anttasks.SerializeHyphPattern/
-taskdef name=runTest classname=org.apache.fop.tools.anttasks.RunTest/
-
property name=main.class value=org.apache.fop.apps.Fop/
filter filtersfile=${build.codegen}/filter /
@@ -266,13 +263,6 @@
/target
!-- === --
- !-- compiles hyphenation patterns --
- !-- === --
- target name=hyphenation depends=prepare
-serHyph includes=*.xml sourceDir=./hyph targetDir=${build.dest}/hyph/
- /target
-
- !-- === --
!-- Generate the source code--
!-- === --
target name=codegen depends=prepare description=Generates the java files
from the xml resources
@@ -442,6 +432,20 @@
target name=compile depends=compile-src,compile-jimi,compile-jai
description=Compiles the source code/
!-- === --
+ !-- compiles hyphenation patterns --
+ !-- === --
+ target name=hyphenation depends=prepare
+path id=hyph-classpath
+ path refid=libs-build-classpath/
+
Re: org.apache.fop.viewer.PreviewDialog
Hello, Oleg! You wrote to [EMAIL PROTECTED] on Fri, 22 Nov 2002 18:37:32 +0200: OT IvanLatysh wrote: I wrote panelPreview which I am going to use instead of PreviewDialog. OT What is the difference? Actually awt viewer redesign task to get it OT reusable is in our todo list [1], so if you can help - share you OT ideas. And I am experience a major problem with AWTRenderer, this renderer couldn't be reused. OT Why? awt viewer succesfully reuse it while reloading fo document, it OT just cleans renderer by removing all rendered pages. It does work only in a case when you didn't change scale, if you did, even after removing pages you got the last page in a renderer :-) --- Yours sincerely, Ivan Latysh. IvanLatysh[a]yahoo.ca - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: xml-fop/contrib/servlet .cvsignore
jeremias2002/11/22 10:12:01 Added: contrib/servlet .cvsignore Log: CVS should ignore the build directory Revision ChangesPath 1.2 +1 -0 xml-fop/contrib/servlet/.cvsignore - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: org.apache.fop.viewer.PreviewDialog
IvanLatysh wrote: OT Why? awt viewer succesfully reuse it while reloading fo document, it OT just cleans renderer by removing all rendered pages. It does work only in a case when you didn't change scale, if you did, even after removing pages you got the last page in a renderer :-) Hm, cannot reproduce. I open fo document, run fop -awt, scale it upto 200%, change the document completely in the editor, press Reload and get new one rendered. -- Oleg Tkachenko eXperanto team Multiconn Technologies, Israel - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 14770] - PDF Renderer does not work with .bmp images.
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=14770. 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=14770 PDF Renderer does not work with .bmp images. --- Additional Comments From [EMAIL PROTECTED] 2002-11-22 18:30 --- Created an attachment (id=3921) example fo which exhibits the problem - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 14770] - PDF Renderer does not work with .bmp images.
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=14770. 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=14770 PDF Renderer does not work with .bmp images. --- Additional Comments From [EMAIL PROTECTED] 2002-11-22 20:05 --- Created an attachment (id=3926) Correct sample which exhibits the problem. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: Alt-Design status: XML handling
Victor Mote wrote: Victor Mote wrote: Oleg Tkachenko wrote: I think we should separate fo tree itself from the process of its building. fo tree structure is required and I agree with Keiron - it's not a DOM, it's just tree representation and I cherish the idea to make it an effectively small structure like saxon's internal tree. But any interim buffers should be avoided as much as it's possible (well, Piter's buffer seems not to be a burden). This is probably a philosophical difference. It seems to me that the area tree is built on the foundation of the fo tree, and that if we only get a brief glimpse of the fo tree as it goes by, not only does our foundation disappear, but we end up putting all of that weight into the superstructure, which tends to make the whole thing collapse. Oleg: After thinking about this a bit more, I think I confused this issue. I think what you were saying is that the existing FOP FO tree /is/ the lightweight data structure that you like. I see your point, and yes I agree, there is no need to replace it with something heavier. My train of thought was in a different direction -- ie. how to get that structure written to disk when necessary so that it doesn't all have to be in memory. I (think I) also had a wrong conception of how long the FO tree data persisted. My apologies for the confusion. Victor, I will comment at greater length, later, on the issues you have raised, but I want to make some comments on the tree structures here. Most people coming to FOP get confused by the fact that SAX is used for parsing. They think in terms of a SAX/DOM dichotomy, and assume that, because we are using SAX, we have nothing like a DOM. In fact, the FO tree is our DOM, or the first stage of our DOM. In the beginning... the FO tree was always there while the area tree was being built, but Mark Lillywhite did some hacking to restrict the tree to the currently active page sequence. As you point out, the FO tree provides the semantics of the layout. The Area tree is an internal representation of the series of marks on the page. If re-flowing is called for, the information from the FO tree is, once again, required. In my opinion, that means that the FO tree has to be cached. To be more precise, the FO tree has to be able to be cached. I envisage the layout engine feeding instructions back to the FO tree concerning subtrees; basically, delete subtree or cache subtree. The layout engine knows whether the layout of a particular page or page sequence is firm or rubbery, and can instruct the FO tree accordingly. Such decisions would be made very carefully in the layout engine. Back in the mists of time, Arved noted that the page numbering problem could be minimised by allowing enough room for the page number worst case. That was a sensible restriction, but it implies a good guess about just what that worst case is going to be. To get that completely right, you need to lay it all out. In any case, if you have the ever-popular Page x of y in your static-content, you need to redo every page anyway. What the initial guess, if it's correct, circumvents, is the need to reflow every page, with all of its nightmarish implications. This is a case for which the min/opt/max expressions of FOP were made. Take a punt about last page number width. Layout the pages, using optimum. Get to the end, with all page numbers resolved. Go back and reflow lines/paragraphs as necessary, using the full min/max range to avoid page under/overflow. (N.B. This won't entirely remove the need for backup and reflow in other circumstances.) I should point out here that I perceive the need for a third tree - a layout tree. It parallels the layout managers, which themselves form a tree. This is still a vague idea for me, but the layout tree would be the work-in-progress on the area tree. It's necessary because much of the layout happens bottom-up, and at the bottom, layout is occurring which cannot go into the current page. Firstly, you don't want to throw away the layout work that you have already done. Secondly, after the page boundary slashes across the layout you have been engaged in, you want to be able to pick up all of the threads again at the beginning of the new page. The layout tree formalises this procedure. Read Jeffrey Kingston's Lout design document for some insight on this. When I talk about the layout engine, I have in mind the process that builds the layout tree, and moves chunks as they are completed into the area tree. 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]
