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 2014/07/18 16:21:14 UTC
svn commit: r1611658 [4/6] - in
/xmlgraphics/fop/branches/FOP-2393_gradient-rendering: ./ lib/
src/java/org/apache/fop/afp/ src/java/org/apache/fop/afp/fonts/
src/java/org/apache/fop/afp/goca/ src/java/org/apache/fop/afp/ioca/
src/java/org/apache/fop/a...
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fonts/type1/Type1SubsetFile.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fonts/type1/Type1SubsetFile.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fonts/type1/Type1SubsetFile.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fonts/type1/Type1SubsetFile.java Fri Jul 18 14:21:06 2014
@@ -51,32 +51,31 @@ public class Type1SubsetFile {
protected static final Log LOG = LogFactory.getLog(Type1SubsetFile.class);
/* The subset list of char strings */
- private HashMap<String, byte[]> subsetCharStrings;
+ protected HashMap<String, byte[]> subsetCharStrings;
/* The list of character names in the subset font */
- private List<String> charNames = null;
+ protected List<String> charNames;
/* A list of unique subroutines references */
- private LinkedHashMap<Integer, byte[]> uniqueSubs;
- private SingleByteFont sbfont = null;
+ protected LinkedHashMap<Integer, byte[]> uniqueSubs;
+ private SingleByteFont sbfont;
/* New line character */
- private String eol = "\n";
+ protected String eol = "\n";
/* An option to determine whether the subroutines are subset */
- private boolean subsetSubroutines = true;
+ protected boolean subsetSubroutines = true;
private byte[] fullFont;
//List of parsed Postscript elements
- private List<PSElement> headerSection;
- private List<PSElement> mainSection;
+ protected List<PSElement> headerSection;
+ protected List<PSElement> mainSection;
//Determines whether the current font uses standard encoding
- private boolean standardEncoding = false;
+ protected boolean standardEncoding;
//Type 1 operators
private static final int OP_SEAC = 6;
private static final int OP_CALLSUBR = 10;
private static final int OP_CALLOTHERSUBR = 16;
- public byte[] createSubset(InputStream in, SingleByteFont sbfont,
- String fontPrefix) throws IOException {
+ public byte[] createSubset(InputStream in, SingleByteFont sbfont) throws IOException {
fullFont = IOUtils.toByteArray(in);
- byte[] subsetFont = createSubset(sbfont, fontPrefix, true);
+ byte[] subsetFont = createSubset(sbfont, true);
//This should never happen but ensure that subset is shorter than original font
return (subsetFont.length == 0 || subsetFont.length > fullFont.length)
? fullFont : subsetFont;
@@ -84,17 +83,14 @@ public class Type1SubsetFile {
/**
* Creates a new subset from the given type 1 font input stream
- * @param in The type 1 font to subset
* @param sbfont The font object containing information such as the
* characters from which to create the subset
- * @param fontPrefix The prefix used in identifying the subset font
- * @param allSubroutines This option will force the subset to include all
+ * @param subsetSubroutines This option will force the subset to include all
* subroutines.
* @return Returns the subset as a byte array
* @throws IOException
*/
- private byte[] createSubset(SingleByteFont sbfont,
- String fontPrefix, boolean subsetSubroutines) throws IOException {
+ private byte[] createSubset(SingleByteFont sbfont, boolean subsetSubroutines) throws IOException {
this.subsetSubroutines = subsetSubroutines;
InputStream in = new ByteArrayInputStream(fullFont);
//Initialise resources used for the font creation
@@ -132,8 +128,8 @@ public class Type1SubsetFile {
//Process and write the main section
PSElement charStrings = getElement("/CharStrings", mainSection);
- int result = readMainSection(mainSection, decoded, subsetEncodingEntries, charStrings);
- if (result == 0) {
+ boolean result = readMainSection(mainSection, decoded, subsetEncodingEntries, charStrings);
+ if (!result) {
/* This check handles the case where a font uses a postscript method to return a
* subroutine index. As there is currently no java postscript interpreter and writing
* one would be very difficult it prevents us from handling this eventuality. The way
@@ -142,16 +138,16 @@ public class Type1SubsetFile {
uniqueSubs.clear();
subsetCharStrings.clear();
charNames.clear();
- return createSubset(sbfont, fontPrefix, false);
+ return createSubset(sbfont, false);
}
//Write header section
- ByteArrayOutputStream boasHeader = writeHeader(pfbData, encoding, subsetEncodingEntries);
+ ByteArrayOutputStream boasHeader = writeHeader(pfbData, encoding);
ByteArrayOutputStream boasMain = writeMainSection(decoded, mainSection, charStrings);
byte[] mainSectionBytes = boasMain.toByteArray();
mainSectionBytes = BinaryCoder.encodeBytes(mainSectionBytes, 55665, 4);
- boasMain = new ByteArrayOutputStream();
+ boasMain.reset();
boasMain.write(mainSectionBytes);
ByteArrayOutputStream baosTrailer = new ByteArrayOutputStream();
@@ -160,8 +156,8 @@ public class Type1SubsetFile {
return stitchFont(boasHeader, boasMain, baosTrailer);
}
- byte[] stitchFont(ByteArrayOutputStream boasHeader, ByteArrayOutputStream boasMain,
- ByteArrayOutputStream boasTrailer) throws IOException {
+ protected byte[] stitchFont(ByteArrayOutputStream boasHeader, ByteArrayOutputStream boasMain,
+ ByteArrayOutputStream boasTrailer) throws IOException {
int headerLength = boasHeader.size();
int mainLength = boasMain.size();
@@ -205,7 +201,7 @@ public class Type1SubsetFile {
/* If no matches are found, create a new entry for the character so
* that it can be added even if it's not in the current encoding. */
if (matches.size() == 0) {
- matches = new ArrayList<String>();
+ matches.clear();
if (glyph == 0) {
matches.add("dup 0 /.notdef put");
} else {
@@ -237,7 +233,7 @@ public class Type1SubsetFile {
return subsetEncodingEntries;
}
- private List<String> searchEntries(HashMap<Integer, String> encodingEntries, int glyph) {
+ protected List<String> searchEntries(HashMap<Integer, String> encodingEntries, int glyph) {
List<String> matches = new ArrayList<String>();
for (Entry<Integer, String> entry : encodingEntries.entrySet()) {
String tag = getEntryPart(entry.getValue(), 3);
@@ -249,15 +245,13 @@ public class Type1SubsetFile {
return matches;
}
- private ByteArrayOutputStream writeHeader(PFBData pfbData, PSElement encoding,
- List<String> subsetEncodingEntries) throws UnsupportedEncodingException,
- IOException {
+ protected ByteArrayOutputStream writeHeader(PFBData pfbData, PSElement encoding) throws IOException {
ByteArrayOutputStream boasHeader = new ByteArrayOutputStream();
boasHeader.write(pfbData.getHeaderSegment(), 0, encoding.getStartPoint() - 1);
if (!standardEncoding) {
//Write out the new encoding table for the subset font
- String encodingArray = eol + String.format("/Encoding %d array", 256) + eol
+ String encodingArray = eol + "/Encoding 256 array" + eol
+ "0 1 255 {1 index exch /.notdef put } for" + eol;
byte[] encodingDefinition = encodingArray.getBytes("ASCII");
boasHeader.write(encodingDefinition, 0, encodingDefinition.length);
@@ -287,7 +281,7 @@ public class Type1SubsetFile {
return boas;
}
- private int readMainSection(List<PSElement> mainSection, byte[] decoded,
+ private boolean readMainSection(List<PSElement> mainSection, byte[] decoded,
List<String> subsetEncodingEntries, PSElement charStrings) {
subsetEncodingEntries.add(0, "dup 0 /.notdef put");
/* Reads and parses the charStrings section to subset the charString
@@ -322,19 +316,19 @@ public class Type1SubsetFile {
/* Recursively scan the charString array for subroutines and if found, copy the
* entry to our subset entries and update any references. */
charStringEntry = createSubsetCharStrings(decoded, charStringEntry, subroutines,
- subsetEncodingEntries, tag);
+ subsetEncodingEntries);
}
if (charStringEntry.length == 0) {
- return 0;
+ return false;
}
charStringEntry = BinaryCoder.encodeBytes(charStringEntry, 4330, skipBytes);
subsetCharStrings.put(tag, charStringEntry);
}
- return 1;
+ return true;
}
private byte[] createSubsetCharStrings(byte[] decoded, byte[] data, PSFixedArray subroutines,
- List<String> subsetEncodingEntries, String glyphName) {
+ List<String> subsetEncodingEntries) {
List<BytesNumber> operands = new ArrayList<BytesNumber>();
for (int i = 0; i < data.length; i++) {
int cur = data[i] & 0xFF;
@@ -348,11 +342,11 @@ public class Type1SubsetFile {
if (uniqueSubs.get(operands.get(operands.size() - 1).getNumber()) == null) {
uniqueSubs.put(operands.get(operands.size() - 1).getNumber(), new byte[0]);
data = addSubroutine(subroutines, operands, decoded, subsetEncodingEntries,
- glyphName, data, i, 1, -1, operands.get(
+ data, i, 1, -1, operands.get(
operands.size() - 1).getNumber());
} else {
data = addSubroutine(subroutines, operands, decoded, subsetEncodingEntries,
- glyphName, data, i, 1, getSubrIndex(operands.get(
+ data, i, 1, getSubrIndex(operands.get(
operands.size() - 1).getNumber()), operands.get(
operands.size() - 1).getNumber());
}
@@ -390,7 +384,7 @@ public class Type1SubsetFile {
return new byte[0];
}
data = addSubroutine(subroutines, operands, decoded, subsetEncodingEntries,
- glyphName, data, i, 2, -1, operands.get(0).getNumber());
+ data, i, 2, -1, operands.get(0).getNumber());
}
}
if (data.length == 0) {
@@ -431,14 +425,14 @@ public class Type1SubsetFile {
}
private byte[] addSubroutine(PSFixedArray subroutines, List<BytesNumber> operands, byte[] decoded,
- List<String> subsetEncodingEntries, String glyphName, byte[] data, int i, int opLength,
+ List<String> subsetEncodingEntries, byte[] data, int i, int opLength,
int existingSubrRef, int subrID) {
if (existingSubrRef == -1) {
int[] subrData = subroutines.getBinaryEntryByIndex(subrID);
byte[] subroutine = getBinaryEntry(subrData, decoded);
subroutine = BinaryCoder.decodeBytes(subroutine, 4330, 4);
subroutine = createSubsetCharStrings(decoded, subroutine, subroutines,
- subsetEncodingEntries, glyphName);
+ subsetEncodingEntries);
if (subroutine.length == 0) {
return new byte[0];
}
@@ -451,8 +445,8 @@ public class Type1SubsetFile {
return data;
}
- private ByteArrayOutputStream writeMainSection(byte[] decoded, List<PSElement> mainSection,
- PSElement charStrings) throws IOException {
+ protected ByteArrayOutputStream writeMainSection(byte[] decoded, List<PSElement> mainSection,
+ PSElement charStrings) throws IOException {
ByteArrayOutputStream main = new ByteArrayOutputStream();
PSElement subrs = getElement("/Subrs", mainSection);
@@ -470,11 +464,9 @@ public class Type1SubsetFile {
writeString(eol + String.format("/Subrs %d array", uniqueSubs.size()), main);
int count = 0;
for (Entry<Integer, byte[]> entry : uniqueSubs.entrySet()) {
- byte[] newSubrBytes = (eol + String.format("dup %d %d %s ", count++,
- entry.getValue().length, rd)).getBytes("ASCII");
- newSubrBytes = concatArray(newSubrBytes, entry.getValue());
- newSubrBytes = concatArray(newSubrBytes, String.format(" %s", np).getBytes("ASCII"));
- main.write(newSubrBytes);
+ writeString(eol + String.format("dup %d %d %s ", count++, entry.getValue().length, rd), main);
+ main.write(entry.getValue());
+ writeString(" " + np, main);
}
writeString(eol + nd, main);
} else {
@@ -498,8 +490,8 @@ public class Type1SubsetFile {
return main;
}
- private String findVariable(byte[] decoded, List<PSElement> elements, String[] matches,
- String fallback) throws UnsupportedEncodingException {
+ protected String findVariable(byte[] decoded, List<PSElement> elements, String[] matches,
+ String fallback) throws UnsupportedEncodingException {
for (PSElement element : elements) {
if (element instanceof PSSubroutine) {
byte[] var = new byte[element.getEndPoint() - element.getStartPoint()];
@@ -575,8 +567,8 @@ public class Type1SubsetFile {
sbfont.mapUsedGlyphName(charIndex, charName);
}
- private void writeString(String entry, ByteArrayOutputStream boas)
- throws UnsupportedEncodingException, IOException {
+ protected void writeString(String entry, ByteArrayOutputStream boas)
+ throws IOException {
byte[] byteEntry = entry.getBytes("ASCII");
boas.write(byteEntry);
}
@@ -587,7 +579,7 @@ public class Type1SubsetFile {
public static final class BytesNumber {
private int number;
private int numBytes;
- private String name = null;
+ private String name;
public BytesNumber(int number, int numBytes) {
this.number = number;
@@ -696,7 +688,7 @@ public class Type1SubsetFile {
* @param decoded The array from which to copy a section of data
* @return Returns the copy of the data section
*/
- byte[] getBinaryEntry(int[] position, byte[] decoded) {
+ protected byte[] getBinaryEntry(int[] position, byte[] decoded) {
int start = position[0];
int finish = position[1];
byte[] line = new byte[finish - start];
@@ -704,7 +696,7 @@ public class Type1SubsetFile {
return line;
}
- private String getEntryPart(String entry, int part) {
+ protected String getEntryPart(String entry, int part) {
Scanner s = new Scanner(entry).useDelimiter(" ");
for (int i = 1; i < part; i++) {
s.next();
@@ -712,7 +704,7 @@ public class Type1SubsetFile {
return s.next();
}
- private PSElement getElement(String elementID, List<PSElement> elements) {
+ protected PSElement getElement(String elementID, List<PSElement> elements) {
for (PSElement element : elements) {
if (element.getOperator().equals(elementID)) {
return element;
@@ -722,14 +714,6 @@ public class Type1SubsetFile {
}
/**
- * Gets the list of subset character names
- * @return Returns the subset character names
- */
- public List<String> getCharNames() {
- return charNames;
- }
-
- /**
* A class to encode and decode sections of a type 1 font file. See Adobe
* Type 1 Font Format Section 7.2 for more details.
*/
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/hyphenation/Hyphenator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/hyphenation/Hyphenator.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/hyphenation/Hyphenator.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/hyphenation/Hyphenator.java Fri Jul 18 14:21:06 2014
@@ -45,10 +45,10 @@ public final class Hyphenator {
/** logging instance */
protected static final Log log = LogFactory.getLog(Hyphenator.class);
- private static HyphenationTreeCache hTreeCache = null;
+ private static HyphenationTreeCache hTreeCache;
/** Enables a dump of statistics. Note: If activated content is sent to System.out! */
- private static boolean statisticsDump = false;
+ private static boolean statisticsDump;
/**
* Creates a new hyphenator.
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/hyphenation/PatternParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/hyphenation/PatternParser.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/hyphenation/PatternParser.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/hyphenation/PatternParser.java Fri Jul 18 14:21:06 2014
@@ -52,7 +52,7 @@ public class PatternParser extends Defau
private ArrayList exception;
private char hyphenChar;
private String errMsg;
- private boolean hasClasses = false;
+ private boolean hasClasses;
static final int ELEM_CLASSES = 1;
static final int ELEM_EXCEPTIONS = 2;
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/hyphenation/SerializeHyphPattern.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/hyphenation/SerializeHyphPattern.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/hyphenation/SerializeHyphPattern.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/hyphenation/SerializeHyphPattern.java Fri Jul 18 14:21:06 2014
@@ -31,7 +31,7 @@ import java.io.ObjectOutputStream;
*/
public class SerializeHyphPattern {
- private boolean errorDump = false;
+ private boolean errorDump;
/**
* Controls the amount of error information dumped.
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java Fri Jul 18 14:21:06 2014
@@ -39,9 +39,9 @@ public abstract class AbstractBaseLayout
implements LayoutManager, PercentBaseContext {
/** Indicator if this LM generates reference areas. */
- protected boolean generatesReferenceArea = false;
+ protected boolean generatesReferenceArea;
/** Indicator if this LM generates block areas. */
- protected boolean generatesBlockArea = false;
+ protected boolean generatesBlockArea;
/** The formatting object for this LM. */
protected final FObj fobj;
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java Fri Jul 18 14:21:06 2014
@@ -96,9 +96,9 @@ public abstract class AbstractBreaker {
private static final long serialVersionUID = -5348831120146774118L;
/** Number of elements to ignore at the beginning of the list. */
- int ignoreAtStart = 0;
+ int ignoreAtStart;
/** Number of elements to ignore at the end of the list. */
- int ignoreAtEnd = 0;
+ int ignoreAtEnd;
/**
* startOn represents where on the page/which page layout
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/AbstractPageSequenceLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/AbstractPageSequenceLayoutManager.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/AbstractPageSequenceLayoutManager.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/AbstractPageSequenceLayoutManager.java Fri Jul 18 14:21:06 2014
@@ -59,9 +59,9 @@ public abstract class AbstractPageSequen
protected Page curPage;
/** the current page number */
- protected int currentPageNum = 0;
+ protected int currentPageNum;
/** The stating page number */
- protected int startPageNum = 0;
+ protected int startPageNum;
/**
* Constructor
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java Fri Jul 18 14:21:06 2014
@@ -66,7 +66,7 @@ public class BlockContainerLayoutManager
// When viewport should grow with the content.
private boolean autoHeight = true;
- private boolean inlineElementList = false;
+ private boolean inlineElementList;
/* holds the (one-time use) fo:block space-before
and -after properties. Large fo:blocks are split
@@ -81,8 +81,8 @@ public class BlockContainerLayoutManager
private MinOptMax foBlockSpaceAfter;
private int horizontalOverflow;
- private double contentRectOffsetX = 0;
- private double contentRectOffsetY = 0;
+ private double contentRectOffsetX;
+ private double contentRectOffsetY;
/**
* Create a new block container layout manager.
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/BlockKnuthSequence.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/BlockKnuthSequence.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/BlockKnuthSequence.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/BlockKnuthSequence.java Fri Jul 18 14:21:06 2014
@@ -29,7 +29,7 @@ public class BlockKnuthSequence extends
private static final long serialVersionUID = 1648962416582509095L;
- private boolean isClosed = false;
+ private boolean isClosed;
/**
* Creates a new and empty list.
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java Fri Jul 18 14:21:06 2014
@@ -123,9 +123,9 @@ public abstract class BreakingAlgorithm
/** Force the algorithm to find a set of breakpoints, even if no feasible breakpoints
* exist.
*/
- private boolean force = false;
+ private boolean force;
/** If set to true, doesn't ignore break possibilities which are definitely too short. */
- protected boolean considerTooShort = false;
+ protected boolean considerTooShort;
/** When in forced mode, the best node leading to a too long line. The line will be
* too long anyway, but this one will lead to a paragraph with fewest demerits.
@@ -162,12 +162,12 @@ public abstract class BreakingAlgorithm
/**
* The lowest available line in the set of active nodes.
*/
- protected int startLine = 0;
+ protected int startLine;
/**
* The highest + 1 available line in the set of active nodes.
*/
- protected int endLine = 0;
+ protected int endLine;
/**
* The total width of all elements handled so far.
@@ -177,12 +177,12 @@ public abstract class BreakingAlgorithm
/**
* The total stretch of all elements handled so far.
*/
- protected int totalStretch = 0;
+ protected int totalStretch;
/**
* The total shrink of all elements handled so far.
*/
- protected int totalShrink = 0;
+ protected int totalShrink;
/**
* Best records.
@@ -268,7 +268,7 @@ public abstract class BreakingAlgorithm
* Holds the number of subsequent recovery attempty that are made to get content fit
* into a line.
*/
- public int fitRecoveryCounter = 0;
+ public int fitRecoveryCounter;
/**
* Construct node.
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/ElementListObserver.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/ElementListObserver.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/ElementListObserver.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/ElementListObserver.java Fri Jul 18 14:21:06 2014
@@ -32,7 +32,7 @@ public final class ElementListObserver {
private ElementListObserver() {
}
- private static List activeObservers = null;
+ private static List activeObservers;
/**
* Adds a new Observer to the list.
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java Fri Jul 18 14:21:06 2014
@@ -34,7 +34,7 @@ public class InlineKnuthSequence extends
private static final long serialVersionUID = 1354774188859946549L;
- private boolean isClosed = false;
+ private boolean isClosed;
/**
* Creates a new and empty list.
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/KnuthBlockBox.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/KnuthBlockBox.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/KnuthBlockBox.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/KnuthBlockBox.java Fri Jul 18 14:21:06 2014
@@ -37,7 +37,7 @@ public class KnuthBlockBox extends Knuth
private int bpd;
private List<FootnoteBodyLayoutManager> footnoteList;
/** List of Knuth elements. This is a list of LinkedList elements. */
- private List elementLists = null;
+ private List elementLists;
/**
* Creates a new box.
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/LMiter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/LMiter.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/LMiter.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/LMiter.java Fri Jul 18 14:21:06 2014
@@ -29,7 +29,7 @@ public class LMiter implements ListItera
/** list of layout managers */
protected List<LayoutManager> listLMs;
/** current position in iteration */
- protected int curPos = 0;
+ protected int curPos;
/** The LayoutManager to which this LMiter is attached **/
private LayoutManager lp;
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/LayoutContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/LayoutContext.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/LayoutContext.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/LayoutContext.java Fri Jul 18 14:21:06 2014
@@ -94,28 +94,28 @@ public final class LayoutContext {
private List pendingBeforeMarks;
/** Current hyphenation context. May be null. */
- private HyphContext hyphContext = null;
+ private HyphContext hyphContext;
/** Alignment in BP direction */
private int bpAlignment = Constants.EN_START;
/** Stretch or shrink value when making areas. */
- private double ipdAdjust = 0.0;
+ private double ipdAdjust;
/** Stretch or shrink value when adding spaces. */
- private double dSpaceAdjust = 0.0;
+ private double dSpaceAdjust;
- private AlignmentContext alignmentContext = null;
+ private AlignmentContext alignmentContext;
/** Amount of space before / start */
- private int spaceBefore = 0;
+ private int spaceBefore;
/** Amount of space after / end */
- private int spaceAfter = 0;
+ private int spaceAfter;
/** Amount of space to reserve at the beginning of each line */
- private int lineStartBorderAndPaddingWidth = 0;
+ private int lineStartBorderAndPaddingWidth;
/** Amount of space to reserve at the end of each line */
- private int lineEndBorderAndPaddingWidth = 0;
+ private int lineEndBorderAndPaddingWidth;
private int breakBefore;
private int breakAfter;
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/LocalBreaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/LocalBreaker.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/LocalBreaker.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/LocalBreaker.java Fri Jul 18 14:21:06 2014
@@ -30,7 +30,7 @@ public abstract class LocalBreaker exten
protected BlockStackingLayoutManager lm;
private int displayAlign;
private int ipd;
- private int overflow = 0;
+ private int overflow;
public LocalBreaker(BlockStackingLayoutManager lm, int ipd, int displayAlign) {
this.lm = lm;
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/PageBreaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/PageBreaker.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/PageBreaker.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/PageBreaker.java Fri Jul 18 14:21:06 2014
@@ -52,9 +52,9 @@ public class PageBreaker extends Abstrac
* The FlowLayoutManager object, which processes
* the single fo:flow of the fo:page-sequence
*/
- private FlowLayoutManager childFLM = null;
+ private FlowLayoutManager childFLM;
- private StaticContentLayoutManager footnoteSeparatorLM = null;
+ private StaticContentLayoutManager footnoteSeparatorLM;
/**
* Construct page breaker.
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java Fri Jul 18 14:21:06 2014
@@ -43,33 +43,33 @@ class PageBreakingAlgorithm extends Brea
private final PageProvider pageProvider;
private final PageBreakingLayoutListener layoutListener;
/** List of PageBreakPosition elements. */
- private LinkedList<PageBreakPosition> pageBreaks = null;
+ private LinkedList<PageBreakPosition> pageBreaks;
/** Footnotes which are cited between the currently considered active node (previous
* break) and the current considered break. Its type is
* List<List<KnuthElement>>, it contains the sequences of KnuthElement
* representing the footnotes bodies.
*/
- private List<List<KnuthElement>> footnotesList = null;
+ private List<List<KnuthElement>> footnotesList;
/** Cumulated bpd of unhandled footnotes. */
- private List<Integer> lengthList = null;
+ private List<Integer> lengthList;
/** Length of all the footnotes which will be put on the current page. */
- private int totalFootnotesLength = 0;
+ private int totalFootnotesLength;
/**
* Length of all the footnotes which have already been inserted, up to the currently
* considered element. That is, footnotes from the currently considered page plus
* footnotes from its preceding pages.
*/
- private int insertedFootnotesLength = 0;
+ private int insertedFootnotesLength;
/** True if footnote citations have been met since the beginning of the page sequence. */
- private boolean footnotesPending = false;
+ private boolean footnotesPending;
/** True if the elements met after the previous break point contain footnote citations. */
- private boolean newFootnotes = false;
+ private boolean newFootnotes;
/** Index of the first footnote met after the previous break point. */
- private int firstNewFootnoteIndex = 0;
+ private int firstNewFootnoteIndex;
/** Index of the last footnote inserted on the current page. */
- private int footnoteListIndex = 0;
+ private int footnoteListIndex;
/** Index of the last element of the last footnote inserted on the current page. */
private int footnoteElementIndex = -1;
@@ -77,20 +77,20 @@ class PageBreakingAlgorithm extends Brea
private final int splitFootnoteDemerits = 5000;
// demerits for a page break that defers a whole footnote to the following page
private final int deferredFootnoteDemerits = 10000;
- private MinOptMax footnoteSeparatorLength = null;
+ private MinOptMax footnoteSeparatorLength;
// the method noBreakBetween(int, int) uses these variables
// to store parameters and result of the last call, in order
// to reuse them and take less time
private int storedPrevBreakIndex = -1;
private int storedBreakIndex = -1;
- private boolean storedValue = false;
+ private boolean storedValue;
//Controls whether overflows should be warned about or not
- private boolean autoHeight = false;
+ private boolean autoHeight;
//Controls whether a single part should be forced if possible (ex. block-container)
- private boolean favorSinglePart = false;
+ private boolean favorSinglePart;
private int ipdDifference;
private KnuthNode bestNodeForIPDChange;
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/SpaceSpecifier.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/SpaceSpecifier.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/SpaceSpecifier.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/SpaceSpecifier.java Fri Jul 18 14:21:06 2014
@@ -33,7 +33,7 @@ import org.apache.fop.traits.SpaceVal;
public class SpaceSpecifier implements Cloneable {
private boolean startsReferenceArea;
- private boolean hasForcing = false;
+ private boolean hasForcing;
private List spaceVals = new ArrayList();
/**
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java Fri Jul 18 14:21:06 2014
@@ -41,7 +41,7 @@ public class StaticContentLayoutManager
private Block targetBlock;
private SideRegion regionFO;
- private int contentAreaIPD = 0;
+ private int contentAreaIPD;
private int contentAreaBPD = -1;
/**
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java Fri Jul 18 14:21:06 2014
@@ -49,7 +49,7 @@ public class CharacterLayoutManager exte
private MinOptMax letterSpaceIPD;
private int hyphIPD;
private Font font;
- private CommonBorderPaddingBackground borderProps = null;
+ private CommonBorderPaddingBackground borderProps;
/**
* Constructor
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java Fri Jul 18 14:21:06 2014
@@ -61,7 +61,7 @@ public class ContentLayoutManager extend
private Area holder;
private int stackSize;
private LayoutManager parentLM;
- private InlineLevelLayoutManager childLM = null;
+ private InlineLevelLayoutManager childLM;
/**
* Constructs a new ContentLayoutManager
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/HyphContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/HyphContext.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/HyphContext.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/HyphContext.java Fri Jul 18 14:21:06 2014
@@ -29,8 +29,8 @@ package org.apache.fop.layoutmgr.inline;
*/
public class HyphContext {
private int[] hyphPoints;
- private int currentOffset = 0;
- private int currentIndex = 0;
+ private int currentOffset;
+ private int currentIndex;
/**
* @param hyphPoints number of hyphenation points
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java Fri Jul 18 14:21:06 2014
@@ -72,11 +72,11 @@ public class InlineLayoutManager extends
*/
private static Log log = LogFactory.getLog(InlineLayoutManager.class);
- private CommonMarginInline inlineProps = null;
- private CommonBorderPaddingBackground borderProps = null;
+ private CommonMarginInline inlineProps;
+ private CommonBorderPaddingBackground borderProps;
- private boolean areaCreated = false;
- private LayoutManager lastChildLM = null; // Set when return last breakposs;
+ private boolean areaCreated;
+ private LayoutManager lastChildLM; // Set when return last breakposs;
private Font font;
@@ -93,7 +93,7 @@ public class InlineLayoutManager extends
/** The keep-together property */
//private KeepProperty keepTogether;
- private AlignmentContext alignmentContext = null;
+ private AlignmentContext alignmentContext;
/**
* Create an inline layout manager.
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java Fri Jul 18 14:21:06 2014
@@ -28,8 +28,8 @@ import org.apache.fop.layoutmgr.Position
*/
public class KnuthInlineBox extends KnuthBox {
- private FootnoteBodyLayoutManager footnoteBodyLM = null;
- private AlignmentContext alignmentContext = null;
+ private FootnoteBodyLayoutManager footnoteBodyLM;
+ private AlignmentContext alignmentContext;
/**
* Create a new KnuthBox.
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java Fri Jul 18 14:21:06 2014
@@ -51,12 +51,12 @@ import org.apache.fop.traits.MinOptMax;
*/
public class LeaderLayoutManager extends LeafNodeLayoutManager {
private Leader fobj;
- private Font font = null;
+ private Font font;
- private List contentList = null;
- private ContentLayoutManager clm = null;
+ private List contentList;
+ private ContentLayoutManager clm;
- private int contentAreaIPD = 0;
+ private int contentAreaIPD;
/**
* Constructor
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java Fri Jul 18 14:21:06 2014
@@ -57,16 +57,16 @@ public abstract class LeafNodeLayoutMana
protected static final Log log = LogFactory.getLog(LeafNodeLayoutManager.class);
/** The inline area that this leafnode will add. */
- protected InlineArea curArea = null;
+ protected InlineArea curArea;
/** Any border, padding and background properties applying to this area */
- protected CommonBorderPaddingBackground commonBorderPaddingBackground = null;
+ protected CommonBorderPaddingBackground commonBorderPaddingBackground;
/** The alignment context applying to this area */
- protected AlignmentContext alignmentContext = null;
+ protected AlignmentContext alignmentContext;
/** Flag to indicate if something was changed as part of the getChangeKnuthElements sequence */
- protected boolean somethingChanged = false;
+ protected boolean somethingChanged;
/** Our area info for the Knuth elements */
- protected AreaInfo areaInfo = null;
+ protected AreaInfo areaInfo;
/**
* Store information about the inline area
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java Fri Jul 18 14:21:06 2014
@@ -168,7 +168,7 @@ public class LineLayoutManager extends I
private LineLayoutPossibilities lineLayouts;
private LineLayoutPossibilities[] lineLayoutsList;
- private int ipd = 0;
+ private int ipd;
/**
* When layout must be re-started due to a change of IPD, there is no need
* to perform hyphenation on the remaining Knuth sequence once again.
@@ -196,9 +196,9 @@ public class LineLayoutManager extends I
private static final long serialVersionUID = 5862072380375189105L;
/** Number of elements to ignore at the beginning of the list. */
- private int ignoreAtStart = 0;
+ private int ignoreAtStart;
/** Number of elements to ignore at the end of the list. */
- private int ignoreAtEnd = 0;
+ private int ignoreAtEnd;
// space at the end of the last line (in millipoints)
private MinOptMax lineFiller;
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java Fri Jul 18 14:21:06 2014
@@ -98,9 +98,9 @@ public class TextLayoutManager extends L
private final MinOptMax[] letterSpaceAdjustArray; //size = textArray.length + 1
/** Font used for the space between words. */
- private Font spaceFont = null;
+ private Font spaceFont;
/** Start index of next TextArea */
- private int nextStart = 0;
+ private int nextStart;
/** size of a space character (U+0020) glyph in current font */
private int spaceCharIPD;
private MinOptMax wordSpaceIPD;
@@ -108,24 +108,24 @@ public class TextLayoutManager extends L
/** size of the hyphen character glyph in current font */
private int hyphIPD;
- private boolean hasChanged = false;
+ private boolean hasChanged;
private int[] returnedIndices = {0, 0};
- private int changeOffset = 0;
- private int thisStart = 0;
- private int tempStart = 0;
+ private int changeOffset;
+ private int thisStart;
+ private int tempStart;
private List changeList = new LinkedList();
- private AlignmentContext alignmentContext = null;
+ private AlignmentContext alignmentContext;
/**
* The width to be reserved for border and padding at the start of the line.
*/
- private int lineStartBAP = 0;
+ private int lineStartBAP;
/**
* The width to be reserved for border and padding at the end of the line.
*/
- private int lineEndBAP = 0;
+ private int lineEndBAP;
private boolean keepTogether;
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java Fri Jul 18 14:21:06 2014
@@ -71,10 +71,10 @@ public class ListItemLayoutManager exten
private ListItemContentLayoutManager label;
private ListItemContentLayoutManager body;
- private Block curBlockArea = null;
+ private Block curBlockArea;
- private List<ListElement> labelList = null;
- private List<ListElement> bodyList = null;
+ private List<ListElement> labelList;
+ private List<ListElement> bodyList;
private Keep keepWithNextPendingOnLabel;
private Keep keepWithNextPendingOnBody;
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java Fri Jul 18 14:21:06 2014
@@ -76,7 +76,7 @@ class ActiveCell {
private Keep keepWithNext;
- private int spanIndex = 0;
+ private int spanIndex;
private Step previousStep;
private Step nextStep;
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java Fri Jul 18 14:21:06 2014
@@ -48,7 +48,7 @@ public abstract class CollapsingBorderMo
//public static final int LAST_ROW_IN_GROUP = 8;
//These statics are used singleton-style. No MT issues here.
- private static CollapsingBorderModel collapse = null;
+ private static CollapsingBorderModel collapse;
// private static CollapsingBorderModel collapseWithPrecedence = null;
/**
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java Fri Jul 18 14:21:06 2014
@@ -50,7 +50,7 @@ public class ColumnSetup {
private List columns = new java.util.ArrayList();
private List colWidths = new java.util.ArrayList();
- private int maxColIndexReferenced = 0;
+ private int maxColIndexReferenced;
/**
* Main Constructor.
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/table/RowPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/table/RowPainter.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/table/RowPainter.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/table/RowPainter.java Fri Jul 18 14:21:06 2014
@@ -50,9 +50,9 @@ import org.apache.fop.layoutmgr.TraitSet
class RowPainter {
private static Log log = LogFactory.getLog(RowPainter.class);
private int colCount;
- private int currentRowOffset = 0;
+ private int currentRowOffset;
/** Currently handled row (= last encountered row). */
- private EffRow currentRow = null;
+ private EffRow currentRow;
private LayoutContext layoutContext;
/**
* Index of the first row of the current part present on the current page.
@@ -79,7 +79,7 @@ class RowPainter {
private CellPart[] lastCellParts;
/** y-offset of the current table part. */
- private int tablePartOffset = 0;
+ private int tablePartOffset;
/** See {@link RowPainter#registerPartBackgroundArea(Block)}. */
private CommonBorderPaddingBackground tablePartBackground;
/** See {@link RowPainter#registerPartBackgroundArea(Block)}. */
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java Fri Jul 18 14:21:06 2014
@@ -69,8 +69,8 @@ public class TableContentLayoutManager i
private TableRowIterator footerIter;
private LinkedList headerList;
private LinkedList footerList;
- private int headerNetHeight = 0;
- private int footerNetHeight = 0;
+ private int headerNetHeight;
+ private int footerNetHeight;
private int startXOffset;
private int usedBPD;
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java Fri Jul 18 14:21:06 2014
@@ -75,7 +75,7 @@ public class TableLayoutManager extends
private static Log log = LogFactory.getLog(TableLayoutManager.class);
private TableContentLayoutManager contentLM;
- private ColumnSetup columns = null;
+ private ColumnSetup columns;
private Block curBlockArea;
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/table/TableRowIterator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/table/TableRowIterator.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/table/TableRowIterator.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/layoutmgr/table/TableRowIterator.java Fri Jul 18 14:21:06 2014
@@ -51,7 +51,7 @@ public class TableRowIterator {
private Iterator rowGroupsIter;
- private int rowIndex = 0;
+ private int rowIndex;
/**
* Creates a new TableRowIterator.
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/AbstractPDFStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/AbstractPDFStream.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/AbstractPDFStream.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/AbstractPDFStream.java Fri Jul 18 14:21:06 2014
@@ -60,7 +60,7 @@ public abstract class AbstractPDFStream
return dictionary;
}
- protected Object get(String key) {
+ public Object get(String key) {
return dictionary.get(key);
}
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/BitmapImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/BitmapImage.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/BitmapImage.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/BitmapImage.java Fri Jul 18 14:21:06 2014
@@ -34,7 +34,7 @@ public class BitmapImage implements PDFI
private PDFDeviceColorSpace colorSpace;
private byte[] bitmaps;
private PDFReference maskRef;
- private PDFColor transparent = null;
+ private PDFColor transparent;
private String key;
private PDFDocument pdfDoc;
private PDFFilter pdfFilter;
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFDocument.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFDocument.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFDocument.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFDocument.java Fri Jul 18 14:21:06 2014
@@ -167,6 +167,8 @@ public class PDFDocument {
private boolean accessibilityEnabled;
+ private boolean mergeFontsEnabled;
+
/**
* Creates an empty PDF document.
*
@@ -1082,6 +1084,14 @@ public class PDFDocument {
return trailerDictionary;
}
+ public boolean isMergeFontsEnabled() {
+ return mergeFontsEnabled;
+ }
+
+ public void setMergeFontsEnabled(boolean mergeFontsEnabled) {
+ this.mergeFontsEnabled = mergeFontsEnabled;
+ }
+
private interface TrailerOutputHelper {
void outputStructureTreeElements(OutputStream stream) throws IOException;
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFFactory.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFFactory.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFFactory.java Fri Jul 18 14:21:06 2014
@@ -877,9 +877,15 @@ public class PDFFactory {
PDFFont font = null;
font = PDFFont.createFont(fontname, fonttype, subsetFontName, null);
- getDocument().registerObject(font);
+ if (descriptor instanceof RefPDFFont) {
+ font.setObjectNumber(((RefPDFFont)descriptor).getRef().getObjectNumber());
+ font.setDocument(getDocument());
+ getDocument().addObject(font);
+ } else {
+ getDocument().registerObject(font);
+ }
- if (fonttype == FontType.TYPE0) {
+ if ((fonttype == FontType.TYPE0 || fonttype == FontType.CIDTYPE0)) {
font.setEncoding(encoding);
CIDFont cidMetrics;
if (metrics instanceof LazyFont) {
@@ -890,16 +896,30 @@ public class PDFFactory {
PDFCIDSystemInfo sysInfo = new PDFCIDSystemInfo(cidMetrics.getRegistry(),
cidMetrics.getOrdering(), cidMetrics.getSupplement());
sysInfo.setDocument(document);
+ assert pdfdesc instanceof PDFCIDFontDescriptor;
PDFCIDFont cidFont = new PDFCIDFont(subsetFontName, cidMetrics.getCIDType(),
cidMetrics.getDefaultWidth(), getFontWidths(cidMetrics), sysInfo,
(PDFCIDFontDescriptor) pdfdesc);
getDocument().registerObject(cidFont);
- PDFCMap cmap = new PDFToUnicodeCMap(cidMetrics.getCIDSet().getChars(), "fop-ucs-H",
+
+ PDFCMap cmap;
+ if (cidMetrics instanceof MultiByteFont && ((MultiByteFont) cidMetrics).getCmapStream() != null) {
+ cmap = new PDFCMap("fop-ucs-H", null);
+ try {
+ cmap.setData(IOUtils.toByteArray(((MultiByteFont) cidMetrics).getCmapStream()));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ } else {
+ cmap = new PDFToUnicodeCMap(cidMetrics.getCIDSet().getChars(), "fop-ucs-H",
new PDFCIDSystemInfo("Adobe", "Identity", 0), false);
+ }
getDocument().registerObject(cmap);
+ assert font instanceof PDFFontType0;
((PDFFontType0)font).setCMAP(cmap);
((PDFFontType0)font).setDescendantFonts(cidFont);
} else {
+ assert font instanceof PDFFontNonBase14;
PDFFontNonBase14 nonBase14 = (PDFFontNonBase14)font;
nonBase14.setDescriptor(pdfdesc);
@@ -965,6 +985,29 @@ public class PDFFactory {
font.setEncoding(mapping.getName());
//No ToUnicode CMap necessary if PDF 1.4, chapter 5.9 (page 368) is to be
//believed.
+ } else if (mapping.getName().equals("FOPPDFEncoding")) {
+ String[] charNameMap = mapping.getCharNameMap();
+ char[] intmap = mapping.getUnicodeCharMap();
+ PDFArray differences = new PDFArray();
+ int len = intmap.length;
+ if (charNameMap.length < len) {
+ len = charNameMap.length;
+ }
+ int last = 0;
+ for (int i = 0; i < len; i++) {
+ if (intmap[i] - 1 != last) {
+ differences.add(intmap[i]);
+ }
+ last = intmap[i];
+ differences.add(new PDFName(charNameMap[i]));
+ }
+ PDFEncoding pdfEncoding = new PDFEncoding(singleByteFont.getEncodingName());
+ getDocument().registerObject(pdfEncoding);
+ pdfEncoding.setDifferences(differences);
+ font.setEncoding(pdfEncoding);
+ if (mapping.getUnicodeCharMap() != null) {
+ generateToUnicodeCmap(nonBase14, mapping);
+ }
} else {
Object pdfEncoding = createPDFEncoding(mapping,
singleByteFont.getFontName());
@@ -1028,8 +1071,30 @@ public class PDFFactory {
private PDFWArray getFontWidths(CIDFont cidFont) {
// Create widths for reencoded chars
PDFWArray warray = new PDFWArray();
- int[] widths = cidFont.getCIDSet().getWidths();
- warray.addEntry(0, widths);
+ if (cidFont instanceof MultiByteFont && ((MultiByteFont)cidFont).getWidthsMap() != null) {
+ Map<Integer, Integer> map = ((MultiByteFont)cidFont).getWidthsMap();
+ for (Map.Entry<Integer, Integer> cid : map.entrySet()) {
+ warray.addEntry(cid.getKey(), new int[] {cid.getValue()});
+ }
+// List<Integer> l = new ArrayList<Integer>(map.keySet());
+// for (int i=0; i<map.size(); i++) {
+// int cid = l.get(i);
+// List<Integer> cids = new ArrayList<Integer>();
+// cids.add(map.get(cid));
+// while (i<map.size()-1 && l.get(i) + 1 == l.get(i + 1)) {
+// cids.add(map.get(l.get(i + 1)));
+// i++;
+// }
+// int[] cidsints = new int[cids.size()];
+// for (int j=0; j<cids.size(); j++) {
+// cidsints[j] = cids.get(j);
+// }
+// warray.addEntry(cid, cidsints);
+// }
+ } else {
+ int[] widths = cidFont.getCIDSet().getWidths();
+ warray.addEntry(0, widths);
+ }
return warray;
}
@@ -1059,7 +1124,7 @@ public class PDFFactory {
private PDFFontDescriptor makeFontDescriptor(FontDescriptor desc, String fontPrefix) {
PDFFontDescriptor descriptor = null;
- if (desc.getFontType() == FontType.TYPE0) {
+ if (desc.getFontType() == FontType.TYPE0 || desc.getFontType() == FontType.CIDTYPE0) {
// CID Font
descriptor = new PDFCIDFontDescriptor(fontPrefix + desc.getEmbedFontName(),
desc.getFontBBox(),
@@ -1143,55 +1208,64 @@ public class PDFFactory {
in = font.getInputStream();
if (in == null) {
return null;
- } else {
- AbstractPDFStream embeddedFont = null;
- if (desc.getFontType() == FontType.TYPE0) {
- MultiByteFont mbfont = (MultiByteFont) font;
- FontFileReader reader = new FontFileReader(in);
- byte[] fontBytes;
- String header = OFFontLoader.readHeader(reader);
- boolean isCFF = mbfont.isOTFFile();
- if (font.getEmbeddingMode() == EmbeddingMode.FULL) {
- fontBytes = reader.getAllBytes();
- if (isCFF) {
- //Ensure version 1.6 for full OTF CFF embedding
- document.setPDFVersion(Version.V1_6);
- }
- } else {
- fontBytes = getFontSubsetBytes(reader, mbfont, header, fontPrefix, desc,
- isCFF);
- }
- embeddedFont = getFontStream(font, fontBytes, isCFF);
- } else if (desc.getFontType() == FontType.TYPE1) {
- if (font.getEmbeddingMode() != EmbeddingMode.SUBSET) {
- embeddedFont = fullyEmbedType1Font(in);
- } else {
- assert font instanceof SingleByteFont;
- SingleByteFont sbfont = (SingleByteFont)font;
- Type1SubsetFile pfbFile = new Type1SubsetFile();
- byte[] subsetData = pfbFile.createSubset(in, sbfont, fontPrefix);
- InputStream subsetStream = new ByteArrayInputStream(subsetData);
- PFBParser parser = new PFBParser();
- PFBData pfb = parser.parsePFB(subsetStream);
- embeddedFont = new PDFT1Stream();
- ((PDFT1Stream) embeddedFont).setData(pfb);
+ }
+ AbstractPDFStream embeddedFont = null;
+ if (desc.getFontType() == FontType.TYPE0) {
+ MultiByteFont mbfont = (MultiByteFont) font;
+ FontFileReader reader = new FontFileReader(in);
+ byte[] fontBytes;
+ String header = OFFontLoader.readHeader(reader);
+ boolean isCFF = mbfont.isOTFFile();
+ if (font.getEmbeddingMode() == EmbeddingMode.FULL) {
+ fontBytes = reader.getAllBytes();
+ if (isCFF) {
+ //Ensure version 1.6 for full OTF CFF embedding
+ document.setPDFVersion(Version.V1_6);
}
} else {
- byte[] file = IOUtils.toByteArray(in);
- embeddedFont = new PDFTTFStream(file.length);
- ((PDFTTFStream) embeddedFont).setData(file, file.length);
+ fontBytes = getFontSubsetBytes(reader, mbfont, header, fontPrefix, desc,
+ isCFF);
}
-
- /*
- embeddedFont.getFilterList().addFilter("flate");
- if (getDocument().isEncryptionActive()) {
- getDocument().applyEncryption(embeddedFont);
+ embeddedFont = getFontStream(font, fontBytes, isCFF);
+ } else if (desc.getFontType() == FontType.TYPE1) {
+ if (font.getEmbeddingMode() != EmbeddingMode.SUBSET) {
+ embeddedFont = fullyEmbedType1Font(in);
} else {
- embeddedFont.getFilterList().addFilter("ascii-85");
- }*/
-
- return embeddedFont;
+ assert font instanceof SingleByteFont;
+ SingleByteFont sbfont = (SingleByteFont)font;
+ Type1SubsetFile pfbFile = new Type1SubsetFile();
+ byte[] subsetData = pfbFile.createSubset(in, sbfont);
+ InputStream subsetStream = new ByteArrayInputStream(subsetData);
+ PFBParser parser = new PFBParser();
+ PFBData pfb = parser.parsePFB(subsetStream);
+ embeddedFont = new PDFT1Stream();
+ ((PDFT1Stream) embeddedFont).setData(pfb);
+ }
+ } else if (desc.getFontType() == FontType.TYPE1C) {
+ byte[] file = IOUtils.toByteArray(in);
+ PDFCFFStream embeddedFont2 = new PDFCFFStream("Type1C");
+ embeddedFont2.setData(file);
+ return embeddedFont2;
+ } else if (desc.getFontType() == FontType.CIDTYPE0) {
+ byte[] file = IOUtils.toByteArray(in);
+ PDFCFFStream embeddedFont2 = new PDFCFFStream("CIDFontType0C");
+ embeddedFont2.setData(file);
+ return embeddedFont2;
+ } else {
+ byte[] file = IOUtils.toByteArray(in);
+ embeddedFont = new PDFTTFStream(file.length);
+ ((PDFTTFStream) embeddedFont).setData(file, file.length);
}
+
+ /*
+ embeddedFont.getFilterList().addFilter("flate");
+ if (getDocument().isEncryptionActive()) {
+ getDocument().applyEncryption(embeddedFont);
+ } else {
+ embeddedFont.getFilterList().addFilter("ascii-85");
+ }*/
+
+ return embeddedFont;
} catch (IOException ioe) {
log.error("Failed to embed font [" + desc + "] " + desc.getEmbedFontName(), ioe);
return null;
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFFilter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFFilter.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFFilter.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFFilter.java Fri Jul 18 14:21:06 2014
@@ -45,7 +45,7 @@ public abstract class PDFFilter {
/**
* Marker to know if this filter has already been applied to the data
*/
- private boolean applied = false;
+ private boolean applied;
/**
* Check if this filter has been applied.
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFFilterList.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFFilterList.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFFilterList.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFFilterList.java Fri Jul 18 14:21:06 2014
@@ -50,9 +50,9 @@ public class PDFFilterList {
private List<PDFFilter> filters = new java.util.ArrayList<PDFFilter>();
- private boolean ignoreASCIIFilters = false;
+ private boolean ignoreASCIIFilters;
- private boolean disableAllFilters = false;
+ private boolean disableAllFilters;
/**
* Default constructor.
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFFont.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFFont.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFFont.java Fri Jul 18 14:21:06 2014
@@ -105,10 +105,11 @@ public class PDFFont extends PDFDictiona
public static PDFFont createFont(String fontname,
FontType subtype, String basefont,
Object encoding) {
- if (subtype == FontType.TYPE0) {
+ if (subtype == FontType.TYPE0 || subtype == FontType.CIDTYPE0) {
return new PDFFontType0(fontname, basefont,
encoding);
} else if ((subtype == FontType.TYPE1)
+ || (subtype == FontType.TYPE1C)
|| (subtype == FontType.MMTYPE1)) {
return new PDFFontType1(fontname, basefont,
encoding);
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFFontDescriptor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFFontDescriptor.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFFontDescriptor.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFFontDescriptor.java Fri Jul 18 14:21:06 2014
@@ -102,7 +102,7 @@ public class PDFFontDescriptor extends P
public void setFontFile(FontType subtype, AbstractPDFStream fontfile) {
if (subtype == FontType.TYPE1) {
put("FontFile", fontfile);
- } else if (fontfile instanceof PDFCFFStreamType0C) {
+ } else if (fontfile instanceof PDFCFFStreamType0C || subtype == FontType.TYPE1C) {
put("FontFile3", fontfile);
} else {
put("FontFile2", fontfile);
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFGoTo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFGoTo.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFGoTo.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFGoTo.java Fri Jul 18 14:21:06 2014
@@ -32,9 +32,9 @@ public class PDFGoTo extends PDFAction {
* the pageReference
*/
private String pageReference;
- private String destination = null;
- private float xPosition = 0;
- private float yPosition = 0;
+ private String destination;
+ private float xPosition;
+ private float yPosition;
/**
* create a /GoTo object.
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFGoToRemote.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFGoToRemote.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFGoToRemote.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFGoToRemote.java Fri Jul 18 14:21:06 2014
@@ -28,9 +28,9 @@ public class PDFGoToRemote extends PDFAc
* the file specification
*/
private PDFReference pdfFileSpec;
- private int pageReference = 0;
- private String destination = null;
- private boolean newWindow = false;
+ private int pageReference;
+ private String destination;
+ private boolean newWindow;
/**
* Create an GoToR object.
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFInfo.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFInfo.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFInfo.java Fri Jul 18 14:21:06 2014
@@ -81,12 +81,12 @@ public class PDFInfo extends PDFObject {
*/
private String producer;
- private String title = null;
- private String author = null;
- private String subject = null;
- private String keywords = null;
- private Date creationDate = null;
- private Date modDate = null;
+ private String title;
+ private String author;
+ private String subject;
+ private String keywords;
+ private Date creationDate;
+ private Date modDate;
private Map<PDFName, String> customProperties;
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFObject.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFObject.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFObject.java Fri Jul 18 14:21:06 2014
@@ -46,7 +46,7 @@ public abstract class PDFObject implemen
/**
* the object's generation (0 in new documents)
*/
- private int generation = 0;
+ private int generation;
/**
* the parent PDFDocument
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFOutline.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFOutline.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFOutline.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFOutline.java Fri Jul 18 14:21:06 2014
@@ -51,7 +51,7 @@ public class PDFOutline extends PDFObjec
private int count;
// whether to show this outline item's child outline items
- private boolean openItem = false;
+ private boolean openItem;
/**
* title to display for the bookmark entry
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFPages.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFPages.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFPages.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFPages.java Fri Jul 18 14:21:06 2014
@@ -39,7 +39,7 @@ public class PDFPages extends PDFObject
/**
* the number of /Page objects
*/
- protected int count = 0;
+ protected int count;
// private PDFPages parent;
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFPaintingState.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFPaintingState.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFPaintingState.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFPaintingState.java Fri Jul 18 14:21:06 2014
@@ -248,17 +248,17 @@ public class PDFPaintingState extends or
private static final long serialVersionUID = 3527950647293177764L;
- private Paint paint = null;
- private Paint backPaint = null;
+ private Paint paint;
+ private Paint backPaint;
//private int lineCap = 0; //Disabled the ones that are not used, yet
//private int lineJoin = 0;
//private float miterLimit = 0;
//private int dashOffset = 0;
- private Shape clip = null;
- private PDFGState gstate = null;
+ private Shape clip;
+ private PDFGState gstate;
//text state
- private float characterSpacing = 0f;
+ private float characterSpacing;
/** {@inheritDoc} */
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org