Merged revisions 607034-611115 via svnmerge from
https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk
........
r607036 | jeremias | 2007-12-27 11:51:11 +0100 (Do, 27 Dez 2007) | 1 line
Don't just exit with no error message if the document contains no content. Pretty irritating if it does so.
........
r608812 | acumiskey | 2008-01-04 13:14:33 +0100 (Fr, 04 Jan 2008) | 3 lines
The fonts variable would have always had an empty Configuration node (non-null value) even if a <fonts/> wasn't present
in the fop configuration.
........
r609567 | jeremias | 2008-01-07 11:52:09 +0100 (Mo, 07 Jan 2008) | 4 lines
Reenabled documentation for fox:destination.
Enabled intermediate format functionality for fox:destination.
Added a test case to check fox:destination.
Deprecated FOP's XMLizable in favor of the XML Graphics Commons variant (and extend that variant).
........
r609627 | jeremias | 2008-01-07 16:06:24 +0100 (Mo, 07 Jan 2008) | 5 lines
Bugzilla #44176:
Support for custom fonts in Java2DRenderer and derived renderers.
Submitted by: Patrick Jaromin <patrick.at.jgsullivan.dot.com>
Patch modified slightly by jeremias.
........
r610020 | acumiskey | 2008-01-08 16:27:02 +0100 (Di, 08 Jan 2008) | 2 lines
cleaned up
........
r610021 | acumiskey | 2008-01-08 16:28:56 +0100 (Di, 08 Jan 2008) | 2 lines
Appears to be unused/referenced and superceeded by PageGroup
........
r610022 | acumiskey | 2008-01-08 16:34:07 +0100 (Di, 08 Jan 2008) | 2 lines
cleaned up
........
r610023 | acumiskey | 2008-01-08 16:35:18 +0100 (Di, 08 Jan 2008) | 2 lines
fixed javadoc
........
r610337 | vhennebert | 2008-01-09 12:02:08 +0100 (Mi, 09 Jan 2008) | 2 lines
Fixed checkstyle issues: tabs and trailing spaces
........
r610355 | vhennebert | 2008-01-09 13:01:21 +0100 (Mi, 09 Jan 2008) | 2 lines
keep-together is an inherited property
........
r610420 | acumiskey | 2008-01-09 16:40:25 +0100 (Mi, 09 Jan 2008) | 2 lines
cleanup
........
r610704 | jeremias | 2008-01-10 08:38:47 +0100 (Do, 10 Jan 2008) | 1 line
Added basic support for PDF page labels.
........
r610739 | jeremias | 2008-01-10 11:13:21 +0100 (Do, 10 Jan 2008) | 1 line
PostScript output now generates the bounding box DSC comments for the whole document.
........
r610821 | vhennebert | 2008-01-10 16:53:20 +0100 (Do, 10 Jan 2008) | 4 lines
- renamed variables for clarity
- moved the computation of a cell's content length in PrimaryGridUnit
- better javadoc for getHeight method in EffRow
........
r610848 | vhennebert | 2008-01-10 18:41:52 +0100 (Do, 10 Jan 2008) | 2 lines
No need to check if the end of the cell is reached when creating the areas for a row
........
r610853 | vhennebert | 2008-01-10 18:54:16 +0100 (Do, 10 Jan 2008) | 2 lines
Simplified addAreasAndFlushRow
........
r610886 | vhennebert | 2008-01-10 20:23:56 +0100 (Do, 10 Jan 2008) | 2 lines
Removed endPart() method and moved its content into addAreasAndFlushRow()
........
r610891 | vhennebert | 2008-01-10 20:34:13 +0100 (Do, 10 Jan 2008) | 2 lines
Removed accumulatedBPD which is redundant with yoffset
........
r610893 | vhennebert | 2008-01-10 20:35:24 +0100 (Do, 10 Jan 2008) | 2 lines
The return value of addAreasAndFlushRow is never used, changed it to void
........
r610905 | vhennebert | 2008-01-10 20:57:29 +0100 (Do, 10 Jan 2008) | 2 lines
Renamed lastRow into currentRow and yoffset into currentRowOffset
........
r611114 | jeremias | 2008-01-11 10:04:28 +0100 (Fr, 11 Jan 2008) | 2 lines
Bugfix: Some string objects were not encrypted (for example in named destinations)
I had to refactor the PDF library a little bit but since it only affects the inner API it shouldn't be a problem that I removed some methods which caused trouble because a didn't think about encryption when I worked on the PDF library last year.
........
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_ImagePackageRedesign@611120 13f79535-47bb-0310-9956-ffa450edef68
16 years ago |
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205 |
- /*
- * 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.java2d;
-
- import java.awt.Font;
- import java.awt.FontFormatException;
- import java.io.IOException;
- import java.io.InputStream;
- import java.util.Map;
- import java.util.Set;
-
- import javax.xml.transform.Source;
- import javax.xml.transform.stream.StreamSource;
-
- import org.apache.fop.fonts.CustomFont;
- import org.apache.fop.fonts.FontType;
- import org.apache.fop.fonts.LazyFont;
- import org.apache.fop.fonts.Typeface;
-
- /**
- * FontMetricsMapper that delegates most methods to an underlying
- * <tt>FontMetrics</tt> instance. This class was designed to allow
- * the underlying <tt>java.awt.Font</tt> to be loaded from a
- * user-configured file not registered in the current graphics environment.
- */
- public class CustomFontMetricsMapper extends Typeface implements FontMetricsMapper {
-
- /**
- * Font metrics for the font this class models.
- */
- private Typeface typeface;
-
- /**
- * The font required by the Java2D renderer.
- */
- private java.awt.Font font;
-
- /**
- * Maintains the most recently requested size.
- */
- private float size = 1;
-
- /**
- * Construction of this class results in the immediate construction.
- * of the underlying <tt>java.awt.Font</tt>
- * @param fontMetrics
- * @throws FontFormatException
- * @throws IOException
- */
- public CustomFontMetricsMapper(final CustomFont fontMetrics)
- throws FontFormatException, IOException {
- this.typeface = fontMetrics;
- initialize(fontMetrics.getEmbedFileSource());
- }
-
- /**
- * Construction of this class results in the immediate construction
- * of the underlying <tt>java.awt.Font</tt>
- * @param fontMetrics
- * @throws FontFormatException
- * @throws IOException
- */
- public CustomFontMetricsMapper(final LazyFont fontMetrics, final Source fontSource)
- throws FontFormatException, IOException {
- this.typeface = fontMetrics;
- initialize(fontSource);
- }
-
- private static final int TYPE1_FONT = 1; //Defined in Java 1.5
-
- /**
- * Loads the java.awt.Font
- * @param source
- * @throws FontFormatException
- * @throws IOException
- */
- private void initialize(final Source source)
- throws FontFormatException, IOException {
- int type = Font.TRUETYPE_FONT;
- if (FontType.TYPE1.equals(typeface.getFontType())) {
- type = TYPE1_FONT; //Font.TYPE1_FONT; only available in Java 1.5
- }
-
- InputStream is = null;
- if (source instanceof StreamSource) {
- is = ((StreamSource) source).getInputStream();
- } else if (source.getSystemId() != null) {
- is = new java.net.URL(source.getSystemId()).openStream();
- } else {
- throw new IllegalArgumentException("No font source provided.");
- }
-
- this.font = Font.createFont(type, is);
- is.close();
-
- }
-
- /** {@inheritDoc} */
- public final String getEncoding() {
- return null; //Not applicable to Java2D rendering
- }
-
- /** {@inheritDoc} */
- public final boolean hasChar(final char c) {
- return font.canDisplay(c);
- }
-
- /** {@inheritDoc} */
- public final char mapChar(final char c) {
- return typeface.mapChar(c);
- }
-
- /** {@inheritDoc} */
- public final Font getFont(final int size) {
- if (this.size == size) {
- return font;
- }
-
- this.size = size / 1000f;
- font = font.deriveFont(this.size);
- return font;
- }
-
- /** {@inheritDoc} */
- public final int getAscender(final int size) {
- return typeface.getAscender(size);
- }
-
- /** {@inheritDoc} */
- public final int getCapHeight(final int size) {
- return typeface.getCapHeight(size);
- }
-
- /** {@inheritDoc} */
- public final int getDescender(final int size) {
- return typeface.getDescender(size);
- }
-
- /** {@inheritDoc} */
- public final String getEmbedFontName() {
- return typeface.getEmbedFontName();
- }
-
- /** {@inheritDoc} */
- public final Set getFamilyNames() {
- return typeface.getFamilyNames();
- }
-
- /** {@inheritDoc} */
- public final String getFontName() {
- return typeface.getFontName();
- }
-
- /** {@inheritDoc} */
- public final FontType getFontType() {
- return typeface.getFontType();
- }
-
- /** {@inheritDoc} */
- public final String getFullName() {
- return typeface.getFullName();
- }
-
- /** {@inheritDoc} */
- public final Map getKerningInfo() {
- return typeface.getKerningInfo();
- }
-
- /** {@inheritDoc} */
- public final int getWidth(final int i, final int size) {
- return typeface.getWidth(i, size);
- }
-
- /** {@inheritDoc} */
- public final int[] getWidths() {
- return typeface.getWidths();
- }
-
- /** {@inheritDoc} */
- public final int getXHeight(final int size) {
- return typeface.getXHeight(size);
- }
-
- /** {@inheritDoc} */
- public final boolean hasKerningInfo() {
- return typeface.hasKerningInfo();
- }
-
- }
|