From fop-commits-return-10210heather38@example.com Wed Jul 02 12:07:56 2008 Return-Path: <fop-commits-return-10210heather38@example.com> Delivered-To: heather38@example.com Received: (qmail 30358 invoked from network); 2 Jul 2008 12:07:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Jul 2008 12:07:55 -0000 Received: (qmail 39254 invoked by uid 500); 2 Jul 2008 12:07:56 -0000 Delivered-To: heather38@example.com Received: (qmail 39169 invoked by uid 500); 2 Jul 2008 12:07:56 -0000 Mailing-List: contact heather38@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:heather38@example.com> List-Unsubscribe: <mailto:heather38@example.com> List-Post: <mailto:heather38@example.com> List-Id: <fop-commits.xmlgraphics.apache.org> Reply-To: heather38@example.com Delivered-To: mailing list heather38@example.com Received: (qmail 39160 invoked by uid 99); 2 Jul 2008 12:07:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jul 2008 05:07:56 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jul 2008 12:07:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0F3942388A06; Wed, 2 Jul 2008 05:07:04 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r673372 - /xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/java2d/Java2DRenderer.java Date: Wed, 02 Jul 2008 12:07:03 -0000 To: heather38@example.com From: heather38@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <heather38@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: acumiskey Date: Wed Jul 2 05:07:02 2008 New Revision: 673372 URL: http://svn.apache.org/viewvc?rev=673372&view=rev Log: Minor cleanup. Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/java2d/Java2DRenderer.java Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/java2d/Java2DRenderer.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/java2d/Java2DRenderer.java?rev=673372&r1=673371&r2=673372&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/java2d/Java2DRenderer.java (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/java2d/Java2DRenderer.java Wed Jul 2 05:07:02 2008 @@ -144,9 +144,7 @@ public Java2DRenderer() { } - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ public void setUserAgent(FOUserAgent foUserAgent) { super.setUserAgent(foUserAgent); userAgent.setRendererOverride(this); // for document regeneration @@ -162,9 +160,7 @@ return userAgent; } - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ public void setupFontInfo(FontInfo inFontInfo) { //Don't call super.setupFontInfo() here! Java2D needs a special font setup // create a temp Image to test font metrics on @@ -437,16 +433,12 @@ state.transform(new AffineTransform(CTMHelper.toPDFArray(ctm))); } - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ protected void endVParea() { restoreGraphicsState(); } - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ protected List breakOutOfStateStack() { log.debug("Block.FIXED --> break out"); List breakOutList; @@ -459,10 +451,7 @@ return breakOutList; } - /** - * {@inheritDoc} - * java.util.List) - */ + /** {@inheritDoc} */ protected void restoreStateStackAfterBreakOut(List breakOutList) { log.debug("Block.FIXED --> restoring context after break-out"); @@ -474,16 +463,12 @@ } } - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ protected void updateColor(Color col, boolean fill) { state.updateColor(col); } - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ protected void clip() { if (currentPath == null) { throw new IllegalStateException("No current path available!"); @@ -492,16 +477,12 @@ currentPath = null; } - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ protected void closePath() { currentPath.closePath(); } - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ protected void lineTo(float x, float y) { if (currentPath == null) { currentPath = new GeneralPath(); @@ -509,9 +490,7 @@ currentPath.lineTo(x, y); } - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ protected void moveTo(float x, float y) { if (currentPath == null) { currentPath = new GeneralPath(); @@ -519,27 +498,23 @@ currentPath.moveTo(x, y); } - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ protected void clipRect(float x, float y, float width, float height) { state.updateClip(new Rectangle2D.Float(x, y, width, height)); } - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ protected void fillRect(float x, float y, float width, float height) { state.getGraph().fill(new Rectangle2D.Float(x, y, width, height)); } - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ protected void drawBorderLine(float x1, float y1, float x2, float y2, boolean horz, boolean startOrBefore, int style, Color col) { Graphics2D g2d = state.getGraph(); - drawBorderLine(new Rectangle2D.Float(x1, y1, x2 - x1, y2 - y1), + float width = x2 - x1; + float height = y2 - y1; + drawBorderLine(new Rectangle2D.Float(x1, y1, width, height), horz, startOrBefore, style, col, g2d); } @@ -704,9 +679,7 @@ } } - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ public void renderText(TextArea text) { renderInlineAreaBackAndBorders(text); @@ -888,18 +861,14 @@ super.renderLeader(area); } - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ public void renderImage(Image image, Rectangle2D pos) { // endTextObject(); String url = image.getURL(); drawImage(url, pos); } - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ protected void drawImage(String uri, Rectangle2D pos, Map foreignAttributes) { int x = currentIPPosition + (int)Math.round(pos.getX()); --------------------------------------------------------------------- To unsubscribe, e-mail: heather38@example.com For additional commands, e-mail: heather38@example.com From fop-commits-return-10211heather38@example.com Wed Jul 02 13:40:05 2008 Return-Path: <fop-commits-return-10211heather38@example.com> Delivered-To: heather38@example.com Received: (qmail 66410 invoked from network); 2 Jul 2008 13:40:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Jul 2008 13:40:05 -0000 Received: (qmail 73554 invoked by uid 500); 2 Jul 2008 13:40:05 -0000 Delivered-To: heather38@example.com Received: (qmail 73534 invoked by uid 500); 2 Jul 2008 13:40:05 -0000 Mailing-List: contact heather38@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:heather38@example.com> List-Unsubscribe: <mailto:heather38@example.com> List-Post: <mailto:heather38@example.com> List-Id: <fop-commits.xmlgraphics.apache.org> Reply-To: heather38@example.com Delivered-To: mailing list heather38@example.com Received: (qmail 73514 invoked by uid 99); 2 Jul 2008 13:40:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jul 2008 06:40:05 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jul 2008 13:39:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EBAFD2388A0A; Wed, 2 Jul 2008 06:39:13 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r673390 - /xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java Date: Wed, 02 Jul 2008 13:39:13 -0000 To: heather38@example.com From: heather38@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <heather38@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: acumiskey Date: Wed Jul 2 06:39:13 2008 New Revision: 673390 URL: http://svn.apache.org/viewvc?rev=673390&view=rev Log: Removed commented method. Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java?rev=673390&r1=673389&r2=673390&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java Wed Jul 2 06:39:13 2008 @@ -474,22 +474,6 @@ } } -// /** -// * Returns the position transform. -// * @param bp The block parent -// * @return the position transform -// */ -// protected AffineTransform getPositionTransform(BlockParent bp) { -// AffineTransform transform = new AffineTransform(); -// transform.translate(bp.getXOffset(), bp.getYOffset()); -// -// //"left/"top" (bv.getX/YOffset()) specify the position of the content rectangle -// transform.translate( -// -bp.getBorderAndPaddingWidthStart(), -// -bp.getBorderAndPaddingWidthBefore()); -// return transform; -// } - private static final QName FOX_TRANSFORM = new QName(ExtensionElementMapping.URI, "fox:transform"); --------------------------------------------------------------------- To unsubscribe, e-mail: heather38@example.com For additional commands, e-mail: heather38@example.com From fop-commits-return-10212heather38@example.com Thu Jul 03 18:25:53 2008 Return-Path: <fop-commits-return-10212heather38@example.com> Delivered-To: heather38@example.com Received: (qmail 90437 invoked from network); 3 Jul 2008 18:25:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 3 Jul 2008 18:25:53 -0000 Received: (qmail 73021 invoked by uid 500); 3 Jul 2008 18:25:54 -0000 Delivered-To: heather38@example.com Received: (qmail 72985 invoked by uid 500); 3 Jul 2008 18:25:54 -0000 Mailing-List: contact heather38@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:heather38@example.com> List-Unsubscribe: <mailto:heather38@example.com> List-Post: <mailto:heather38@example.com> List-Id: <fop-commits.xmlgraphics.apache.org> Reply-To: heather38@example.com Delivered-To: mailing list heather38@example.com Received: (qmail 72976 invoked by uid 99); 3 Jul 2008 18:25:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jul 2008 11:25:54 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jul 2008 18:25:11 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7F10023889F3; Thu, 3 Jul 2008 11:25:02 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r673750 - in /xmlgraphics/fop/branches/fop-0_95: src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java test/layoutengine/standard-testcases/marker_page-number-citation_bugzilla45295.xml Date: Thu, 03 Jul 2008 18:25:02 -0000 To: heather38@example.com From: heather38@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <heather38@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: adelmelle Date: Thu Jul 3 11:25:01 2008 New Revision: 673750 URL: http://svn.apache.org/viewvc?rev=673750&view=rev Log: Fix for Bugzilla 45295 (already committed to the trunk with r672010, r672495 and r672496) Added: xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/marker_page-number-citation_bugzilla45295.xml (with props) Modified: xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java Modified: xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java?rev=673750&r1=673749&r2=673750&view=diff ============================================================================== --- xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java (original) +++ xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java Thu Jul 3 11:25:01 2008 @@ -21,6 +21,7 @@ import java.awt.Color; +import org.xml.sax.Attributes; import org.xml.sax.Locator; import org.apache.fop.apps.FOPException; @@ -101,9 +102,9 @@ } /** {@inheritDoc} */ - protected void startOfNode() throws FOPException { - super.startOfNode(); - if (refId.equals("")) { + public void processNode(String elementName, Locator locator, Attributes attlist, PropertyList pList) throws FOPException { + super.processNode(elementName, locator, attlist, pList); + if (!inMarker() && (refId == null || "".equals(refId))) { missingPropertyError("ref-id"); } } Added: xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/marker_page-number-citation_bugzilla45295.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/marker_page-number-citation_bugzilla45295.xml?rev=673750&view=auto ============================================================================== --- xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/marker_page-number-citation_bugzilla45295.xml (added) +++ xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/marker_page-number-citation_bugzilla45295.xml Thu Jul 3 11:25:01 2008 @@ -0,0 +1,95 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<!-- $Id$ --> +<testcase> + <info> + <p> + This test checks for resolution of forward references in + fo:markers, as reported in Bugzilla 45295. + </p> + </info> + <fo> + <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> + <fo:layout-master-set> + <fo:simple-page-master master-name="first" + margin-right="1.5cm" + margin-left="1.5cm" + margin-bottom="2cm" + margin-top="1cm" + page-width="21cm" + page-height="29.7cm"> + <fo:region-body margin-top="1cm"/> + <fo:region-before extent="1cm"/> + <fo:region-after extent="1.5cm"/> + </fo:simple-page-master> + </fo:layout-master-set> + <fo:page-sequence master-reference="first" initial-page-number="1"> + <fo:static-content flow-name="xsl-region-before"> + <fo:block-container height="1cm" width="15cm" top="0cm" left="0cm" position="absolute"> + <fo:block> + <fo:retrieve-marker retrieve-class-name="message" + retrieve-boundary="page" + retrieve-position="first-starting-within-page"/> + </fo:block> + </fo:block-container> + <fo:block-container height="1cm" width="15cm" top="0cm" left="0cm" position="absolute"> + <fo:block> + <fo:retrieve-marker retrieve-class-name="term" + retrieve-boundary="page" + retrieve-position="last-ending-within-page"/> + </fo:block> + </fo:block-container> + </fo:static-content> + <fo:static-content flow-name="xsl-region-after"> + <fo:block text-align="start" font-size="10pt" font-family="serif" line-height="1em + 2pt"> + Page (<fo:page-number/> / <fo:page-number-citation ref-id="end-of-document"/>) + </fo:block> + </fo:static-content> + <fo:flow flow-name="xsl-region-body"> + <fo:block> + <fo:marker marker-class-name="message"> + <fo:block> + WARNING: Page sequence contains: <fo:page-number-citation id="pnc1" ref-id="end-of-document"/> pages. + </fo:block> + </fo:marker> + </fo:block> + <fo:block text-align="start" font-size="12pt" font-family="sans-serif"> + This page sequence has more than one page so you will see the message only at the top of the first page. + </fo:block> + <fo:block break-before="page" text-align="start" font-size="12pt" font-family="sans-serif"> + Some text. + </fo:block> + <fo:block break-before="page" text-align="start" font-size="12pt" font-family="sans-serif"> + Some text. + </fo:block> + <fo:block break-before="page" text-align="start" font-size="12pt" font-family="sans-serif"> + Some more text on last page. + </fo:block> + <fo:block id="end-of-document"> + <fo:marker marker-class-name="term"> + [marker content] + </fo:marker> + </fo:block> + </fo:flow> + </fo:page-sequence> + </fo:root> + </fo> + <checks> + <true xpath="//text[@prod-id='pnc1'][1]/word = '4'" /> + </checks> +</testcase> Propchange: xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/marker_page-number-citation_bugzilla45295.xml ------------------------------------------------------------------------------ svn:keywords = Id --------------------------------------------------------------------- To unsubscribe, e-mail: heather38@example.com For additional commands, e-mail: heather38@example.com From fop-commits-return-10213heather38@example.com Fri Jul 04 13:14:21 2008 Return-Path: <fop-commits-return-10213heather38@example.com> Delivered-To: heather38@example.com Received: (qmail 59407 invoked from network); 4 Jul 2008 13:14:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 Jul 2008 13:14:21 -0000 Received: (qmail 88115 invoked by uid 500); 4 Jul 2008 13:14:22 -0000 Delivered-To: heather38@example.com Received: (qmail 88032 invoked by uid 500); 4 Jul 2008 13:14:22 -0000 Mailing-List: contact heather38@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:heather38@example.com> List-Unsubscribe: <mailto:heather38@example.com> List-Post: <mailto:heather38@example.com> List-Id: <fop-commits.xmlgraphics.apache.org> Reply-To: heather38@example.com Delivered-To: mailing list heather38@example.com Received: (qmail 88023 invoked by uid 99); 4 Jul 2008 13:14:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jul 2008 06:14:22 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jul 2008 13:13:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5AABC23889BA; Fri, 4 Jul 2008 06:13:30 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r674039 - /xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java Date: Fri, 04 Jul 2008 13:13:30 -0000 To: heather38@example.com From: heather38@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <heather38@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: acumiskey Date: Fri Jul 4 06:13:29 2008 New Revision: 674039 URL: http://svn.apache.org/viewvc?rev=674039&view=rev Log: Minor readability improvement. Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java?rev=674039&r1=674038&r2=674039&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java Fri Jul 4 06:13:29 2008 @@ -539,7 +539,9 @@ protected void drawBorderLine(float x1, float y1, float x2, float y2, boolean horz, boolean startOrBefore, int style, Color col) { Graphics2D g2d = state.getGraph(); - drawBorderLine(new Rectangle2D.Float(x1, y1, x2 - x1, y2 - y1), + float width = x2 - x1; + float height = y2 - y1; + drawBorderLine(new Rectangle2D.Float(x1, y1, width, height), horz, startOrBefore, style, col, g2d); } --------------------------------------------------------------------- To unsubscribe, e-mail: heather38@example.com For additional commands, e-mail: heather38@example.com From fop-commits-return-10214heather38@example.com Fri Jul 04 13:17:58 2008 Return-Path: <fop-commits-return-10214heather38@example.com> Delivered-To: heather38@example.com Received: (qmail 60374 invoked from network); 4 Jul 2008 13:17:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 Jul 2008 13:17:58 -0000 Received: (qmail 91746 invoked by uid 500); 4 Jul 2008 13:17:59 -0000 Delivered-To: heather38@example.com Received: (qmail 91721 invoked by uid 500); 4 Jul 2008 13:17:59 -0000 Mailing-List: contact heather38@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:heather38@example.com> List-Unsubscribe: <mailto:heather38@example.com> List-Post: <mailto:heather38@example.com> List-Id: <fop-commits.xmlgraphics.apache.org> Reply-To: heather38@example.com Delivered-To: mailing list heather38@example.com Received: (qmail 91712 invoked by uid 99); 4 Jul 2008 13:17:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jul 2008 06:17:59 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jul 2008 13:17:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 534AC2388A39; Fri, 4 Jul 2008 06:17:07 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r674043 - /xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java Date: Fri, 04 Jul 2008 13:17:07 -0000 To: heather38@example.com From: heather38@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <heather38@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: acumiskey Date: Fri Jul 4 06:17:06 2008 New Revision: 674043 URL: http://svn.apache.org/viewvc?rev=674043&view=rev Log: The pdf StringBuffer is only used on these two lines and doesn't seem to do anything... Very strange... :-S Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java?rev=674043&r1=674042&r2=674043&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java Fri Jul 4 06:17:06 2008 @@ -1415,7 +1415,6 @@ updateColor(ct, true); beginTextObject(); - StringBuffer pdf = new StringBuffer(); String fontName = getInternalFontNameForArea(text); int size = ((Integer) text.getTrait(Trait.FONT_SIZE)).intValue(); @@ -1434,8 +1433,6 @@ textutil.writeTextMatrix(new AffineTransform(1, 0, 0, -1, rx / 1000f, bl / 1000f)); - currentStream.add(pdf.toString()); - super.renderText(text); textutil.writeTJ(); --------------------------------------------------------------------- To unsubscribe, e-mail: heather38@example.com For additional commands, e-mail: heather38@example.com From fop-commits-return-10215heather38@example.com Fri Jul 04 13:22:34 2008 Return-Path: <fop-commits-return-10215heather38@example.com> Delivered-To: heather38@example.com Received: (qmail 61876 invoked from network); 4 Jul 2008 13:22:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 Jul 2008 13:22:34 -0000 Received: (qmail 98047 invoked by uid 500); 4 Jul 2008 13:22:35 -0000 Delivered-To: heather38@example.com Received: (qmail 97961 invoked by uid 500); 4 Jul 2008 13:22:35 -0000 Mailing-List: contact heather38@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:heather38@example.com> List-Unsubscribe: <mailto:heather38@example.com> List-Post: <mailto:heather38@example.com> List-Id: <fop-commits.xmlgraphics.apache.org> Reply-To: heather38@example.com Delivered-To: mailing list heather38@example.com Received: (qmail 97952 invoked by uid 99); 4 Jul 2008 13:22:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jul 2008 06:22:35 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jul 2008 13:21:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9747923889BA; Fri, 4 Jul 2008 06:21:43 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r674045 - in /xmlgraphics/fop/branches/Temp_AFPGOCAResources: ./ src/java/org/apache/fop/render/pdf/PDFRenderer.java test/fotree/testcases/column-number_cells_rows.fo Date: Fri, 04 Jul 2008 13:21:43 -0000 To: heather38@example.com From: heather38@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <heather38@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: acumiskey Date: Fri Jul 4 06:21:43 2008 New Revision: 674045 URL: http://svn.apache.org/viewvc?rev=674045&view=rev Log: Merged revisions 672833,674039,674043 via svnmerge from https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk ........ r672833 | adelmelle | 2008-06-30 18:34:41 +0100 (Mon, 30 Jun 2008) | 2 lines Added check for the case where column-number is specified on something other than a fo:table-cell or fo:table-column (strictly not an error) ........ r674039 | acumiskey | 2008-07-04 14:13:29 +0100 (Fri, 04 Jul 2008) | 2 lines Minor readability improvement. ........ r674043 | acumiskey | 2008-07-04 14:17:06 +0100 (Fri, 04 Jul 2008) | 3 lines The pdf StringBuffer is only used on these two lines and doesn't seem to do anything... Very strange... :-S ........ Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/ (props changed) xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFRenderer.java xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/fotree/testcases/column-number_cells_rows.fo Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Fri Jul 4 06:21:43 2008 @@ -1 +1 @@ -/xmlgraphics/fop/trunk:1-672776 +/xmlgraphics/fop/trunk:1-674043 Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFRenderer.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFRenderer.java?rev=674045&r1=674044&r2=674045&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFRenderer.java (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFRenderer.java Fri Jul 4 06:21:43 2008 @@ -1415,7 +1415,6 @@ updateColor(ct, true); beginTextObject(); - StringBuffer pdf = new StringBuffer(); String fontName = getInternalFontNameForArea(text); int size = ((Integer) text.getTrait(Trait.FONT_SIZE)).intValue(); @@ -1434,8 +1433,6 @@ textutil.writeTextMatrix(new AffineTransform(1, 0, 0, -1, rx / 1000f, bl / 1000f)); - currentStream.add(pdf.toString()); - super.renderText(text); textutil.writeTJ(); Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/fotree/testcases/column-number_cells_rows.fo URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/fotree/testcases/column-number_cells_rows.fo?rev=674045&r1=674044&r2=674045&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/fotree/testcases/column-number_cells_rows.fo (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/fotree/testcases/column-number_cells_rows.fo Fri Jul 4 06:21:43 2008 @@ -181,6 +181,10 @@ </fo:table-row> </fo:table-body> </fo:table> + <fo:block column-number="4"> + <test:assert property="column-number" expected="4" /> + Test column-number when specified on fo:block + </fo:block> </fo:flow> </fo:page-sequence> </fo:root> --------------------------------------------------------------------- To unsubscribe, e-mail: heather38@example.com For additional commands, e-mail: heather38@example.com From fop-commits-return-10216heather38@example.com Fri Jul 04 13:58:19 2008 Return-Path: <fop-commits-return-10216heather38@example.com> Delivered-To: heather38@example.com Received: (qmail 71395 invoked from network); 4 Jul 2008 13:58:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 Jul 2008 13:58:19 -0000 Received: (qmail 37231 invoked by uid 500); 4 Jul 2008 13:58:20 -0000 Delivered-To: heather38@example.com Received: (qmail 37203 invoked by uid 500); 4 Jul 2008 13:58:20 -0000 Mailing-List: contact heather38@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:heather38@example.com> List-Unsubscribe: <mailto:heather38@example.com> List-Post: <mailto:heather38@example.com> List-Id: <fop-commits.xmlgraphics.apache.org> Reply-To: heather38@example.com Delivered-To: mailing list heather38@example.com Received: (qmail 37193 invoked by uid 99); 4 Jul 2008 13:58:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jul 2008 06:58:20 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jul 2008 13:57:37 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 73126238899B; Fri, 4 Jul 2008 06:57:58 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r674056 - in /xmlgraphics/fop/trunk/src/java/org/apache/fop: area/Area.java area/inline/InlineArea.java render/AbstractRenderer.java Date: Fri, 04 Jul 2008 13:57:58 -0000 To: heather38@example.com From: heather38@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <heather38@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: acumiskey Date: Fri Jul 4 06:57:57 2008 New Revision: 674056 URL: http://svn.apache.org/viewvc?rev=674056&view=rev Log: * Some minor optimizations in AbstractRenderer. * Renamed getBooleanTrait() to getTraitAsBoolean() in Area. Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Area.java xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Area.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Area.java?rev=674056&r1=674055&r2=674056&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Area.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Area.java Fri Jul 4 06:57:57 2008 @@ -415,10 +415,11 @@ /** * Get a boolean trait from this area. + * * @param oTraitCode the trait key * @return the trait value */ - public boolean getBooleanTrait(Object oTraitCode) { + public boolean getTraitAsBoolean(Object oTraitCode) { final Object obj = getTrait(oTraitCode); if (obj instanceof Boolean) { return ((Boolean)obj).booleanValue(); Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java?rev=674056&r1=674055&r2=674056&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java Fri Jul 4 06:57:57 2008 @@ -182,22 +182,22 @@ *@return true if the inline area is underlined. */ public boolean hasUnderline() { - return getBooleanTrait(Trait.UNDERLINE); + return getTraitAsBoolean(Trait.UNDERLINE); } /** @return true if the inline area is overlined. */ public boolean hasOverline() { - return getBooleanTrait(Trait.OVERLINE); + return getTraitAsBoolean(Trait.OVERLINE); } /** @return true if the inline area has a line through. */ public boolean hasLineThrough() { - return getBooleanTrait(Trait.LINETHROUGH); + return getTraitAsBoolean(Trait.LINETHROUGH); } /** @return true if the inline area is blinking. */ public boolean isBlinking() { - return getBooleanTrait(Trait.BLINK); + return getTraitAsBoolean(Trait.BLINK); } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java?rev=674056&r1=674055&r2=674056&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java Fri Jul 4 06:57:57 2008 @@ -246,15 +246,25 @@ last here. */ RegionViewport viewport; viewport = page.getRegionViewport(FO_REGION_BEFORE); - renderRegionViewport(viewport); + if (viewport != null) { + renderRegionViewport(viewport); + } viewport = page.getRegionViewport(FO_REGION_START); - renderRegionViewport(viewport); + if (viewport != null) { + renderRegionViewport(viewport); + } viewport = page.getRegionViewport(FO_REGION_END); - renderRegionViewport(viewport); + if (viewport != null) { + renderRegionViewport(viewport); + } viewport = page.getRegionViewport(FO_REGION_AFTER); - renderRegionViewport(viewport); + if (viewport != null) { + renderRegionViewport(viewport); + } viewport = page.getRegionViewport(FO_REGION_BODY); - renderRegionViewport(viewport); + if (viewport != null) { + renderRegionViewport(viewport); + } } /** @@ -266,27 +276,25 @@ * @param port The region viewport to be rendered */ protected void renderRegionViewport(RegionViewport port) { - if (port != null) { - Rectangle2D view = port.getViewArea(); - // The CTM will transform coordinates relative to - // this region-reference area into page coords, so - // set origin for the region to 0,0. - currentBPPosition = 0; - currentIPPosition = 0; - - RegionReference regionReference = port.getRegionReference(); - handleRegionTraits(port); - - // shouldn't the viewport have the CTM - startVParea(regionReference.getCTM(), port.isClip() ? view : null); - // do after starting viewport area - if (regionReference.getRegionClass() == FO_REGION_BODY) { - renderBodyRegion((BodyRegion) regionReference); - } else { - renderRegion(regionReference); - } - endVParea(); + Rectangle2D view = port.getViewArea(); + // The CTM will transform coordinates relative to + // this region-reference area into page coords, so + // set origin for the region to 0,0. + currentBPPosition = 0; + currentIPPosition = 0; + + RegionReference regionReference = port.getRegionReference(); + handleRegionTraits(port); + + // shouldn't the viewport have the CTM + startVParea(regionReference.getCTM(), port.isClip() ? view : null); + // do after starting viewport area + if (regionReference.getRegionClass() == FO_REGION_BODY) { + renderBodyRegion((BodyRegion) regionReference); + } else { + renderRegion(regionReference); } + endVParea(); } /** @@ -320,8 +328,7 @@ * @param region The region reference area */ protected void renderRegion(RegionReference region) { - List blocks = region.getBlocks(); - renderBlocks(null, blocks); + renderBlocks(null, region.getBlocks()); } /** @@ -502,7 +509,7 @@ int saveBP = currentBPPosition; // Calculate the position of the content rectangle. - if (parent != null && !Boolean.TRUE.equals(parent.getTrait(Trait.IS_VIEWPORT_AREA))) { + if (parent != null && !parent.getTraitAsBoolean(Trait.IS_VIEWPORT_AREA)) { currentBPPosition += parent.getBorderAndPaddingWidthBefore(); /* This is unnecessary now as we're going to use the *-indent traits currentIPPosition += parent.getBorderAndPaddingWidthStart(); @@ -558,7 +565,7 @@ // simply move position currentBPPosition += block.getAllocBPD(); } - } else if (Boolean.TRUE.equals(block.getTrait(Trait.IS_REFERENCE_AREA))) { + } else if (block.getTraitAsBoolean(Trait.IS_REFERENCE_AREA)) { renderReferenceArea(block); } else { // save position and offset @@ -864,4 +871,5 @@ matrix[5] = matrix[5] * 1000; return new AffineTransform(matrix); } + } --------------------------------------------------------------------- To unsubscribe, e-mail: heather38@example.com For additional commands, e-mail: heather38@example.com From fop-commits-return-10217heather38@example.com Fri Jul 04 14:06:02 2008 Return-Path: <fop-commits-return-10217heather38@example.com> Delivered-To: heather38@example.com Received: (qmail 74018 invoked from network); 4 Jul 2008 14:06:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 Jul 2008 14:06:02 -0000 Received: (qmail 42946 invoked by uid 500); 4 Jul 2008 14:06:03 -0000 Delivered-To: heather38@example.com Received: (qmail 42920 invoked by uid 500); 4 Jul 2008 14:06:03 -0000 Mailing-List: contact heather38@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:heather38@example.com> List-Unsubscribe: <mailto:heather38@example.com> List-Post: <mailto:heather38@example.com> List-Id: <fop-commits.xmlgraphics.apache.org> Reply-To: heather38@example.com Delivered-To: mailing list heather38@example.com Received: (qmail 42910 invoked by uid 99); 4 Jul 2008 14:06:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jul 2008 07:06:03 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jul 2008 14:05:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 609912388A39; Fri, 4 Jul 2008 07:05:41 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r674062 - in /xmlgraphics/fop/branches/Temp_AFPGOCAResources: ./ src/java/org/apache/fop/area/Area.java src/java/org/apache/fop/area/inline/InlineArea.java src/java/org/apache/fop/render/AbstractRenderer.java Date: Fri, 04 Jul 2008 14:05:41 -0000 To: heather38@example.com From: heather38@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <heather38@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: acumiskey Date: Fri Jul 4 07:05:40 2008 New Revision: 674062 URL: http://svn.apache.org/viewvc?rev=674062&view=rev Log: Merged revisions 674056 via svnmerge from https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk ........ r674056 | acumiskey | 2008-07-04 14:57:57 +0100 (Fri, 04 Jul 2008) | 3 lines * Some minor optimizations in AbstractRenderer. * Renamed getBooleanTrait() to getTraitAsBoolean() in Area. ........ Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/ (props changed) xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/Area.java xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/inline/InlineArea.java xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractRenderer.java Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Fri Jul 4 07:05:40 2008 @@ -1 +1 @@ -/xmlgraphics/fop/trunk:1-674043 +/xmlgraphics/fop/trunk:1-674060 Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/Area.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/Area.java?rev=674062&r1=674061&r2=674062&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/Area.java (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/Area.java Fri Jul 4 07:05:40 2008 @@ -417,10 +417,11 @@ /** * Get a boolean trait from this area. + * * @param oTraitCode the trait key * @return the trait value */ - public boolean getBooleanTrait(Object oTraitCode) { + public boolean getTraitAsBoolean(Object oTraitCode) { final Object obj = getTrait(oTraitCode); if (obj instanceof Boolean) { return ((Boolean)obj).booleanValue(); Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/inline/InlineArea.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/inline/InlineArea.java?rev=674062&r1=674061&r2=674062&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/inline/InlineArea.java (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/inline/InlineArea.java Fri Jul 4 07:05:40 2008 @@ -182,22 +182,22 @@ *@return true if the inline area is underlined. */ public boolean hasUnderline() { - return getBooleanTrait(Trait.UNDERLINE); + return getTraitAsBoolean(Trait.UNDERLINE); } /** @return true if the inline area is overlined. */ public boolean hasOverline() { - return getBooleanTrait(Trait.OVERLINE); + return getTraitAsBoolean(Trait.OVERLINE); } /** @return true if the inline area has a line through. */ public boolean hasLineThrough() { - return getBooleanTrait(Trait.LINETHROUGH); + return getTraitAsBoolean(Trait.LINETHROUGH); } /** @return true if the inline area is blinking. */ public boolean isBlinking() { - return getBooleanTrait(Trait.BLINK); + return getTraitAsBoolean(Trait.BLINK); } /** Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractRenderer.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractRenderer.java?rev=674062&r1=674061&r2=674062&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractRenderer.java (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractRenderer.java Fri Jul 4 07:05:40 2008 @@ -246,15 +246,25 @@ last here. */ RegionViewport viewport; viewport = page.getRegionViewport(FO_REGION_BEFORE); - renderRegionViewport(viewport); + if (viewport != null) { + renderRegionViewport(viewport); + } viewport = page.getRegionViewport(FO_REGION_START); - renderRegionViewport(viewport); + if (viewport != null) { + renderRegionViewport(viewport); + } viewport = page.getRegionViewport(FO_REGION_END); - renderRegionViewport(viewport); + if (viewport != null) { + renderRegionViewport(viewport); + } viewport = page.getRegionViewport(FO_REGION_AFTER); - renderRegionViewport(viewport); + if (viewport != null) { + renderRegionViewport(viewport); + } viewport = page.getRegionViewport(FO_REGION_BODY); - renderRegionViewport(viewport); + if (viewport != null) { + renderRegionViewport(viewport); + } } /** @@ -266,27 +276,25 @@ * @param port The region viewport to be rendered */ protected void renderRegionViewport(RegionViewport port) { - if (port != null) { - Rectangle2D view = port.getViewArea(); - // The CTM will transform coordinates relative to - // this region-reference area into page coords, so - // set origin for the region to 0,0. - currentBPPosition = 0; - currentIPPosition = 0; - - RegionReference regionReference = port.getRegionReference(); - handleRegionTraits(port); - - // shouldn't the viewport have the CTM - startVParea(regionReference.getCTM(), port.isClip() ? view : null); - // do after starting viewport area - if (regionReference.getRegionClass() == FO_REGION_BODY) { - renderBodyRegion((BodyRegion) regionReference); - } else { - renderRegion(regionReference); - } - endVParea(); + Rectangle2D view = port.getViewArea(); + // The CTM will transform coordinates relative to + // this region-reference area into page coords, so + // set origin for the region to 0,0. + currentBPPosition = 0; + currentIPPosition = 0; + + RegionReference regionReference = port.getRegionReference(); + handleRegionTraits(port); + + // shouldn't the viewport have the CTM + startVParea(regionReference.getCTM(), port.isClip() ? view : null); + // do after starting viewport area + if (regionReference.getRegionClass() == FO_REGION_BODY) { + renderBodyRegion((BodyRegion) regionReference); + } else { + renderRegion(regionReference); } + endVParea(); } /** @@ -320,8 +328,7 @@ * @param region The region reference area */ protected void renderRegion(RegionReference region) { - List blocks = region.getBlocks(); - renderBlocks(null, blocks); + renderBlocks(null, region.getBlocks()); } /** @@ -502,7 +509,7 @@ int saveBP = currentBPPosition; // Calculate the position of the content rectangle. - if (parent != null && !Boolean.TRUE.equals(parent.getTrait(Trait.IS_VIEWPORT_AREA))) { + if (parent != null && !parent.getTraitAsBoolean(Trait.IS_VIEWPORT_AREA)) { currentBPPosition += parent.getBorderAndPaddingWidthBefore(); /* This is unnecessary now as we're going to use the *-indent traits currentIPPosition += parent.getBorderAndPaddingWidthStart(); @@ -558,7 +565,7 @@ // simply move position currentBPPosition += block.getAllocBPD(); } - } else if (Boolean.TRUE.equals(block.getTrait(Trait.IS_REFERENCE_AREA))) { + } else if (block.getTraitAsBoolean(Trait.IS_REFERENCE_AREA)) { renderReferenceArea(block); } else { // save position and offset @@ -864,4 +871,5 @@ matrix[5] = matrix[5] * 1000; return new AffineTransform(matrix); } + } --------------------------------------------------------------------- To unsubscribe, e-mail: heather38@example.com For additional commands, e-mail: heather38@example.com From fop-commits-return-10218heather38@example.com Fri Jul 04 14:11:03 2008 Return-Path: <fop-commits-return-10218heather38@example.com> Delivered-To: heather38@example.com Received: (qmail 75420 invoked from network); 4 Jul 2008 14:11:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 Jul 2008 14:11:02 -0000 Received: (qmail 47371 invoked by uid 500); 4 Jul 2008 14:11:03 -0000 Delivered-To: heather38@example.com Received: (qmail 47343 invoked by uid 500); 4 Jul 2008 14:11:03 -0000 Mailing-List: contact heather38@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:heather38@example.com> List-Unsubscribe: <mailto:heather38@example.com> List-Post: <mailto:heather38@example.com> List-Id: <fop-commits.xmlgraphics.apache.org> Reply-To: heather38@example.com Delivered-To: mailing list heather38@example.com Received: (qmail 47334 invoked by uid 99); 4 Jul 2008 14:11:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jul 2008 07:11:03 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jul 2008 14:10:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0824B23889BB; Fri, 4 Jul 2008 07:10:12 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r674064 - /xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextHandler.java Date: Fri, 04 Jul 2008 14:10:11 -0000 To: heather38@example.com From: heather38@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <heather38@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: acumiskey Date: Fri Jul 4 07:10:11 2008 New Revision: 674064 URL: http://svn.apache.org/viewvc?rev=674064&view=rev Log: Removed 'this'. Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextHandler.java Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextHandler.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextHandler.java?rev=674064&r1=674063&r2=674064&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextHandler.java (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextHandler.java Fri Jul 4 07:10:11 2008 @@ -79,7 +79,7 @@ } if (overrideFont != null) { FontInfo fontInfo = getFontInfo(); - AFPPageFonts pageFonts = this.afpState.getPageFonts(); + AFPPageFonts pageFonts = afpState.getPageFonts(); String internalFontName = overrideFont.getFontName(); int fontSize = overrideFont.getFontSize(); if (afpState.setFontName(internalFontName) || afpState.setFontSize(fontSize)) { --------------------------------------------------------------------- To unsubscribe, e-mail: heather38@example.com For additional commands, e-mail: heather38@example.com From fop-commits-return-10219heather38@example.com Fri Jul 04 14:13:29 2008 Return-Path: <fop-commits-return-10219heather38@example.com> Delivered-To: heather38@example.com Received: (qmail 76000 invoked from network); 4 Jul 2008 14:13:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 Jul 2008 14:13:29 -0000 Received: (qmail 48314 invoked by uid 500); 4 Jul 2008 14:13:30 -0000 Delivered-To: heather38@example.com Received: (qmail 48292 invoked by uid 500); 4 Jul 2008 14:13:30 -0000 Mailing-List: contact heather38@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:heather38@example.com> List-Unsubscribe: <mailto:heather38@example.com> List-Post: <mailto:heather38@example.com> List-Id: <fop-commits.xmlgraphics.apache.org> Reply-To: heather38@example.com Delivered-To: mailing list heather38@example.com Received: (qmail 48283 invoked by uid 99); 4 Jul 2008 14:13:30 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jul 2008 07:13:30 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jul 2008 14:12:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5D9CB23889BA; Fri, 4 Jul 2008 07:12:38 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r674065 - /xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Page.java Date: Fri, 04 Jul 2008 14:12:38 -0000 To: heather38@example.com From: heather38@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <heather38@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: acumiskey Date: Fri Jul 4 07:12:37 2008 New Revision: 674065 URL: http://svn.apache.org/viewvc?rev=674065&view=rev Log: Replaced conditional with a switch and capitalized method javadoc description. Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Page.java Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Page.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Page.java?rev=674065&r1=674064&r2=674065&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Page.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Page.java Fri Jul 4 07:12:37 2008 @@ -209,27 +209,28 @@ /** * Get the region from this page. * - * @param areaclass the region area class + * @param areaClass the region area class * @return the region viewport or null if none */ - public RegionViewport getRegionViewport(int areaclass) { - if (areaclass == Constants.FO_REGION_BEFORE) { + public RegionViewport getRegionViewport(int areaClass) { + switch (areaClass) { + case Constants.FO_REGION_BEFORE: return regionBefore; - } else if (areaclass == Constants.FO_REGION_START) { + case Constants.FO_REGION_START: return regionStart; - } else if (areaclass == Constants.FO_REGION_BODY) { - return regionBody; - } else if (areaclass == Constants.FO_REGION_END) { + case Constants.FO_REGION_BODY: + return regionBody; + case Constants.FO_REGION_END: return regionEnd; - } else if (areaclass == Constants.FO_REGION_AFTER) { + case Constants.FO_REGION_AFTER: return regionAfter; + default: + throw new IllegalArgumentException("No such area class with ID = " + areaClass); } - throw new IllegalArgumentException("No such area class with ID = " - + areaclass); } /** - * indicates whether any FOs have been added to the body region + * Indicates whether any FOs have been added to the body region * * @return whether any FOs have been added to the body region */ --------------------------------------------------------------------- To unsubscribe, e-mail: heather38@example.com For additional commands, e-mail: heather38@example.com From fop-commits-return-10220heather38@example.com Fri Jul 04 14:15:50 2008 Return-Path: <fop-commits-return-10220heather38@example.com> Delivered-To: heather38@example.com Received: (qmail 76346 invoked from network); 4 Jul 2008 14:15:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 Jul 2008 14:15:49 -0000 Received: (qmail 48931 invoked by uid 500); 4 Jul 2008 14:15:51 -0000 Delivered-To: heather38@example.com Received: (qmail 48904 invoked by uid 500); 4 Jul 2008 14:15:50 -0000 Mailing-List: contact heather38@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:heather38@example.com> List-Unsubscribe: <mailto:heather38@example.com> List-Post: <mailto:heather38@example.com> List-Id: <fop-commits.xmlgraphics.apache.org> Reply-To: heather38@example.com Delivered-To: mailing list heather38@example.com Received: (qmail 48895 invoked by uid 99); 4 Jul 2008 14:15:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jul 2008 07:15:50 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jul 2008 14:15:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3EABF23889BA; Fri, 4 Jul 2008 07:14:59 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r674066 - in /xmlgraphics/fop/branches/Temp_AFPGOCAResources: ./ src/java/org/apache/fop/area/Page.java Date: Fri, 04 Jul 2008 14:14:59 -0000 To: heather38@example.com From: heather38@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <heather38@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: acumiskey Date: Fri Jul 4 07:14:58 2008 New Revision: 674066 URL: http://svn.apache.org/viewvc?rev=674066&view=rev Log: Merged revisions 674065 via svnmerge from https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk ........ r674065 | acumiskey | 2008-07-04 15:12:37 +0100 (Fri, 04 Jul 2008) | 2 lines Replaced conditional with a switch and capitalized method javadoc description. ........ Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/ (props changed) xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/Page.java Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Fri Jul 4 07:14:58 2008 @@ -1 +1 @@ -/xmlgraphics/fop/trunk:1-674060 +/xmlgraphics/fop/trunk:1-674065 Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/Page.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/Page.java?rev=674066&r1=674065&r2=674066&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/Page.java (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/Page.java Fri Jul 4 07:14:58 2008 @@ -209,27 +209,28 @@ /** * Get the region from this page. * - * @param areaclass the region area class + * @param areaClass the region area class * @return the region viewport or null if none */ - public RegionViewport getRegionViewport(int areaclass) { - if (areaclass == Constants.FO_REGION_BEFORE) { + public RegionViewport getRegionViewport(int areaClass) { + switch (areaClass) { + case Constants.FO_REGION_BEFORE: return regionBefore; - } else if (areaclass == Constants.FO_REGION_START) { + case Constants.FO_REGION_START: return regionStart; - } else if (areaclass == Constants.FO_REGION_BODY) { - return regionBody; - } else if (areaclass == Constants.FO_REGION_END) { + case Constants.FO_REGION_BODY: + return regionBody; + case Constants.FO_REGION_END: return regionEnd; - } else if (areaclass == Constants.FO_REGION_AFTER) { + case Constants.FO_REGION_AFTER: return regionAfter; + default: + throw new IllegalArgumentException("No such area class with ID = " + areaClass); } - throw new IllegalArgumentException("No such area class with ID = " - + areaclass); } /** - * indicates whether any FOs have been added to the body region + * Indicates whether any FOs have been added to the body region * * @return whether any FOs have been added to the body region */ --------------------------------------------------------------------- To unsubscribe, e-mail: heather38@example.com For additional commands, e-mail: heather38@example.com From fop-commits-return-10221heather38@example.com Fri Jul 04 15:58:43 2008 Return-Path: <fop-commits-return-10221heather38@example.com> Delivered-To: heather38@example.com Received: (qmail 56378 invoked from network); 4 Jul 2008 15:58:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 Jul 2008 15:58:43 -0000 Received: (qmail 68039 invoked by uid 500); 4 Jul 2008 15:58:44 -0000 Delivered-To: heather38@example.com Received: (qmail 68015 invoked by uid 500); 4 Jul 2008 15:58:43 -0000 Mailing-List: contact heather38@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:heather38@example.com> List-Unsubscribe: <mailto:heather38@example.com> List-Post: <mailto:heather38@example.com> List-Id: <fop-commits.xmlgraphics.apache.org> Reply-To: heather38@example.com Delivered-To: mailing list heather38@example.com Received: (qmail 68006 invoked by uid 99); 4 Jul 2008 15:58:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jul 2008 08:58:43 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jul 2008 15:58:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DED7A23889BB; Fri, 4 Jul 2008 08:57:51 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r674077 - /xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextDataInfo.java Date: Fri, 04 Jul 2008 15:57:51 -0000 To: heather38@example.com From: heather38@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <heather38@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: acumiskey Date: Fri Jul 4 08:57:51 2008 New Revision: 674077 URL: http://svn.apache.org/viewvc?rev=674077&view=rev Log: Encapsulates text data. Added: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextDataInfo.java (with props) Added: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextDataInfo.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextDataInfo.java?rev=674077&view=auto ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextDataInfo.java (added) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextDataInfo.java Fri Jul 4 08:57:51 2008 @@ -0,0 +1,170 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* $Id$ */ + +package org.apache.fop.render.afp; + +import java.awt.Color; + +/** + * Contains text data information + */ +public class AFPTextDataInfo { + private int fontReference; + private int x; + private int y; + private Color color; + private int variableSpaceCharacterIncrement; + private int interCharacterAdjustment; + private byte[] data; + private int orientation; + + /** + * @return the font reference + */ + public int getFontReference() { + return fontReference; + } + + /** + * Sets the font reference + * @param fontReference the font reference + */ + protected void setFontReference(int fontReference) { + this.fontReference = fontReference; + } + + /** + * @return the x coordinate + */ + public int getX() { + return x; + } + + /** + * Sets the X coordinate + * @param x the X coordinate + */ + protected void setX(int x) { + this.x = x; + } + + /** + * @return the y coordinate + */ + public int getY() { + return y; + } + + /** + * Sets the Y coordinate + * @param y the Y coordinate + */ + protected void setY(int y) { + this.y = y; + } + + /** + * @return the color + */ + public Color getColor() { + return color; + } + + /** + * Sets the color + * @param color the color + */ + protected void setColor(Color color) { + this.color = color; + } + + /** + * @return the variable space character increment + */ + public int getVariableSpaceCharacterIncrement() { + return variableSpaceCharacterIncrement; + } + + /** + * Sets the variable space character increment + * @param variableSpaceCharacterIncrement the variable space character increment + */ + protected void setVariableSpaceCharacterIncrement( + int variableSpaceCharacterIncrement) { + this.variableSpaceCharacterIncrement = variableSpaceCharacterIncrement; + } + + /** + * @return the inter character adjustment + */ + public int getInterCharacterAdjustment() { + return interCharacterAdjustment; + } + + /** + * Sets the inter character adjustment + * @param interCharacterAdjustment the inter character adjustment + */ + protected void setInterCharacterAdjustment(int interCharacterAdjustment) { + this.interCharacterAdjustment = interCharacterAdjustment; + } + + /** + * @return the text data + */ + public byte[] getData() { + return data; + } + + /** + * Sets the text data + * @param data the text orientation + */ + protected void setData(byte[] data) { + this.data = data; + } + + /** + * Sets the text orientation + * @param orientation the text orientation + */ + public void setOrientation(int orientation) { + this.orientation = orientation; + } + + /** + * @return the text orientation + */ + public int getOrientation() { + return this.orientation; + } + + /** {@inheritDoc} */ + public String toString() { + return "AFPTextDataInfo{fontReference=" + fontReference + + ", x=" + x + + ", y=" + y + + ", color=" + color + + ", vsci=" + variableSpaceCharacterIncrement + + ", ica=" + interCharacterAdjustment + + ", orientation=" + orientation + + ", data=" + data + + "}"; + } +} \ No newline at end of file Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextDataInfo.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextDataInfo.java ------------------------------------------------------------------------------ svn:keywords = Revision Id --------------------------------------------------------------------- To unsubscribe, e-mail: heather38@example.com For additional commands, e-mail: heather38@example.com From fop-commits-return-10222heather38@example.com Sat Jul 05 22:54:51 2008 Return-Path: <fop-commits-return-10222heather38@example.com> Delivered-To: heather38@example.com Received: (qmail 83805 invoked from network); 5 Jul 2008 22:54:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 5 Jul 2008 22:54:51 -0000 Received: (qmail 60608 invoked by uid 500); 5 Jul 2008 22:54:52 -0000 Delivered-To: heather38@example.com Received: (qmail 60579 invoked by uid 500); 5 Jul 2008 22:54:51 -0000 Mailing-List: contact heather38@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:heather38@example.com> List-Unsubscribe: <mailto:heather38@example.com> List-Post: <mailto:heather38@example.com> List-Id: <fop-commits.xmlgraphics.apache.org> Reply-To: heather38@example.com Delivered-To: mailing list heather38@example.com Received: (qmail 60570 invoked by uid 99); 5 Jul 2008 22:54:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 05 Jul 2008 15:54:51 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 05 Jul 2008 22:54:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D71F22388A0C; Sat, 5 Jul 2008 15:53:59 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r674245 - /xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableFObj.java Date: Sat, 05 Jul 2008 22:53:59 -0000 To: heather38@example.com From: heather38@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <heather38@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: adelmelle Date: Sat Jul 5 15:53:58 2008 New Revision: 674245 URL: http://svn.apache.org/viewvc?rev=674245&view=rev Log: Fixed ClassCastException when specifying column-number on something other than a fo:table-column or fo:table-cell... Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableFObj.java Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableFObj.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableFObj.java?rev=674245&r1=674244&r2=674245&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableFObj.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableFObj.java Sat Jul 5 15:53:58 2008 @@ -55,9 +55,10 @@ CollapsingBorderModel collapsingBorderModel; /** - * Main constructor + * Create a TableFObj instance that is a child + * of the given {@link FONode} * - * @param parent the parent node + * @param parent the parent {@link FONode} */ public TableFObj(FONode parent) { super(parent); @@ -81,6 +82,8 @@ } /** + * Return the value for the "border-precedence" property + * for the given side. * * @param side the side for which to return the border precedence * @return the "border-precedence" value for the given side @@ -102,13 +105,13 @@ /** * Convenience method to returns a reference - * to the base Table instance + * to the base {@link Table} instance. * * @return the base table instance * */ public Table getTable() { - // Will be overridden in Table; for any other Table-node, recursive call to + // Overridden in Table; for any other Table-node, recursive call to // parent.getTable() return ((TableFObj) parent).getTable(); } @@ -119,13 +122,13 @@ public abstract CommonBorderPaddingBackground getCommonBorderPaddingBackground(); /** - * PropertyMaker subclass for the column-number property - * + * {@link PropertyMaker} subclass for the column-number property */ public static class ColumnNumberPropertyMaker extends PropertyMaker { /** * Constructor + * * @param propId the id of the property for which the maker should * be created */ @@ -144,46 +147,50 @@ /** + * {@inheritDoc} * Check the value of the column-number property. - * Return the parent's column index (initial value) in case - * of a negative or zero value - * - * @see org.apache.fop.fo.properties.PropertyMaker#make(PropertyList, String, FObj) */ public Property make(PropertyList propertyList, String value, FObj fo) throws PropertyException { + Property p = super.make(propertyList, value, fo); - ColumnNumberManagerHolder parent - = (ColumnNumberManagerHolder) propertyList.getParentFObj(); - ColumnNumberManager columnIndexManager = parent.getColumnNumberManager(); int columnIndex = p.getNumeric().getValue(); int colSpan = propertyList.get(Constants.PR_NUMBER_COLUMNS_SPANNED) .getNumeric().getValue(); - - int lastIndex = columnIndex - 1 + colSpan; - for (int i = columnIndex; i <= lastIndex; ++i) { - if (columnIndexManager.isColumnNumberUsed(i)) { - /* if column-number is already in use by another - * cell/column => error! - */ - TableEventProducer eventProducer = TableEventProducer.Provider.get( - fo.getUserAgent().getEventBroadcaster()); - eventProducer.cellOverlap(this, propertyList.getFObj().getName(), - i, fo.getLocator()); + + // only check whether the column-number is occupied in case it was + // specified on a fo:table-cell or fo:table-column + int foId = propertyList.getFObj().getNameId(); + if (foId == FO_TABLE_COLUMN || foId == FO_TABLE_CELL) { + ColumnNumberManagerHolder parent + = (ColumnNumberManagerHolder) propertyList.getParentFObj(); + ColumnNumberManager columnIndexManager = parent.getColumnNumberManager(); + int lastIndex = columnIndex - 1 + colSpan; + for (int i = columnIndex; i <= lastIndex; ++i) { + if (columnIndexManager.isColumnNumberUsed(i)) { + /* if column-number is already in use by another + * cell/column => error! + */ + TableEventProducer eventProducer + = TableEventProducer.Provider.get( + fo.getUserAgent().getEventBroadcaster()); + eventProducer.cellOverlap( + this, propertyList.getFObj().getName(), + i, propertyList.getFObj().getLocator()); + } } } - return p; } - + /** - * If the value is not positive, return a property whose value is the next column number - * * {@inheritDoc} + * If the value is not positive, return a property whose value + * is the next column number. */ - public Property convertProperty(Property p, - PropertyList propertyList, FObj fo) + public Property convertProperty(Property p, + PropertyList propertyList, FObj fo) throws PropertyException { if (p instanceof EnumProperty) { return EnumNumber.getInstance(p); @@ -191,15 +198,24 @@ Number val = p.getNumber(); if (val != null) { int i = Math.round(val.floatValue()); + int foId = propertyList.getFObj().getNameId(); if (i <= 0) { - ColumnNumberManagerHolder parent = - (ColumnNumberManagerHolder) propertyList.getParentFObj(); - ColumnNumberManager columnIndexManager = parent.getColumnNumberManager(); - i = columnIndexManager.getCurrentColumnNumber(); + if (foId == FO_TABLE_CELL || foId == FO_TABLE_COLUMN) { + ColumnNumberManagerHolder parent = + (ColumnNumberManagerHolder) propertyList.getParentFObj(); + ColumnNumberManager columnIndexManager = parent.getColumnNumberManager(); + i = columnIndexManager.getCurrentColumnNumber(); + } else { + /* very exceptional case: + * negative column-number specified on + * a FO that is not a fo:table-cell or fo:table-column + */ + i = 1; + } TableEventProducer eventProducer = TableEventProducer.Provider.get(fo.getUserAgent().getEventBroadcaster()); eventProducer.forceNextColumnNumber(this, propertyList.getFObj().getName(), - val, i, fo.getLocator()); + val, i, propertyList.getFObj().getLocator()); } return NumberProperty.getInstance(i); } @@ -233,26 +249,26 @@ /** * Creates a BorderSpecification from the border set on the given side. If no border * is set, a BorderSpecification with border-style none is created. - * + * * @param side one of CommonBorderPaddingBackground.BEFORE|AFTER|START|END */ private void createBorder(int side) { BorderSpecification borderSpec = new BorderSpecification( getCommonBorderPaddingBackground().getBorderInfo(side), getNameId()); switch (side) { - case CommonBorderPaddingBackground.BEFORE: - borderBefore = new ConditionalBorder(borderSpec, collapsingBorderModel); - break; - case CommonBorderPaddingBackground.AFTER: - borderAfter = new ConditionalBorder(borderSpec, collapsingBorderModel); - break; - case CommonBorderPaddingBackground.START: - borderStart = borderSpec; - break; - case CommonBorderPaddingBackground.END: - borderEnd = borderSpec; - break; - default: assert false; + case CommonBorderPaddingBackground.BEFORE: + borderBefore = new ConditionalBorder(borderSpec, collapsingBorderModel); + break; + case CommonBorderPaddingBackground.AFTER: + borderAfter = new ConditionalBorder(borderSpec, collapsingBorderModel); + break; + case CommonBorderPaddingBackground.START: + borderStart = borderSpec; + break; + case CommonBorderPaddingBackground.END: + borderEnd = borderSpec; + break; + default: assert false; } } } --------------------------------------------------------------------- To unsubscribe, e-mail: heather38@example.com For additional commands, e-mail: heather38@example.com From fop-commits-return-10223heather38@example.com Sun Jul 06 07:50:45 2008 Return-Path: <fop-commits-return-10223heather38@example.com> Delivered-To: heather38@example.com Received: (qmail 28915 invoked from network); 6 Jul 2008 07:50:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 6 Jul 2008 07:50:45 -0000 Received: (qmail 13667 invoked by uid 500); 6 Jul 2008 07:50:46 -0000 Delivered-To: heather38@example.com Received: (qmail 13644 invoked by uid 500); 6 Jul 2008 07:50:46 -0000 Mailing-List: contact heather38@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:heather38@example.com> List-Unsubscribe: <mailto:heather38@example.com> List-Post: <mailto:heather38@example.com> List-Id: <fop-commits.xmlgraphics.apache.org> Reply-To: heather38@example.com Delivered-To: mailing list heather38@example.com Received: (qmail 13635 invoked by uid 99); 6 Jul 2008 07:50:46 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Jul 2008 00:50:46 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Jul 2008 07:50:03 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C13E623889BA; Sun, 6 Jul 2008 00:50:24 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r674267 - /xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeParser.java Date: Sun, 06 Jul 2008 07:50:24 -0000 To: heather38@example.com From: heather38@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <heather38@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: adelmelle Date: Sun Jul 6 00:50:23 2008 New Revision: 674267 URL: http://svn.apache.org/viewvc?rev=674267&view=rev Log: Switch AreaTreeParser to use a java.nio.CharBuffer, and ignore characters events for all elements other than <word>, <space> or <character> Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeParser.java Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeParser.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeParser.java?rev=674267&r1=674266&r2=674267&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeParser.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeParser.java Sun Jul 6 00:50:23 2008 @@ -26,6 +26,7 @@ import java.util.Set; import java.util.Stack; import java.util.StringTokenizer; +import java.nio.CharBuffer; import javax.xml.transform.Source; import javax.xml.transform.Transformer; @@ -132,8 +133,10 @@ private ElementMappingRegistry elementMappingRegistry; private Attributes lastAttributes; - private StringBuffer content = new StringBuffer(); + private CharBuffer content = CharBuffer.allocate(64); + private boolean ignoreCharacters = true; + private PageViewport currentPageViewport; private Map pageViewportsByKey = new java.util.HashMap(); // set of "ID firsts" that have already been assigned to a PV: @@ -261,7 +264,10 @@ boolean handled = true; if ("".equals(uri)) { Maker maker = (Maker)makers.get(localName); + content.clear(); + ignoreCharacters = true; if (maker != null) { + ignoreCharacters = maker.ignoreCharacters(); maker.startElement(attributes); } else if ("extension-attachments".equals(localName)) { //TODO implement me @@ -311,11 +317,12 @@ Maker maker = (Maker)makers.get(localName); if (maker != null) { maker.endElement(); + content.clear(); } + ignoreCharacters = true; } else { //log.debug("Ignoring " + localName + " in namespace: " + uri); } - content.setLength(0); //Reset text buffer (see characters()) } } @@ -324,6 +331,7 @@ private static interface Maker { void startElement(Attributes attributes) throws SAXException; void endElement(); + boolean ignoreCharacters(); } private abstract class AbstractMaker implements Maker { @@ -335,6 +343,10 @@ public void endElement() { //nop } + + public boolean ignoreCharacters() { + return true; + } } private class AreaTreeMaker extends AbstractMaker { @@ -444,7 +456,7 @@ public void endElement() { assertObjectOfClass(areaStack.pop(), RegionReference.class); - } + } } private class RegionAfterMaker extends AbstractMaker { @@ -455,7 +467,7 @@ public void endElement() { assertObjectOfClass(areaStack.pop(), RegionReference.class); - } + } } private class RegionStartMaker extends AbstractMaker { @@ -466,7 +478,7 @@ public void endElement() {
{'source': 'Apache Software Foundation Public Mail Archives'}