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 ma...@apache.org on 2006/12/22 12:13:49 UTC
svn commit: r489620 - in /xmlgraphics/fop/trunk:
src/codegen/unicode/java/org/apache/fop/text/linebreak/
src/java/org/apache/fop/text/linebreak/
test/java/org/apache/fop/text/linebreak/
test/layoutengine/standard-testcases/
Author: manuel
Date: Fri Dec 22 03:13:46 2006
New Revision: 489620
URL: http://svn.apache.org/viewvc?view=rev&rev=489620
Log:
Fix compilation error caused by incorrect package name in generated code. Also updated tests to Unicode 5 UAX#14 pair table compliance.
Modified:
xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/text/linebreak/LineBreakUtils.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakStatusTest.java
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_uax14_linebreaking.xml
Modified: xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java?view=diff&rev=489620&r1=489619&r2=489620
==============================================================================
--- xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java (original)
+++ xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java Fri Dec 22 03:13:46 2006
@@ -252,7 +252,7 @@
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!");
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/text/linebreak/LineBreakUtils.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/text/linebreak/LineBreakUtils.java?view=diff&rev=489620&r1=489619&r2=489620
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/text/linebreak/LineBreakUtils.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/text/linebreak/LineBreakUtils.java Fri Dec 22 03:13:46 2006
@@ -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!
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakStatusTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakStatusTest.java?view=diff&rev=489620&r1=489619&r2=489620
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakStatusTest.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakStatusTest.java Fri Dec 22 03:13:46 2006
@@ -127,7 +127,7 @@
// CL -- Closing Punctuation (XB)
assertTrue(testBreak(
"Right Parenthesis ) break",
- "^^^^^^%^^^^^^^^^^^^^_^^^^"
+ "^^^^^^%^^^^^^^^^^^^^%^^^^"
));
// CM -- Attached Characters and Combining Marks (XB) -- normative
@@ -150,7 +150,7 @@
// EX -- Exclamation / interrogation (XB)
assertTrue(testBreak(
"EX CL ! ) break",
- "^^^%^^^^^^_^^^^"
+ "^^^%^^^^^^%^^^^"
));
assertTrue(testBreak(
@@ -244,7 +244,7 @@
// OP -- Opening Punctuation (XA)
assertTrue(testBreak(
"[ Bracket ( Parenthesis",
- "^^^^^^^^^^_^^^^^^^^^^^^"
+ "^^^^^^^^^^%^^^^^^^^^^^^"
));
// PO -- Postfix (Numeric) (XB)
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_uax14_linebreaking.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_uax14_linebreaking.xml?view=diff&rev=489620&r1=489619&r2=489620
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_uax14_linebreaking.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_uax14_linebreaking.xml Fri Dec 22 03:13:46 2006
@@ -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"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org