Fix compilation error caused by incorrect package name in generated code. Also update...

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@489620 13f79535-47bb-0310-9956-ffa450edef68

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 b956cabff4e949b65911d17410a35996e7d7e097..7eba4573a1f30f53b914e71b104e78ae9051b07c 100644 (file)
--- 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 285b8a5e6cf76939acfd425cb1c4b87dfa937d97..30883ffb21f5a2c316de0cc15913411580a32e4d 100644 (file)
--- 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 6ec075a08e648e85556cd38e9f9d38bad96cfe02..f832d089676ad947568220bc2d1a3a4bfedf93b7 100644 (file)
--- 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 973891f6580120f245348e9ab1acfbcba0797ec4..101e5197dcc40370066ed003d3f5f3072c789797 100755 (executable)
--- 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)
           </fo:block>
           <fo:block background-color="yellow" margin="0pt 0pt 3pt 0pt">
-            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
           </fo:block>
           <fo:block background-color="silver" font-size="8pt" margin="3pt 0pt 0pt 0pt">
             EX -- Exclamation / interrogation (XB)
@@ -101,7 +101,7 @@
             OP -- Opening Punctuation (XA)
           </fo:block>
           <fo:block background-color="yellow" margin="0pt 0pt 3pt 0pt">
-            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
           </fo:block>
           <fo:block background-color="silver" font-size="8pt" margin="3pt 0pt 0pt 0pt">
             SY -- Symbols Allowing Break After (A)
@@ -139,9 +139,9 @@
       <eval expected="117250" xpath="//flow/block[9]/lineArea[2]/text/@ipd"/>
 
       <eval expected="3" xpath="count(//flow/block[11]/lineArea)"/>
-      <eval expected="122250" xpath="//flow/block[11]/lineArea[1]/text/@ipd"/>
-      <eval expected="166730" xpath="//flow/block[11]/lineArea[2]/text/@ipd"/>
-      <eval expected="52800" xpath="//flow/block[11]/lineArea[3]/text/@ipd"/>
+      <eval expected="130590" xpath="//flow/block[11]/lineArea[1]/text/@ipd"/>
+      <eval expected="168960" xpath="//flow/block[11]/lineArea[2]/text/@ipd"/>
+      <eval expected="70030" xpath="//flow/block[11]/lineArea[3]/text/@ipd"/>
 
       <eval expected="3" xpath="count(//flow/block[13]/lineArea)"/>
       <eval expected="162290" xpath="//flow/block[13]/lineArea[1]/text/@ipd"/>
@@ -172,9 +172,9 @@
       <eval expected="30570" xpath="//flow/block[22]/lineArea[3]/text/@ipd"/>
 
       <eval expected="3" xpath="count(//flow/block[24]/lineArea)"/>
-      <eval expected="163390" xpath="//flow/block[24]/lineArea[1]/text/@ipd"/>
-      <eval expected="144490" xpath="//flow/block[24]/lineArea[2]/text/@ipd"/>
-      <eval expected="27790" xpath="//flow/block[24]/lineArea[3]/text/@ipd"/>
+      <eval expected="128940" xpath="//flow/block[24]/lineArea[1]/text/@ipd"/>
+      <eval expected="158390" xpath="//flow/block[24]/lineArea[2]/text/@ipd"/>
+      <eval expected="76140" xpath="//flow/block[24]/lineArea[3]/text/@ipd"/>
 
       <eval expected="2" xpath="count(//flow/block[26]/lineArea)"/>
       <eval expected="156750" xpath="//flow/block[26]/lineArea[1]/text/@ipd"/>