remove CID support (bug #5553)
Remove CID from all our fontpaths.
(cherry picked from 69820a10e3
commit)
This commit is contained in:
parent
abe5e079af
commit
d17ec01e83
|
@ -391,7 +391,7 @@ AC_ARG_WITH(mesa-source, AS_HELP_STRING([--with-mesa-source=MESA_SOURCE], [P
|
|||
AC_ARG_WITH(fontdir, AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to top level dir where fonts are installed (default: ${libdir}/X11/fonts)]),
|
||||
[ FONTDIR="$withval" ],
|
||||
[ FONTDIR="${libdir}/X11/fonts" ])
|
||||
DEFAULT_FONT_PATH="${FONTDIR}/misc/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/CID/,${FONTDIR}/100dpi/,${FONTDIR}/75dpi/"
|
||||
DEFAULT_FONT_PATH="${FONTDIR}/misc/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi/,${FONTDIR}/75dpi/"
|
||||
AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
|
||||
[ FONTPATH="$withval" ],
|
||||
[ FONTPATH="${DEFAULT_FONT_PATH}" ])
|
||||
|
|
|
@ -93,7 +93,6 @@ CPP_FILES_FLAGS = \
|
|||
-DMISCFONTPATH="\"$(BASE_FONT_PATH)/misc\"" \
|
||||
-DT1FONTPATH="\"$(BASE_FONT_PATH)/Type1\"" \
|
||||
-DTRUETYPEFONTPATH="\"$(BASE_FONT_PATH)/TTF\"" \
|
||||
-DCIDFONTPATH="\"$(BASE_FONT_PATH)/CID\"" \
|
||||
-DDPI75FONTPATH="\"$(BASE_FONT_PATH)/75dpi\"" \
|
||||
-DDPI100FONTPATH="\"$(BASE_FONT_PATH)/100dpi\"" \
|
||||
-DMODULEPATH=\"$(DEFAULT_MODULE_PATH)\"
|
||||
|
|
|
@ -57,9 +57,6 @@ static XF86ModuleVersionInfo VersRec =
|
|||
_X_EXPORT XF86ModuleData type1ModuleData = { &VersRec, type1Setup, NULL };
|
||||
|
||||
extern void Type1RegisterFontFileFunctions(void);
|
||||
#ifdef BUILDCID
|
||||
extern void CIDRegisterFontFileFunctions(void);
|
||||
#endif
|
||||
|
||||
FontModule type1Module = {
|
||||
Type1RegisterFontFileFunctions,
|
||||
|
@ -67,23 +64,11 @@ FontModule type1Module = {
|
|||
NULL
|
||||
};
|
||||
|
||||
#ifdef BUILDCID
|
||||
FontModule CIDModule = {
|
||||
CIDRegisterFontFileFunctions,
|
||||
"CID",
|
||||
NULL
|
||||
};
|
||||
#endif
|
||||
|
||||
static pointer
|
||||
type1Setup(pointer module, pointer opts, int *errmaj, int *errmin)
|
||||
{
|
||||
type1Module.module = module;
|
||||
LoadFont(&type1Module);
|
||||
#ifdef BUILDCID
|
||||
CIDModule.module = module;
|
||||
LoadFont(&CIDModule);
|
||||
#endif
|
||||
|
||||
/* Need a non-NULL return */
|
||||
return (pointer)1;
|
||||
|
|
|
@ -311,7 +311,6 @@ font path elements:
|
|||
.I __projectroot__/lib/X11/fonts/misc/
|
||||
.I __projectroot__/lib/X11/fonts/TTF/
|
||||
.I __projectroot__/lib/X11/fonts/Type1/
|
||||
.I __projectroot__/lib/X11/fonts/CID/
|
||||
.I __projectroot__/lib/X11/fonts/75dpi/
|
||||
.I __projectroot__/lib/X11/fonts/100dpi/
|
||||
.fi
|
||||
|
@ -326,7 +325,6 @@ The recommended font path contains the following font path elements:
|
|||
.I __projectroot__/lib/X11/fonts/75dpi/:unscaled
|
||||
.I __projectroot__/lib/X11/fonts/100dpi/:unscaled
|
||||
.I __projectroot__/lib/X11/fonts/Type1/
|
||||
.I __projectroot__/lib/X11/fonts/CID/
|
||||
.I __projectroot__/lib/X11/fonts/Speedo/
|
||||
.I __projectroot__/lib/X11/fonts/75dpi/
|
||||
.I __projectroot__/lib/X11/fonts/100dpi/
|
||||
|
|
|
@ -56,7 +56,6 @@ XCOMM command (or a combination of both methods)
|
|||
FontPath MISCFONTPATH
|
||||
FontPath T1FONTPATH
|
||||
FontPath TRUETYPEFONTPATH
|
||||
FontPath CIDFONTPATH
|
||||
FontPath DPI75FONTPATH
|
||||
FontPath DPI100FONTPATH
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user