Changeset 1402 for toiletTweet

Timestamp:

Nov 15, 2006, 1:07:00 PM (16 years ago)

Author:

Sam Hocevar

Message:

• Fix universal smushing.

File:

• toilet/trunk/src/figlet.c (modified) (3 diffs)

toilet/trunk/src/figlet.c

@@ -125 +125 @@
             {
                 if(xleft < cx->x &&
-                   smush(cucul_get_char(cx->charcv, xright, y),
-                         cucul_get_char(cx->cv, cx->x - 1 - xleft, cx->y + y),
+                   smush(cucul_get_char(cx->cv, cx->x - 1 - xleft, cx->y + y),
+                         cucul_get_char(cx->charcv, xright, y),
                          0))
                     xleft++;
@@ -376 +376 @@
 static uint32_t smush(uint32_t ch1, uint32_t ch2, unsigned int mode)
 {
-
     /* Rule 1 */
     if(ch1 == ch2 && ch1 != 0xa0)
@@ -392 +391 @@
             return ch2;
 
+        if(ch2 == '_' && strchr(rule2, ch1))
+            return ch1;
+
         /* Rule 3 */
         if((tmp1 = strchr(rule3, ch1)) && (tmp2 = strchr(rule3, ch2)))