[Fontconfig] fontconfig: Branch 'master' - 2 commits

[Behdad Esfahbod]

 fc-lang/ja.orth |    2 +-
 src/fcdbg.c     |    4 ++--
 src/fclang.c    |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 161620108bbb4e70f2817481e4d5bc26772fe67e
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Jul 28 14:24:21 2009 -0400

    [ja.orth] Comment out FULLWIDTH YEN SIGN (#22942)

diff --git a/fc-lang/ja.orth b/fc-lang/ja.orth
index 3c383e3..572ca91 100644
--- a/fc-lang/ja.orth
+++ b/fc-lang/ja.orth
@@ -6562,4 +6562,4 @@
 0x9F9C	# <CJK>
 0x9F9D	# <CJK>
 0x9FA0	# <CJK>
-0xFFE5	# FULLWIDTH YEN SIGN
+#0xFFE5	# FULLWIDTH YEN SIGN
commit 7c12181f7a75a434e2139f4bee794046258342cf
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Jul 28 14:23:10 2009 -0400

    Improve charset printing

diff --git a/src/fcdbg.c b/src/fcdbg.c
index b2ab512..fd2d55a 100644
--- a/src/fcdbg.c
+++ b/src/fcdbg.c
@@ -116,13 +116,13 @@ FcCharSetPrint (const FcCharSet *c)
     }
 #endif
 		
+    printf ("\n");
     for (i = 0; i < c->num; i++)
     {
 	intptr_t	leaf_offset = leaves[i];
 	FcCharLeaf	*leaf = FcOffsetToPtr (leaves, leaf_offset, FcCharLeaf);
 	
-	if (i)
-	    printf ("\t");
+	printf ("\t");
 	printf ("%04x:", numbers[i]);
 	for (j = 0; j < 256/32; j++)
 	    printf (" %08x", leaf->map[j]);
diff --git a/src/fclang.c b/src/fclang.c
index 9d1858d..c5ad5ef 100644
--- a/src/fclang.c
+++ b/src/fclang.c
@@ -61,7 +61,7 @@ FcFreeTypeLangSet (const FcCharSet  *charset,
 	return 0;
     if (FcDebug() & FC_DBG_LANGSET) 
     {
-	printf ("font charset\n");
+	printf ("font charset");
 	FcCharSetPrint (charset);
 	printf ("\n");
     }
@@ -69,7 +69,7 @@ FcFreeTypeLangSet (const FcCharSet  *charset,
     {
 	if (FcDebug() & FC_DBG_LANGSET) 
 	{
-	    printf ("%s charset\n", fcLangCharSets[i].lang);
+	    printf ("%s charset", fcLangCharSets[i].lang);
 	    FcCharSetPrint (&fcLangCharSets[i].charset);
 	    printf ("\n");
 	}