![Jeremias Maerki](https://secure.gravatar.com/avatar/7e0393eaef26065d612909513ec19196?d=identicon) Merged revisions 642144-647679 via svnmerge from
https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk
........
r642923 | jeremias | 2008-03-31 10:39:49 +0200 (Mo, 31 Mrz 2008) | 1 line
Fixed possible NullPointerException in AFM kerning table build code.
........
r642924 | jeremias | 2008-03-31 10:40:48 +0200 (Mo, 31 Mrz 2008) | 1 line
Added missing code for determining the PDF Flags. The removes the need to have a PFM if you have an AFM file for a Type 1 font.
........
r642927 | jeremias | 2008-03-31 10:48:34 +0200 (Mo, 31 Mrz 2008) | 1 line
Updated XG Commons for revision: http://svn.apache.org/viewvc?rev=642925&view=rev
........
r644208 | jeremias | 2008-04-03 10:05:14 +0200 (Do, 03 Apr 2008) | 11 lines
Bugzilla #44737:
Added support for auto-configuring TrueType Collections. XML font metrics files for *.ttc fonts are not required anymore.
Submitted by: Jason Harrop <jason.at.plutext.org>
Changes to patch or in addition to the patch:
- Tab chars removed and Checkstyle issues fixed
- Some simplifications in the cache handling (CachedFontInfo is obsolete and less cache-private information is exposed to the outside).
- TTCs are fully detected and registered with FOP.
- TTCs can also be registered using a "font" element. The new "sub-font" attribute selected the sub-font in the TTC.
- Bug fixed in TTFFile: Font names were not decoded correctly (ex. font names in Chinese)
- Minimal docs.
........
r644213 | jeremias | 2008-04-03 10:13:50 +0200 (Do, 03 Apr 2008) | 1 line
Oops. Fixed a last-minute change that broke the build.
........
r644691 | jeremias | 2008-04-04 14:19:50 +0200 (Fr, 04 Apr 2008) | 3 lines
Bugzilla #44743:
Added a public accessor for reference to the current page to PDFGraphics2D.
Submitted by: Yegor Kozlov <yegor.at.dinom.ru>
........
r644697 | jeremias | 2008-04-04 14:40:22 +0200 (Fr, 04 Apr 2008) | 2 lines
Bugzilla #44744:
Disable drawString(AttributedCharacterIterator, float, float) as it contains bugs and rely on the fallback implementation from AbstractGraphics2D.
........
r645104 | jeremias | 2008-04-05 16:11:50 +0200 (Sa, 05 Apr 2008) | 1 line
Fixed broken links.
........
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_ProcessingFeedback@647685 13f79535-47bb-0310-9956-ffa450edef68
16 years ago ![Jeremias Maerki](https://secure.gravatar.com/avatar/7e0393eaef26065d612909513ec19196?d=identicon) Merged revisions 642144-647679 via svnmerge from
https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk
........
r642923 | jeremias | 2008-03-31 10:39:49 +0200 (Mo, 31 Mrz 2008) | 1 line
Fixed possible NullPointerException in AFM kerning table build code.
........
r642924 | jeremias | 2008-03-31 10:40:48 +0200 (Mo, 31 Mrz 2008) | 1 line
Added missing code for determining the PDF Flags. The removes the need to have a PFM if you have an AFM file for a Type 1 font.
........
r642927 | jeremias | 2008-03-31 10:48:34 +0200 (Mo, 31 Mrz 2008) | 1 line
Updated XG Commons for revision: http://svn.apache.org/viewvc?rev=642925&view=rev
........
r644208 | jeremias | 2008-04-03 10:05:14 +0200 (Do, 03 Apr 2008) | 11 lines
Bugzilla #44737:
Added support for auto-configuring TrueType Collections. XML font metrics files for *.ttc fonts are not required anymore.
Submitted by: Jason Harrop <jason.at.plutext.org>
Changes to patch or in addition to the patch:
- Tab chars removed and Checkstyle issues fixed
- Some simplifications in the cache handling (CachedFontInfo is obsolete and less cache-private information is exposed to the outside).
- TTCs are fully detected and registered with FOP.
- TTCs can also be registered using a "font" element. The new "sub-font" attribute selected the sub-font in the TTC.
- Bug fixed in TTFFile: Font names were not decoded correctly (ex. font names in Chinese)
- Minimal docs.
........
r644213 | jeremias | 2008-04-03 10:13:50 +0200 (Do, 03 Apr 2008) | 1 line
Oops. Fixed a last-minute change that broke the build.
........
r644691 | jeremias | 2008-04-04 14:19:50 +0200 (Fr, 04 Apr 2008) | 3 lines
Bugzilla #44743:
Added a public accessor for reference to the current page to PDFGraphics2D.
Submitted by: Yegor Kozlov <yegor.at.dinom.ru>
........
r644697 | jeremias | 2008-04-04 14:40:22 +0200 (Fr, 04 Apr 2008) | 2 lines
Bugzilla #44744:
Disable drawString(AttributedCharacterIterator, float, float) as it contains bugs and rely on the fallback implementation from AbstractGraphics2D.
........
r645104 | jeremias | 2008-04-05 16:11:50 +0200 (Sa, 05 Apr 2008) | 1 line
Fixed broken links.
........
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_ProcessingFeedback@647685 13f79535-47bb-0310-9956-ffa450edef68
16 years ago ![Jeremias Maerki](https://secure.gravatar.com/avatar/7e0393eaef26065d612909513ec19196?d=identicon) Merged revisions 642144-647679 via svnmerge from
https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk
........
r642923 | jeremias | 2008-03-31 10:39:49 +0200 (Mo, 31 Mrz 2008) | 1 line
Fixed possible NullPointerException in AFM kerning table build code.
........
r642924 | jeremias | 2008-03-31 10:40:48 +0200 (Mo, 31 Mrz 2008) | 1 line
Added missing code for determining the PDF Flags. The removes the need to have a PFM if you have an AFM file for a Type 1 font.
........
r642927 | jeremias | 2008-03-31 10:48:34 +0200 (Mo, 31 Mrz 2008) | 1 line
Updated XG Commons for revision: http://svn.apache.org/viewvc?rev=642925&view=rev
........
r644208 | jeremias | 2008-04-03 10:05:14 +0200 (Do, 03 Apr 2008) | 11 lines
Bugzilla #44737:
Added support for auto-configuring TrueType Collections. XML font metrics files for *.ttc fonts are not required anymore.
Submitted by: Jason Harrop <jason.at.plutext.org>
Changes to patch or in addition to the patch:
- Tab chars removed and Checkstyle issues fixed
- Some simplifications in the cache handling (CachedFontInfo is obsolete and less cache-private information is exposed to the outside).
- TTCs are fully detected and registered with FOP.
- TTCs can also be registered using a "font" element. The new "sub-font" attribute selected the sub-font in the TTC.
- Bug fixed in TTFFile: Font names were not decoded correctly (ex. font names in Chinese)
- Minimal docs.
........
r644213 | jeremias | 2008-04-03 10:13:50 +0200 (Do, 03 Apr 2008) | 1 line
Oops. Fixed a last-minute change that broke the build.
........
r644691 | jeremias | 2008-04-04 14:19:50 +0200 (Fr, 04 Apr 2008) | 3 lines
Bugzilla #44743:
Added a public accessor for reference to the current page to PDFGraphics2D.
Submitted by: Yegor Kozlov <yegor.at.dinom.ru>
........
r644697 | jeremias | 2008-04-04 14:40:22 +0200 (Fr, 04 Apr 2008) | 2 lines
Bugzilla #44744:
Disable drawString(AttributedCharacterIterator, float, float) as it contains bugs and rely on the fallback implementation from AbstractGraphics2D.
........
r645104 | jeremias | 2008-04-05 16:11:50 +0200 (Sa, 05 Apr 2008) | 1 line
Fixed broken links.
........
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_ProcessingFeedback@647685 13f79535-47bb-0310-9956-ffa450edef68
16 years ago ![Jeremias Maerki](https://secure.gravatar.com/avatar/7e0393eaef26065d612909513ec19196?d=identicon) New feature: "Intermediate format" (IF). The IF is basically the XML dialect written by the area tree renderer (XMLRenderer). A new parser for this format allows reparsing a serialized and possibly modified area tree and rendering it to the final target format. More details on the Wiki at http://wiki.apache.org/xmlgraphics-fop/AreaTreeIntermediateXml. No advanced features have been implemented, yet, only the basic functionality. The whole change should be fully backwards-compatible WRT the outer FOP API except maybe for FOTreeBuilder.addElementMapping(), and the area tree XML which got small changes.
The area tree has been cleaned up. The serializability has been restored. The CachedRenderPagesModel works again and can, in certain situations, decrease the maximum amount of memory held at one point in time. Some adjustments were necessary in the area tree to help the work of the AreaTreeParser.
The AreaTreeParser is new and is responsible for parsing area tree XML files and adding pages to a RenderPagesModel instance. It is SAX-based and should be pretty efficient.
XMLUnit (http://xmlunit.sourceforge.net, BSD license) is a new dependency for the test code. It is used to verify the correctness of the intermediate format code. It doesn't have to be installed for the build to run through, though.
ElementMapping got a new method getDOMImplementation() which provides the DOMImplementation used to handle a subdocument of a particular namespace. For example, SVG uses Batik's SVG DOM. The AreaTreeParser needs that to properly recreate foreign objects because it can't use the mechanism of the FO tree. The default implementation returns null.
The ElementMapping instances are no longer maintained by the FOTreeBuilder, but by the newly created ElementMappingRegistry class. It is expected that the instance of this class is moved from the FOTreeBuilder and the AreaTreeParser's Handler class to the "environment class" once it is created to cut down on the startup time for each processed document.
The XMLRenderer has been slightly modified to improve the serialization/deserialization qualities of the area tree XML format.
The XMLRenderer can now mimic another renderer (see mimicRenderer(Renderer)) in order to use its font setup. That way it is made certain that the reparsed area tree will render to the final target format exactly as expected.
Fixed a bug in the XMLHandlerRegistry which did not always return the right XMLHandler for every situation.
Added a DefaultErrorListener to the util package. I've had problems with Xalan-J swallowing exceptions with its default ErrorListener, so I added a simple one for convenience and use in AreaTreeParser.
Example code for working with the AreaTreeParser can be found in examples/embedding. Documentation will follow.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@369753 13f79535-47bb-0310-9956-ffa450edef68
18 years ago |
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368 |
- /*
- * 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.fonts;
- import java.io.IOException;
- import java.io.InputStream;
- import java.net.URL;
- import java.util.Map;
- import java.util.Set;
-
- import javax.xml.transform.Source;
- import javax.xml.transform.stream.StreamSource;
-
- import org.xml.sax.InputSource;
-
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
-
- import org.apache.fop.apps.FOPException;
-
- /**
- * This class is used to defer the loading of a font until it is really used.
- */
- public class LazyFont extends Typeface implements FontDescriptor {
-
- private static Log log = LogFactory.getLog(LazyFont.class);
-
- private String metricsFileName = null;
- private String fontEmbedPath = null;
- private boolean useKerning = false;
- private String subFontName = null;
-
- private boolean isMetricsLoaded = false;
- private Typeface realFont = null;
- private FontDescriptor realFontDescriptor = null;
-
- private FontResolver resolver = null;
-
- /**
- * Main constructor
- * @param fontInfo the font info to embed
- * @param resolver the font resolver to handle font URIs
- */
- public LazyFont(EmbedFontInfo fontInfo, FontResolver resolver) {
-
- this.metricsFileName = fontInfo.getMetricsFile();
- this.fontEmbedPath = fontInfo.getEmbedFile();
- this.useKerning = fontInfo.getKerning();
- this.subFontName = fontInfo.getSubFontName();
- this.resolver = resolver;
- }
-
- /** {@inheritDoc} */
- public String toString() {
- return ( "metrics-url=" + metricsFileName + ", embed-url=" + fontEmbedPath
- + ", kerning=" + useKerning );
- }
-
- private void load(boolean fail) {
- if (!isMetricsLoaded) {
- try {
- if (metricsFileName != null) {
- /**@todo Possible thread problem here */
- FontReader reader = null;
- if (resolver != null) {
- Source source = resolver.resolve(metricsFileName);
- if (source == null) {
- String err
- = "Cannot load font: failed to create Source from metrics file "
- + metricsFileName;
- if (fail) {
- throw new RuntimeException(err);
- } else {
- log.error(err);
- }
- return;
- }
- InputStream in = null;
- if (source instanceof StreamSource) {
- in = ((StreamSource) source).getInputStream();
- }
- if (in == null && source.getSystemId() != null) {
- in = new java.net.URL(source.getSystemId()).openStream();
- }
- if (in == null) {
- String err = "Cannot load font: After URI resolution, the returned"
- + " Source object does not contain an InputStream"
- + " or a valid URL (system identifier) for metrics file: "
- + metricsFileName;
- if (fail) {
- throw new RuntimeException(err);
- } else {
- log.error(err);
- }
- return;
- }
- InputSource src = new InputSource(in);
- src.setSystemId(source.getSystemId());
- reader = new FontReader(src);
- } else {
- reader = new FontReader(new InputSource(
- new URL(metricsFileName).openStream()));
- }
- reader.setKerningEnabled(useKerning);
- reader.setFontEmbedPath(fontEmbedPath);
- reader.setResolver(resolver);
- realFont = reader.getFont();
- } else {
- if (fontEmbedPath == null) {
- throw new RuntimeException("Cannot load font. No font URIs available.");
- }
- realFont = FontLoader.loadFont(fontEmbedPath, this.subFontName, resolver);
- }
- if (realFont instanceof FontDescriptor) {
- realFontDescriptor = (FontDescriptor) realFont;
- }
- } catch (FOPException fopex) {
- log.error("Failed to read font metrics file " + metricsFileName, fopex);
- if (fail) {
- throw new RuntimeException(fopex.getMessage());
- }
- } catch (IOException ioex) {
- log.error("Failed to read font metrics file " + metricsFileName, ioex);
- if (fail) {
- throw new RuntimeException(ioex.getMessage());
- }
- }
- realFont.setEventListener(this.eventListener);
- isMetricsLoaded = true;
- }
- }
-
- /**
- * Gets the real font.
- * @return the real font
- */
- public Typeface getRealFont() {
- load(false);
- return realFont;
- }
-
- // ---- Font ----
- /** {@inheritDoc} */
- public String getEncodingName() {
- load(true);
- return realFont.getEncodingName();
- }
-
- /**
- * {@inheritDoc}
- */
- public char mapChar(char c) {
- load(true);
- return realFont.mapChar(c);
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean hadMappingOperations() {
- load(true);
- return realFont.hadMappingOperations();
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean hasChar(char c) {
- load(true);
- return realFont.hasChar(c);
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean isMultiByte() {
- load(true);
- return realFont.isMultiByte();
- }
-
- // ---- FontMetrics interface ----
- /** {@inheritDoc} */
- public String getFontName() {
- load(true);
- return realFont.getFontName();
- }
-
- /** {@inheritDoc} */
- public String getEmbedFontName() {
- load(true);
- return realFont.getEmbedFontName();
- }
-
- /** {@inheritDoc} */
- public String getFullName() {
- load(true);
- return realFont.getFullName();
- }
-
- /** {@inheritDoc} */
- public Set getFamilyNames() {
- load(true);
- return realFont.getFamilyNames();
- }
-
- /**
- * {@inheritDoc}
- */
- public int getMaxAscent(int size) {
- load(true);
- return realFont.getMaxAscent(size);
- }
-
- /**
- * {@inheritDoc}
- */
- public int getAscender(int size) {
- load(true);
- return realFont.getAscender(size);
- }
-
- /**
- * {@inheritDoc}
- */
- public int getCapHeight(int size) {
- load(true);
- return realFont.getCapHeight(size);
- }
-
- /**
- * {@inheritDoc}
- */
- public int getDescender(int size) {
- load(true);
- return realFont.getDescender(size);
- }
-
- /**
- * {@inheritDoc}
- */
- public int getXHeight(int size) {
- load(true);
- return realFont.getXHeight(size);
- }
-
- /**
- * {@inheritDoc}
- */
- public int getWidth(int i, int size) {
- load(true);
- return realFont.getWidth(i, size);
- }
-
- /**
- * {@inheritDoc}
- */
- public int[] getWidths() {
- load(true);
- return realFont.getWidths();
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean hasKerningInfo() {
- load(true);
- return realFont.hasKerningInfo();
- }
-
- /**
- * {@inheritDoc}
- */
- public Map getKerningInfo() {
- load(true);
- return realFont.getKerningInfo();
- }
-
- // ---- FontDescriptor interface ----
- /**
- * {@inheritDoc}
- */
- public int getCapHeight() {
- load(true);
- return realFontDescriptor.getCapHeight();
- }
-
- /**
- * {@inheritDoc}
- */
- public int getDescender() {
- load(true);
- return realFontDescriptor.getDescender();
- }
-
- /**
- * {@inheritDoc}
- */
- public int getAscender() {
- load(true);
- return realFontDescriptor.getAscender();
- }
-
- /**
- * {@inheritDoc}
- */
- public int getFlags() {
- load(true);
- return realFontDescriptor.getFlags();
- }
-
- /**
- * {@inheritDoc}
- */
- public int[] getFontBBox() {
- load(true);
- return realFontDescriptor.getFontBBox();
- }
-
- /**
- * {@inheritDoc}
- */
- public int getItalicAngle() {
- load(true);
- return realFontDescriptor.getItalicAngle();
- }
-
- /**
- * {@inheritDoc}
- */
- public int getStemV() {
- load(true);
- return realFontDescriptor.getStemV();
- }
-
- /**
- * {@inheritDoc}
- */
- public FontType getFontType() {
- load(true);
- return realFontDescriptor.getFontType();
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean isEmbeddable() {
- load(true);
- return realFontDescriptor.isEmbeddable();
- }
-
- }
-
|