acumiskey
Thu, 08 May 2008 08:45:54 -0700
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java?rev=654562&r1=654561&r2=654562&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java Thu May 8 08:45:26 2008 @@ -23,8 +23,8 @@ import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; + import org.apache.fop.apps.FOPException; -import org.apache.fop.fonts.FontCache; import org.apache.fop.fonts.FontInfo; import org.apache.fop.fonts.FontManager; import org.apache.fop.fonts.FontResolver; @@ -55,17 +55,18 @@ //Fonts try { FontResolver fontResolver = FontManager.createMinimalFontResolver(); - //TODO The following could be optimized by retaining the FontCache somewhere - FontCache fontCache = FontCache.load(); - if (fontCache == null) { - fontCache = new FontCache(); - } - //TODO Provide fontBaseURL to this method call - final String fontBaseURL = null; + //TODO The following could be optimized by retaining the FontManager somewhere + FontManager fontManager = new FontManager(); + + //TODO Make use of fontBaseURL, font substitution and referencing configuration + //Requires a change to the expected configuration layout + List/*<EmbedFontInfo>*/ embedFontInfoList = PrintRendererConfigurator.buildFontListFromConfiguration( - cfg, fontBaseURL, fontResolver, false, fontCache); - fontCache.save(); + cfg, fontResolver, false, fontManager); + if (fontManager.useCache()) { + fontManager.getFontCache().save(); + } FontInfo fontInfo = new FontInfo(); FontSetup.setup(fontInfo, embedFontInfoList, fontResolver); graphics.setFontInfo(fontInfo); Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/status.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/status.xml?rev=654562&r1=654561&r2=654562&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/status.xml (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/status.xml Thu May 8 08:45:26 2008 @@ -60,10 +60,21 @@ <action context="Renderers" dev="AC" importance="high" type="add"> Added de-duplication and externalization support for IOCA and GOCA data resource objects. </action --> + <action context="Fonts" dev="JM" type="add"> + For auto-detected fonts it is now possible to specify that a font needs to be referenced + rather than embedded (for the output formats that support this distinction). + </action> + <action context="Layout" dev="AD" type="fix" fixes-bug="42423"> + Added support for the "id" attribute on fo:wrappers when used + as a child of the fo:flow. + </action> + <action context="Layout" dev="AD" type="fix" fixes-bug="41500"> + Fixed a ClassCastException when using an fo:wrapper as a child + of an fo:block-container. + </action> <action context="Fonts" dev="AC" type="add"> Add support for font substitution. </action> - <action context="Code" dev="AD" type="fix" fixed-bug="44203"> <action context="Renderers" dev="JM" type="fix" fixes-bug="43650"> PCL Renderer: Improved page format selection so it doesn't interfere with duplex printing. Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/basictests.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/basictests.xml?rev=654562&r1=654561&r2=654562&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/basictests.xml (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/basictests.xml Thu May 8 08:45:26 2008 @@ -1,9 +1,9 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <!DOCTYPE testsuite SYSTEM "testsuite.dtd"> <testsuite profile="Basic Conformance Tests"> <testcases profile="Example"> <testcases profile="simpleblock" > - <test id="1" interaction="none" fo="block" xml="xml/1.xml" xsl="xsl/doc.xsl" level="basic"> + <test id="xml1" interaction="none" fo="block" xml="xml/1.xml" xsl="xsl/doc.xsl" level="basic"> simple test </test> <testresult id="1" agreement="full"> Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/fotree/disabled-testcases.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/fotree/disabled-testcases.xml?rev=654562&r1=654561&r2=654562&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/fotree/disabled-testcases.xml (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/fotree/disabled-testcases.xml Thu May 8 08:45:26 2008 @@ -28,4 +28,14 @@ <description>The code currently evaluates this function according to the column in which the marker appears in the source document, rather than the column it is retrieved in.</description> </testcase> + <testcase> + <name>column-number_negative-or-zero</name> + <file>column-number_negative-or-zero.fo</file> + <description></description> + </testcase> + <testcase> + <name>column-number_non-integer</name> + <file>column-number_non-integer.fo</file> + <description></description> + </testcase> </disabled-testcases> Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/layoutengine/disabled-testcases.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/layoutengine/disabled-testcases.xml?rev=654562&r1=654561&r2=654562&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/layoutengine/disabled-testcases.xml (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/layoutengine/disabled-testcases.xml Thu May 8 08:45:26 2008 @@ -234,12 +234,6 @@ case should be revisited.</description> </testcase> <testcase> - <name>fo:wrapper around block-level content (with id)</name> - <file>wrapper_block_id.xml</file> - <description>"id" attributes on fo:wrapper around block-level content don't get - added to the area tree.</description> - </testcase> - <testcase> <name>Soft hyphen with normal hyphenation enabled</name> <file>block_shy_linebreaking_hyph.xml</file> <description>A soft hyphen should be a preferred as break compared to a --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]