You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by vh...@apache.org on 2010/11/25 22:13:40 UTC
svn commit: r1039185 - in /xmlgraphics/fop/branches/Temp_ComplexScripts: ./
src/codegen/unicode/java/org/apache/fop/hyphenation/
src/codegen/unicode/java/org/apache/fop/util/ src/java/org/apache/fop/afp/
src/java/org/apache/fop/afp/apps/ src/java/org/a...
Author: vhennebert
Date: Thu Nov 25 21:13:38 2010
New Revision: 1039185
URL: http://svn.apache.org/viewvc?rev=1039185&view=rev
Log:
Merged changes from Trunk up to rev. 1039179
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/ (props changed)
xmlgraphics/fop/branches/Temp_ComplexScripts/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/codegen/unicode/java/org/apache/fop/util/License.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPConstants.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPDataObjectFactory.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/GrayScaleColorConverter.java (contents, props changed)
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/apps/ (props changed)
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/fonts/AFPFontInfo.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/GraphicsObject.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/IncludePageOverlay.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/IncludePageSegment.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/InterchangeSet.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/InvokeMediumMap.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/MapPageOverlay.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/PageSegment.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/TagLogicalElement.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/TagLogicalElementBean.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/parser/ (props changed)
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/apps/FOUserAgent.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/apps/FopFactory.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/apps/FopFactoryConfigurator.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/LineArea.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/Trait.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/Image.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/BreakPropertySet.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/FontAdder.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/FontCache.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/FontDetector.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/FontManager.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/FontManagerConfigurator.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/Typeface.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/hyphenation/HyphenationTreeCache.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/hyphenation/PatternParser.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/hyphenation/SerializeHyphPattern.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/pdf/PDFObject.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/AbstractConfigurator.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/DummyPercentBaseContext.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/afp/extensions/AFPInvokeMediumMapElement.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/awt/AWTRenderer.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/intermediate/extensions/GoToXYAction.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/java2d/Java2DImageHandlerRenderedImage.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSEventProducer.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/FoUnitsConverter.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPage.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/tools/BuilderContext.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/PDFGraphics2D.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/util/ColorExt.java (props changed)
xmlgraphics/fop/branches/Temp_ComplexScripts/src/sandbox/org/apache/fop/render/mif/RefElement.java
xmlgraphics/fop/branches/Temp_ComplexScripts/status.xml
Propchange: xmlgraphics/fop/branches/Temp_ComplexScripts/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 25 21:13:38 2010
@@ -1,4 +1,4 @@
/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign:603620-746655
/xmlgraphics/fop/branches/fop-0_95:684572,688085,688696
/xmlgraphics/fop/branches/fop-1_0:959975-964707
-/xmlgraphics/fop/trunk:981451-1036883
+/xmlgraphics/fop/trunk:981451-1039180
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java Thu Nov 25 21:13:38 2010
@@ -50,7 +50,7 @@ import org.apache.fop.util.License;
* The methods fromJava and fromTeX are commented out because they are not Java 1.4 compliant.
*/
public final class UnicodeClasses {
-
+
/** directory containing unicode properties files */
public static final String UNICODE_DIR = "http://www.unicode.org/Public/UNIDATA/";
@@ -73,7 +73,7 @@ public final class UnicodeClasses {
w.write("<!-- in 'src/java/org/apache/fop/hyphenation' -->\n");
w.write("<!-- * commit the changed file -->\n");
}
-
+
/**
* Generate classes.xml from Java's compiled-in Unicode Character Database
* @param hexcode whether to prefix each class with the hexcode (only for debugging purposes)
@@ -99,7 +99,7 @@ public final class UnicodeClasses {
ow.write("<classes>\n");
// loop over the first Unicode plane
for (int code = Character.MIN_VALUE; code <= maxChar; ++code) {
-
+
// skip surrogate area
if (code == Character.MIN_SURROGATE) {
code = Character.MAX_SURROGATE;
@@ -114,7 +114,7 @@ public final class UnicodeClasses {
|| Character.getType(code) == Character.OTHER_LETTER)) {
continue;
}
-
+
// skip a number of blocks
Character.UnicodeBlock ubi = Character.UnicodeBlock.of(code);
if (ubi.equals(Character.UnicodeBlock.SUPERSCRIPTS_AND_SUBSCRIPTS)
@@ -146,18 +146,18 @@ public final class UnicodeClasses {
ow.flush();
ow.close();
}
-
-
+
+
/**
* The column numbers in the UCD file
*/
public static final int UNICODE = 0, GENERAL_CATEGORY = 2, SIMPLE_UPPERCASE_MAPPING = 12,
SIMPLE_LOWERCASE_MAPPING = 13, SIMPLE_TITLECASE_MAPPING = 14, NUM_FIELDS = 15;
-
+
/**
* Generate classes.xml from Unicode Character Database files
* @param hexcode whether to prefix each class with the hexcode (only for debugging purposes)
- * @param unidataPath path to the directory with UCD files
+ * @param unidataPath path to the directory with UCD files
* @param outfilePath output file
* @throws IOException if the input files are not found
* @throws URISyntaxException if {@code unidataPath} cannot be converted to a URI
@@ -175,7 +175,7 @@ public final class UnicodeClasses {
throw new FileNotFoundException
("URI with file or http scheme required for UNIDATA input directory");
}
-
+
File f = new File(outfilePath);
if (f.exists()) {
f.delete();
@@ -183,7 +183,7 @@ public final class UnicodeClasses {
f.createNewFile();
FileOutputStream fw = new FileOutputStream(f);
OutputStreamWriter ow = new OutputStreamWriter(fw, "utf-8");
-
+
URI inuri = unidata.resolve("Blocks.txt");
InputStream inis = null;
if (scheme.equals("file")) {
@@ -253,7 +253,7 @@ public final class UnicodeClasses {
if (j < blockNames.length) {
continue;
}
-
+
int uppercode = -1, titlecode = -1;
if (!"".equals(fields[SIMPLE_UPPERCASE_MAPPING])) {
uppercode = Integer.parseInt(fields[SIMPLE_UPPERCASE_MAPPING], 16);
@@ -284,7 +284,7 @@ public final class UnicodeClasses {
/**
* Generate classes.xml from XeTeX's Unicode letters file
* @param hexcode whether to prefix each class with the hexcode (only for debugging purposes)
- * @param lettersPath path to XeTeX's Unicode letters file unicode-letters-XeTeX.tex
+ * @param lettersPath path to XeTeX's Unicode letters file unicode-letters-XeTeX.tex
* @param outfilePath output file
* @throws IOException in case of an I/O exception
*/
@@ -345,7 +345,7 @@ public final class UnicodeClasses {
inbr.close();
}
-
+
/**
* @param args [--hexcode] [--java|--ucd|--tex] outfile [infile]
* @throws IOException if the input file cannot be found
@@ -375,7 +375,7 @@ public final class UnicodeClasses {
if (++i < args.length) {
infile = args[i];
}
-
+
if (type.equals("java") && infile != null) {
System.err.println("Type java does not allow an infile");
System.exit(1);
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/codegen/unicode/java/org/apache/fop/util/License.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/codegen/unicode/java/org/apache/fop/util/License.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/codegen/unicode/java/org/apache/fop/util/License.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/codegen/unicode/java/org/apache/fop/util/License.java Thu Nov 25 21:13:38 2010
@@ -28,7 +28,7 @@ import java.io.Writer;
* Write the Apache license text in various forms
*/
public final class License {
-
+
private License() {
}
@@ -56,10 +56,10 @@ public final class License {
* The subversion Id keyword line
*/
public static final String ID = "$Id$";
-
+
/**
* Calculate the maximum line length in the Apache license text
- * for use in formatting
+ * for use in formatting
*/
private static int maxLength;
static {
@@ -103,7 +103,7 @@ public final class License {
w.write("\n");
w.write("<!-- " + ID + " -->\n");
}
-
+
/**
* For testing purposes
* @param args optional, --java or --xml
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPConstants.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPConstants.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPConstants.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPConstants.java Thu Nov 25 21:13:38 2010
@@ -39,13 +39,13 @@ public interface AFPConstants {
* The encoding to use to convert to US ASCII (7 bit)
*/
String US_ASCII_ENCODING = "US-ASCII";
-
+
/**
* The scaling of the default transform is set to
* approximately 72 user space coordinates per square inch
*/
int DPI_72 = 72;
-
+
/**
* 72dpi in millipoints
*/
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPDataObjectFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPDataObjectFactory.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPDataObjectFactory.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPDataObjectFactory.java Thu Nov 25 21:13:38 2010
@@ -167,7 +167,7 @@ public class AFPDataObjectFactory {
//set color converter (i.e. an rgb to grayscale converter)
graphicsObj.setColorConverter(g2d.getPaintingState().getColorConverter());
-
+
// paint to graphics object
Graphics2DImagePainter painter = graphicsObjectInfo.getPainter();
Rectangle2D area = graphicsObjectInfo.getArea();
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/GrayScaleColorConverter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/GrayScaleColorConverter.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/GrayScaleColorConverter.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/GrayScaleColorConverter.java Thu Nov 25 21:13:38 2010
@@ -1,61 +1,61 @@
-/*
- * 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.afp;
-
-import java.awt.Color;
-
-import org.apache.xmlgraphics.java2d.color.ColorConverter;
-
-import org.apache.fop.util.ColorUtil;
-
-/**
- * Converts to grayscale using the standard RED=30%, GREEN=59% and BLUE=11%
- * weights (see http://en.wikipedia.org/wiki/Grayscale)
- */
-final class GrayScaleColorConverter implements ColorConverter {
-
- private static final int RED_WEIGHT = 77;
- private static final int GREEN_WEIGTH = 150;
- private static final int BLUE_WEIGHT = 28;
-
- private static final GrayScaleColorConverter SINGLETON = new GrayScaleColorConverter();
-
- private GrayScaleColorConverter() { }
-
- /**
- * static factory
- *
- * @return singleton instance of GrayScaleColorConverter
- */
- public static GrayScaleColorConverter getInstance() {
- return SINGLETON;
- }
-
- /**
- * The color is converted to CMYK with just the K component {@inheritDoc}
- */
- public Color convert(Color color) {
-
- float kValue = (RED_WEIGHT * color.getRed() + GREEN_WEIGTH * color.getGreen() + BLUE_WEIGHT
- * color.getBlue()) / 255.0f / 255.0f;
-
- return ColorUtil.toCMYKGrayColor(kValue);
- }
-}
+/*
+ * 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.afp;
+
+import java.awt.Color;
+
+import org.apache.xmlgraphics.java2d.color.ColorConverter;
+
+import org.apache.fop.util.ColorUtil;
+
+/**
+ * Converts to grayscale using the standard RED=30%, GREEN=59% and BLUE=11%
+ * weights (see http://en.wikipedia.org/wiki/Grayscale)
+ */
+final class GrayScaleColorConverter implements ColorConverter {
+
+ private static final int RED_WEIGHT = 77;
+ private static final int GREEN_WEIGTH = 150;
+ private static final int BLUE_WEIGHT = 28;
+
+ private static final GrayScaleColorConverter SINGLETON = new GrayScaleColorConverter();
+
+ private GrayScaleColorConverter() { }
+
+ /**
+ * static factory
+ *
+ * @return singleton instance of GrayScaleColorConverter
+ */
+ public static GrayScaleColorConverter getInstance() {
+ return SINGLETON;
+ }
+
+ /**
+ * The color is converted to CMYK with just the K component {@inheritDoc}
+ */
+ public Color convert(Color color) {
+
+ float kValue = (RED_WEIGHT * color.getRed() + GREEN_WEIGTH * color.getGreen() + BLUE_WEIGHT
+ * color.getBlue()) / 255.0f / 255.0f;
+
+ return ColorUtil.toCMYKGrayColor(kValue);
+ }
+}
Propchange: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/GrayScaleColorConverter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/GrayScaleColorConverter.java
------------------------------------------------------------------------------
svn:keywords = Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/apps/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 25 21:13:38 2010
@@ -2,4 +2,4 @@
/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/afp/apps:603620-746655
/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/afp/apps:684572,688085,688696
/xmlgraphics/fop/branches/fop-1_0/src/java/org/apache/fop/afp/apps:959975-964707
-/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/apps:981451-1036883
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/apps:981451-1039180
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/fonts/AFPFontInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/fonts/AFPFontInfo.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/fonts/AFPFontInfo.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/fonts/AFPFontInfo.java Thu Nov 25 21:13:38 2010
@@ -32,7 +32,7 @@ public class AFPFontInfo {
/**
* Main constructor
- *
+ *
* @param afpFont The AFP Font
* @param tripletList List of font triplets to associate with this font
*/
@@ -43,7 +43,7 @@ public class AFPFontInfo {
/**
* Returns the afp font
- *
+ *
* @return the afp font
*/
public AFPFont getAFPFont() {
@@ -52,7 +52,7 @@ public class AFPFontInfo {
/**
* Returns the list of font triplets associated with this font.
- *
+ *
* @return List of font triplets
*/
public List/*<FontTriplet>*/ getFontTriplets() {
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/GraphicsObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/GraphicsObject.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/GraphicsObject.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/GraphicsObject.java Thu Nov 25 21:13:38 2010
@@ -386,7 +386,7 @@ public class GraphicsObject extends Abst
/** the internal graphics state */
private static final class GraphicsState {
-
+
private GraphicsState() {
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/IncludePageOverlay.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/IncludePageOverlay.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/IncludePageOverlay.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/IncludePageOverlay.java Thu Nov 25 21:13:38 2010
@@ -56,7 +56,7 @@ public class IncludePageOverlay extends
/**
* Constructor for the Include Page Overlay
- *
+ *
* @param overlayName Name of the page segment
* @param x The x position
* @param y The y position
@@ -64,7 +64,7 @@ public class IncludePageOverlay extends
*/
public IncludePageOverlay(String overlayName, int x, int y, int orientation) {
super(overlayName);
-
+
this.x = x;
this.y = y;
setOrientation(orientation);
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/IncludePageSegment.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/IncludePageSegment.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/IncludePageSegment.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/IncludePageSegment.java Thu Nov 25 21:13:38 2010
@@ -46,22 +46,22 @@ public class IncludePageSegment extends
* The x position where we need to put this object on the page
*/
private int x;
-
+
/**
* The y position where we need to put this object on the page
*/
private int y;
-
+
/**
* Constructor for the Include Page Segment
- *
+ *
* @param name Name of the page segment
* @param x The x position
* @param y The y position
*/
public IncludePageSegment(String name, int x, int y) {
super(name);
-
+
this.x = x;
this.y = y;
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/InterchangeSet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/InterchangeSet.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/InterchangeSet.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/InterchangeSet.java Thu Nov 25 21:13:38 2010
@@ -5,9 +5,9 @@
* 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.
@@ -25,10 +25,10 @@ package org.apache.fop.afp.modca;
public class InterchangeSet {
/** interchange set 1 string value */
public static final String MODCA_PRESENTATION_INTERCHANGE_SET_1 = "MO:DCA-P IS/1";
-
+
/** interchange set 2 string value */
public static final String MODCA_PRESENTATION_INTERCHANGE_SET_2 = "MO:DCA-P IS/2";
-
+
/** resource interchange set string value */
public static final String MODCA_RESOURCE_INTERCHANGE_SET = "MO:DCA-L";
@@ -47,7 +47,7 @@ public class InterchangeSet {
/**
* Returns the interchange set value of a given string
- *
+ *
* @param str an interchange set value
* @return an interchange set
*/
@@ -65,7 +65,7 @@ public class InterchangeSet {
/**
* Main constructor
- *
+ *
* @param value the interchange set value
*/
public InterchangeSet(int value) {
@@ -74,39 +74,39 @@ public class InterchangeSet {
/**
* Returns true if complies with MOD:CA interchange set 1
- *
+ *
* @return true if complies with MOD:CA interchange set 1
*/
protected boolean is1() {
return value == SET_1;
}
-
+
/**
* Returns true if complies with MOD:CA interchange set 2
- *
+ *
* @return true if complies with MOD:CA interchange set 2
*/
public boolean is2() {
return value == SET_2;
}
-
+
/**
* Returns true if complies with MOD:CA resource set
- *
+ *
* @return true if complies with MOD:CA resource set
*/
public boolean isResource() {
return value == RESOURCE_SET;
}
-
+
/** {@inheritDoc} */
public String toString() {
return NAMES[value];
}
-
+
/**
* Returns true if MOD:CA interchange set 2 (resource groups) is supported
- *
+ *
* @return true if MOD:CA interchange set 2 (resource groups) is supported
*/
public boolean supportsLevel2() {
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/InvokeMediumMap.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/InvokeMediumMap.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/InvokeMediumMap.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/InvokeMediumMap.java Thu Nov 25 21:13:38 2010
@@ -34,7 +34,7 @@ public class InvokeMediumMap extends Abs
/**
* Constructor for the Invoke Medium Map
- *
+ *
* @param name the name of the medium map
*/
public InvokeMediumMap(String name) {
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/MapPageOverlay.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/MapPageOverlay.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/MapPageOverlay.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/MapPageOverlay.java Thu Nov 25 21:13:38 2010
@@ -35,7 +35,7 @@ import org.apache.fop.afp.util.BinaryUti
public class MapPageOverlay extends AbstractAFPObject {
private static final int MAX_SIZE = 253;
-
+
/**
* The collection of overlays (maximum of 254 stored as byte[])
*/
@@ -53,7 +53,7 @@ public class MapPageOverlay extends Abst
}
return this.overLays;
}
-
+
/**
* Add an overlay to to the map page overlay object.
*
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/PageSegment.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/PageSegment.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/PageSegment.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/PageSegment.java Thu Nov 25 21:13:38 2010
@@ -5,9 +5,9 @@
* 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.
@@ -32,10 +32,10 @@ import java.util.List;
public class PageSegment extends AbstractNamedAFPObject {
private List/*<AbstractAFPObject>*/ objects = null;
-
+
/**
* Main constructor
- *
+ *
* @param name the name of this object
*/
public PageSegment(String name) {
@@ -44,7 +44,7 @@ public class PageSegment extends Abstrac
/**
* Returns a list of objects contained withing this page segment
- *
+ *
* @return a list of objects contained within this page segment
*/
public List/*<AbstractAFPObject>*/ getObjects() {
@@ -56,13 +56,13 @@ public class PageSegment extends Abstrac
/**
* Adds a resource object (image/graphic) to this page segment
- *
+ *
* @param object the resource objec to add to this page segment
*/
public void addObject(AbstractAFPObject object) {
getObjects().add(object);
}
-
+
/** {@inheritDoc} */
protected void writeStart(OutputStream os) throws IOException {
byte[] data = new byte[17];
@@ -82,7 +82,7 @@ public class PageSegment extends Abstrac
copySF(data, Type.END, Category.PAGE_SEGMENT);
os.write(data);
}
-
+
/** {@inheritDoc} */
public String toString() {
return this.name;
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/TagLogicalElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/TagLogicalElement.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/TagLogicalElement.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/TagLogicalElement.java Thu Nov 25 21:13:38 2010
@@ -102,11 +102,11 @@ public class TagLogicalElement extends A
FullyQualifiedNameTriplet.FORMAT_CHARSTR,
name);
setAttributeValue(value);
- setAttributeQualifier(tleID, 1);
-
+ setAttributeQualifier(tleID, 1);
+
byte[] data = new byte[SF_HEADER.length];
copySF(data, Type.ATTRIBUTE, Category.PROCESS_ELEMENT);
-
+
int tripletDataLength = getTripletDataLength();
byte[] l = BinaryUtils.convert(data.length + tripletDataLength - 1, 2);
data[1] = l[0];
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/TagLogicalElementBean.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/TagLogicalElementBean.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/TagLogicalElementBean.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/TagLogicalElementBean.java Thu Nov 25 21:13:38 2010
@@ -34,7 +34,7 @@ public class TagLogicalElementBean {
/**
* Constructor for the TagLogicalElementBean.
- *
+ *
* @param key the key attribute
* @param value the value attribute
*/
@@ -45,7 +45,7 @@ public class TagLogicalElementBean {
/**
* Getter for the key attribute.
- *
+ *
* @return the key
*/
public String getKey() {
@@ -54,7 +54,7 @@ public class TagLogicalElementBean {
/**
* Getter for the value attribute.
- *
+ *
* @return the value
*/
public String getValue() {
Propchange: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/parser/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 25 21:13:38 2010
@@ -2,4 +2,4 @@
/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/afp/parser:603620-746655
/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/afp/parser:684572,688085,688696
/xmlgraphics/fop/branches/fop-1_0/src/java/org/apache/fop/afp/parser:959975-964707
-/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/parser:981451-1036883
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/parser:981451-1039180
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/apps/FOUserAgent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/apps/FOUserAgent.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/apps/FOUserAgent.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/apps/FOUserAgent.java Thu Nov 25 21:13:38 2010
@@ -35,6 +35,7 @@ import org.apache.commons.logging.LogFac
import org.apache.xmlgraphics.image.loader.ImageContext;
import org.apache.xmlgraphics.image.loader.ImageSessionContext;
import org.apache.xmlgraphics.image.loader.impl.AbstractImageSessionContext;
+import org.apache.xmlgraphics.util.UnitConv;
import org.apache.fop.Version;
import org.apache.fop.accessibility.Accessibility;
@@ -450,7 +451,7 @@ public class FOUserAgent {
* @see #getTargetResolution()
*/
public float getTargetPixelUnitToMillimeter() {
- return 25.4f / this.targetResolution;
+ return UnitConv.IN2MM / this.targetResolution;
}
/** @return the resolution for resolution-dependant output */
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/apps/FopFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/apps/FopFactory.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/apps/FopFactory.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/apps/FopFactory.java Thu Nov 25 21:13:38 2010
@@ -42,6 +42,7 @@ import org.apache.commons.logging.LogFac
import org.apache.xmlgraphics.image.loader.ImageContext;
import org.apache.xmlgraphics.image.loader.ImageManager;
+import org.apache.xmlgraphics.util.UnitConv;
import org.apache.fop.fo.ElementMapping;
import org.apache.fop.fo.ElementMappingRegistry;
@@ -539,7 +540,7 @@ public class FopFactory implements Image
* @see #getSourceResolution()
*/
public float getSourcePixelUnitToMillimeter() {
- return 25.4f / getSourceResolution();
+ return UnitConv.IN2MM / getSourceResolution();
}
/**
@@ -567,7 +568,7 @@ public class FopFactory implements Image
* @see #getTargetResolution()
*/
public float getTargetPixelUnitToMillimeter() {
- return 25.4f / this.targetResolution;
+ return UnitConv.IN2MM / this.targetResolution;
}
/**
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/apps/FopFactoryConfigurator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/apps/FopFactoryConfigurator.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/apps/FopFactoryConfigurator.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/apps/FopFactoryConfigurator.java Thu Nov 25 21:13:38 2010
@@ -33,6 +33,7 @@ import org.apache.avalon.framework.confi
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.xmlgraphics.image.GraphicsConstants;
import org.apache.xmlgraphics.image.loader.spi.ImageImplRegistry;
import org.apache.xmlgraphics.image.loader.util.Penalty;
@@ -61,10 +62,10 @@ public class FopFactoryConfigurator {
public static final String DEFAULT_PAGE_HEIGHT = "11in";
/** Defines the default source resolution (72dpi) for FOP */
- public static final float DEFAULT_SOURCE_RESOLUTION = 72.0f; //dpi
+ public static final float DEFAULT_SOURCE_RESOLUTION = GraphicsConstants.DEFAULT_DPI; //dpi
/** Defines the default target resolution (72dpi) for FOP */
- public static final float DEFAULT_TARGET_RESOLUTION = 72.0f; //dpi
+ public static final float DEFAULT_TARGET_RESOLUTION = GraphicsConstants.DEFAULT_DPI; //dpi
private static final String PREFER_RENDERER = "prefer-renderer";
@@ -159,7 +160,7 @@ public class FopFactoryConfigurator {
lang = hyphPatConfig[i].getAttribute("lang", null);
if (lang == null) {
- addError("The lang attribute of a hyphenation-pattern configuration"
+ addError("The lang attribute of a hyphenation-pattern configuration"
+ " element must exist (" + location + ")", error);
} else if (!lang.matches("[a-zA-Z]{2}")) {
addError("The lang attribute of a hyphenation-pattern configuration"
@@ -191,7 +192,7 @@ public class FopFactoryConfigurator {
LogUtil.handleError(log, error.toString(), strict);
continue;
}
-
+
String llccKey = HyphenationTreeCache.constructLlccKey(lang, country);
hyphPatNames.put(llccKey, filename);
if (log.isDebugEnabled()) {
@@ -270,7 +271,7 @@ public class FopFactoryConfigurator {
}
error.append(message);
}
-
+
private void configureImageLoading(Configuration parent, boolean strict) throws FOPException {
if (parent == null) {
return;
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/LineArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/LineArea.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/LineArea.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/LineArea.java Thu Nov 25 21:13:38 2010
@@ -40,7 +40,7 @@ public class LineArea extends Area {
* page-number or a page-number-citation is resolved
*/
private final class LineAdjustingInfo implements Serializable {
-
+
private static final long serialVersionUID = -6103629976229458273L;
private int lineAlignment;
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/Trait.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/Trait.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/Trait.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/Trait.java Thu Nov 25 21:13:38 2010
@@ -201,7 +201,7 @@ public final class Trait implements Seri
public static final Integer OVERLINE_COLOR = new Integer(35);
/** Trait for color of linethrough decorations when rendering inline parent. */
public static final Integer LINETHROUGH_COLOR = new Integer(36);
-
+
/** The ptr trait. Used for accessibility */
public static final Integer PTR = new Integer(37);
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/Image.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/Image.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/Image.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/Image.java Thu Nov 25 21:13:38 2010
@@ -31,7 +31,7 @@ public class Image extends Area {
private static final long serialVersionUID = 4800834714349695386L;
private String url;
-
+
/**
* Create a new image with the given url.
*
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/BreakPropertySet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/BreakPropertySet.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/BreakPropertySet.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/BreakPropertySet.java Thu Nov 25 21:13:38 2010
@@ -5,9 +5,9 @@
* 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.
@@ -29,5 +29,5 @@ public interface BreakPropertySet {
/** @return the "break-before" property. */
int getBreakBefore();
-
+
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/FontAdder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/FontAdder.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/FontAdder.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/FontAdder.java Thu Nov 25 21:13:38 2010
@@ -26,7 +26,7 @@ import java.util.List;
import org.apache.fop.fonts.autodetect.FontInfoFinder;
/**
- * Adds a list of fonts to a given font info list
+ * Adds a list of fonts to a given font info list
*/
public class FontAdder {
private FontEventListener listener;
@@ -44,7 +44,7 @@ public class FontAdder {
this.resolver = resolver;
this.listener = listener;
}
-
+
/**
* Iterates over font url list adding to font info list
* @param fontURLList font file list
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/FontCache.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/FontCache.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/FontCache.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/FontCache.java Thu Nov 25 21:13:38 2010
@@ -106,7 +106,7 @@ public final class FontCache implements
/**
* Returns the default font cache file.
- *
+ *
* @param forWriting
* true if the user directory should be created
* @return the default font cache file
@@ -133,7 +133,7 @@ public final class FontCache implements
/**
* Reads the default font cache file and returns its contents.
- *
+ *
* @return the font cache deserialized from the file (or null if no cache
* file exists or if it could not be read)
*/
@@ -143,7 +143,7 @@ public final class FontCache implements
/**
* Reads a font cache file and returns its contents.
- *
+ *
* @param cacheFile
* the cache file
* @return the font cache deserialized from the file (or null if no cache
@@ -186,7 +186,7 @@ public final class FontCache implements
/**
* Writes the font cache to disk.
- *
+ *
* @throws FOPException
* fop exception
*/
@@ -196,7 +196,7 @@ public final class FontCache implements
/**
* Writes the font cache to disk.
- *
+ *
* @param cacheFile
* the file to write to
* @throws FOPException
@@ -226,7 +226,7 @@ public final class FontCache implements
/**
* creates a key given a font info for the font mapping
- *
+ *
* @param fontInfo
* font info
* @return font cache key
@@ -242,7 +242,7 @@ public final class FontCache implements
/**
* cache has been updated since it was read
- *
+ *
* @return if this cache has changed
*/
public boolean hasChanged() {
@@ -251,7 +251,7 @@ public final class FontCache implements
/**
* is this font in the cache?
- *
+ *
* @param embedUrl
* font info
* @return boolean
@@ -262,7 +262,7 @@ public final class FontCache implements
/**
* is this font info in the cache?
- *
+ *
* @param fontInfo
* font info
* @return font
@@ -275,7 +275,7 @@ public final class FontCache implements
/**
* Tries to identify a File instance from an array of URLs. If there's no
* file URL in the array, the method returns null.
- *
+ *
* @param urls
* array of possible font urls
* @return file font file
@@ -313,7 +313,7 @@ public final class FontCache implements
/**
* Adds a font info to cache
- *
+ *
* @param fontInfo
* font info
*/
@@ -346,7 +346,7 @@ public final class FontCache implements
/**
* Returns a font from the cache.
- *
+ *
* @param embedUrl
* font info
* @return CachedFontFile object
@@ -360,7 +360,7 @@ public final class FontCache implements
* Returns the EmbedFontInfo instances belonging to a font file. If the font
* file was modified since it was cached the entry is removed and null is
* returned.
- *
+ *
* @param embedUrl
* the font URL
* @param lastModified
@@ -380,7 +380,7 @@ public final class FontCache implements
/**
* removes font from cache
- *
+ *
* @param embedUrl
* embed url
*/
@@ -398,7 +398,7 @@ public final class FontCache implements
/**
* has this font previously failed to load?
- *
+ *
* @param embedUrl
* embed url
* @param lastModified
@@ -425,7 +425,7 @@ public final class FontCache implements
/**
* Registers a failed font with the cache
- *
+ *
* @param embedUrl
* embed url
* @param lastModified
@@ -463,7 +463,7 @@ public final class FontCache implements
/**
* Retrieve the last modified date/time of a URL.
- *
+ *
* @param url
* the URL
* @return the last modified date/time
@@ -520,7 +520,7 @@ public final class FontCache implements
/**
* Gets the modified timestamp for font file (not always available)
- *
+ *
* @return modified timestamp
*/
public long lastModified() {
@@ -530,7 +530,7 @@ public final class FontCache implements
/**
* Gets the modified timestamp for font file (used for the purposes of
* font info caching)
- *
+ *
* @param lastModified
* modified font file timestamp
*/
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/FontDetector.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/FontDetector.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/FontDetector.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/FontDetector.java Thu Nov 25 21:13:38 2010
@@ -41,7 +41,7 @@ public class FontDetector {
private static final String[] FONT_MIMETYPES = {
"application/x-font", "application/x-font-truetype"
};
-
+
private FontManager fontManager;
private FontAdder fontAdder;
private boolean strict;
@@ -75,7 +75,7 @@ public class FontDetector {
List/*<URL>*/ fontURLList = fontFileFinder.find(
fontBase.getAbsolutePath());
fontAdder.add(fontURLList, fontInfoList);
-
+
//Can only use the font base URL if it's a file URL
}
} catch (IOException e) {
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/FontManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/FontManager.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/FontManager.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/FontManager.java Thu Nov 25 21:13:38 2010
@@ -175,11 +175,11 @@ public class FontManager {
}
return fontCache;
}
-
+
/**
* Saves the FontCache as necessary
- *
- * @throws FOPException fop exception
+ *
+ * @throws FOPException fop exception
*/
public void saveCache() throws FOPException {
if (useCache) {
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/FontManagerConfigurator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/FontManagerConfigurator.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/FontManagerConfigurator.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/FontManagerConfigurator.java Thu Nov 25 21:13:38 2010
@@ -97,7 +97,7 @@ public class FontManagerConfigurator {
// global font configuration
Configuration fontsCfg = cfg.getChild("fonts", false);
if (fontsCfg != null) {
-
+
// font substitution
Configuration substitutionsCfg = fontsCfg.getChild("substitutions", false);
if (substitutionsCfg != null) {
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/Typeface.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/Typeface.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/Typeface.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/Typeface.java Thu Nov 25 21:13:38 2010
@@ -139,7 +139,7 @@ public abstract class Typeface implement
}
}
}
-
+
/** {@inheritDoc} */
public String toString() {
StringBuffer sbuf = new StringBuffer(super.toString());
@@ -147,5 +147,5 @@ public abstract class Typeface implement
sbuf.append(getFullName());
sbuf.append('}');
return sbuf.toString();
- }
+ }
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/hyphenation/HyphenationTreeCache.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/hyphenation/HyphenationTreeCache.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/hyphenation/HyphenationTreeCache.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/hyphenation/HyphenationTreeCache.java Thu Nov 25 21:13:38 2010
@@ -73,7 +73,7 @@ public class HyphenationTreeCache {
* @param lang the language
* @param country the country (may be null or "none")
* @param hyphPatNames the map of user-configured hyphenation pattern file names
- * @return the hyphenation pattern file name or null
+ * @return the hyphenation pattern file name or null
*/
public static String constructUserKey(String lang, String country, Map hyphPatNames) {
String userKey = null;
@@ -84,7 +84,7 @@ public class HyphenationTreeCache {
}
return userKey;
}
-
+
/**
* Cache a hyphenation tree under its key.
* @param key the key (ex. "de_CH" or "en")
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/hyphenation/PatternParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/hyphenation/PatternParser.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/hyphenation/PatternParser.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/hyphenation/PatternParser.java Thu Nov 25 21:13:38 2010
@@ -273,14 +273,14 @@ public class PatternParser extends Defau
parser = mainParser;
}
}
-
+
//
// ContentHandler methods
//
/**
* {@inheritDoc}
- * @throws SAXException
+ * @throws SAXException
*/
public void startElement(String uri, String local, String raw,
Attributes attrs) throws SAXException {
@@ -463,9 +463,9 @@ public class PatternParser extends Defau
public void addPattern(String p, String v) {
testOut.println("pattern: " + p + " : " + v);
}
-
+
private PrintStream testOut = System.out;
-
+
/**
* Set test out stream.
* @param testOut the testOut to set
@@ -473,7 +473,7 @@ public class PatternParser extends Defau
public void setTestOut(PrintStream testOut) {
this.testOut = testOut;
}
-
+
/**
* Close test out file.
*/
@@ -503,5 +503,5 @@ public class PatternParser extends Defau
}
}
-
+
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/hyphenation/SerializeHyphPattern.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/hyphenation/SerializeHyphPattern.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/hyphenation/SerializeHyphPattern.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/hyphenation/SerializeHyphPattern.java Thu Nov 25 21:13:38 2010
@@ -27,10 +27,10 @@ import java.io.ObjectOutputStream;
/**
* Serialize hyphenation patterns
* For all xml files in the source directory a pattern file is built in the target directory
- * This class may be called from the ant build file in a java task
+ * This class may be called from the ant build file in a java task
*/
public class SerializeHyphPattern {
-
+
private boolean errorDump = false;
/**
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java Thu Nov 25 21:13:38 2010
@@ -33,6 +33,7 @@ import org.apache.batik.gvt.GraphicsNode
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.xmlgraphics.image.GraphicsConstants;
import org.apache.xmlgraphics.image.loader.Image;
import org.apache.xmlgraphics.image.loader.ImageException;
import org.apache.xmlgraphics.image.loader.ImageFlavor;
@@ -72,7 +73,7 @@ public class ImageConverterSVG2G2D exten
}
//Prepare
- float pxToMillimeter = UnitConv.IN2MM / 72; //default: 72dpi
+ float pxToMillimeter = UnitConv.IN2MM / GraphicsConstants.DEFAULT_DPI;
Number ptm = (Number)hints.get(ImageProcessingHints.SOURCE_RESOLUTION);
if (ptm != null) {
pxToMillimeter = (float)(UnitConv.IN2MM / ptm.doubleValue());
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java Thu Nov 25 21:13:38 2010
@@ -59,7 +59,7 @@ public abstract class BreakingAlgorithm
/** Holder for symbolic literals for the fitness classes */
static final class FitnessClasses {
-
+
private FitnessClasses() {
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java Thu Nov 25 21:13:38 2010
@@ -91,7 +91,7 @@ public abstract class LeafNodeLayoutMana
* @param ipd inline progression dimension
* @param bHyph true if hyphenated
* @param alignmentContext an alignment context
- */
+ */
public AreaInfo(short iLS, MinOptMax ipd, boolean bHyph,
AlignmentContext alignmentContext) {
iLScount = iLS;
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/pdf/PDFObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/pdf/PDFObject.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/pdf/PDFObject.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/pdf/PDFObject.java Thu Nov 25 21:13:38 2010
@@ -401,7 +401,7 @@ public abstract class PDFObject implemen
* identical, this method is not required to check everything. In the case
* of PDFObjects, this means that the overriding function does not have to
* check for {@link #getObjectID()}.
- *
+ *
* @param o
* object to compare to.
* @return true if the other object has the same content.
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/AbstractConfigurator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/AbstractConfigurator.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/AbstractConfigurator.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/AbstractConfigurator.java Thu Nov 25 21:13:38 2010
@@ -33,7 +33,7 @@ public abstract class AbstractConfigurat
protected static final Log log = LogFactory.getLog(AbstractConfigurator.class);
private static final String MIME = "mime";
-
+
/** fop factory configuration */
protected FOUserAgent userAgent = null;
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/DummyPercentBaseContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/DummyPercentBaseContext.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/DummyPercentBaseContext.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/DummyPercentBaseContext.java Thu Nov 25 21:13:38 2010
@@ -39,7 +39,7 @@ public final class DummyPercentBaseConte
public static DummyPercentBaseContext getInstance() {
return singleton;
}
-
+
/** {@inheritDoc} */
public int getBaseLength(int lengthBase, FObj fo) {
return 0;
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/afp/extensions/AFPInvokeMediumMapElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/afp/extensions/AFPInvokeMediumMapElement.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/afp/extensions/AFPInvokeMediumMapElement.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/afp/extensions/AFPInvokeMediumMapElement.java Thu Nov 25 21:13:38 2010
@@ -44,7 +44,7 @@ public class AFPInvokeMediumMapElement e
super.startOfNode();
if (parent.getNameId() != Constants.FO_PAGE_SEQUENCE
&& parent.getNameId() != Constants.FO_SIMPLE_PAGE_MASTER) {
-
+
invalidChildError(getLocator(), parent.getName(), getNamespaceURI(), getName(),
"rule.childOfPageSequence");
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/awt/AWTRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/awt/AWTRenderer.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/awt/AWTRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/awt/AWTRenderer.java Thu Nov 25 21:13:38 2010
@@ -29,14 +29,16 @@ package org.apache.fop.render.awt;
// Java
import java.awt.Color;
import java.awt.Dimension;
-import java.awt.geom.Rectangle2D;
import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
import java.awt.print.PageFormat;
import java.awt.print.Pageable;
import java.awt.print.Paper;
import java.awt.print.Printable;
import java.io.IOException;
+import org.apache.xmlgraphics.util.UnitConv;
+
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.FopFactoryConfigurator;
@@ -46,8 +48,8 @@ import org.apache.fop.area.PageViewport;
import org.apache.fop.render.awt.viewer.PreviewDialog;
import org.apache.fop.render.awt.viewer.Renderable;
import org.apache.fop.render.awt.viewer.StatusListener;
-import org.apache.fop.render.java2d.Java2DRenderer;
import org.apache.fop.render.extensions.prepress.PageScale;
+import org.apache.fop.render.java2d.Java2DRenderer;
/**
* The AWTRender outputs the pages generated by the layout engine to a Swing
@@ -152,10 +154,10 @@ public class AWTRenderer extends Java2DR
pageWidth = (int) Math.round(bounds.getWidth() / 1000f);
pageHeight = (int) Math.round(bounds.getHeight() / 1000f);
double scaleX = scaleFactor
- * (25.4 / FopFactoryConfigurator.DEFAULT_TARGET_RESOLUTION)
+ * (UnitConv.IN2MM / FopFactoryConfigurator.DEFAULT_TARGET_RESOLUTION)
/ userAgent.getTargetPixelUnitToMillimeter();
double scaleY = scaleFactor
- * (25.4 / FopFactoryConfigurator.DEFAULT_TARGET_RESOLUTION)
+ * (UnitConv.IN2MM / FopFactoryConfigurator.DEFAULT_TARGET_RESOLUTION)
/ userAgent.getTargetPixelUnitToMillimeter();
if (getPageViewport(pageNum).getForeignAttributes() != null) {
String scale = (String) getPageViewport(pageNum).getForeignAttributes().get(
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/intermediate/extensions/GoToXYAction.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/intermediate/extensions/GoToXYAction.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/intermediate/extensions/GoToXYAction.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/intermediate/extensions/GoToXYAction.java Thu Nov 25 21:13:38 2010
@@ -74,7 +74,7 @@ public class GoToXYAction extends Abstra
* <p>
* This function will always return a valid value for safety. Use
* {@link #isComplete()} to check if the link is actually complete.
- *
+ *
* @return the page index (0-based)
*/
public int getPageIndex() {
@@ -90,7 +90,7 @@ public class GoToXYAction extends Abstra
* <p>
* This function will always return a valid value for safety. Use
* {@link #isComplete()} to check if the link is actually complete.
- *
+ *
* @return the target location (coordinates in millipoints)
*/
public Point getTargetLocation() {
@@ -112,7 +112,7 @@ public class GoToXYAction extends Abstra
private boolean isCompleteExceptTargetLocation() {
return (getPageIndex() >= 0);
}
-
+
/** {@inheritDoc} */
public boolean isComplete() {
return this.isCompleteExceptTargetLocation() && (this.targetLocation != null);
@@ -147,9 +147,9 @@ public class GoToXYAction extends Abstra
atts.addAttribute(null, "id", "id", XMLUtil.CDATA, getID());
atts.addAttribute(null, "page-index", "page-index",
XMLUtil.CDATA, Integer.toString(pageIndex));
- atts.addAttribute(null, "x", "x", XMLUtil.CDATA,
+ atts.addAttribute(null, "x", "x", XMLUtil.CDATA,
Integer.toString(reportedTargetLocation.x));
- atts.addAttribute(null, "y", "y", XMLUtil.CDATA,
+ atts.addAttribute(null, "y", "y", XMLUtil.CDATA,
Integer.toString(reportedTargetLocation.y));
} else {
atts.addAttribute(null, "idref", "idref", XMLUtil.CDATA, getID());
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/java2d/Java2DImageHandlerRenderedImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/java2d/Java2DImageHandlerRenderedImage.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/java2d/Java2DImageHandlerRenderedImage.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/java2d/Java2DImageHandlerRenderedImage.java Thu Nov 25 21:13:38 2010
@@ -27,6 +27,7 @@ import java.awt.image.RenderedImage;
import java.awt.image.WritableRaster;
import java.io.IOException;
+import org.apache.xmlgraphics.image.GraphicsConstants;
import org.apache.xmlgraphics.image.loader.Image;
import org.apache.xmlgraphics.image.loader.ImageFlavor;
import org.apache.xmlgraphics.image.loader.ImageInfo;
@@ -76,7 +77,7 @@ public class Java2DImageHandlerRenderedI
//scaling because of image resolution
//float sourceResolution = java2dContext.getUserAgent().getSourceResolution();
//source resolution seems to be a bad idea, not sure why
- float sourceResolution = 72;
+ float sourceResolution = GraphicsConstants.DEFAULT_DPI;
sourceResolution *= 1000; //we're working in the millipoint area
sx *= sourceResolution / info.getSize().getDpiHorizontal();
sy *= sourceResolution / info.getSize().getDpiVertical();
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/java2d/Java2DRenderer.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/java2d/Java2DRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/java2d/Java2DRenderer.java Thu Nov 25 21:13:38 2010
@@ -53,6 +53,7 @@ import org.apache.xmlgraphics.image.load
import org.apache.xmlgraphics.image.loader.impl.ImageRendered;
import org.apache.xmlgraphics.image.loader.impl.ImageXMLDOM;
import org.apache.xmlgraphics.image.loader.util.ImageUtil;
+import org.apache.xmlgraphics.util.UnitConv;
import org.apache.fop.ResourceEventProducer;
import org.apache.fop.apps.FOPException;
@@ -317,10 +318,10 @@ public abstract class Java2DRenderer ext
}
scaleX = scaleX
- * (25.4f / FopFactoryConfigurator.DEFAULT_TARGET_RESOLUTION)
+ * (UnitConv.IN2MM / FopFactoryConfigurator.DEFAULT_TARGET_RESOLUTION)
/ userAgent.getTargetPixelUnitToMillimeter();
scaleY = scaleY
- * (25.4f / FopFactoryConfigurator.DEFAULT_TARGET_RESOLUTION)
+ * (UnitConv.IN2MM / FopFactoryConfigurator.DEFAULT_TARGET_RESOLUTION)
/ userAgent.getTargetPixelUnitToMillimeter();
int bitmapWidth = (int) ((pageWidth * scaleX) + 0.5);
int bitmapHeight = (int) ((pageHeight * scaleY) + 0.5);
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java Thu Nov 25 21:13:38 2010
@@ -134,7 +134,7 @@ public abstract class AbstractImageAdapt
// sRGB hasn't been set up for the PDF document
// so install but don't set to DefaultRGB
cs = PDFICCBasedColorSpace.setupsRGBColorSpace(doc);
- }
+ }
pdfICCStream = cs.getICCStream();
}
return pdfICCStream;
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java Thu Nov 25 21:13:38 2010
@@ -84,7 +84,7 @@ public class PDFImageHandlerSVG implemen
userAgent.getFactory().getImageManager(),
userAgent.getImageSessionContext(),
new AffineTransform());
-
+
//Cloning SVG DOM as Batik attaches non-thread-safe facilities (like the CSS engine)
//to it.
Document clonedDoc = BatikUtil.cloneSVGDocument(imageSVG.getDocument());
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSEventProducer.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSEventProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSEventProducer.java Thu Nov 25 21:13:38 2010
@@ -29,7 +29,7 @@ public interface PSEventProducer extends
/** Provider class for the event producer. */
final class Provider {
-
+
private Provider() {
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/FoUnitsConverter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/FoUnitsConverter.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/FoUnitsConverter.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/FoUnitsConverter.java Thu Nov 25 21:13:38 2010
@@ -24,6 +24,7 @@ import java.util.Map;
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.properties.FixedLength;
+import org.apache.xmlgraphics.util.UnitConv;
/** Converts XSL-FO units to RTF units
@@ -43,8 +44,8 @@ final class FoUnitsConverter {
public static final float POINT_TO_TWIPS = 20f;
/** millimeters and centimeters to twips: , one point is 1/72 of an inch, one inch is 25.4 mm */
- public static final float IN_TO_TWIPS = 72f * POINT_TO_TWIPS;
- public static final float MM_TO_TWIPS = IN_TO_TWIPS / 25.4f;
+ public static final float IN_TO_TWIPS = UnitConv.IN2PT * POINT_TO_TWIPS;
+ public static final float MM_TO_TWIPS = IN_TO_TWIPS / UnitConv.IN2MM;
public static final float CM_TO_TWIPS = 10 * MM_TO_TWIPS;
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPage.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPage.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPage.java Thu Nov 25 21:13:38 2010
@@ -62,7 +62,7 @@ extends RtfContainer {
public static final String FOOTERY = "footery";
/** constant for itap level */
public static final String ITAP = "itap";
-
+
/** String array of RtfPage attributes */
public static final String[] PAGE_ATTR = new String[]{
PAGE_WIDTH, PAGE_HEIGHT, LANDSCAPE, MARGIN_TOP, MARGIN_BOTTOM,
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/tools/BuilderContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/tools/BuilderContext.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/tools/BuilderContext.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/tools/BuilderContext.java Thu Nov 25 21:13:38 2010
@@ -111,7 +111,7 @@ public class BuilderContext {
return result;
}
- /**
+ /**
* Push an RtfContainer on our stack.
* @param c the container
*/
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java Thu Nov 25 21:13:38 2010
@@ -26,7 +26,6 @@ import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
import org.w3c.dom.DOMImplementation;
-
import org.xml.sax.EntityResolver;
import org.apache.avalon.framework.configuration.Configurable;
@@ -48,10 +47,12 @@ import org.apache.batik.util.SVGConstant
import org.apache.commons.logging.Log;
import org.apache.commons.logging.impl.SimpleLog;
+import org.apache.xmlgraphics.image.GraphicsConstants;
import org.apache.xmlgraphics.image.loader.ImageContext;
import org.apache.xmlgraphics.image.loader.ImageManager;
import org.apache.xmlgraphics.image.loader.ImageSessionContext;
import org.apache.xmlgraphics.image.loader.impl.AbstractImageSessionContext;
+import org.apache.xmlgraphics.util.UnitConv;
/**
* This is the common base class of all of FOP's transcoders.
@@ -226,7 +227,7 @@ public abstract class AbstractFOPTransco
if (hints.containsKey(KEY_DEVICE_RESOLUTION)) {
return ((Float)hints.get(KEY_DEVICE_RESOLUTION)).floatValue();
} else {
- return 72;
+ return GraphicsConstants.DEFAULT_DPI;
}
}
@@ -253,7 +254,7 @@ public abstract class AbstractFOPTransco
protected void setupImageInfrastructure(final String baseURI) {
final ImageContext imageContext = new ImageContext() {
public float getSourceResolution() {
- return 25.4f / userAgent.getPixelUnitToMillimeter();
+ return UnitConv.IN2MM / userAgent.getPixelUnitToMillimeter();
}
};
this.imageManager = new ImageManager(imageContext);
@@ -372,7 +373,7 @@ public abstract class AbstractFOPTransco
return ((Float)getTranscodingHints().get(key)).floatValue();
} else {
// return 0.3528f; // 72 dpi
- return 25.4f / 96; //96dpi = 0.2645833333333333333f;
+ return UnitConv.IN2MM / 96; //96dpi = 0.2645833333333333333f;
}
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java Thu Nov 25 21:13:38 2010
@@ -30,6 +30,8 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.StringWriter;
+import org.apache.xmlgraphics.image.GraphicsConstants;
+
import org.apache.fop.Version;
import org.apache.fop.fonts.FontInfo;
import org.apache.fop.fonts.FontSetup;
@@ -64,7 +66,7 @@ public class PDFDocumentGraphics2D exten
/** Normal PDF resolution (72dpi) */
public static final int NORMAL_PDF_RESOLUTION = 72;
/** Default device resolution (300dpi is a resonable quality for most purposes) */
- public static final int DEFAULT_NATIVE_DPI = 300;
+ public static final int DEFAULT_NATIVE_DPI = GraphicsConstants.DEFAULT_SAMPLE_DPI;
/**
* The device resolution may be different from the normal target resolution. See
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/PDFGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/PDFGraphics2D.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/PDFGraphics2D.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/PDFGraphics2D.java Thu Nov 25 21:13:38 2010
@@ -60,6 +60,7 @@ import org.apache.batik.ext.awt.Renderin
import org.apache.batik.gvt.GraphicsNode;
import org.apache.batik.gvt.PatternPaint;
+import org.apache.xmlgraphics.image.GraphicsConstants;
import org.apache.xmlgraphics.image.loader.ImageInfo;
import org.apache.xmlgraphics.image.loader.ImageSize;
import org.apache.xmlgraphics.image.loader.impl.ImageRawCCITTFax;
@@ -1270,7 +1271,8 @@ public class PDFGraphics2D extends Abstr
private PDFXObject addRenderedImage(String key, RenderedImage img) {
ImageInfo info = new ImageInfo(null, "image/unknown");
- ImageSize size = new ImageSize(img.getWidth(), img.getHeight(), 72);
+ ImageSize size = new ImageSize(img.getWidth(), img.getHeight(),
+ GraphicsConstants.DEFAULT_DPI);
info.setSize(size);
ImageRendered imgRend = new ImageRendered(info, img, null);
ImageRenderedAdapter adapter = new ImageRenderedAdapter(imgRend, key);
Propchange: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/util/ColorExt.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 25 21:13:38 2010
@@ -2,4 +2,4 @@
/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/util/ColorExt.java:745924-830281
/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/ColorExt.java:603620-746655
/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/util/ColorExt.java:684572,688085,688696
-/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorExt.java:981451-1036883
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorExt.java:981451-1039180
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/sandbox/org/apache/fop/render/mif/RefElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/sandbox/org/apache/fop/render/mif/RefElement.java?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/sandbox/org/apache/fop/render/mif/RefElement.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/sandbox/org/apache/fop/render/mif/RefElement.java Thu Nov 25 21:13:38 2010
@@ -38,7 +38,7 @@ public class RefElement extends MIFEleme
super(name);
}
- /**
+ /**
* @param key a key
* @return an mif element
*/
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/status.xml?rev=1039185&r1=1039184&r2=1039185&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/status.xml (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/status.xml Thu Nov 25 21:13:38 2010
@@ -58,6 +58,9 @@
documents. Example: the fix of marks layering will be such a case when it's done.
-->
<release version="FOP Trunk" date="TBD">
+ <action context="Code" dev="VH" type="fix" fixes-bug="49695" due-to="Joshua Marquart">
+ Replaced magic numbers with constants from UnitConv and GraphicsConstants.
+ </action>
<action context="Renderers" dev="JM" type="add" fixes-bug="42600" due-to="Maximilian Aster">
Added some support for break-before/-after for RTF output.
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org