summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ui/text.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ui/text.c b/src/ui/text.c
index c4ad8172..ac879af4 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -845,9 +845,9 @@ iLocalDef iBool isClosingBracket_(iChar c) {
845 return (c == ')' || c == ']' || c == '}' || c == '>'); 845 return (c == ')' || c == ']' || c == '}' || c == '>');
846} 846}
847 847
848iLocalDef iBool isBracket_(iChar c) { 848//iLocalDef iBool isBracket_(iChar c) {
849 return (c == '(' || c == '[' || c == '{' || c == '<' || isClosingBracket_(c)); 849// return (c == '(' || c == '[' || c == '{' || c == '<' || isClosingBracket_(c));
850} 850//}
851 851
852iLocalDef iBool isWrapBoundary_(iChar prevC, iChar c) { 852iLocalDef iBool isWrapBoundary_(iChar prevC, iChar c) {
853 /* Line wrapping boundaries are determined by looking at a character and the 853 /* Line wrapping boundaries are determined by looking at a character and the
@@ -857,13 +857,13 @@ iLocalDef iBool isWrapBoundary_(iChar prevC, iChar c) {
857 can wrap text like foo/bar/baz-abc-def.xyz at any puncation boundaries, 857 can wrap text like foo/bar/baz-abc-def.xyz at any puncation boundaries,
858 without wrapping on other punctuation used for expressive purposes like 858 without wrapping on other punctuation used for expressive purposes like
859 emoticons :-) */ 859 emoticons :-) */
860 if (isClosingBracket_(c)) { 860 if (isClosingBracket_(prevC) && !isWrapPunct_(c)) {
861 return iTrue; 861 return iTrue;
862 } 862 }
863 if (isSpace_Char(prevC)) { 863 if (isSpace_Char(prevC)) {
864 return iFalse; 864 return iFalse;
865 } 865 }
866 if ((c == '/' || c == '-' || c == '_' || c == '+') && !isWrapPunct_(prevC)) { 866 if ((prevC == '/' || prevC == '-' || prevC == '_' || prevC == '+') && !isWrapPunct_(c)) {
867 return iTrue; 867 return iTrue;
868 } 868 }
869 return isSpace_Char(c); 869 return isSpace_Char(c);
@@ -1102,7 +1102,7 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
1102 xposExtend = iMax(xposExtend, xpos); 1102 xposExtend = iMax(xposExtend, xpos);
1103 xposMax = iMax(xposMax, xposExtend); 1103 xposMax = iMax(xposMax, xposExtend);
1104 if (args->continueFrom_out && ((mode & noWrapFlag_RunMode) || isWrapBoundary_(prevCh, ch))) { 1104 if (args->continueFrom_out && ((mode & noWrapFlag_RunMode) || isWrapBoundary_(prevCh, ch))) {
1105 lastWordEnd = chPos; 1105 lastWordEnd = currentPos;
1106 } 1106 }
1107#if defined (LAGRANGE_ENABLE_KERNING) 1107#if defined (LAGRANGE_ENABLE_KERNING)
1108 /* Check the next character. */ 1108 /* Check the next character. */