Author: malat-guest Date: 2012-01-03 14:13:13 +0000 (Tue, 03 Jan 2012) New Revision: 15634
Modified: trunk/fop/debian/patches/illegalargex.patch Log: Fix copy/paste error Modified: trunk/fop/debian/patches/illegalargex.patch =================================================================== --- trunk/fop/debian/patches/illegalargex.patch 2012-01-03 13:44:48 UTC (rev 15633) +++ trunk/fop/debian/patches/illegalargex.patch 2012-01-03 14:13:13 UTC (rev 15634) @@ -4,8 +4,8 @@ Origin: http://svn.apache.org/viewvc?view=revision&revision=1042115 Index: fop-1.0.dfsg2/src/java/org/apache/fop/fo/FOTreeBuilder.java =================================================================== ---- fop-1.0.dfsg2.orig/src/java/org/apache/fop/fo/FOTreeBuilder.java 2012-01-03 14:40:57.000000000 +0100 -+++ fop-1.0.dfsg2/src/java/org/apache/fop/fo/FOTreeBuilder.java 2012-01-03 14:41:43.000000000 +0100 +--- fop-1.0.dfsg2.orig/src/java/org/apache/fop/fo/FOTreeBuilder.java 2012-01-03 15:12:46.000000000 +0100 ++++ fop-1.0.dfsg2/src/java/org/apache/fop/fo/FOTreeBuilder.java 2012-01-03 15:12:48.000000000 +0100 @@ -398,7 +398,9 @@ FOValidationEventProducer eventProducer = FOValidationEventProducer.Provider.get( @@ -19,8 +19,8 @@ } Index: fop-1.0.dfsg2/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java =================================================================== ---- fop-1.0.dfsg2.orig/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java 2012-01-03 14:40:56.000000000 +0100 -+++ fop-1.0.dfsg2/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java 2012-01-03 14:41:43.000000000 +0100 +--- fop-1.0.dfsg2.orig/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java 2012-01-03 15:12:46.000000000 +0100 ++++ fop-1.0.dfsg2/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java 2012-01-03 15:12:48.000000000 +0100 @@ -774,10 +774,7 @@ while (lastIndex > 0 && foText.charAt(lastIndex - 1) == CharUtilities.SOFT_HYPHEN) { lastIndex--; @@ -32,7 +32,7 @@ boolean kerning = font.hasKerning(); MinOptMax wordIPD = MinOptMax.ZERO; for (int i = thisStart; i < lastIndex; i++) { -@@ -803,24 +800,31 @@ +@@ -803,23 +800,31 @@ } } } @@ -56,7 +56,6 @@ - // add one more letter space, in case other text follows - if (breakOpportunity && !TextLayoutManager.isSpace(ch)) { - iLetterSpaces++; -- } + // shy+chars at start of word: wordLength == 0 && breakOpportunity + // shy only characters in word: wordLength == 0 && !breakOpportunity + int wordLength = lastIndex - thisStart; @@ -69,6 +68,6 @@ + if (breakOpportunity && !TextLayoutManager.isSpace(ch)) { + letterSpaces++; + } + } assert iLetterSpaces >= 0; wordIPD = wordIPD.plus(letterSpaceIPD.mult(iLetterSpaces)); - _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
