FOP-2044: Hyphenation of Uppercase Words, Combined with Underlines; applied second patch by Robert Meyer; expanded the layout test case.

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

1 files changed, 2 insertions, 1 deletions

diff --git a/src/java/org/apache/fop/hyphenation/HyphenationTree.java b/src/java/org/apache/fop/hyphenation/HyphenationTree.java
index 1709d204a..70fc3f05a 100644
--- a/src/java/org/apache/fop/hyphenation/HyphenationTree.java
+++ b/src/java/org/apache/fop/hyphenation/HyphenationTree.java
@@ -403,7 +403,8 @@ public class HyphenationTree extends TernaryTree
         for (int iNonLetterWord = 0; iNonLetterWord < nonLetterWords.size(); iNonLetterWord++) {
             char[] nonLetterWord = nonLetterWords.get(iNonLetterWord);
             Hyphenation curHyph = hyphenate(nonLetterWord, 0, nonLetterWord.length,
-                    remainCharCount, pushCharCount);
+                    (iNonLetterWord == 0) ? remainCharCount : 1,
+                    (iNonLetterWord == nonLetterWords.size() - 1) ? pushCharCount : 1);
             if (curHyph == null) {
                 continue;
             }