Merge remote-tracking branch 'origin/released'

Conflicts:
	fontconfig/doc/fcformat.fncs
	fontconfig/fc-cat/fc-cat.c
	fontconfig/fc-list/fc-list.c
	fontconfig/fc-match/fc-match.c
	fontconfig/src/fcdir.c
	fontconfig/src/fcformat.c
	fontconfig/src/fcname.c
	mesalib/src/glsl/linker.cpp
	mesalib/src/mesa/state_tracker/st_format.c

1 files changed, 5 insertions, 2 deletions

diff --git a/fontconfig/src/fcformat.c b/fontconfig/src/fcformat.c
index 28433a705..df184f704 100644
--- a/fontconfig/src/fcformat.c
+++ b/fontconfig/src/fcformat.c
@@ -62,6 +62,7 @@
  * unparse	FcNameUnparse

  * fcmatch	fc-match default

  * fclist	fc-list default

+ * fccat	fc-cat default

  * pkgkit	PackageKit package tag format

  *

  *

@@ -74,8 +75,9 @@
  */

 

 

+#define FCCAT_FORMAT	"\"%{file|basename|cescape}\" %{index} \"%{-file{%{=unparse|cescape}}}\""

 #define FCMATCH_FORMAT	"%{file:-<unknown filename>|basename}: \"%{family[0]:-<unknown family>}\" \"%{style[0]:-<unknown style>}\""

-#define FCLIST_FORMAT	"%{?file{%{file}: }}%{=unparse}"

+#define FCLIST_FORMAT	"%{?file{%{file}: }}%{-file{%{=unparse}}}"

 #define PKGKIT_FORMAT	"%{[]family{font(%{family|downcase|delete( )})\n}}%{[]lang{font(:lang=%{lang|downcase|translate(_,-)})\n}}"

 

 

@@ -304,6 +306,7 @@ interpret_builtin (FcFormatContext *c,
 #define BUILTIN(name, format) \

     else if (0 == strcmp ((const char *) c->word, name))\

 	ret = FcPatternFormatToBuf (pat, (const FcChar8 *) format, buf)

+    BUILTIN ("fccat",    FCCAT_FORMAT);

     BUILTIN ("fcmatch",  FCMATCH_FORMAT);

     BUILTIN ("fclist",   FCLIST_FORMAT);

     BUILTIN ("pkgkit",   PKGKIT_FORMAT);

@@ -732,7 +735,7 @@ interpret_simple (FcFormatContext *c,
 	c->word = c->word + strlen ((const char *) c->word) + 1;

 	/* for now we just support 'default value' */

 	if (!expect_char (c, '-') ||

-	    !read_chars (c, '\0'))

+	    !read_chars (c, '|'))

 	{

 	    c->word = orig;

 	    return FcFalse;