From 31b3f8f9eb543d28deedcabd40dc589d0ab72a45 Mon Sep 17 00:00:00 2001 From: Manuel Mall Date: Fri, 22 Dec 2006 11:13:46 +0000 Subject: [PATCH] Fix compilation error caused by incorrect package name in generated code. Also updated tests to Unicode 5 UAX#14 pair table compliance. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@489620 13f79535-47bb-0310-9956-ffa450edef68 --- .../text/linebreak/GenerateLineBreakUtils.java | 2 +- .../fop/text/linebreak/LineBreakUtils.java | 2 +- .../fop/text/linebreak/LineBreakStatusTest.java | 6 +++--- .../block_uax14_linebreaking.xml | 16 ++++++++-------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java b/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java index b956cabff..7eba4573a 100644 --- a/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java +++ b/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java @@ -252,7 +252,7 @@ public class GenerateLineBreakUtils { out.println(); out.println("/* $Id$ */"); out.println(); - out.println("package org.apache.commons.text.linebreak;"); + out.println("package org.apache.fop.text.linebreak;"); out.println(); out.println("/* "); out.println(" * This is a generated file, DO NOT CHANGE!"); diff --git a/src/java/org/apache/fop/text/linebreak/LineBreakUtils.java b/src/java/org/apache/fop/text/linebreak/LineBreakUtils.java index 285b8a5e6..30883ffb2 100644 --- a/src/java/org/apache/fop/text/linebreak/LineBreakUtils.java +++ b/src/java/org/apache/fop/text/linebreak/LineBreakUtils.java @@ -17,7 +17,7 @@ /* $Id$ */ -package org.apache.commons.text.linebreak; +package org.apache.fop.text.linebreak; /* * This is a generated file, DO NOT CHANGE! diff --git a/test/java/org/apache/fop/text/linebreak/LineBreakStatusTest.java b/test/java/org/apache/fop/text/linebreak/LineBreakStatusTest.java index 6ec075a08..f832d0896 100644 --- a/test/java/org/apache/fop/text/linebreak/LineBreakStatusTest.java +++ b/test/java/org/apache/fop/text/linebreak/LineBreakStatusTest.java @@ -127,7 +127,7 @@ public class LineBreakStatusTest extends TestCase { // CL -- Closing Punctuation (XB) assertTrue(testBreak( "Right Parenthesis ) break", - "^^^^^^%^^^^^^^^^^^^^_^^^^" + "^^^^^^%^^^^^^^^^^^^^%^^^^" )); // CM -- Attached Characters and Combining Marks (XB) -- normative @@ -150,7 +150,7 @@ public class LineBreakStatusTest extends TestCase { // EX -- Exclamation / interrogation (XB) assertTrue(testBreak( "EX CL ! ) break", - "^^^%^^^^^^_^^^^" + "^^^%^^^^^^%^^^^" )); assertTrue(testBreak( @@ -244,7 +244,7 @@ public class LineBreakStatusTest extends TestCase { // OP -- Opening Punctuation (XA) assertTrue(testBreak( "[ Bracket ( Parenthesis", - "^^^^^^^^^^_^^^^^^^^^^^^" + "^^^^^^^^^^%^^^^^^^^^^^^" )); // PO -- Postfix (Numeric) (XB) diff --git a/test/layoutengine/standard-testcases/block_uax14_linebreaking.xml b/test/layoutengine/standard-testcases/block_uax14_linebreaking.xml index 973891f65..101e5197d 100755 --- a/test/layoutengine/standard-testcases/block_uax14_linebreaking.xml +++ b/test/layoutengine/standard-testcases/block_uax14_linebreaking.xml @@ -62,7 +62,7 @@ CL -- Closing Punctuation (XB) - Closing )brackets )even )if )preceeded )by )a )space )are )not )a )break )point + Closing ) brackets ) even ) if ) preceeded ) by ) a ) space ) are ) not ) a ) break ) point EX -- Exclamation / interrogation (XB) @@ -101,7 +101,7 @@ OP -- Opening Punctuation (XA) - Opening( brackets( even( if( followed( by( a( space( are( not( a( break( point + Opening ( brackets ( even ( if ( followed ( by ( a ( space ( are ( not ( a ( break ( point SY -- Symbols Allowing Break After (A) @@ -139,9 +139,9 @@ - - - + + + @@ -172,9 +172,9 @@ - - - + + + -- 2.39.5