Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/traits/WritingModeTraits.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/traits/WritingModeTraits.java?rev=1550851&r1=1550850&r2=1550851&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/traits/WritingModeTraits.java (original) +++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/traits/WritingModeTraits.java Fri Dec 13 23:41:13 2013 @@ -31,20 +31,21 @@ public class WritingModeTraits implement private Direction rowProgressionDirection; private Direction shiftDirection; private WritingMode writingMode; + private boolean explicit; /** * Default writing mode traits constructor. */ public WritingModeTraits() { - this (WritingMode.LR_TB); + this (WritingMode.LR_TB, false); } /** * Construct writing mode traits using the specified writing mode. * @param writingMode a writing mode traits object */ - public WritingModeTraits(WritingMode writingMode) { - assignWritingModeTraits(writingMode); + public WritingModeTraits(WritingMode writingMode, boolean explicit) { + assignWritingModeTraits(writingMode, explicit); } /** @@ -125,17 +126,25 @@ public class WritingModeTraits implement } /** + * @return the "explicit-writing-mode" trait. + */ + public boolean getExplicitWritingMode() { + return explicit; + } + + /** * @param writingMode the "writing-mode" trait. */ - public void setWritingMode(WritingMode writingMode) { + public void setWritingMode(WritingMode writingMode, boolean explicit) { this.writingMode = writingMode; + this.explicit = explicit; } /** * @param writingMode the "writing-mode" trait. */ - public void assignWritingModeTraits(WritingMode writingMode) { - writingMode.assignWritingModeTraits(this); + public void assignWritingModeTraits(WritingMode writingMode, boolean explicit) { + writingMode.assignWritingModeTraits(this, explicit); } /**
Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/traits/WritingModeTraitsGetter.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/traits/WritingModeTraitsGetter.java?rev=1550851&r1=1550850&r2=1550851&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/traits/WritingModeTraitsGetter.java (original) +++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/traits/WritingModeTraitsGetter.java Fri Dec 13 23:41:13 2013 @@ -55,4 +55,9 @@ public interface WritingModeTraitsGetter */ WritingMode getWritingMode(); + /** + * @return the "explicit-writing-mode" trait + */ + boolean getExplicitWritingMode(); + } Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/traits/WritingModeTraitsSetter.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/traits/WritingModeTraitsSetter.java?rev=1550851&r1=1550850&r2=1550851&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/traits/WritingModeTraitsSetter.java (original) +++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/traits/WritingModeTraitsSetter.java Fri Dec 13 23:41:13 2013 @@ -58,13 +58,14 @@ public interface WritingModeTraitsSetter * Set value of writing-mode trait. * @param writingMode the "writing-mode" trait */ - void setWritingMode(WritingMode writingMode); + void setWritingMode(WritingMode writingMode, boolean explicit); /** * Collectivelly assign values to all writing mode traits based upon a specific * writing mode. * @param writingMode the "writing-mode" trait + * @param explicit true if writing mode explicitly specified */ - void assignWritingModeTraits(WritingMode writingMode); + void assignWritingModeTraits(WritingMode writingMode, boolean explicit); } Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/util/AbstractPaintingState.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/util/AbstractPaintingState.java?rev=1550851&r1=1550850&r2=1550851&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/util/AbstractPaintingState.java (original) +++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/util/AbstractPaintingState.java Fri Dec 13 23:41:13 2013 @@ -24,7 +24,6 @@ import java.awt.geom.AffineTransform; import java.io.Serializable; import java.util.Arrays; import java.util.Collection; -import java.util.Iterator; import java.util.List; import java.util.Stack; @@ -36,10 +35,10 @@ public abstract class AbstractPaintingSt private static final long serialVersionUID = 5998356138437094188L; /** current state data */ - private AbstractData data = null; + private AbstractData data; /** the state stack */ - private StateStack/*<AbstractData>*/ stateStack = new StateStack/*<AbstractData>*/(); + private StateStack<AbstractData> stateStack = new StateStack<AbstractData>(); /** * Instantiates a new state data object @@ -216,8 +215,7 @@ public abstract class AbstractPaintingSt */ public AffineTransform getTransform() { AffineTransform at = new AffineTransform(); - for (Iterator iter = stateStack.iterator(); iter.hasNext();) { - AbstractData data = (AbstractData)iter.next(); + for (AbstractData data : stateStack) { AffineTransform stackTrans = data.getTransform(); at.concatenate(stackTrans); } @@ -249,7 +247,7 @@ public abstract class AbstractPaintingSt if (stateStack.isEmpty()) { return null; } else { - AbstractData baseData = (AbstractData)stateStack.get(0); + AbstractData baseData = stateStack.get(0); return (AffineTransform) baseData.getTransform().clone(); } } @@ -297,7 +295,7 @@ public abstract class AbstractPaintingSt */ public AbstractData restore() { if (!stateStack.isEmpty()) { - setData((AbstractData)stateStack.pop()); + setData(stateStack.pop()); return this.data; } else { return null; @@ -310,12 +308,11 @@ public abstract class AbstractPaintingSt * * @param dataList a state data list */ - public void saveAll(List/*<AbstractData>*/ dataList) { - Iterator it = dataList.iterator(); - while (it.hasNext()) { + public void saveAll(List<AbstractData> dataList) { + for (AbstractData data : dataList) { // save current data on stack save(); - setData((AbstractData)it.next()); + setData(data); } } @@ -325,8 +322,8 @@ public abstract class AbstractPaintingSt * * @return a list of state data popped from the stack */ - public List/*<AbstractData>*/ restoreAll() { - List/*<AbstractData>*/ dataList = new java.util.ArrayList/*<AbstractData>*/(); + public List<AbstractData> restoreAll() { + List<AbstractData> dataList = new java.util.ArrayList<AbstractData>(); AbstractData data; while (true) { data = getData(); @@ -361,7 +358,7 @@ public abstract class AbstractPaintingSt * * @return the state stack */ - protected Stack/*<AbstractData>*/ getStateStack() { + protected Stack<AbstractData> getStateStack() { return this.stateStack; } @@ -369,8 +366,10 @@ public abstract class AbstractPaintingSt @Override public Object clone() { AbstractPaintingState state = instantiate(); - state.stateStack = new StateStack(this.stateStack); - state.data = (AbstractData)this.data.clone(); + state.stateStack = new StateStack<AbstractData>(this.stateStack); + if (this.data != null) { + state.data = (AbstractData)this.data.clone(); + } return state; } @@ -385,7 +384,7 @@ public abstract class AbstractPaintingSt /** * A stack implementation which holds state objects */ - public class StateStack extends java.util.Stack { + public class StateStack<E> extends java.util.Stack<E> { private static final long serialVersionUID = 4897178211223823041L; @@ -393,7 +392,6 @@ public abstract class AbstractPaintingSt * Default constructor */ public StateStack() { - super(); } /** @@ -419,25 +417,28 @@ public abstract class AbstractPaintingSt private static final long serialVersionUID = 5208418041189828624L; /** The current color */ - protected Color color = null; + protected Color color; /** The current background color */ - protected Color backColor = null; + protected Color backColor; /** The current font name */ - protected String fontName = null; + protected String fontName; /** The current font size */ - protected int fontSize = 0; + protected int fontSize; /** The current line width */ - protected float lineWidth = 0; + protected float lineWidth; /** The dash array for the current basic stroke (line type) */ - protected float[] dashArray = null; + protected float[] dashArray; /** The current transform */ - protected AffineTransform transform = null; + protected AffineTransform transform; + + /** The current (optional content group) layer. */ + protected String layer; /** * Returns a newly create data object @@ -485,6 +486,18 @@ public abstract class AbstractPaintingSt transform = new AffineTransform(); } + public void setLayer(String layer) { + if (layer != null) { + this.layer = layer; + } else { + throw new IllegalArgumentException(); + } + } + + public String getLayer() { + return this.layer; + } + /** * Returns the derived rotation from the current transform * @@ -523,6 +536,7 @@ public abstract class AbstractPaintingSt this.transform = new AffineTransform(); } data.transform = new AffineTransform(this.transform); + data.layer = this.layer; return data; } @@ -535,7 +549,8 @@ public abstract class AbstractPaintingSt + ", fontSize=" + fontSize + ", lineWidth=" + lineWidth + ", dashArray=" + dashArray - + ", transform=" + transform; + + ", transform=" + transform + + ", layer=" + layer; } } } Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/util/GenerationHelperContentHandler.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/util/GenerationHelperContentHandler.java?rev=1550851&r1=1550850&r2=1550851&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/util/GenerationHelperContentHandler.java (original) +++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/util/GenerationHelperContentHandler.java Fri Dec 13 23:41:13 2013 @@ -35,6 +35,7 @@ public class GenerationHelperContentHand private static final Attributes EMPTY_ATTS = new AttributesImpl(); private String mainNamespace; + private Object contentHandlerContext; /** * Main constructor. If the given handler also implements any of the EntityResolver, @@ -42,10 +43,12 @@ public class GenerationHelperContentHand * @param handler the SAX content handler to delegate all calls to * @param mainNamespace the main namespace used for generated XML content when abbreviated * ContentHandler calls are used. + * @param contentHandlerContext additional content handler context state */ - public GenerationHelperContentHandler(ContentHandler handler, String mainNamespace) { + public GenerationHelperContentHandler(ContentHandler handler, String mainNamespace, Object contentHandlerContext) { super(handler); this.mainNamespace = mainNamespace; + this.contentHandlerContext = contentHandlerContext; } /** @@ -66,6 +69,14 @@ public class GenerationHelperContentHand } /** + * Returns the context object (may be null). + * @return the context object + */ + public Object getContentHandlerContext() { + return this.contentHandlerContext; + } + + /** * Convenience method to generate a startElement SAX event. * @param localName the local name of the element * @param atts the attributes Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/util/XMLUtil.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/util/XMLUtil.java?rev=1550851&r1=1550850&r2=1550851&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/util/XMLUtil.java (original) +++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/util/XMLUtil.java Fri Dec 13 23:41:13 2013 @@ -300,4 +300,35 @@ public final class XMLUtil implements XM } } + /** + * Escape '<', '>' and '&' using NCRs. + * @param unescaped string + * @return escaped string + */ + public static String escape(String unescaped) { + int needsEscape = 0; + for (int i = 0, n = unescaped.length(); i < n; ++i) { + char c = unescaped.charAt(i); + if ((c == '<') || (c == '>') || (c == '&')) { + ++needsEscape; + } + } + if (needsEscape > 0) { + StringBuffer sb = new StringBuffer(unescaped.length() + 6 * needsEscape); + for (int i = 0, n = unescaped.length(); i < n; ++i) { + char c = unescaped.charAt(i); + if ((c == '<') || (c == '>') || (c == '&')) { + sb.append("&#x"); + sb.append(Integer.toString(c, 16)); + sb.append(';'); + } else { + sb.append(c); + } + } + return sb.toString(); + } else { + return unescaped; + } + } + } Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java?rev=1550851&r1=1550850&r2=1550851&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java (original) +++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java Fri Dec 13 23:41:13 2013 @@ -229,7 +229,7 @@ public class SVGDocumentHandler extends } private GenerationHelperContentHandler decorate(ContentHandler contentHandler) { - return new GenerationHelperContentHandler(contentHandler, getMainNamespace()); + return new GenerationHelperContentHandler(contentHandler, getMainNamespace(), getContext()); } private void closeCurrentStream() { Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/sandbox/org/apache/fop/render/svg/SVGPainter.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/sandbox/org/apache/fop/render/svg/SVGPainter.java?rev=1550851&r1=1550850&r2=1550851&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/sandbox/org/apache/fop/render/svg/SVGPainter.java (original) +++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/sandbox/org/apache/fop/render/svg/SVGPainter.java Fri Dec 13 23:41:13 2013 @@ -146,16 +146,16 @@ public class SVGPainter extends Abstract } /** {@inheritDoc} */ - public void startGroup(AffineTransform[] transforms) throws IFException { - startGroup(SVGUtil.formatAffineTransformsMptToPt(transforms)); + public void startGroup(AffineTransform[] transforms, String layer) throws IFException { + startGroup(SVGUtil.formatAffineTransformsMptToPt(transforms), layer); } /** {@inheritDoc} */ - public void startGroup(AffineTransform transform) throws IFException { - startGroup(SVGUtil.formatAffineTransformMptToPt(transform)); + public void startGroup(AffineTransform transform, String layer) throws IFException { + startGroup(SVGUtil.formatAffineTransformMptToPt(transform), layer); } - private void startGroup(String transform) throws IFException { + private void startGroup(String transform, String layer) throws IFException { try { AttributesImpl atts = new AttributesImpl(); if (transform != null && transform.length() > 0) { Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/status.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/status.xml?rev=1550851&r1=1550850&r2=1550851&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_WhitespaceManagement/status.xml (original) +++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/status.xml Fri Dec 13 23:41:13 2013 @@ -58,7 +58,19 @@ users, i.e. when the behaviour changes and could affect the layout of existing documents. Example: the fix of marks layering will be such a case when it's done. --> - <release version="FOP Trunk" date="TBD"> + <release version="FOP Trunk" date="01 November 2013"> + <action context="Code" dev="GA" type="fix" fixes-bug="FOP-2311"> + Eliminate regression to shorthand properties from Bugzilla 37114 (FOP-1069). + </action> + <action context="Renderers" dev="GA" type="add" fixes-bug="FOP-2301"> + Enable support for PDF sub-page transitions. + </action> + <action context="Layout" dev="GA" type="fix" fixes-bug="FOP-2310"> + Fix misplaced table cell border in WM RTL context. + </action> + <action context="Renderers" dev="GA" type="add" fixes-bug="FOP-2298"> + Enable support for PDF page transitions. + </action> <action context="Code" dev="PH" type="fix" fixes-bug="FOP-2211" due-to="Alexios Giotis, PH"> Fix and improve the handling of temporary files using the new URI resource resolvers </action> Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/apps/FopConfParserTestCase.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/apps/FopConfParserTestCase.java?rev=1550851&r1=1550850&r2=1550851&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/apps/FopConfParserTestCase.java (original) +++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/apps/FopConfParserTestCase.java Fri Dec 13 23:41:13 2013 @@ -19,6 +19,7 @@ package org.apache.fop.apps; +import java.io.File; import java.io.IOException; import java.io.InputStream; import java.net.URI; @@ -127,4 +128,41 @@ public class FopConfParserTestCase { builder.setPreferRenderer(true); assertTrue(buildFactory().getRendererFactory().isRendererPreferred()); } + + @Test + public void testRelativeURINoBaseNoFont() throws Exception { + checkRelativeURIs("test/config/relative-uri/no-base_no-font.xconf", + "", ""); + } + + @Test + public void testRelativeURINoBaseFont() throws Exception { + checkRelativeURIs("test/config/relative-uri/no-base_font.xconf", + "", "test/config/relative-uri/fonts/"); + } + + @Test + public void testRelativeURIBaseNoFont() throws Exception { + checkRelativeURIs("test/config/relative-uri/base_no-font.xconf", + "test/config/relative-uri/relative/", "test/config/relative-uri/relative/"); + } + + @Test + public void testRelativeURIBaseFont() throws Exception { + checkRelativeURIs("test/config/relative-uri/base_font.xconf", + "test/config/relative-uri/relative/", "test/config/relative-uri/fonts/"); + } + + private void checkRelativeURIs(String conf, String expectedBase, String expectedFontBase) + throws SAXException, IOException { + File configFile = new File(conf); + URI currentDir = new File(".").getCanonicalFile().toURI(); + FopConfParser parser = new FopConfParser(configFile, currentDir); + FopFactoryBuilder fopFactoryBuilder = parser.getFopFactoryBuilder(); + assertEquals("base URI", currentDir.resolve(expectedBase), + fopFactoryBuilder.getBaseURI()); + assertEquals("font base", currentDir.resolve(expectedFontBase), + fopFactoryBuilder.getFontManager().getResourceResolver().getBaseURI()); + } + } Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/complexscripts/bidi/BidiTestData.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/complexscripts/bidi/BidiTestData.java?rev=1550851&r1=1550850&r2=1550851&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/complexscripts/bidi/BidiTestData.java (original) +++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/complexscripts/bidi/BidiTestData.java Fri Dec 13 23:41:13 2013 @@ -23,7 +23,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.ObjectInputStream; -// CSOFF: WhitespaceAfterCheck /* * !!! THIS IS A GENERATED FILE !!! Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/complexscripts/fonts/ttx/TTXFile.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/complexscripts/fonts/ttx/TTXFile.java?rev=1550851&r1=1550850&r2=1550851&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/complexscripts/fonts/ttx/TTXFile.java (original) +++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/complexscripts/fonts/ttx/TTXFile.java Fri Dec 13 23:41:13 2013 @@ -72,9 +72,7 @@ import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; -// CSOFF: InnerAssignmentCheck // CSOFF: LineLengthCheck -// CSOFF: NoWhitespaceAfterCheck /** * This class supports a subset of the <code>TTX</code> file as produced by the Adobe FLEX Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/fonts/EmbedFontInfoTestCase.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/fonts/EmbedFontInfoTestCase.java?rev=1550851&r1=1550850&r2=1550851&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/fonts/EmbedFontInfoTestCase.java (original) +++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/fonts/EmbedFontInfoTestCase.java Fri Dec 13 23:41:13 2013 @@ -35,6 +35,8 @@ import static org.junit.Assert.assertTru */ public class EmbedFontInfoTestCase { + public EmbedFontInfoTestCase() {} + private EmbedFontInfo sut; private final URI metricsURI = URI.create("test/resources/fonts/ttf/glb12.ttf.xml"); Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/fonts/FontsTestSuite.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/fonts/FontsTestSuite.java?rev=1550851&r1=1550850&r2=1550851&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/fonts/FontsTestSuite.java (original) +++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/fonts/FontsTestSuite.java Fri Dec 13 23:41:13 2013 @@ -29,7 +29,7 @@ import org.junit.runners.Suite.SuiteClas @RunWith(Suite.class) @SuiteClasses({ FontManagerConfiguratorTestCase.class, - EmbedFontInfo.class, + EmbedFontInfoTestCase.class, FontEventProcessingTestCase.class, FontManagerConfiguratorTestCase.class }) Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/pdf/PDFDestsTestCase.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/pdf/PDFDestsTestCase.java?rev=1550851&r1=1550850&r2=1550851&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/pdf/PDFDestsTestCase.java (original) +++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/pdf/PDFDestsTestCase.java Fri Dec 13 23:41:13 2013 @@ -32,7 +32,7 @@ import java.util.List; public class PDFDestsTestCase extends PDFObjectTestCase { private PDFDests dests = new PDFDests(); - private String expectedString = "<< /Names [(number) 10 (name) /Test#20name] >>\n"; + private String expectedString = "<< /Names [(number) 10 (name) /Test#20name] >>"; @Before public void setUp() { Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java?rev=1550851&r1=1550850&r2=1550851&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java (original) +++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java Fri Dec 13 23:41:13 2013 @@ -47,7 +47,7 @@ public class PDFDictionaryTestCase exten + " /array [1 (two) 20]\n" + " /number 20\n" + " /null null\n" - + ">>\n"; + + ">>"; @Before public void setUp() { Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/pdf/PDFPageLabelsTestCase.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/pdf/PDFPageLabelsTestCase.java?rev=1550851&r1=1550850&r2=1550851&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/pdf/PDFPageLabelsTestCase.java (original) +++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/pdf/PDFPageLabelsTestCase.java Fri Dec 13 23:41:13 2013 @@ -37,11 +37,11 @@ public class PDFPageLabelsTestCase { int index = 0; StringBuilder expected = new StringBuilder(); expected.append("["); - expected.append(index + " << /S /r >>\n"); + expected.append(index + " << /S /r >>"); pageLabels.addPageLabel(index++, "i"); pageLabels.addPageLabel(index++, "ii"); pageLabels.addPageLabel(index++, "iii"); - expected.append(" " + index + " << /S /D >>\n"); + expected.append(" " + index + " << /S /D >>"); pageLabels.addPageLabel(index++, "1"); pageLabels.addPageLabel(index++, "2"); pageLabels.addPageLabel(index++, "3"); @@ -52,33 +52,33 @@ public class PDFPageLabelsTestCase { pageLabels.addPageLabel(index++, "8"); pageLabels.addPageLabel(index++, "9"); pageLabels.addPageLabel(index++, "10"); - expected.append(" " + index + " << /S /A >>\n"); + expected.append(" " + index + " << /S /A >>"); pageLabels.addPageLabel(index++, "A"); pageLabels.addPageLabel(index++, "B"); - expected.append(" " + index + " << /S /R /St 100 >>\n"); + expected.append(" " + index + " << /S /R /St 100 >>"); pageLabels.addPageLabel(index++, "C"); - expected.append(" " + index + " << /S /R /St 500 >>\n"); + expected.append(" " + index + " << /S /R /St 500 >>"); pageLabels.addPageLabel(index++, "D"); - expected.append(" " + index + " << /S /A /St 5 >>\n"); + expected.append(" " + index + " << /S /A /St 5 >>"); pageLabels.addPageLabel(index++, "E"); pageLabels.addPageLabel(index++, "F"); pageLabels.addPageLabel(index++, "G"); - expected.append(" " + index + " << /P (aa) >>\n"); + expected.append(" " + index + " << /P (aa) >>"); pageLabels.addPageLabel(index++, "aa"); - expected.append(" " + index + " << /P (ab) >>\n"); + expected.append(" " + index + " << /P (ab) >>"); pageLabels.addPageLabel(index++, "ab"); - expected.append(" " + index + " << /P (ac) >>\n"); + expected.append(" " + index + " << /P (ac) >>"); pageLabels.addPageLabel(index++, "ac"); - expected.append(" " + index + " << /S /a >>\n"); + expected.append(" " + index + " << /S /a >>"); pageLabels.addPageLabel(index++, "a"); pageLabels.addPageLabel(index++, "b"); - expected.append(" " + index + " << /S /R /St 2 >>\n"); + expected.append(" " + index + " << /S /R /St 2 >>"); pageLabels.addPageLabel(index++, "II"); - expected.append(" " + index + " << /S /R /St 12 >>\n"); + expected.append(" " + index + " << /S /R /St 12 >>"); pageLabels.addPageLabel(index++, "XII"); - expected.append(" " + index + " <<\n /P (00)\n /S /D\n /St 9\n>>\n"); + expected.append(" " + index + " <<\n /P (00)\n /S /D\n /St 9\n>>"); pageLabels.addPageLabel(index++, "009"); - expected.append(" " + index + " <<\n /P (0)\n /S /D\n /St 10\n>>\n"); + expected.append(" " + index + " <<\n /P (0)\n /S /D\n /St 10\n>>"); pageLabels.addPageLabel(index++, "010"); pageLabels.addPageLabel(index++, "011"); expected.append("]"); Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/pdf/PDFStreamTestCase.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/pdf/PDFStreamTestCase.java?rev=1550851&r1=1550850&r2=1550851&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/pdf/PDFStreamTestCase.java (original) +++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/pdf/PDFStreamTestCase.java Fri Dec 13 23:41:13 2013 @@ -118,7 +118,7 @@ public class PDFStreamTestCase { private byte[] createSampleStreamData() throws IOException { ByteArrayOutputStream stream = new ByteArrayOutputStream(); - stream.write("stream\n".getBytes("US-ASCII")); + stream.write("\nstream\n".getBytes("US-ASCII")); stream.write(createSampleData()); stream.write("\nendstream".getBytes("US-ASCII")); return stream.toByteArray(); Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/pdf/xref/CrossReferenceTableTestCase.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/pdf/xref/CrossReferenceTableTestCase.java?rev=1550851&r1=1550850&r2=1550851&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/pdf/xref/CrossReferenceTableTestCase.java (original) +++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/pdf/xref/CrossReferenceTableTestCase.java Fri Dec 13 23:41:13 2013 @@ -73,7 +73,7 @@ public class CrossReferenceTableTestCase .append(" /Info 2 0 R\n") .append(" /ID [<0123456789ABCDEF> <0123456789ABCDEF>]\n") .append(" /Size ").append(Integer.toString(offsets.size() + 1)).append('\n') - .append(">>\n"); + .append(">>"); return getBytes(expected); } Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/render/intermediate/AbstractIFPainterTestCase.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/render/intermediate/AbstractIFPainterTestCase.java?rev=1550851&r1=1550850&r2=1550851&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/render/intermediate/AbstractIFPainterTestCase.java (original) +++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/render/intermediate/AbstractIFPainterTestCase.java Fri Dec 13 23:41:13 2013 @@ -51,7 +51,7 @@ public class AbstractIFPainterTestCase { public void endViewport() throws IFException { } - public void startGroup(AffineTransform transform) throws IFException { + public void startGroup(AffineTransform transform, String layer) throws IFException { } public void endGroup() throws IFException { Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/fox_external-document_2.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/fox_external-document_2.xml?rev=1550851&r1=1550850&r2=1550851&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/fox_external-document_2.xml (original) +++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/fox_external-document_2.xml Fri Dec 13 23:41:13 2013 @@ -71,8 +71,8 @@ <eval expected="0 0 597172 843913" xpath="//viewport[@prod-id = 'img4']/@pos"/> <eval expected="0 0 843913 597172" xpath="//pageViewport[@nr = '6']/page/regionViewport/@rect"/> - <eval expected="843913" xpath="//pageViewport[@nr = '6']/page/regionViewport/@ipd"/> - <eval expected="597172" xpath="//pageViewport[@nr = '6']/page/regionViewport/@bpd"/> + <eval expected="597172" xpath="//pageViewport[@nr = '6']/page/regionViewport/@ipd"/> + <eval expected="843913" xpath="//pageViewport[@nr = '6']/page/regionViewport/@bpd"/> <eval expected="597172" xpath="//pageViewport[@nr = '6']/page/regionViewport/regionBody/@ipd"/> <eval expected="843913" xpath="//pageViewport[@nr = '6']/page/regionViewport/regionBody/@bpd"/> <eval expected="[0.0 -1.0 1.0 0.0 0.0 597172.0]" xpath="//pageViewport[@nr = '6']/page/regionViewport/regionBody/@ctm"/> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
