pbwest 2004/05/18 16:05:27 Modified: src/java/org/apache/fop/render/awt Tag: FOP_0-20-0_Alt-Design FontTest.java src/java/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design FoPcdata.java FoPageSequence.java src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FoRoot.java FONode.java Log: Layout W.I.P. Revision Changes Path No revision No revision 1.1.2.2 +6 -5 xml-fop/src/java/org/apache/fop/render/awt/Attic/FontTest.java Index: FontTest.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/awt/Attic/FontTest.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- FontTest.java 20 Apr 2004 17:20:53 -0000 1.1.2.1 +++ FontTest.java 18 May 2004 23:05:26 -0000 1.1.2.2 @@ -47,9 +47,10 @@ GraphicsEnvironment.getLocalGraphicsEnvironment(); Font[] fonts = gEnv.getAllFonts(); String[] families = gEnv.getAvailableFontFamilyNames(); - BufferedImage fontImage = - new BufferedImage(100, 100, BufferedImage.TYPE_INT_RGB); - Graphics2D g2D = fontImage.createGraphics(); + BufferedImage pageSpread = + new BufferedImage(20*72, 12*72, BufferedImage.TYPE_INT_RGB); + //Graphics2D g2D = fontImage.createGraphics(); + Graphics2D g2D = pageSpread.createGraphics(); FontRenderContext frc = g2D.getFontRenderContext(); } No revision No revision 1.1.2.9 +12 -2 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPcdata.java Index: FoPcdata.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPcdata.java,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -u -r1.1.2.8 -r1.1.2.9 --- FoPcdata.java 8 Mar 2004 21:51:59 -0000 1.1.2.8 +++ FoPcdata.java 18 May 2004 23:05:26 -0000 1.1.2.9 @@ -143,4 +143,14 @@ return characters; } + // PCDATA provides sequences of inline-areas to fill line-areas in the + // parent block area. + // Generate a text-layout for the PCDATA. + /** + * Generate a + */ + private void processText() { + + } + } 1.1.2.16 +30 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPageSequence.java Index: FoPageSequence.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPageSequence.java,v retrieving revision 1.1.2.15 retrieving revision 1.1.2.16 diff -u -r1.1.2.15 -r1.1.2.16 --- FoPageSequence.java 11 May 2004 13:48:21 -0000 1.1.2.15 +++ FoPageSequence.java 18 May 2004 23:05:26 -0000 1.1.2.16 @@ -21,6 +21,10 @@ package org.apache.fop.fo.flow; // FOP +import java.awt.Graphics2D; +import java.awt.GraphicsEnvironment; +import java.awt.font.FontRenderContext; +import java.awt.image.BufferedImage; import java.util.ArrayList; import java.util.Arrays; import java.util.BitSet; @@ -195,6 +199,12 @@ { super(foTree, FObjectNames.PAGE_SEQUENCE, parent, event, FONode.PAGESEQ_SET, sparsePropsMap, sparseIndices); + // Set up the graphics environment + pageSpread = + new BufferedImage(20*72, 12*72, BufferedImage.TYPE_INT_RGB); + g2D = pageSpread.createGraphics(); + frcontext = g2D.getFontRenderContext(); + XmlEvent ev; // Look for optional title log.finer("page-sequence title"); @@ -291,6 +301,23 @@ } makeSparsePropsSet(); + } + + private GraphicsEnvironment gEnv = null; + public GraphicsEnvironment getGraphicsEnvironment() { + return gEnv; + } + private BufferedImage pageSpread = null; + public BufferedImage getPageSpread() { + return pageSpread; + } + private Graphics2D g2D = null; + public Graphics2D getGraphics2D() { + return g2D; + } + private FontRenderContext frcontext = null; + public FontRenderContext getFontRenderContext() { + return frcontext; } public Area getReferenceRectangle() throws FOPException { No revision No revision 1.1.2.13 +3 -4 xml-fop/src/java/org/apache/fop/fo/Attic/FoRoot.java Index: FoRoot.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/FoRoot.java,v retrieving revision 1.1.2.12 retrieving revision 1.1.2.13 diff -u -r1.1.2.12 -r1.1.2.13 --- FoRoot.java 8 May 2004 13:05:20 -0000 1.1.2.12 +++ FoRoot.java 18 May 2004 23:05:27 -0000 1.1.2.13 @@ -21,7 +21,6 @@ import java.util.Arrays; import java.util.NoSuchElementException; - import org.apache.fop.apps.FOPException; import org.apache.fop.area.Area; import org.apache.fop.datastructs.TreeException; 1.2.2.27 +11 -0 xml-fop/src/java/org/apache/fop/fo/FONode.java Index: FONode.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FONode.java,v retrieving revision 1.2.2.26 retrieving revision 1.2.2.27 diff -u -r1.2.2.26 -r1.2.2.27 --- FONode.java 13 May 2004 13:48:54 -0000 1.2.2.26 +++ FONode.java 18 May 2004 23:05:27 -0000 1.2.2.27 @@ -18,6 +18,7 @@ */ package org.apache.fop.fo; +import java.awt.GraphicsEnvironment; import java.awt.geom.Rectangle2D; import java.util.BitSet; import java.util.HashMap; @@ -190,6 +191,10 @@ /** The number of markers on this FO. */ protected int numMarkers = 0; + private GraphicsEnvironment gEnv = null; + protected GraphicsEnvironment getGraphicsEnvironment() { + return gEnv; + } /** * @param foTree an <tt>FOTree</tt> to which this node belongs * @param type the fo type of this FONode. @@ -225,6 +230,12 @@ exprParser = foTree.exprParser; propertySet = new PropertyValue[PropNames.LAST_PROPERTY_INDEX + 1]; foAttributes = new FOAttributes(event, this); + if (parent == null) { + // Setup the graphics environment + gEnv = GraphicsEnvironment.getLocalGraphicsEnvironment(); + } else { + gEnv = parent.getGraphicsEnvironment(); + } if ((stateFlags & MC_MARKER) == 0) { processAttributes(); }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]