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

[Behdad Esfahbod]

 fc-cat/fc-cat.c |    1 +
 src/fcformat.c  |    8 ++++++++
 2 files changed, 9 insertions(+)

New commits:
commit 9d8d0226d9ac5bc9956263a13454179eafc4ab82
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Sep 3 08:11:00 2010 -0400

    Bug 29995 - fc-cat does not invoke FcFini()

diff --git a/fc-cat/fc-cat.c b/fc-cat/fc-cat.c
index a9326c8..d9a597c 100644
--- a/fc-cat/fc-cat.c
+++ b/fc-cat/fc-cat.c
@@ -404,5 +404,6 @@ main (int argc, char **argv)
 	    FcStrFree (cache_file);
     }
 
+    FcFini ();
     return 0;
 }
commit 25afea879d5b73c116e00c2c62b2a7ce9bcf803a
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Aug 18 11:31:31 2010 -0400

    Add comments

diff --git a/src/fcformat.c b/src/fcformat.c
index bf94017..4fb89a5 100644
--- a/src/fcformat.c
+++ b/src/fcformat.c
@@ -69,6 +69,7 @@
  *
  * - verbose builtin that is like FcPatternPrint
  * - allow indexing subexprs using '%{[idx]elt1,elt2{subexpr}}'
+ * - allow indexing in +, -, ? filtering?
  * - conditional/filtering/deletion on binding (using '(w)'/'(s)'/'(=)' notation)
  */
 
@@ -436,6 +437,7 @@ interpret_filter_in (FcFormatContext *c,
 
     do
     {
+	/* XXX binding */
 	if (!read_word (c) ||
 	    !FcObjectSetAdd (os, (const char *) c->word))
 	{
@@ -636,6 +638,7 @@ interpret_enumerate (FcFormatContext *c,
 	    FcPatternDel (subpat, os->objects[0]);
 	    if ((lang = FcStrListNext (lang_strs)))
 	    {
+		/* XXX binding? */
 		FcPatternAddString (subpat, os->objects[0], lang);
 		done = FcFalse;
 	    }
@@ -654,6 +657,7 @@ interpret_enumerate (FcFormatContext *c,
 		if (FcResultMatch ==
 		    FcPatternGet (pat, os->objects[i], idx, &v))
 		{
+		    /* XXX binding */
 		    FcPatternAdd (subpat, os->objects[i], v, FcFalse);
 		    done = FcFalse;
 		}
@@ -788,6 +792,8 @@ cescape (FcFormatContext *c,
 	 const FcChar8   *str,
 	 FcStrBuf        *buf)
 {
+    /* XXX escape \n etc? */
+
     while(*str)
     {
 	switch (*str)
@@ -825,6 +831,8 @@ xmlescape (FcFormatContext *c,
 	   const FcChar8   *str,
 	   FcStrBuf        *buf)
 {
+    /* XXX escape \n etc? */
+
     while(*str)
     {
 	switch (*str)