Return-Path: Delivered-To: apmail-xmlgraphics-fop-commits-archive@www.apache.org Received: (qmail 93508 invoked from network); 21 Nov 2008 18:18:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Nov 2008 18:18:53 -0000 Received: (qmail 81732 invoked by uid 500); 21 Nov 2008 18:19:02 -0000 Delivered-To: apmail-xmlgraphics-fop-commits-archive@xmlgraphics.apache.org Received: (qmail 81672 invoked by uid 500); 21 Nov 2008 18:19:02 -0000 Mailing-List: contact fop-commits-help@xmlgraphics.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: fop-dev@xmlgraphics.apache.org Delivered-To: mailing list fop-commits@xmlgraphics.apache.org Received: (qmail 81663 invoked by uid 99); 21 Nov 2008 18:19:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Nov 2008 10:19:02 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Nov 2008 18:17:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AC87B2388986; Fri, 21 Nov 2008 10:17:53 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r719664 [2/2] - in /xmlgraphics/fop/branches/Temp_AreaTreeNewDesign: ./ lib/ src/documentation/ src/documentation/content/xdocs/ src/documentation/content/xdocs/0.95/ src/documentation/content/xdocs/trunk/ src/java/META-INF/services/ src/ja... Date: Fri, 21 Nov 2008 18:17:49 -0000 To: fop-commits@xmlgraphics.apache.org From: jeremias@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081121181753.AC87B2388986@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSSVGHandler.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSSVGHandler.java?rev=719664&r1=719663&r2=719664&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSSVGHandler.java (original) +++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSSVGHandler.java Fri Nov 21 10:17:47 2008 @@ -262,7 +262,8 @@ NativeTextHandler nativeTextHandler = null; BridgeContext ctx = new BridgeContext(ua); if (!strokeText) { - nativeTextHandler = new NativeTextHandler(graphics, psInfo.getFontInfo()); + FontInfo fontInfo = psInfo.getFontInfo(); + nativeTextHandler = new NativeTextHandler(graphics, fontInfo); graphics.setCustomTextHandler(nativeTextHandler); PSTextPainter textPainter = new PSTextPainter(nativeTextHandler); ctx.setTextPainter(textPainter); @@ -283,8 +284,8 @@ float w = (float)ctx.getDocumentSize().getWidth() * 1000f; float h = (float)ctx.getDocumentSize().getHeight() * 1000f; - float sx = psInfo.getWidth() / (float)w; - float sy = psInfo.getHeight() / (float)h; + float sx = psInfo.getWidth() / w; + float sy = psInfo.getHeight() / h; ctx = null; builder = null; Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/FOPSAXSVGDocumentFactory.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/FOPSAXSVGDocumentFactory.java?rev=719664&r1=719663&r2=719664&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/FOPSAXSVGDocumentFactory.java (original) +++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/FOPSAXSVGDocumentFactory.java Fri Nov 21 10:17:47 2008 @@ -21,6 +21,8 @@ import java.io.IOException; +import org.w3c.dom.Document; + import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -71,4 +73,13 @@ return super.resolveEntity(publicId, systemId); } + /** + * Returns the document built up by handling the incoming SAX events. This method will not + * return any instance for the first SAX events have been received. + * @return the DOM document + */ + public Document getDocument() { + return this.document; + } + } Propchange: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/svg/AbstractSVGDocumentHandler.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 21 10:17:47 2008 @@ -1 +1 @@ -/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/AbstractSVGDocumentHandler.java:699793-706550 +/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/AbstractSVGDocumentHandler.java:699793-719661 Propchange: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 21 10:17:47 2008 @@ -1 +1 @@ -/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java:699793-706550 +/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java:699793-719661 Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/status.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/status.xml?rev=719664&r1=719663&r2=719664&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/status.xml (original) +++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/status.xml Fri Nov 21 10:17:47 2008 @@ -53,6 +53,29 @@ + + Added support for SVG 1.2 functionality inside fo:instream-foreign-object. + + + Fixed a bug when combining break-before with a span change. + + + Fixed some multi-threading issues in FontCache.java: +
    +
  • remove the unused private readObject()
    • +
  • make the changeLock member final (initialization-safety + impossible to reassign)
    • +
  • perform the HashMap check for a failed font inside the synchronized block to avoid a race condition
    • +
+ + + Added PDF /Launch action: references to URIs using the file:// protocol will now generate + a /Launch action as opposed to a more general /URI (which doesn't yield the expected result + for this protocol). + + + Fixed a problem where the BPD or a block area could be wrong if there is a nested, + absolutely positioned area (for example a block-container). + Bugzilla 40798: A conditional-page-master-reference with page-position="last" qualifies for a first page, if it is also the last. Additionally: also added support for Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/external-graphic_svg.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/external-graphic_svg.xml?rev=719664&r1=719663&r2=719664&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/external-graphic_svg.xml (original) +++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/external-graphic_svg.xml Fri Nov 21 10:17:47 2008 @@ -23,7 +23,8 @@

- + @@ -47,6 +48,11 @@ EOG + SVG external-graphic with an intrinsic size and fox:conversion-mode="bitmap" + + EOG + EOF Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/xmlgraphics-fop-pom-template.pom URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/xmlgraphics-fop-pom-template.pom?rev=719664&r1=719663&r2=719664&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/xmlgraphics-fop-pom-template.pom (original) +++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/xmlgraphics-fop-pom-template.pom Fri Nov 21 10:17:47 2008 @@ -130,6 +130,11 @@ 4.3.1 + org.apache.avalon.framework + avalon-framework-impl + 4.3.1 + + javax.servlet servlet-api 2.2 --------------------------------------------------------------------- To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org