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 @@ <changes> <release version="FOP Trunk" date="TBD"> + <action context="Images" dev="JM" type="add" fixes-bug="41657"> + Added support for SVG 1.2 functionality inside fo:instream-foreign-object. + </action> + <action context="Layout" dev="AD" type="fix" fixes-bug="46240"> + Fixed a bug when combining break-before with a span change. + </action> + <action context="Code" dev="AD" type="fix" fixes-bug="46211" due-to="rogov.AT.devexperts.com"> + Fixed some multi-threading issues in FontCache.java: + <ul> + <li>remove the unused private readObject()</li> + <li>make the changeLock member final (initialization-safety + impossible to reassign)</li> + <li>perform the HashMap check for a failed font inside the synchronized block to avoid a race condition</li> + </ul> + </action> + <action context="Renderers" dev="AD" type="add" fixes-bug="45113" due-to="Alexander Stamenov"> + 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). + </action> + <action context="Layout" dev="JM" type="fix"> + 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). + </action> <action context="Layout" dev="AD" type="fix" fixes-bug="40798"> 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 @@ </p> </info> <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"; xmlns:svg="http://www.w3.org/2000/svg";> + <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"; xmlns:svg="http://www.w3.org/2000/svg"; + xmlns:fox="http://xmlgraphics.apache.org/fop/extensions";> <fo:layout-master-set> <fo:simple-page-master master-name="normal" page-width="10in" page-height="15in"> <fo:region-body/> @@ -47,6 +48,11 @@ <fo:block text-align="left"> <fo:external-graphic src="../../resources/images/img-w-size.svg"/>EOG </fo:block> + <fo:block text-align="left">SVG external-graphic with an intrinsic size and fox:conversion-mode="bitmap"</fo:block> + <fo:block text-align="left"> + <fo:external-graphic src="../../resources/images/img-w-size.svg" + fox:conversion-mode="bitmap"/>EOG + </fo:block> <fo:block>EOF</fo:block> </fo:flow> </fo:page-sequence> 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 @@ <version>4.3.1</version> </dependency> <dependency> + <groupId>org.apache.avalon.framework</groupId> + <artifactId>avalon-framework-impl</artifactId> + <version>4.3.1</version> + </dependency> + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.2</version> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
