X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2FStringJustifier.java;h=ed202911e1f755d2e547bea905d5333e24a5e4e8;hp=9ea0b7259282f6f4d8ab7a934fe039970aa47daf;hb=HEAD;hpb=620f732927beb44ba33d35cc47646ec53b5f535b diff --git a/src/be/nikiroo/utils/StringJustifier.java b/src/be/nikiroo/utils/StringJustifier.java index 9ea0b72..ed20291 100644 --- a/src/be/nikiroo/utils/StringJustifier.java +++ b/src/be/nikiroo/utils/StringJustifier.java @@ -26,6 +26,9 @@ * * @author Kevin Lamonte [kevin.lamonte@gmail.com] * @version 1 + * + * I added some changes to integrate it here. + * @author Niki */ package be.nikiroo.utils; @@ -220,8 +223,14 @@ class StringJustifier { if ((i + 1) < line.length()) { char car = line.charAt(i); char nextCar = line.charAt(i + 1); - if (nextCar == ' ' || car == '-' || nextCar == '-') { + if (car == ' ' || car == '-' || nextCar == ' ') { needDash = false; + } else if (i > 0) { + char prevCar = line.charAt(i - 1); + if (prevCar == ' ' || prevCar == '-') { + needDash = false; + i--; + } } } @@ -238,8 +247,8 @@ class StringJustifier { // no dash before parenthesis (but cannot add one more // after) if ((i + 1) < line.length()) { - char car = line.charAt(i + 1); - if (car == '(' || car == ')') { + char nextCar = line.charAt(i + 1); + if (nextCar == '(' || nextCar == ')') { needDash = false; } }