Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/afp/fonts/CharactersetEncoderTestCase.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/afp/fonts/CharactersetEncoderTestCase.java?rev=1343310&r1=1343309&r2=1343310&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/afp/fonts/CharactersetEncoderTestCase.java (original) +++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/afp/fonts/CharactersetEncoderTestCase.java Mon May 28 16:16:23 2012 @@ -19,10 +19,6 @@ package org.apache.fop.afp.fonts; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.nio.charset.CharacterCodingException; @@ -30,6 +26,10 @@ import java.nio.charset.CharacterCodingE import org.junit.Before; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + /** * Test {@link CharactersetEncoder} */ @@ -39,8 +39,9 @@ public class CharactersetEncoderTestCase @Before public void setUp() { - singlebyteEncoder = CharactersetEncoder.newInstance("cp500", false); - doublebyteEncoder = CharactersetEncoder.newInstance("cp937", true); + singlebyteEncoder = CharactersetEncoder.newInstance("cp500", CharacterSetType.SINGLE_BYTE); + doublebyteEncoder = CharactersetEncoder.newInstance("cp937", + CharacterSetType.DOUBLE_BYTE_LINE_DATA); } // This is just an arbitrary CJK string @@ -95,7 +96,7 @@ public class CharactersetEncoderTestCase @Test public void testEncode() throws CharacterCodingException, IOException { - CharactersetEncoder.EncodedChars encChars;// = doublebyteEncoder.encode(testCJKText); + CharactersetEncoder.EncodedChars encChars; // = doublebyteEncoder.encode(testCJKText); ByteArrayOutputStream bOut = new ByteArrayOutputStream(); // JAVA 1.5 has a bug in the JVM in which these err for some reason... JAVA 1.6 no issues /*encChars.writeTo(bOut, 0, encChars.getLength());
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/events/EventProcessingTestCase.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/events/EventProcessingTestCase.java?rev=1343310&r1=1343309&r2=1343310&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/events/EventProcessingTestCase.java (original) +++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/events/EventProcessingTestCase.java Mon May 28 16:16:23 2012 @@ -124,4 +124,16 @@ public class EventProcessingTestCase { doTest("inline-level.fo", InlineLevelEventProducer.class.getName() + ".lineOverflows"); } + + @Test + public void testViewportIPDOverflow() throws FOPException, TransformerException, IOException, + SAXException { + doTest("viewport-overflow.fo", BlockLevelEventProducer.class.getName() + ".viewportIPDOverflow"); + } + + @Test + public void testViewportBPDOverflow() throws FOPException, TransformerException, IOException, + SAXException { + doTest("viewport-overflow.fo", BlockLevelEventProducer.class.getName() + ".viewportBPDOverflow"); + } } Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/fo/properties/PropertyListMocks.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/fo/properties/PropertyListMocks.java?rev=1343310&r1=1343309&r2=1343310&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/fo/properties/PropertyListMocks.java (original) +++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/fo/properties/PropertyListMocks.java Mon May 28 16:16:23 2012 @@ -69,6 +69,10 @@ public final class PropertyListMocks { final Property borderCollapseProperty = mock(Property.class); when(borderCollapseProperty.getEnum()).thenReturn(Constants.EN_SEPARATE); when(mockPList.get(Constants.PR_BORDER_COLLAPSE)).thenReturn(borderCollapseProperty); + + final Property writingModeProperty = mock(Property.class); + when(writingModeProperty.getEnum()).thenReturn(Constants.EN_LR_TB); + when(mockPList.get(Constants.PR_WRITING_MODE)).thenReturn(writingModeProperty); } catch (PropertyException e) { throw new RuntimeException(e); } Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/render/intermediate/IFStructureTreeBuilderTestCase.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/render/intermediate/IFStructureTreeBuilderTestCase.java?rev=1343310&r1=1343309&r2=1343310&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/render/intermediate/IFStructureTreeBuilderTestCase.java (original) +++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/render/intermediate/IFStructureTreeBuilderTestCase.java Mon May 28 16:16:23 2012 @@ -61,7 +61,7 @@ public class IFStructureTreeBuilderTestC // Expected } - sut.startPageSequence(null); + sut.startPageSequence(null, null); sut.endPageSequence(); sut.replayEventsForPageSequence(handler, 0); @@ -89,7 +89,7 @@ public class IFStructureTreeBuilderTestC final String nodeName = "block"; final ContentHandler handler = mock(ContentHandler.class); - sut.startPageSequence(null); + sut.startPageSequence(null, null); sut.startNode(nodeName, createSimpleAttributes(attributes)); sut.endPageSequence(); @@ -105,7 +105,7 @@ public class IFStructureTreeBuilderTestC final String nodeName = "block"; final ContentHandler handler = mock(ContentHandler.class); - sut.startPageSequence(null); + sut.startPageSequence(null, null); sut.endNode(nodeName); sut.endPageSequence(); Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/bidi_propagation_1.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/bidi_propagation_1.xml?rev=1343310&r1=1343309&r2=1343310&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/bidi_propagation_1.xml (original) +++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/bidi_propagation_1.xml Mon May 28 16:16:23 2012 @@ -66,7 +66,7 @@ <fo:table-cell margin-left="0" text-align="right"> <fo:block> <fo:inline> - <fo:inline><fo:bidi-override unicode-bidi="bidi-override" direction="rtl">X</fo:bidi-override></fo:inline> + <fo:inline><fo:bidi-override unicode-bidi="bidi-override" direction="rtl">XY</fo:bidi-override></fo:inline> </fo:inline> </fo:block> </fo:table-cell> @@ -93,7 +93,7 @@ <fo:table-cell margin-left="0" text-align="right"> <fo:block> <fo:inline> - <fo:inline><fo:bidi-override unicode-bidi="bidi-override" direction="rtl">X</fo:bidi-override></fo:inline> + <fo:inline><fo:bidi-override unicode-bidi="bidi-override" direction="rtl">XY</fo:bidi-override></fo:inline> </fo:inline> </fo:block> </fo:table-cell> Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/character_writing-mode_rl.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/character_writing-mode_rl.xml?rev=1343310&r1=1343309&r2=1343310&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/character_writing-mode_rl.xml (original) +++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/character_writing-mode_rl.xml Mon May 28 16:16:23 2012 @@ -59,18 +59,18 @@ <eval expected="6672" xpath="//flow/block[2]/block[1]/block[1]/lineArea/inlineparent/text[1]/@ipd"/> <eval expected="4" xpath="//flow/block[2]/block[1]/block[1]/lineArea/inlineparent/text[1]/word[1]"/> <eval expected="3" xpath="//flow/block[2]/block[1]/block[1]/lineArea/inlineparent/text[1]/word[1]/@level"/> - <true xpath="boolean(//flow/block[2]/block[1]/block[1]/lineArea/inlineparent/text[1]/word[1]/@reversed)"/> + <eval expected="" xpath="//flow/block[2]/block[1]/block[1]/lineArea/inlineparent/text[1]/word[1]/@reversed"/> <eval expected="6672" xpath="//flow/block[2]/block[1]/block[1]/lineArea/inlineparent/text[2]/@ipd"/> <eval expected="3" xpath="//flow/block[2]/block[1]/block[1]/lineArea/inlineparent/text[2]/word[1]"/> - <eval expected="3" xpath="//flow/block[2]/block[1]/block[1]/lineArea/inlineparent/text[1]/word[1]/@level"/> - <true xpath="boolean(//flow/block[2]/block[1]/block[1]/lineArea/inlineparent/text[1]/word[1]/@reversed)"/> + <eval expected="3" xpath="//flow/block[2]/block[1]/block[1]/lineArea/inlineparent/text[2]/word[1]/@level"/> + <eval expected="" xpath="//flow/block[2]/block[1]/block[1]/lineArea/inlineparent/text[2]/word[1]/@reversed"/> <eval expected="6672" xpath="//flow/block[2]/block[1]/block[1]/lineArea/inlineparent/text[3]/@ipd"/> <eval expected="2" xpath="//flow/block[2]/block[1]/block[1]/lineArea/inlineparent/text[3]/word[1]"/> <eval expected="3" xpath="//flow/block[2]/block[1]/block[1]/lineArea/inlineparent/text[3]/word[1]/@level"/> - <true xpath="boolean(//flow/block[2]/block[1]/block[1]/lineArea/inlineparent/text[3]/word[1]/@reversed)"/> + <eval expected="" xpath="//flow/block[2]/block[1]/block[1]/lineArea/inlineparent/text[3]/word[1]/@reversed"/> <eval expected="6672" xpath="//flow/block[2]/block[1]/block[1]/lineArea/inlineparent/text[4]/@ipd"/> <eval expected="1" xpath="//flow/block[2]/block[1]/block[1]/lineArea/inlineparent/text[4]/word[1]"/> <eval expected="3" xpath="//flow/block[2]/block[1]/block[1]/lineArea/inlineparent/text[4]/word[1]/@level"/> - <true xpath="boolean(//flow/block[2]/block[1]/block[1]/lineArea/inlineparent/text[4]/word[1]/@reversed)"/> + <eval expected="" xpath="//flow/block[2]/block[1]/block[1]/lineArea/inlineparent/text[4]/word[1]/@reversed"/> </checks> </testcase> Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/1.5/test.pdf URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/1.5/test.pdf?rev=1343310&r1=1343309&r2=1343310&view=diff ============================================================================== Binary files - no diff available. Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/background-image_jpg_repeat.pdf URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/background-image_jpg_repeat.pdf?rev=1343310&r1=1343309&r2=1343310&view=diff ============================================================================== Binary files - no diff available. Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/background-image_jpg_single.pdf URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/background-image_jpg_single.pdf?rev=1343310&r1=1343309&r2=1343310&view=diff ============================================================================== Binary files - no diff available. Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/background-image_png_repeat.pdf URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/background-image_png_repeat.pdf?rev=1343310&r1=1343309&r2=1343310&view=diff ============================================================================== Binary files - no diff available. Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/background-image_png_single.pdf URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/background-image_png_single.pdf?rev=1343310&r1=1343309&r2=1343310&view=diff ============================================================================== Binary files - no diff available. Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/background-image_svg_repeat.pdf URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/background-image_svg_repeat.pdf?rev=1343310&r1=1343309&r2=1343310&view=diff ============================================================================== Binary files - no diff available. Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/background-image_svg_single.pdf URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/background-image_svg_single.pdf?rev=1343310&r1=1343309&r2=1343310&view=diff ============================================================================== Binary files - no diff available. Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/complete.pdf URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/complete.pdf?rev=1343310&r1=1343309&r2=1343310&view=diff ============================================================================== Binary files - no diff available. Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/image_jpg.pdf URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/image_jpg.pdf?rev=1343310&r1=1343309&r2=1343310&view=diff ============================================================================== Binary files - no diff available. Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/image_png.pdf URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/image_png.pdf?rev=1343310&r1=1343309&r2=1343310&view=diff ============================================================================== Binary files - no diff available. Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/image_svg.pdf URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/image_svg.pdf?rev=1343310&r1=1343309&r2=1343310&view=diff ============================================================================== Binary files - no diff available. Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/image_wmf.pdf URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/image_wmf.pdf?rev=1343310&r1=1343309&r2=1343310&view=diff ============================================================================== Binary files - no diff available. Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/leader.pdf URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/leader.pdf?rev=1343310&r1=1343309&r2=1343310&view=diff ============================================================================== Binary files - no diff available. Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/links.pdf URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/links.pdf?rev=1343310&r1=1343309&r2=1343310&view=diff ============================================================================== Binary files - no diff available. Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/role.pdf URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/role.pdf?rev=1343310&r1=1343309&r2=1343310&view=diff ============================================================================== Binary files - no diff available. Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/role_non-standard.pdf URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/role_non-standard.pdf?rev=1343310&r1=1343309&r2=1343310&view=diff ============================================================================== Binary files - no diff available. Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/text_1.pdf URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/text_1.pdf?rev=1343310&r1=1343309&r2=1343310&view=diff ============================================================================== Binary files - no diff available. Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/text_2.pdf URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/text_2.pdf?rev=1343310&r1=1343309&r2=1343310&view=diff ============================================================================== Binary files - no diff available. Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/text_font-embedding.pdf URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/text_font-embedding.pdf?rev=1343310&r1=1343309&r2=1343310&view=diff ============================================================================== Binary files - no diff available. Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/role.fo URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/role.fo?rev=1343310&r1=1343309&r2=1343310&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/role.fo (original) +++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/role.fo Mon May 28 16:16:23 2012 @@ -19,12 +19,17 @@ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"; language="en" country="GB"> <fo:layout-master-set> <fo:simple-page-master master-name="page" - page-height="220pt" page-width="320pt" margin="10pt"> - <fo:region-body/> + page-height="240pt" page-width="320pt" margin="10pt" margin-bottom="8pt"> + <fo:region-body margin-bottom="20pt"/> + <fo:region-after extent="10pt"/> </fo:simple-page-master> </fo:layout-master-set> - <fo:page-sequence master-reference="page"> - <fo:flow flow-name="xsl-region-body" hyphenate="true" font-family="sans-serif"> + <fo:page-sequence master-reference="page" role="Art"> + <fo:static-content flow-name="xsl-region-after" role="NonStruct" font-size="8pt"> + <fo:block text-align="center"><fo:page-number/></fo:block> + </fo:static-content> + <fo:flow flow-name="xsl-region-body" role="NonStruct" hyphenate="true" + font-family="sans-serif"> <fo:block role="H1" font-weight="bold" font-size="150%" space-before.minimum="1.5em" space-before.optimum="2em" --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
