cvs commit: xml-fop/src/org/apache/fop/viewer/resources resources.tr
olegt 2003/02/08 02:57:50 Modified:src/org/apache/fop/viewer/resources Tag: fop-0_20_2-maintain resources.tr Log: More turkish l10n messages. Revision ChangesPath No revision No revision 1.1.2.2 +3 -0 xml-fop/src/org/apache/fop/viewer/resources/Attic/resources.tr Index: resources.tr === RCS file: /home/cvs/xml-fop/src/org/apache/fop/viewer/resources/Attic/resources.tr,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- resources.tr 4 Feb 2003 21:15:08 - 1.1.2.1 +++ resources.tr 8 Feb 2003 10:57:50 - 1.1.2.2 @@ -14,6 +14,7 @@ Print=Yazdır Page=Sayfa of= +Zoom=Zum (Yakınlaştırmak) Init parser=Grammer İnceleyiciyi (Parser) başlat Init mappings=Eşlemeleri Başlat Build FO tree=FO ağacını yarat @@ -21,6 +22,8 @@ Render=Çevir Close=Kapat Go to Page=Sayfaya Git +Reload=Yeniden Yükle Cancel=Vazgeç Page number=Sayfa numarası + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/viewer/resources Viewer_tr.properties
olegt 2003/02/04 15:13:20 Added: src/org/apache/fop/viewer/resources Viewer_tr.properties Log: Added Turkish messages for AWT Viewer. Revision ChangesPath 1.1 xml-fop/src/org/apache/fop/viewer/resources/Viewer_tr.properties Index: Viewer_tr.properties === # # Copyright (C) The Apache Software Foundation. All rights reserved.# # - # # This software is published under the terms of the Apache Software License # # version 1.1, a copy of which has been included with this distribution in # # the LICENSE file. # # # # AWT viewer's GUI resources. Turkish bundle. # Menu.File=Dosya Menu.Exit=\u00c7\u0131k\u0131\u015f Menu.View=\u0130zle Menu.First.page=\u0130lk Sayfa Menu.Prev.page=\u00d6nceki Sayfa Menu.Next.page=Sonraki Sayfa Menu.Last.page=Son Sayfa Menu.Go.to.Page=Sayfaya Git Menu.Help=Yard\u0131m Menu.Default.zoom=Standart zum Menu.About=Hakk\u0131nda Menu.Print=Yazd\u0131r Title.Preview=\u00d6nizleme Status.Show=G\u00f6ster Status.Page=Sayfa Status.of= Status.Build.FO.tree=FO a\u011fac\u0131n\u0131 yarat Label.Page.number=Sayfa numaras\u0131 Button.Cancel=Vazge\u00e7 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop CHANGES
olegt 2003/02/04 13:24:18 Modified:.Tag: fop-0_20_2-maintain CHANGES Log: Added Turkish messages for AWT Viewer Revision ChangesPath No revision No revision 1.10.2.46 +2 -0 xml-fop/CHANGES Index: CHANGES === RCS file: /home/cvs/xml-fop/CHANGES,v retrieving revision 1.10.2.45 retrieving revision 1.10.2.46 diff -u -r1.10.2.45 -r1.10.2.46 --- CHANGES 3 Feb 2003 23:43:25 - 1.10.2.45 +++ CHANGES 4 Feb 2003 21:24:18 - 1.10.2.46 @@ -1,5 +1,7 @@ == Done since 0.20.4 release +- Added Turkish messages for AWT Viewer + Submitted by: Togan Muftuoglu <[EMAIL PROTECTED]> - Fixed leader expansion and leader alignment to reference area to some extent(#7490 and #15936). - Temporary fix for wrong mapping of the hyphen character in the PostScript - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/viewer/resources messages.tr resources.tr
olegt 2003/02/04 13:15:08 Added: src/org/apache/fop/viewer/resources Tag: fop-0_20_2-maintain messages.tr resources.tr Log: Turkish messages for AWT Viewer Revision ChangesPath No revision No revision 1.1.2.1 +80 -0 xml-fop/src/org/apache/fop/viewer/resources/Attic/messages.tr 1.1.2.1 +26 -0 xml-fop/src/org/apache/fop/viewer/resources/Attic/resources.tr - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/documentation/content/xdocs book.xml
olegt 2003/01/27 12:59:55 Modified:src/documentation/content/xdocs book.xml Log: Added Logo contest menu item. Revision ChangesPath 1.8 +1 -0 xml-fop/src/documentation/content/xdocs/book.xml Index: book.xml === RCS file: /home/cvs/xml-fop/src/documentation/content/xdocs/book.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- book.xml 19 Nov 2002 07:57:27 - 1.7 +++ book.xml 27 Jan 2003 20:59:55 - 1.8 @@ -11,6 +11,7 @@ + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/documentation/content/xdocs logocontest.xml
olegt 2003/01/26 13:35:32 Added: src/documentation/content/xdocs logocontest.xml Log: Logo contest page. Revision ChangesPath 1.1 xml-fop/src/documentation/content/xdocs/logocontest.xml Index: logocontest.xml === http://cvs.apache.org/viewcvs.cgi/*checkout*/xml-forrest/src/resources/schema/dtd/document-v11.dtd";> Logo contest FOP needs new logo and FOP Team decided to hold an open logo contest. We invite all members of the FOP community as well as any other interested parties to participate as contestants or by expressing your opinion through voting. We have set up http://vote.sparklit.com/web_poll.spark/714566";>Web Poll where you can see contestant logos and vote. The rules The rules are simple: Everyone can participate as contestant Everyone can vote, but only FOP Team picks out the winner No reward except for pride The winner image is donated to Apache, but the authorship is preserved The final result should be in SVG format Reasonable size for logo Deadline for submitting logos and voting: 28 February 2003 How to participate Submit your image or link to it to http://xml.apache.org/fop/resources.html#xpointer(/document[1]/body[1]/section[1]/section[1])">fop-user mail list. Vote for a logo you like the most at FOP logo contest http://vote.sparklit.com/web_poll.spark/714566";>Web Poll. Credits We would like to thank http://ant.apache.org";>Ant and http://jakarta.apache.org/poi/index.html";>POI teams for ideas how to make a logo contest. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/documentation/content/xdocs news.xml
olegt 2003/01/26 13:34:12 Modified:src/documentation/content/xdocs news.xml Log: Added logo contest page and news entry. Revision ChangesPath 1.6 +5 -0 xml-fop/src/documentation/content/xdocs/news.xml Index: news.xml === RCS file: /home/cvs/xml-fop/src/documentation/content/xdocs/news.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- news.xml 18 Jan 2003 18:04:58 - 1.5 +++ news.xml 26 Jan 2003 21:34:12 - 1.6 @@ -8,6 +8,11 @@ + 28 January 2003 - FOP logo contest + We are looking for a new logo. FOP logo + contest is started! + + 23 December 2002 - Official FOP Wiki See http://nagoya.apache.org/wiki/apachewiki.cgi?FOPProjectPages"; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo/pagination Region.java
olegt 2003/01/05 14:07:03
Modified:src/org/apache/fop/fo/pagination Region.java
Log:
These fields should be public.
Revision ChangesPath
1.16 +6 -6 xml-fop/src/org/apache/fop/fo/pagination/Region.java
Index: Region.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Region.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Region.java 5 Jan 2003 09:03:12 - 1.15
+++ Region.java 5 Jan 2003 22:07:03 - 1.16
@@ -32,11 +32,11 @@
public abstract class Region extends FObj {
private static final String PROP_REGION_NAME = "region-name";
-protected static final String BEFORE = "before";
-protected static final String START = "start";
-protected static final String END ="end";
-protected static final String AFTER = "after";
-protected static final String BODY = "body";
+public static final String BEFORE = "before";
+public static final String START = "start";
+public static final String END ="end";
+public static final String AFTER = "after";
+public static final String BODY = "body";
private SimplePageMaster _layoutMaster;
private String _regionName;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo/pagination Region.java RegionAfter.java RegionBA.java RegionBefore.java RegionBody.java RegionEnd.java RegionSE.java RegionStart.java SimplePageMaster.java
olegt 2003/01/05 01:03:12
Modified:src/org/apache/fop/fo/pagination Region.java
RegionAfter.java RegionBA.java RegionBefore.java
RegionBody.java RegionEnd.java RegionSE.java
RegionStart.java SimplePageMaster.java
Log:
Made regions to be writing-modó aware, now it's ok for lr-tb, rl-tb and tb-rl.
Revision ChangesPath
1.15 +15 -13xml-fop/src/org/apache/fop/fo/pagination/Region.java
Index: Region.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Region.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Region.java 22 Dec 2002 23:37:06 - 1.14
+++ Region.java 5 Jan 2003 09:03:12 - 1.15
@@ -7,11 +7,11 @@
package org.apache.fop.fo.pagination;
+// Java
import java.awt.Rectangle;
import java.awt.geom.Rectangle2D;
// FOP
-
import org.apache.fop.datatypes.FODimension;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.FONode;
@@ -23,24 +23,26 @@
import org.apache.fop.area.RegionReference;
import org.apache.fop.layoutmgr.AbstractLayoutManager;
+// SAX
import org.xml.sax.Attributes;
/**
* This is an abstract base class for pagination regions
*/
public abstract class Region extends FObj {
-public static final String PROP_REGION_NAME = "region-name";
+private static final String PROP_REGION_NAME = "region-name";
-public static final String BEFORE = "before";
-public static final String START = "start";
-public static final String END ="end";
-public static final String AFTER = "after";
-public static final String BODY = "body";
+protected static final String BEFORE = "before";
+protected static final String START = "start";
+protected static final String END ="end";
+protected static final String AFTER = "after";
+protected static final String BODY = "body";
private SimplePageMaster _layoutMaster;
private String _regionName;
protected int overflow;
+protected int wm;
protected Region(FONode parent) {
super(parent);
@@ -60,8 +62,8 @@
if (isReserved(getRegionName())
&&!getRegionName().equals(getDefaultRegionName())) {
throw new FOPException(PROP_REGION_NAME + " '" + _regionName
- + "' for " + this.name
- + " not permitted.");
++ "' for " + this.name
++ " not permitted.");
}
}
@@ -69,9 +71,10 @@
_layoutMaster = (SimplePageMaster)parent;
} else {
throw new FOPException(this.name + " must be child "
- + "of simple-page-master, not "
- + parent.getName());
++ "of simple-page-master, not "
++ parent.getName());
}
+this.wm = this.properties.get("writing-mode").getEnum();
}
/**
@@ -195,5 +198,4 @@
int getExtent() {
return 0;
}
-
}
1.16 +9 -7 xml-fop/src/org/apache/fop/fo/pagination/RegionAfter.java
Index: RegionAfter.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/RegionAfter.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- RegionAfter.java 22 Dec 2002 23:37:06 - 1.15
+++ RegionAfter.java 5 Jan 2003 09:03:12 - 1.16
@@ -9,6 +9,7 @@
// FOP
import org.apache.fop.fo.*;
+import org.apache.fop.fo.properties.WritingMode;
import org.apache.fop.datatypes.FODimension;
import org.apache.fop.area.RegionReference;
@@ -22,12 +23,14 @@
}
protected Rectangle getViewportRectangle (FODimension reldims) {
-// Depends on extent and precedence
-Rectangle vpRect =
-new Rectangle(0, reldims.bpd - getExtent(),
-reldims.ipd, getExtent());
+// Depends on extent, precedence ans writing mode
+Rectangle vpRect;
+if (this.wm == WritingMode.LR_TB || this.wm == WritingMode.RL_TB)
+vpRect = new Rectangle(0, reldims.bpd - getExtent(), reldims.ipd,
getExtent());
+else
+vpRect = new Rectangle(0, reldims.bpd - getExtent(), getExtent(),
reldims.ipd);
cvs commit: xml-fop/src/org/apache/fop/fo/pagination Root.java
olegt 2002/12/22 16:01:56
Modified:src/org/apache/fop/fo/pagination Root.java
Log:
Made fields private.
Revision ChangesPath
1.23 +3 -7 xml-fop/src/org/apache/fop/fo/pagination/Root.java
Index: Root.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Root.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Root.java 22 Dec 2002 23:37:06 - 1.22
+++ Root.java 23 Dec 2002 00:01:56 - 1.23
@@ -19,9 +19,8 @@
* The fo:root formatting object. Contains page masters, page-sequences.
*/
public class Root extends FObj {
-
-LayoutMasterSet layoutMasterSet;
-List pageSequences;
+private LayoutMasterSet layoutMasterSet;
+private List pageSequences;
/**
* keeps count of page number from over PageSequence instances
@@ -30,11 +29,8 @@
public Root(FONode parent) {
super(parent);
-
// this.properties.get("media-usage");
-
pageSequences = new ArrayList();
-
if (parent != null) {
//throw new FOPException("root must be root element");
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo/pagination LayoutMasterSet.java PageMasterReference.java PageNumberGenerator.java PageSequenceMaster.java Region.java RegionAfter.java RegionBA.java RegionBASE.java RegionBefore.java RegionBody.java RegionEnd.java RegionSE.java RegionStart.java Root.java SimplePageMaster.java
olegt 2002/12/22 15:37:06
Modified:src/org/apache/fop/fo/pagination LayoutMasterSet.java
PageMasterReference.java PageNumberGenerator.java
PageSequenceMaster.java Region.java
RegionAfter.java RegionBA.java RegionBASE.java
RegionBefore.java RegionBody.java RegionEnd.java
RegionSE.java RegionStart.java Root.java
SimplePageMaster.java
Log:
Cleaned up unused imports.
Revision ChangesPath
1.18 +7 -8 xml-fop/src/org/apache/fop/fo/pagination/LayoutMasterSet.java
Index: LayoutMasterSet.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/LayoutMasterSet.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- LayoutMasterSet.java 29 Nov 2002 23:18:54 - 1.17
+++ LayoutMasterSet.java 22 Dec 2002 23:37:05 - 1.18
@@ -9,13 +9,12 @@
// FOP
import org.apache.fop.fo.*;
-import org.apache.fop.fo.properties.*;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.layout.PageMaster;
// Java
import java.util.HashMap;
import java.util.Iterator;
+import java.util.Map;
import org.xml.sax.Attributes;
@@ -29,8 +28,8 @@
* information for a page sequence.
*/
public class LayoutMasterSet extends FObj {
-private HashMap simplePageMasters;
-private HashMap pageSequenceMasters;
+private Map simplePageMasters;
+private Map pageSequenceMasters;
public LayoutMasterSet(FONode parent) {
super(parent);
@@ -110,12 +109,12 @@
protected void checkRegionNames() throws FOPException {
// Section 7.33.15 check to see that if a region-name is a
// duplicate, that it maps to the same region-class.
-HashMap allRegions = new HashMap();
+Map allRegions = new HashMap();
for (Iterator spm = simplePageMasters.values().iterator();
spm.hasNext(); ) {
SimplePageMaster simplePageMaster =
(SimplePageMaster)spm.next();
-HashMap spmRegions = simplePageMaster.getRegions();
+Map spmRegions = simplePageMaster.getRegions();
for (Iterator e = spmRegions.values().iterator();
e.hasNext(); ) {
Region region = (Region)e.next();
@@ -140,7 +139,7 @@
/**
* Checks whether or not a region name exists in this master set
- * @returns true when the region name specified has a region in this
LayoutMasterSet
+ * @return true when the region name specified has a region in this
LayoutMasterSet
*/
protected boolean regionNameExists(String regionName) {
for (Iterator e = simplePageMasters.values().iterator();
1.11 +3 -2
xml-fop/src/org/apache/fop/fo/pagination/PageMasterReference.java
Index: PageMasterReference.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/PageMasterReference.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PageMasterReference.java 17 Aug 2002 23:51:07 - 1.10
+++ PageMasterReference.java 22 Dec 2002 23:37:05 - 1.11
@@ -7,10 +7,11 @@
package org.apache.fop.fo.pagination;
+// FOP
import org.apache.fop.fo.*;
-import org.apache.fop.fo.properties.*;
import org.apache.fop.apps.FOPException;
+// SAX
import org.xml.sax.Attributes;
/**
1.7 +1 -7
xml-fop/src/org/apache/fop/fo/pagination/PageNumberGenerator.java
Index: PageNumberGenerator.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/PageNumberGenerator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PageNumberGenerator.java 25 Oct 2002 09:29:43 - 1.6
+++ PageNumberGenerator.java 22 Dec 2002 23:37:05 - 1.7
@@ -7,14 +7,8 @@
package org.apache.fop.fo.pagination;
-// FOP
-import org.apache.fop.fo.properties.*;
-
// Avalon
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-
-// Java
-import java.util.*;
/**
* This class uses the 'format', 'groupingSeparator', 'groupingSize',
1.12 +4 -5 xml-fop/src/org/apache/fop/fo/pagination/PageSequenceMaster.java
Index: PageSequenceMaster.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/PageSequenceMaster.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PageSequen
cvs commit: xml-fop/src/org/apache/fop/tools AreaTreeBuilder.java
olegt 2002/12/22 14:40:31
Modified:src/org/apache/fop/apps LayoutHandler.java
src/org/apache/fop/area AreaTree.java
CachedRenderPagesModel.java
src/org/apache/fop/tools AreaTreeBuilder.java
Added: src/org/apache/fop/area AreaTreeModel.java
RenderPagesModel.java StorePagesModel.java
Log:
AreaTreeModel and its implementations moved out of AreaTree class.
Revision ChangesPath
1.10 +4 -6 xml-fop/src/org/apache/fop/apps/LayoutHandler.java
Index: LayoutHandler.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/LayoutHandler.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- LayoutHandler.java18 Dec 2002 23:09:28 - 1.9
+++ LayoutHandler.java22 Dec 2002 22:40:31 - 1.10
@@ -17,9 +17,7 @@
// FOP
import org.apache.fop.layout.FontInfo;
-import org.apache.fop.area.AreaTree;
-import org.apache.fop.area.Title;
-import org.apache.fop.area.TreeExt;
+import org.apache.fop.area.*;
import org.apache.fop.render.Renderer;
import org.apache.fop.fo.pagination.PageSequence;
import org.apache.fop.fo.pagination.LayoutMasterSet;
@@ -78,7 +76,7 @@
* The current AreaTree for the PageSequence being rendered.
*/
private AreaTree areaTree;
-private AreaTree.AreaTreeModel atModel;
+private AreaTreeModel atModel;
/**
* @param outputStream the stream that the result is rendered to
@@ -225,7 +223,7 @@
* @param model the store pages model
* @throws FOPException if there is an error
*/
-private void processAreaTree(AreaTree.StorePagesModel model) throws
FOPException {
+private void processAreaTree(StorePagesModel model) throws FOPException {
int count = 0;
int seqc = model.getPageSequenceCount();
while (count < seqc) {
1.14 +1 -320xml-fop/src/org/apache/fop/area/AreaTree.java
Index: AreaTree.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/area/AreaTree.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- AreaTree.java 29 Nov 2002 23:18:52 - 1.13
+++ AreaTree.java 22 Dec 2002 22:40:31 - 1.14
@@ -192,324 +192,5 @@
}
model.endDocument();
}
-
-/**
- * This is the model for the area tree object.
- * The model implementation can handle the page sequence,
- * page and extensions.
- */
-public abstract static class AreaTreeModel {
-/**
- * Start a page sequence on this model.
- * @param title the title of the new page sequence
- */
-public abstract void startPageSequence(Title title);
-
-/**
- * Add a page to this moel.
- * @param page the page to add to the model.
- */
-public abstract void addPage(PageViewport page);
-
-/**
- * Add an extension to this model.
- * @param ext the extension to add
- * @param when when the extension should be handled
- */
-public abstract void addExtension(TreeExt ext, int when);
-
-/**
- * Signal the end of the document for any processing.
- */
-public abstract void endDocument();
-}
-
-/**
- * This class stores all the pages in the document
- * for interactive agents.
- * The pages are stored and can be retrieved in any order.
- */
-public static class StorePagesModel extends AreaTreeModel {
-private List pageSequence = null;
-private List titles = new ArrayList();
-private List currSequence;
-private List extensions = new ArrayList();
-
-/**
- * Create a new store pages model
- */
-public StorePagesModel() {
-}
-
-/**
- * Start a new page sequence.
- * This creates a new list for the pages in the new page sequence.
- * @param title the title of the page sequence.
- */
-public void startPageSequence(Title title) {
-titles.add(title);
-if (pageSequence == null) {
-pageSequence = new ArrayList();
-}
-currSequence = new ArrayList();
-pageSequence.add(currSequence);
-}
-
-/**
- * Add a page.
- * @param page the page to add to the current page sequence
- */
-public void addPage(PageViewport page) {
-currSequence.add(page);
-}
-
-/**
- * Get the page sequence co
cvs commit: xml-fop/src/org/apache/fop/render/txt TXTRenderer.java
olegt 2002/12/22 13:40:08
Modified:src/org/apache/fop/render/txt Tag: fop-0_20_2-maintain
TXTRenderer.java
Log:
Fixed NPE when options or encoding are null.
Revision ChangesPath
No revision
No revision
1.12.2.9 +12 -7 xml-fop/src/org/apache/fop/render/txt/TXTRenderer.java
Index: TXTRenderer.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/txt/TXTRenderer.java,v
retrieving revision 1.12.2.8
retrieving revision 1.12.2.9
diff -u -r1.12.2.8 -r1.12.2.9
--- TXTRenderer.java 8 Nov 2002 10:25:29 - 1.12.2.8
+++ TXTRenderer.java 22 Dec 2002 21:40:07 - 1.12.2.9
@@ -46,6 +46,7 @@
*/
TXTStream currentStream;
public static final String encodingOptionName = "txt.encoding";
+private static final String DEFAULT_ENCODING = "UTF-8";
private int pageHeight = 7920;
@@ -1699,13 +1700,17 @@
throws IOException {
log.info("rendering areas to TEXT");
currentStream = new TXTStream(outputStream);
-String encoding = (String)options.get(encodingOptionName);
-try {
-byte buff[] = " ".getBytes(encoding);
-} catch (java.io.UnsupportedEncodingException uee) {
-log.warn("Encoding '"+encoding+"' is not a valid Java encoding. Use
UTF-8.");
-encoding = "UTF-8";
+String encoding;
+if (options != null &&
(encoding=(String)options.get(encodingOptionName))!=null) {
+try {
+byte buff[] = " ".getBytes(encoding);
+} catch (java.io.UnsupportedEncodingException uee) {
+log.warn("Encoding '"+encoding+"' is not supported, so defaulted to
" + DEFAULT_ENCODING);
+encoding = DEFAULT_ENCODING;
+}
}
+else
+encoding = DEFAULT_ENCODING;
currentStream.setEncoding(encoding);
firstPage=true;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/layout/hyphenation PatternParser.java
olegt 2002/12/18 16:35:32
Modified:src/org/apache/fop/area Page.java Trait.java
src/org/apache/fop/area/inline Container.java
InlineParent.java
src/org/apache/fop/layout AbsolutePositionProps.java
AreaClass.java FontDescriptor.java FontInfo.java
FontState.java PageMaster.java TextState.java
src/org/apache/fop/layout/hyphenation PatternParser.java
Log:
Cleaned up unused imports.
Revision ChangesPath
1.8 +1 -2 xml-fop/src/org/apache/fop/area/Page.java
Index: Page.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/area/Page.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Page.java 14 Nov 2002 11:13:32 - 1.7
+++ Page.java 19 Dec 2002 00:35:31 - 1.8
@@ -9,7 +9,6 @@
import java.io.Serializable;
import java.util.Map;
-import java.util.HashMap;
/**
* The page.
1.11 +1 -4 xml-fop/src/org/apache/fop/area/Trait.java
Index: Trait.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/area/Trait.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Trait.java29 Nov 2002 23:18:52 - 1.10
+++ Trait.java19 Dec 2002 00:35:31 - 1.11
@@ -9,7 +9,6 @@
import org.apache.fop.datatypes.ColorType;
import org.apache.fop.traits.BorderProps;
-import org.apache.fop.layout.FontState;
import java.io.Serializable;
import java.util.Map;
@@ -256,8 +255,6 @@
/**
* Return the string for debugging.
- *
- * @param the string from the data value
*/
public String toString() {
return data.toString();
1.5 +1 -2 xml-fop/src/org/apache/fop/area/inline/Container.java
Index: Container.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/area/inline/Container.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Container.java14 Nov 2002 11:13:33 - 1.4
+++ Container.java19 Dec 2002 00:35:31 - 1.5
@@ -9,7 +9,6 @@
import org.apache.fop.area.Area;
import org.apache.fop.area.Block;
-import org.apache.fop.render.Renderer;
import java.util.List;
import java.util.ArrayList;
1.8 +1 -2 xml-fop/src/org/apache/fop/area/inline/InlineParent.java
Index: InlineParent.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/area/inline/InlineParent.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- InlineParent.java 14 Nov 2002 11:13:33 - 1.7
+++ InlineParent.java 19 Dec 2002 00:35:31 - 1.8
@@ -8,7 +8,6 @@
package org.apache.fop.area.inline;
import org.apache.fop.area.Area;
-import org.apache.fop.area.Block;
import org.apache.fop.render.Renderer;
import java.util.List;
1.3 +1 -3 xml-fop/src/org/apache/fop/layout/AbsolutePositionProps.java
Index: AbsolutePositionProps.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/AbsolutePositionProps.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbsolutePositionProps.java30 Aug 2002 08:03:23 - 1.2
+++ AbsolutePositionProps.java19 Dec 2002 00:35:31 - 1.3
@@ -7,8 +7,6 @@
package org.apache.fop.layout;
-import org.apache.fop.datatypes.Length;
-
/**
* Store all hyphenation related properties on an FO.
* Public "structure" allows direct member access.
1.3 +7 -7 xml-fop/src/org/apache/fop/layout/AreaClass.java
Index: AreaClass.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/AreaClass.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AreaClass.java30 Jul 2001 20:29:27 - 1.2
+++ AreaClass.java19 Dec 2002 00:35:31 - 1.3
@@ -10,13 +10,13 @@
import org.apache.fop.apps.FOPException;
public class AreaClass {
-public static String UNASSIGNED = "unassigned";
+public static final String UNASSIGNED = "unassigned";
-public static String XSL_NORMAL = "xsl-normal";
-public static String XSL_ABSOLUTE = "xsl-absolute";
-public static String XSL_FOOTNOTE = "xsl-footnote";
-public static String XSL_SIDE_FLOAT = "xsl-side-float";
-pub
cvs commit: xml-fop/src/org/apache/fop/apps LayoutHandler.java
olegt 2002/12/18 15:09:28
Modified:src/org/apache/fop/apps LayoutHandler.java
Log:
Cleaned up unused imports, made collection of the statistics optional.
Revision ChangesPath
1.9 +39 -39xml-fop/src/org/apache/fop/apps/LayoutHandler.java
Index: LayoutHandler.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/LayoutHandler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LayoutHandler.java9 Dec 2002 11:22:35 - 1.8
+++ LayoutHandler.java18 Dec 2002 23:09:28 - 1.9
@@ -7,42 +7,43 @@
package org.apache.fop.apps;
+// Java
import java.io.OutputStream;
import java.io.IOException;
-import java.util.HashSet;
import java.util.List;
+// SAX
import org.xml.sax.SAXException;
+// FOP
import org.apache.fop.layout.FontInfo;
-import org.apache.fop.area.PageViewport;
import org.apache.fop.area.AreaTree;
-import org.apache.fop.area.CachedRenderPagesModel;
import org.apache.fop.area.Title;
import org.apache.fop.area.TreeExt;
import org.apache.fop.render.Renderer;
import org.apache.fop.fo.pagination.PageSequence;
import org.apache.fop.fo.pagination.LayoutMasterSet;
-import org.apache.avalon.framework.logger.Logger;
-
/**
* Layout handler that receives the structure events.
* This initiates layout processes and corresponding
* rendering processes such as start/end.
*/
public class LayoutHandler extends StructureHandler {
-private static final boolean MEM_PROFILE_WITH_GC = false;
+
+// TODO: Collecting of statistics should be configurable
+private final boolean collectStatistics = true;
+private final boolean MEM_PROFILE_WITH_GC = false;
/**
Somewhere to get our stats from.
*/
-private Runtime runtime = Runtime.getRuntime();
+private Runtime runtime;
/**
Keep track of the number of pages rendered.
*/
-int pageCount = 0;
+private int pageCount;
/**
Keep track of heap memory allocated,
@@ -87,6 +88,8 @@
*/
public LayoutHandler(OutputStream outputStream, Renderer renderer,
boolean store) {
+if (collectStatistics)
+runtime = Runtime.getRuntime();
this.outputStream = outputStream;
this.renderer = renderer;
@@ -112,15 +115,15 @@
* @throws SAXException if there is an error
*/
public void startDocument() throws SAXException {
-pageCount = 0;
-
-if (MEM_PROFILE_WITH_GC) {
-System.gc(); // This takes time but gives better results
+//Initialize statistics
+if (collectStatistics) {
+pageCount = 0;
+if (MEM_PROFILE_WITH_GC) {
+System.gc(); // This takes time but gives better results
+}
+initialMemory = runtime.totalMemory() - runtime.freeMemory();
+startTime = System.currentTimeMillis();
}
-
-initialMemory = runtime.totalMemory() - runtime.freeMemory();
-startTime = System.currentTimeMillis();
-
try {
renderer.setupFontInfo(fontInfo);
// check that the "any,normal,400" font exists
@@ -147,30 +150,27 @@
throw new SAXException(e);
}
-if (getLogger().isDebugEnabled()) {
+if (collectStatistics) {
if (MEM_PROFILE_WITH_GC) {
// This takes time but gives better results
System.gc();
}
-
long memoryNow = runtime.totalMemory() - runtime.freeMemory();
long memoryUsed = (memoryNow - initialMemory) / 1024L;
-getLogger().debug("Initial heap size: " + (initialMemory / 1024L) +
"Kb");
-getLogger().debug("Current heap size: " + (memoryNow / 1024L) + "Kb");
-getLogger().debug("Total memory used: " + memoryUsed + "Kb");
-
-if (!MEM_PROFILE_WITH_GC) {
-getLogger().debug(" Memory use is indicative; no GC was
performed");
-getLogger().debug(" These figures should not be used
comparatively");
-}
-}
-
-if (getLogger().isDebugEnabled()) {
long timeUsed = System.currentTimeMillis() - startTime;
-getLogger().debug("Total time used: " + timeUsed + "ms");
-getLogger().debug("Pages rendered: " + pageCount);
-if (pageCount > 0) {
-getLogger().debug("Avg render time: " + (timeUsed / pageCount) +
"ms/page");
cvs commit: xml-fop/src/org/apache/fop/fo FOTreeBuilder.java
olegt 2002/12/16 15:27:15
Modified:src/org/apache/fop/fo FOTreeBuilder.java
Log:
Removed unused imports, cleaned up style, logging and javadoc. Removed redundant
unknown fo collection.
Revision ChangesPath
1.41 +26 -39xml-fop/src/org/apache/fop/fo/FOTreeBuilder.java
Index: FOTreeBuilder.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FOTreeBuilder.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- FOTreeBuilder.java14 Aug 2002 14:25:18 - 1.40
+++ FOTreeBuilder.java16 Dec 2002 23:27:15 - 1.41
@@ -10,9 +10,6 @@
// FOP
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.StructureHandler;
-import org.apache.fop.fo.pagination.Root;
-import org.apache.fop.fo.pagination.PageSequence;
-import org.apache.fop.extensions.ExtensionObj;
// Avalon
import org.apache.avalon.framework.logger.Logger;
@@ -20,13 +17,10 @@
// SAX
import org.xml.sax.helpers.DefaultHandler;
import org.xml.sax.SAXException;
-import org.xml.sax.InputSource;
import org.xml.sax.Attributes;
// Java
-import java.util.HashMap;
-import java.util.ArrayList;
-import java.io.IOException;
+import java.util.*;
/**
* SAX Handler that builds the formatting object tree.
@@ -42,34 +36,32 @@
public class FOTreeBuilder extends DefaultHandler {
/**
- * table mapping element names to the makers of objects
- * representing formatting objects
+ * Table mapping element names to the makers of objects
+ * representing formatting objects.
*/
-protected HashMap fobjTable = new HashMap();
-
-protected ArrayList namespaces = new ArrayList();
+protected Map fobjTable = new HashMap();
/**
- * current formatting object being handled
+ * Set of mapped namespaces.
*/
-protected FONode currentFObj = null;
+protected Set namespaces = new HashSet();
/**
- * the root of the formatting object tree
+ * Current formatting object being handled
*/
-protected FObj rootFObj = null;
+protected FONode currentFObj = null;
/**
- * set of names of formatting objects encountered but unknown
+ * The root of the formatting object tree
*/
-protected HashMap unknownFOs = new HashMap();
+protected FONode rootFObj = null;
/**
- *
* The class that handles formatting and rendering to a stream
* ([EMAIL PROTECTED])
*/
private StructureHandler structHandler;
+
private FOUserAgent userAgent;
public FOTreeBuilder() {}
@@ -86,17 +78,15 @@
return userAgent;
}
-
public void setStructHandler(StructureHandler sh) {
this.structHandler = sh;
}
/**
- * add a mapping from element name to maker.
+ * Adds a mapping from a namespace to a table of makers.
*
- * @param namespaceURI namespace URI of formatting object element
- * @param localName local name of formatting object element
- * @param maker Maker for class representing formatting object
+ * @param namespaceURI namespace URI of formatting object elements
+ * @param table table of makers
*/
public void addMapping(String namespaceURI, HashMap table) {
this.fobjTable.put(namespaceURI, table);
@@ -118,7 +108,6 @@
public void endElement(String uri, String localName, String rawName)
throws SAXException {
currentFObj.end();
-
currentFObj = currentFObj.getParent();
}
@@ -128,13 +117,18 @@
public void startDocument()
throws SAXException {
rootFObj = null;// allows FOTreeBuilder to be reused
-getLogger().debug("building formatting object tree");
+if (getLogger().isDebugEnabled())
+getLogger().debug("Building formatting object tree");
structHandler.startDocument();
}
+/**
+ * SAX Handler for the end of the document
+ */
public void endDocument()
throws SAXException {
-getLogger().debug("Parsing of document complete");
+if (getLogger().isDebugEnabled())
+getLogger().debug("Parsing of document complete");
structHandler.endDocument();
}
@@ -149,7 +143,7 @@
/* the maker for the formatting object started */
ElementMapping.Maker fobjMaker = null;
-HashMap table = (HashMap)fobjTable.get(uri);
+Map table = (Map)fobjTable.get(uri);
if(table != null) {
fobjMaker = (ElementMapping.Maker)table.get(localName);
// try default
@@ -158,20 +152,14 @@
cvs commit: xml-fop/src/org/apache/fop/apps InputHandler.java
olegt 2002/12/16 14:01:43
Modified:src/org/apache/fop/apps InputHandler.java
Log:
Modified to use SAXParserFactory instead of loading class by name.
Revision ChangesPath
1.9 +17 -26xml-fop/src/org/apache/fop/apps/InputHandler.java
Index: InputHandler.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/InputHandler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- InputHandler.java 25 Oct 2002 09:29:39 - 1.8
+++ InputHandler.java 16 Dec 2002 22:01:43 - 1.9
@@ -10,27 +10,27 @@
// SAX
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
+import org.xml.sax.SAXException;
// Java
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.parsers.ParserConfigurationException;
import java.net.URL;
import java.io.File;
public abstract class InputHandler {
-
public abstract InputSource getInputSource();
public abstract XMLReader getParser() throws FOPException;
-
public static InputSource urlInputSource(URL url) {
return new InputSource(url.toString());
}
/**
- * create an InputSource from a File
- *
- * @param file the File
- * @return the InputSource created
+ * Creates an InputSource from a File
+ * @param file the File
+ * @return the InputSource created
*/
public static InputSource fileInputSource(File file) {
/* this code adapted from James Clark's in XT */
@@ -50,29 +50,20 @@
}
/**
- * creates a SAX parser, using the value of org.xml.sax.parser
- * defaulting to org.apache.xerces.parsers.SAXParser
- *
- * @return the created SAX parser
+ * Creates XMLReader object using default
+ * SAXParserFactory
+ * @return the created XMLReader
*/
protected static XMLReader createParser() throws FOPException {
-String parserClassName = Driver.getParserClassName();
-//log.debug("using SAX parser " + parserClassName);
-
try {
-return (XMLReader)Class.forName(parserClassName).newInstance();
-} catch (ClassNotFoundException e) {
-throw new FOPException(e);
-} catch (InstantiationException e) {
-throw new FOPException("Could not instantiate "
- + parserClassName, e);
-} catch (IllegalAccessException e) {
-throw new FOPException("Could not access " + parserClassName, e);
-} catch (ClassCastException e) {
-throw new FOPException(parserClassName + " is not a SAX driver",
- e);
+SAXParserFactory factory = SAXParserFactory.newInstance();
+factory.setNamespaceAware(true);
+return factory.newSAXParser().getXMLReader();
+} catch (SAXException se) {
+throw new FOPException("Coudn't create XMLReader", se);
+} catch (ParserConfigurationException pce) {
+throw new FOPException("Coudn't create XMLReader", pce);
}
}
-
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/conf fop.xconf
olegt 2002/12/14 07:35:28 Modified:conf fop.xconf Log: Fixed well-formedness. Revision ChangesPath 1.3 +1 -1 xml-fop/conf/fop.xconf Index: fop.xconf === RCS file: /home/cvs/xml-fop/conf/fop.xconf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fop.xconf 22 Jul 2002 10:33:57 - 1.2 +++ fop.xconf 14 Dec 2002 15:35:28 - 1.3 @@ -104,5 +104,5 @@ - + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/docs/examples runtests.bat runtests.sh
olegt 2002/12/11 14:13:21 Modified:.fop.bat docs/examples runtests.bat runtests.sh Log: Removed footprints of bsf.jar. Revision ChangesPath 1.8 +0 -1 xml-fop/fop.bat Index: fop.bat === RCS file: /home/cvs/xml-fop/fop.bat,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fop.bat 22 Nov 2002 18:07:13 - 1.7 +++ fop.bat 11 Dec 2002 22:13:20 - 1.8 @@ -7,7 +7,6 @@ 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 1.13 +0 -1 xml-fop/docs/examples/runtests.bat Index: runtests.bat === RCS file: /home/cvs/xml-fop/docs/examples/runtests.bat,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- runtests.bat 22 Nov 2002 18:06:45 - 1.12 +++ runtests.bat 11 Dec 2002 22:13:21 - 1.13 @@ -14,7 +14,6 @@ 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 1.10 +0 -1 xml-fop/docs/examples/runtests.sh Index: runtests.sh === RCS file: /home/cvs/xml-fop/docs/examples/runtests.sh,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- runtests.sh 22 Nov 2002 18:06:45 - 1.9 +++ runtests.sh 11 Dec 2002 22:13:21 - 1.10 @@ -20,7 +20,6 @@ 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 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/lib BSF.license.txt bsf.jar
olegt 2002/12/11 14:01:55 Removed: lib BSF.license.txt bsf.jar Log: Removed bsf.jar and its license as unused anymore. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/docs/examples runtests.sh runtests.bat
olegt 2002/12/10 14:28:03 Modified:.Tag: fop-0_20_2-maintain fop.bat build.xml test Tag: fop-0_20_2-maintain createpdf.sh docs/examples Tag: fop-0_20_2-maintain runtests.sh runtests.bat Log: Removed footprints of bsf.jar. Revision ChangesPath No revision No revision 1.4.2.8 +0 -1 xml-fop/fop.bat Index: fop.bat === RCS file: /home/cvs/xml-fop/fop.bat,v retrieving revision 1.4.2.7 retrieving revision 1.4.2.8 diff -u -r1.4.2.7 -r1.4.2.8 --- fop.bat 19 Nov 2002 13:42:55 - 1.4.2.7 +++ fop.bat 10 Dec 2002 22:28:02 - 1.4.2.8 @@ -7,7 +7,6 @@ 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 1.44.2.33 +1 -7 xml-fop/build.xml Index: build.xml === RCS file: /home/cvs/xml-fop/build.xml,v retrieving revision 1.44.2.32 retrieving revision 1.44.2.33 diff -u -r1.44.2.32 -r1.44.2.33 --- build.xml 10 Dec 2002 15:01:38 - 1.44.2.32 +++ build.xml 10 Dec 2002 22:28:02 - 1.44.2.33 @@ -39,13 +39,7 @@ To make things easier for you, the Fop distribution contains a precompiled version of Ant and the build scripts take care of all the -classpath issues except the following: - -You need to have xerces.jar, xalan.jar and bsf.jar (comes with xalan) in -your classpath. You can get those from http://xml.apache.org/xerces and -http://xml.apache.org/xalan respectively. - -Additionaly you have to make sure, that the "JAVA_HOME" environment +classpath issues except the following: "JAVA_HOME" environment property should be set to match the JVM you want to use. That's it. No revision No revision 1.4.2.4 +1 -1 xml-fop/test/createpdf.sh Index: createpdf.sh === RCS file: /home/cvs/xml-fop/test/createpdf.sh,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -u -r1.4.2.3 -r1.4.2.4 --- createpdf.sh 18 Nov 2002 14:37:47 - 1.4.2.3 +++ createpdf.sh 10 Dec 2002 22:28:02 - 1.4.2.4 @@ -2,7 +2,7 @@ LIBDIR=../lib -LOCALCLASSPATH=$LIBDIR/batik.jar:$LIBDIR/xercesImpl-2.0.1.jar:$LIBDIR/xalan-2.3.1.jar:$LIBDIR/xml-apis.jar:$LIBDIR/bsf.jar +LOCALCLASSPATH=$LIBDIR/batik.jar:$LIBDIR/xercesImpl-2.0.1.jar:$LIBDIR/xalan-2.3.1.jar:$LIBDIR/xml-apis.jar LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/jimi-1.0.jar:$LIBDIR/jai_core.jar:$LIBDIR/jai_codec.jar:$LIBDIR/avalon-framework-cvs-20020806.jar:$LIBDIR/logkit-1.0.jar $JAVA_HOME/bin/java -cp ../build/fop.jar:$LOCALCLASSPATH org.apache.fop.tools.TestConverter -pdf -b ./ basictests.xml No revision No revision 1.8.2.10 +0 -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.2.9 retrieving revision 1.8.2.10 diff -u -r1.8.2.9 -r1.8.2.10 --- runtests.sh 19 Nov 2002 13:34:08 - 1.8.2.9 +++ runtests.sh 10 Dec 2002 22:28:02 - 1.8.2.10 @@ -33,7 +33,6 @@ 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 1.11.2.10 +0 -1 xml-fop/docs/examples/runtests.bat Index: runtests.bat === RCS file: /home/cvs/xml-fop/docs/examples/runtests.bat,v retrieving revision 1.11.2.9 retrieving revision 1.11.2.10 diff -u -r1.11.2.9 -r1.11.2.10 --- runtests.bat 19 Nov 2002 13:34:08 - 1.11.2.9 +++ runtests.bat 10 Dec 2002 22:28:02 - 1.11.2.10 @@ -14,7 +14,6 @@ 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
cvs commit: xml-fop/docs/examples/tables background.fo borders.fo break.fo headfoot.fo keep.fo omit.fo space.fo widowsorphans.fo
olegt 2002/11/29 16:27:56 Modified:docs/examples/fo Tag: fop-0_20_2-maintain bordershorthand.fo character.fo contlabel.fo corresprop.fo fonts.fo hyphen.fo inhprop.fo link.fo list.fo normal.fo normalex.fo pdfoutline.fo readme.fo simple.fo table.fo textdeko.fo docs/examples/markers Tag: fop-0_20_2-maintain hide.fo docs/examples/pagination Tag: fop-0_20_2-maintain basic1.fo basic2.fo docs/examples/svg Tag: fop-0_20_2-maintain embedding.fo external.fo docs/examples/tables Tag: fop-0_20_2-maintain background.fo borders.fo break.fo headfoot.fo keep.fo omit.fo space.fo widowsorphans.fo Log: Fixed overlaping regions. Revision ChangesPath No revision No revision 1.1.2.2 +2 -2 xml-fop/docs/examples/fo/bordershorthand.fo Index: bordershorthand.fo === RCS file: /home/cvs/xml-fop/docs/examples/fo/bordershorthand.fo,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- bordershorthand.fo6 Dec 2001 21:28:18 - 1.1.2.1 +++ bordershorthand.fo30 Nov 2002 00:27:53 - 1.1.2.2 @@ -28,7 +28,7 @@ margin-bottom="2cm" margin-left="2.0cm + 0.5cm" margin-right="(5cm * 1cm) div 2cm"> - + @@ -41,7 +41,7 @@ margin-bottom="round(2.4) * 1cm" margin-left="2.5 * 1cm" margin-right="5.5cm - 3cm"> - + 1.1.4.2 +1 -1 xml-fop/docs/examples/fo/character.fo Index: character.fo === RCS file: /home/cvs/xml-fop/docs/examples/fo/character.fo,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -u -r1.1.4.1 -r1.1.4.2 --- character.fo 6 Dec 2001 21:28:18 - 1.1.4.1 +++ character.fo 30 Nov 2002 00:27:53 - 1.1.4.2 @@ -25,7 +25,7 @@ margin-bottom="2cm" margin-left="2.5cm" margin-right="2.5cm"> - + 1.1.2.2 +1 -1 xml-fop/docs/examples/fo/Attic/contlabel.fo Index: contlabel.fo === RCS file: /home/cvs/xml-fop/docs/examples/fo/Attic/contlabel.fo,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- contlabel.fo 24 Nov 2002 22:22:47 - 1.1.2.1 +++ contlabel.fo 30 Nov 2002 00:27:53 - 1.1.2.2 @@ -10,8 +10,8 @@ page-width="21cm" page-height="29.7cm" master-name="first"> - + 1.1.4.2 +2 -2 xml-fop/docs/examples/fo/corresprop.fo Index: corresprop.fo === RCS file: /home/cvs/xml-fop/docs/examples/fo/corresprop.fo,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -u -r1.1.4.1 -r1.1.4.2 --- corresprop.fo 6 Dec 2001 21:28:18 - 1.1.4.1 +++ corresprop.fo 30 Nov 2002 00:27:53 - 1.1.4.2 @@ -28,7 +28,7 @@ margin-bottom="2cm" margin-left="2.0cm + 0.5cm" margin-right="(5cm * 1cm) div 2cm"> - + @@ -41,7 +41,7 @@ margin-bottom="round(2.4) * 1cm" margin-left="2.5 * 1cm" margin-right="5.5cm - 3cm"> - + 1.7.4.4 +1 -1 xml-fop/docs/examples/fo/fonts.fo Index: fonts.fo === RCS file: /home/cvs/xml-fop/docs/examples/fo/fonts.fo,v retrieving revision 1.7.4.3 retrieving revision 1.7.4.4 diff -u -r1.7.4.3 -r1.7.4.4 --- fonts.fo 26 Jun 2002 20:34:19 - 1.7.4.3 +++ fonts.fo 30 Nov 2002 00:27:53 - 1.7.4.4 @@ -11,7 +11,7 @@ margin-bottom="2cm" margin-left="2.5cm" margin-right="2.5cm"> - + 1.4.2.4 +1 -1 xml-fop/docs/examples/fo/hyphen.fo Index: hyphen.fo =
cvs commit: xml-fop CHANGES
olegt 2002/11/29 01:46:19 Modified:.Tag: fop-0_20_2-maintain CHANGES Log: Updated changes for page-height="auto" bug fix. Revision ChangesPath No revision No revision 1.10.2.35 +1 -0 xml-fop/CHANGES Index: CHANGES === RCS file: /home/cvs/xml-fop/CHANGES,v retrieving revision 1.10.2.34 retrieving revision 1.10.2.35 diff -u -r1.10.2.34 -r1.10.2.35 --- CHANGES 29 Nov 2002 08:45:14 - 1.10.2.34 +++ CHANGES 29 Nov 2002 09:46:18 - 1.10.2.35 @@ -1,5 +1,6 @@ == Done since 0.20.4 release +- Fixed infinite loop when page-height="auto" (Oleg Tkachenko) - Fix embedding of Adobe Type 1 fonts. PFB file encoded in PC format were not decoded prior to embedding. This may explain error messages with certain RIP engines. (Jeremias Maerki) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/codegen foproperties.xml
olegt 2002/11/23 23:23:51
Modified:src/org/apache/fop/fo/pagination Tag: fop-0_20_2-maintain
SimplePageMaster.java
src/codegen Tag: fop-0_20_2-maintain foproperties.xml
Log:
Support for page-width and page-height "auto" values (fallback to 8 and 11in). Fixes
infinite loop when page-height is "auto".
Revision ChangesPath
No revision
No revision
1.15.2.7 +9 -7 xml-fop/src/org/apache/fop/fo/pagination/SimplePageMaster.java
Index: SimplePageMaster.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/SimplePageMaster.java,v
retrieving revision 1.15.2.6
retrieving revision 1.15.2.7
diff -u -r1.15.2.6 -r1.15.2.7
--- SimplePageMaster.java 19 Nov 2002 01:04:05 - 1.15.2.6
+++ SimplePageMaster.java 24 Nov 2002 07:23:51 - 1.15.2.7
@@ -9,12 +9,11 @@
// FOP
import org.apache.fop.fo.*;
-import org.apache.fop.fo.properties.*;
import org.apache.fop.layout.PageMaster;
-import org.apache.fop.layout.RegionArea;
import org.apache.fop.layout.BodyRegionArea;
import org.apache.fop.layout.MarginProps;
import org.apache.fop.apps.FOPException;
+import org.apache.fop.datatypes.Length;
import java.util.HashMap;
import java.util.Iterator;
@@ -27,6 +26,9 @@
* ¶6.4.12
*/
public class SimplePageMaster extends FObj {
+// Fallback values for "auto" page size: 8x11in
+private final static int FALLBACK_PAGE_HEIGHT = 792000;
+private final static int FALLBACK_PAGE_WIDTH = 576000;
public static class Maker extends FObj.Maker {
public FObj make(FObj parent,
@@ -82,10 +84,10 @@
}
protected void end() {
-int pageWidth =
-this.properties.get("page-width").getLength().mvalue();
-int pageHeight =
-this.properties.get("page-height").getLength().mvalue();
+Length pageWidthLen = this.properties.get("page-width").getLength();
+int pageWidth = pageWidthLen.isAuto() ? FALLBACK_PAGE_WIDTH :
pageWidthLen.mvalue();
+Length pageHeightLen = this.properties.get("page-height").getLength();
+int pageHeight = pageHeightLen.isAuto() ? FALLBACK_PAGE_HEIGHT :
pageHeightLen.mvalue();
// this.properties.get("reference-orientation");
// this.properties.get("writing-mode");
No revision
No revision
1.25.2.6 +3 -3 xml-fop/src/codegen/foproperties.xml
Index: foproperties.xml
===
RCS file: /home/cvs/xml-fop/src/codegen/foproperties.xml,v
retrieving revision 1.25.2.5
retrieving revision 1.25.2.6
diff -u -r1.25.2.5 -r1.25.2.6
--- foproperties.xml 28 Jul 2002 22:18:04 - 1.25.2.5
+++ foproperties.xml 24 Nov 2002 07:23:51 - 1.25.2.6
@@ -1592,7 +1592,7 @@
Length
1.0pt
-
+
@@ -1849,7 +1849,7 @@
false
Length
- 11in
+ auto
page-position
@@ -1868,7 +1868,7 @@
false
Length
- 8in
+ auto
precedence
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
