Bug 50835 - Deprecate FC_GLOBAL_ADVANCE

FC_GLOBAL_ADVANCE is deprecated. this flag is simply ignored on
freetype 2.4.5 or later.

diff --git a/conf.d/20-fix-globaladvance.conf b/conf.d/20-fix-globaladvance.conf
deleted file mode 100644 (file)
index c62ba59..0000000
--- a/conf.d/20-fix-globaladvance.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-<!--
-  Some Asian fonts misadvertise themselves as monospaced when
-  in fact they are dual-spaced (half and full).  This makes
-  FreeType very confused as it forces all widths to match.
-  Undo this magic by disabling the width forcing code -->
-       <match target="font">
-               <test name="family" compare="eq" ignore-blanks="true"><string>GulimChe</string></test>
-               <edit name="globaladvance"><bool>false</bool></edit>
-       </match>
-
-       <match target="font">
-               <test name="family" compare="eq" ignore-blanks="true"><string>DotumChe</string></test>
-               <edit name="globaladvance"><bool>false</bool></edit>
-       </match>
-
-       <match target="font">
-               <test name="family" compare="eq" ignore-blanks="true"><string>BatangChe</string></test>
-               <edit name="globaladvance"><bool>false</bool></edit>
-       </match>
-
-       <match target="font">
-               <test name="family" compare="eq" ignore-blanks="true"><string>GungsuhChe</string></test>
-               <edit name="globaladvance"><bool>false</bool></edit>
-       </match>
-</fontconfig>

diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
index 93bf8d3..7f14920 100644 (file)
--- a/conf.d/Makefile.am
+++ b/conf.d/Makefile.am
@@ -25,7 +25,6 @@ DOC_FILES= \
        README
 
 CONF_LINKS = \
-       20-fix-globaladvance.conf \
        20-unhint-small-vera.conf \
        30-urw-aliases.conf \
        30-metric-aliases.conf \
@@ -58,7 +57,6 @@ template_DATA =                               \
        11-lcdfilter-default.conf       \
        11-lcdfilter-legacy.conf        \
        11-lcdfilter-light.conf         \
-       20-fix-globaladvance.conf       \
        20-unhint-small-vera.conf       \
        25-unhint-nonlatin.conf         \
        30-urw-aliases.conf             \

diff --git a/doc/fontconfig-devel.sgml b/doc/fontconfig-devel.sgml
index ab39092..79cceb1 100644 (file)
--- a/doc/fontconfig-devel.sgml
+++ b/doc/fontconfig-devel.sgml
@@ -164,7 +164,7 @@ convenience for the application's rendering mechanism.
     verticallayout FC_VERTICAL_LAYOUT     Bool    Use vertical layout
     autohint       FC_AUTOHINT            Bool    Use autohinter instead of
                                                   normal hinter
-    globaladvance  FC_GLOBAL_ADVANCE      Bool    Use font global advance data
+    globaladvance  FC_GLOBAL_ADVANCE      Bool    Use font global advance data (deprecated)
     file           FC_FILE                String  The filename holding the font
     index          FC_INDEX               Int     The index of the font within
                                                   the file

diff --git a/doc/fontconfig-user.sgml b/doc/fontconfig-user.sgml
index f29cfe0..92d0db8 100644 (file)
--- a/doc/fontconfig-user.sgml
+++ b/doc/fontconfig-user.sgml
@@ -112,7 +112,7 @@ convenience for the applications' rendering mechanism.
   hintstyle       Int     Automatic hinting style
   verticallayout  Bool    Use vertical layout
   autohint        Bool    Use autohinter instead of normal hinter
-  globaladvance   Bool    Use font global advance data
+  globaladvance   Bool    Use font global advance data (deprecated)
   file            String  The filename holding the font
   index           Int     The index of the font within the file
   ftface          FT_Face Use the specified FreeType face object

diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 002c9cd..238ab65 100644 (file)
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -85,6 +85,7 @@ typedef int           FcBool;
 #define FC_HINT_STYLE      "hintstyle"         /* Int */
 #define FC_VERTICAL_LAYOUT  "verticallayout"   /* Bool (false) */
 #define FC_AUTOHINT        "autohint"          /* Bool (false) */
+/* FC_GLOBAL_ADVANCE is deprecated. this is simply ignored on freetype 2.4.5 or later */
 #define FC_GLOBAL_ADVANCE   "globaladvance"    /* Bool (true) */
 #define FC_WIDTH           "width"             /* Int */
 #define FC_FILE                    "file"              /* String */

diff --git a/src/fcdefault.c b/src/fcdefault.c
index c6b5669..8ad1b1e 100644 (file)
--- a/src/fcdefault.c
+++ b/src/fcdefault.c
@@ -32,6 +32,7 @@ static const struct {
     { FC_HINTING_OBJECT,          FcTrue       },  /* !FT_LOAD_NO_HINTING */
     { FC_VERTICAL_LAYOUT_OBJECT,   FcFalse     },  /* FC_LOAD_VERTICAL_LAYOUT */
     { FC_AUTOHINT_OBJECT,         FcFalse      },  /* FC_LOAD_FORCE_AUTOHINT */
+    /* XXX: FC_GLOBAL_ADVANCE is deprecated */
     { FC_GLOBAL_ADVANCE_OBJECT,    FcTrue      },  /* !FC_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH */
     { FC_EMBEDDED_BITMAP_OBJECT,   FcTrue      },  /* !FC_LOAD_NO_BITMAP */
     { FC_DECORATIVE_OBJECT,       FcFalse      },

diff --git a/src/fcint.h b/src/fcint.h
index 7cc4ed2..60bc0cc 100644 (file)
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -868,7 +868,7 @@ FcListPatternMatchAny (const FcPattern *p,
 #define FC_HINTING_OBJECT      17
 #define FC_VERTICAL_LAYOUT_OBJECT      18
 #define FC_AUTOHINT_OBJECT     19
-#define FC_GLOBAL_ADVANCE_OBJECT       20
+#define FC_GLOBAL_ADVANCE_OBJECT       20      /* deprecated */
 #define FC_FILE_OBJECT         21
 #define FC_INDEX_OBJECT                22
 #define FC_RASTERIZER_OBJECT   23

diff --git a/src/fcname.c b/src/fcname.c
index d51307b..6a1fc12 100644 (file)
--- a/src/fcname.c
+++ b/src/fcname.c
@@ -54,7 +54,7 @@ static const FcObjectType _FcBaseObjectTypes[] = {
     { FC_HINTING,      FcTypeBool, },
     { FC_VERTICAL_LAYOUT,   FcTypeBool, },
     { FC_AUTOHINT,     FcTypeBool, },
-    { FC_GLOBAL_ADVANCE,    FcTypeBool, },
+    { FC_GLOBAL_ADVANCE,    FcTypeBool, },     /* deprecated */
     { FC_FILE,         FcTypeString, },
     { FC_INDEX,                FcTypeInteger, },
     { FC_RASTERIZER,   FcTypeString, },
@@ -442,7 +442,7 @@ static const FcConstant _FcBaseConstants[] = {
     { (FcChar8 *) "hinting",       "hinting",      FcTrue },
     { (FcChar8 *) "verticallayout", "verticallayout",  FcTrue },
     { (FcChar8 *) "autohint",      "autohint",     FcTrue },
-    { (FcChar8 *) "globaladvance",  "globaladvance",   FcTrue },
+    { (FcChar8 *) "globaladvance",  "globaladvance",   FcTrue }, /* deprecated */
     { (FcChar8 *) "outline",       "outline",      FcTrue },
     { (FcChar8 *) "scalable",      "scalable",     FcTrue },
     { (FcChar8 *) "minspace",      "minspace",     FcTrue },