cleanup

src/font/unicode-joining.c

@@ -73,7 +73,7 @@ static char get_char_from_joining_type(BidiJoiningType j, BOOL visual)
 
 #   define _BIDI_ADD_TYPE(TYPE,SYMBOL)	\
     if (BIDI_IS_JOINING_TYPE_##TYPE(j)) return SYMBOL;
-#   include "fribidi-joining-types-list.h"
+#   include "unicode-joining-types-list.inc"
 #   undef _BIDI_ADD_TYPE
 
     return '?';
@@ -86,7 +86,7 @@ static void print_joining_types(const BidiLevel *embedding_levels,
 
     _DBG_PRINTF ("  Join. types: ");
     for (i = 0; i < len; i++)
-        _DBG_PRINTF2 ("%c", get_char_from_joining_type (jtypes[i],
+        _DBG_PRINTF ("%c", get_char_from_joining_type (jtypes[i],
                     !BIDI_LEVEL_IS_RTL(embedding_levels[i])));
     _DBG_PRINTF ("\n");
 }
@@ -107,8 +107,6 @@ void GUIAPI UBidiJoinArabic(const BidiType *bidi_types,
 {
     if (len == 0) return;
 
-    _DBG_PRINTF ("in fribidi_join_arabic");
-
 #ifdef DEBUG
     print_joining_types (embedding_levels, len, ar_props);
 #endif	/* DEBUG */
@@ -192,8 +190,6 @@ void GUIAPI UBidiJoinArabic(const BidiType *bidi_types,
 #ifdef DEBUG
      print_joining_types (embedding_levels, len, ar_props);
 #endif /* DEBUG */
-
-    _DBG_PRINTF ("leaving fribidi_join_arabic");
 }
 
 #endif /* _MGCHARSET_UNICODE */

src/font/unicode-shape.c

@@ -63,8 +63,6 @@ void GUIAPI UBidiShapeMirroring(const BidiLevel *embedding_levels,
 {
     register int i;
 
-    _DBG_PRINTF("in fribidi_shape_mirroring");
-
     if (len == 0 || !str) return;
 
     /* L4. Mirror all characters that are in odd levels and have mirrors. */
@@ -85,8 +83,6 @@ void GUIAPI UBidiShape(Uint32 flags,
     if (len == 0 || !str)
         return;
 
-    _DBG_PRINTF ("in fribidi_shape");
-
     if (ar_props)
         UBidiShapeArabic(flags, embedding_levels, ar_props, str, len);