#include <fontconfig/fontconfig.h>
-

adds a single Unicode char to the set, returning FcFalse on failure, either as a result of a constant set or from running out of memory. -

#include <fontconfig/fontconfig.h>
-

src. -

#include <fontconfig/fontconfig.h>
-

a. -

#include <fontconfig/fontconfig.h>
-

FcCharSetCoverage returns the next page in the charset which has any coverage. -

#include <fontconfig/fontconfig.h>
-

FcCharSetCreate allocates and initializes a new empty character set object. -

#include <fontconfig/fontconfig.h>
-

deletes a single Unicode char from the set, returning FcFalse on failure, either as a result of a constant set or from running out of memory. -

#include <fontconfig/fontconfig.h>
-

contain the same set of Unicode chars. -

#include <fontconfig/fontconfig.h>
-

map[3] and later are left as an exercise for the reader ;). -

#include <fontconfig/fontconfig.h>
-

ucs4. -

#include <fontconfig/fontconfig.h>
-

b. -

#include <fontconfig/fontconfig.h>
-

b. -

#include <fontconfig/fontconfig.h>
-

b. -

#include <fontconfig/fontconfig.h>
-

is a constant set or from running out of memory. -

#include <fontconfig/fontconfig.h>
-

FcCharSetNew is a DEPRECATED alias for FcCharSetCreate. -

#include <fontconfig/fontconfig.h>
-

*next. -

#include <fontconfig/fontconfig.h>
-

b. -

#include <fontconfig/fontconfig.h>
-

b. -

#include <fontconfig/fontconfig.h>
-

b. -

#include <fontconfig/fontconfig.h>
-

is NULL, the current configuration is used. -

#include <fontconfig/fontconfig.h>
-

is NULL, the current configuration is used. -

#include <fontconfig/fontconfig.h>
-

config is NULL, the current configuration is used. -

#include <fontconfig/fontconfig.h>
-

config is NULL, the current configuration is used. -

#include <fontconfig/fontconfig.h>
-

Description

Creates an empty configuration. -

#include <fontconfig/fontconfig.h>
-

#include <fontconfig/fontconfig.h>
-

is FcFalse, then all use of the home directory in these contexts will be disabled. The previous setting of the value is returned. -

#include <fontconfig/fontconfig.h>
-

FcConfigDestroy when the relevant values are no longer referenced. -

#include <fontconfig/fontconfig.h>
-

FcBlanks is deprecated. This function always returns NULL. -

#include <fontconfig/fontconfig.h>
-

config is NULL, the current configuration is used. -

#include <fontconfig/fontconfig.h>
-

With fontconfig no longer using per-user cache files, this function now simply returns NULL to indicate that no per-user file exists. -

#include <fontconfig/fontconfig.h>
-

config is NULL, the current configuration is used. -

#include <fontconfig/fontconfig.h>
-

config is NULL, the current configuration is used. -

#include <fontconfig/fontconfig.h>
-

Description

Returns the current default configuration. -

#include <fontconfig/fontconfig.h>
-

The result of this function is affected by the FONTCONFIG_SYSROOT environment variable or equivalent functionality. -

#include <fontconfig/fontconfig.h>
-

config is NULL, the current configuration is used. -

#include <fontconfig/fontconfig.h>
-

FcConfigDestroy when the return value is no longer referenced. -

#include <fontconfig/fontconfig.h>
-

config is NULL, the current configuration is used. -

#include <fontconfig/fontconfig.h>
-

FcConfigDestroy when the return value is no longer referenced. -

#include <fontconfig/fontconfig.h>
-

#include <fontconfig/fontconfig.h>
-

#include <fontconfig/fontconfig.h>
-

config since 2.12.0, returning FcFalse if that call fails. -

#include <fontconfig/fontconfig.h>
-

config is NULL, the current configuration is used. -

#include <fontconfig/fontconfig.h>
-

#include <fontconfig/fontconfig.h>
-

config is NULL, the current configuration is used. -

#include <fontconfig/fontconfig.h>
-

config is NULL, the current configuration is used. -

#include <fontconfig/fontconfig.h>
-

-

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

. This returns FcTrue if the operation is successfully complete. otherwise FcFalse. -

Since

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

This function is deprecated. it doesn't take any effects. -

Since

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

dir. -

Since

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

is non-NULL, it will be filled with the results of stat(2) on the cache file. -

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

, unless that is NULL. See also FcDirCacheRead. -

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

is FcFalse, then an existing, valid cache file will be used. Otherwise, a new cache will be created by scanning the directory and that returned. -

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

and update the cache. returns NULL if failed. -

Since

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

. Returns FcFalse when some internal error occurs (out of memory, etc). Errors actually unlinking any files are ignored. -

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

. When no other references to it remain, all memory associated with the cache will be freed. -

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

has an associated valid cache file, else returns FcFalse -

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

. All of this functionality is now automatically managed by FcDirCacheLoad and FcDirCacheRead. -

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

. Calling this function does not create any cache files. Use FcDirCacheRead() if caching is desired. -

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

is a directory, otherwise returns FcFalse. -

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

Up

#include <fontconfig/fontconfig.h>
-

#include <fontconfig/fontconfig.h>
-

is NULL, the default configuration is checked to be up to date, and used. -

#include <fontconfig/fontconfig.h>
-

config is NULL, the current configuration is used. -

#include <fontconfig/fontconfig.h>
-

kind FcMatchFont and then returned. -

#include <fontconfig/fontconfig.h>
-

Adds a pattern to a font set. Note that the pattern is not copied before being inserted into the set. Returns FcFalse if the pattern cannot be inserted into the set (due to allocation failure). Otherwise returns FcTrue. -

#include <fontconfig/fontconfig.h>
-

Description

Creates an empty font set. -

#include <fontconfig/fontconfig.h>
-

Destroys a font set. Note that this destroys any referenced patterns as well. -

#include <fontconfig/fontconfig.h>
-

is NULL, the default configuration is checked to be up to date, and used. -

#include <fontconfig/fontconfig.h>
-

is NULL, the current configuration is used. Returns NULL if an error occurs during this process. -

#include <fontconfig/fontconfig.h>
-

. The format of the output is designed to be of help to users and developers, and may change at any time. -

#include <fontconfig/fontconfig.h>
-

FcFontSetDestroy directly instead. -

#include <fontconfig/fontconfig.h>
-

pattern. +>. If The FcFontSet returned by FcFontSetSort is destroyed by calling FcFontSetDestroy. -

#include <fontconfig/fontconfig.h>
-

config is NULL, the current configuration is used. -

#include <fontconfig.h> #include <fcfreetype.h> -

#include <fontconfig.h> #include <fcfreetype.h> - is ignored and accepted only for compatibility with older code. -

#include <fontconfig/fontconfig.h>
-

Returns a string set of the default languages according to the environment variables on the system. This function looks for them in order of FC_LANG, LC_ALL, LC_CTYPE and LANG then. If there are no valid values in those environment variables, "en" will be set as fallback. -

#include <fontconfig/fontconfig.h>
-

Description

Returns a string set of all known languages. -

#include <fontconfig/fontconfig.h>
-

Description

Returns the version number of the library. -

#include <fontconfig/fontconfig.h>
-

#include <fontconfig/fontconfig.h>
-

#include <fontconfig/fontconfig.h>
-

Loads the default configuration file and builds information about the available fonts. Returns the resulting configuration. -

#include <fontconfig/fontconfig.h>
-

Loads the default configuration file and returns the resulting configuration. Does not load any font information. -

#include <fontconfig/fontconfig.h>
-

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

is an lower case ASCII letter. -

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

is a upper case ASCII letter. -

Up

#include <fontconfig/fontconfig.h>
-

Description

Returns the FcCharMap for a language. -

#include <fontconfig/fontconfig.h>
-

lang suitable on fontconfig. -

#include <fontconfig/fontconfig.h>
-

should be of the form Ll-Tt where Ll is a two or three letter language from ISO 639 and Tt is a territory from ISO 3166. -

#include <fontconfig/fontconfig.h>
-

#include <fontconfig/fontconfig.h>
-

ls_a has no territory. -

#include <fontconfig/fontconfig.h>
-

ls. -

#include <fontconfig/fontconfig.h>
-

FcLangSetCreate creates a new FcLangSet object. -

#include <fontconfig/fontconfig.h>
-

should be of the form Ll-Tt where Ll is a two or three letter language from ISO 639 and Tt is a territory from ISO 3166. -

#include <fontconfig/fontconfig.h>
-

FcLangSetDestroy destroys a FcLangSet object, freeing all memory associated with it. -

#include <fontconfig/fontconfig.h>
-

ls_b. -

#include <fontconfig/fontconfig.h>
-

langset. -

#include <fontconfig/fontconfig.h>
-

FcLangSetHash. However, two langsets with the same hash value may not be equal. -

#include <fontconfig/fontconfig.h>
-

lang. If +>. If ls +> has no matching language, this function returns FcLangDifferentLang. -

#include <fontconfig/fontconfig.h>
-

ls_b. -

#include <fontconfig/fontconfig.h>
-

ls_b. -

#include <fontconfig/fontconfig.h>
-

mat into it. -

#include <fontconfig/fontconfig.h>
-

returning FcTrue when they are equal and FcFalse when they are not. -

#include <fontconfig/fontconfig.h>
-

to the identity matrix. -

#include <fontconfig/fontconfig.h>
-

result. -

#include <fontconfig/fontconfig.h>
-

-

#include <fontconfig/fontconfig.h>
-

-

#include <fontconfig/fontconfig.h>
-

-

<<< Previous

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

result if present. -

<<< PreviousFcNameGetConstantFcNameGetConstantFor +FcNameGetConstantFor


<<< Previous		Next >>>

FcNameGetConstantFor

Name

FcNameGetConstantFor -- Lookup symbolic constant For object

Synopsis

#include <fontconfig/fontconfig.h>
+

const FcConstant * FcNameGetConstantFor(FcChar8 *string, char *object);

Description

Return the FcConstant structure related to symbolic constant string +for object. +

<<< Previous	Home	Next >>>
FcNameGetConstant	Up	FcNameConstant

\ No newline at end of file diff -Nru fontconfig-2.14.1/doc/fontconfig-devel/fcnamegetconstant.html fontconfig-2.14.2/doc/fontconfig-devel/fcnamegetconstant.html --- fontconfig-2.14.1/doc/fontconfig-devel/fcnamegetconstant.html 2022-10-21 07:35:16.000000000 +0000 +++ fontconfig-2.14.2/doc/fontconfig-devel/fcnamegetconstant.html 2023-01-27 08:23:13.000000000 +0000 @@ -15,8 +15,8 @@ TITLE="FcNameUnregisterConstants" HREF="fcnameunregisterconstants.html">Next >>>

#include <fontconfig/fontconfig.h>
-

string. -

Next >>>FcNameConstantFcNameGetConstantFor

#include <fontconfig/fontconfig.h>
-

object. -

#include <fontconfig/fontconfig.h>
-

name from the standard text format described above into a pattern. -

#include <fontconfig/fontconfig.h>
-

Description

Deprecated. Does nothing. Returns FcFalse. -

#include <fontconfig/fontconfig.h>
-

Description

Deprecated. Does nothing. Returns FcFalse. -

#include <fontconfig/fontconfig.h>
-

Converts the given pattern into the standard text format described above. The return value is not static, but instead refers to newly allocated memory which should be freed by the caller using free(). -

#include <fontconfig/fontconfig.h>
-

Description

Deprecated. Does nothing. Returns FcFalse. -

#include <fontconfig/fontconfig.h>
-

Description

Deprecated. Does nothing. Returns FcFalse. -

#include <fontconfig/fontconfig.h>
-

Adds a property name to the set. Returns FcFalse if the property name cannot be inserted into the set (due to allocation failure). Otherwise returns FcTrue. -

#include <fontconfig/fontconfig.h>
-

result variable directly. -

#include <fontconfig/fontconfig.h>
-

Description

Creates an empty set. -

#include <fontconfig/fontconfig.h>
-

Description

Destroys an object set. -

#include <fontconfig/fontconfig.h>
-

#include <fontconfig/fontconfig.h>
-

FcPatternAddRange are available since 2.11.91. -

#include <fontconfig/fontconfig.h>
-

strong. -

#include <fontconfig/fontconfig.h>
-

variable. -

#include <fontconfig/fontconfig.h>
-

Description

Creates a pattern with no properties; used to build patterns from scratch. -

#include <fontconfig/fontconfig.h>
-

Description

Deletes all values associated with the property `object', returning +>Deletes all values associated with the property `object', returning whether the property existed or not. -

#include <fontconfig/fontconfig.h>
-

Decrement the pattern reference count. If all references are gone, destroys the pattern, in the process destroying all related values. -

#include <fontconfig/fontconfig.h>
-

. Each pattern may be modified without affecting the other. -

#include <fontconfig/fontconfig.h>
-

pb are exactly alike. -

#include <fontconfig/fontconfig.h>
-

os. -

#include <fontconfig/fontconfig.h>
-

p is returned. -

#include <fontconfig/fontconfig.h>
-

p if any and returns FcTrue. returns FcFalse otherwise. -

#include <fontconfig/fontconfig.h>
-

, lower-cased and with spaces removed. -

#include <fontconfig/fontconfig.h>
-

. The value returned is not a copy, but rather refers to the data stored within the pattern directly. Applications must not free this value. -

#include <fontconfig/fontconfig.h>
-

FcPatternGetRange are available since 2.11.91. -

#include <fontconfig/fontconfig.h>
-

. The Value returned is not a copy, but rather refers to the data stored within the pattern directly. Applications must not free this value. -

#include <fontconfig/fontconfig.h>
-

Returns a 32-bit number which is the same for any two patterns which are equal. -

#include <fontconfig/fontconfig.h>
-

point to same object and contains same values. return FcFalse otherwise. -

#include <fontconfig/fontconfig.h>
-

iter isn't valid. -

#include <fontconfig/fontconfig.h>
-

#include <fontconfig/fontconfig.h>
-

p. returns FcFalse otherwise. -

#include <fontconfig/fontconfig.h>
-

has been changed to the next object. returns FcFalse otherwise. -

#include <fontconfig/fontconfig.h>
-

will not have any valid data. -

#include <fontconfig/fontconfig.h>
-

iter isn't valid, returns 0. -

#include <fontconfig/fontconfig.h>
-

p has. -

#include <fontconfig/fontconfig.h>
-

Prints an easily readable version of the pattern to stdout. There is no provision for reparsing data in this format, it's just for diagnostics and debugging. -

#include <fontconfig/fontconfig.h>
-

. Patterns are freed only when the reference count reaches zero. -

#include <fontconfig/fontconfig.h>
-

Description

Removes the value associated with the property `object' at position `id', returning +>Removes the value associated with the property `object' at position `id', returning whether the property existed and had a value at that position or not. -

#include <fontconfig/fontconfig.h>
-

range. -

#include <fontconfig/fontconfig.h>
-

FcRangeCreateDouble creates a new FcRange object with double sized value. -

#include <fontconfig/fontconfig.h>
-

FcRangeCreateInteger creates a new FcRange object with integer sized value. -

#include <fontconfig/fontconfig.h>
-

FcRangeDestroy destroys a FcRange object, freeing all memory associated with it. -

#include <fontconfig/fontconfig.h>
-

end as the range. -

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

stripped of any leading directory names. This is returned in newly allocated storage which should be freed when no longer needed. -

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

s2. -

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

. This test is case-insensitive for all proper UTF-8 encoded strings. -

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

FcConfigEnableHome). -

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

strdup, but that function isn't available on every platform. -

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

. This is returned in newly allocated storage which should be freed when no longer needed. -

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

, converting upper case letters to lower case and returns the allocated buffer. -

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

This is just a wrapper around free(3) which helps track memory usage of strings within the fontconfig library. -

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

set. -

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

list. -

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

list. -

Since

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

list. -

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

there, returning the new string. -

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

, The copy is created with FcStrCopyFilename so that leading '~' values are replaced with the value of the HOME environment variable. -

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

set. -

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

Create an empty set. -

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

s was a member else FcFalse. -

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

set. -

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

. Ordering of strings within the two sets is not considered. -

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

set. -

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

. This test will operate properly with UTF8 encoded strings. -

Up

Name

Synopsis

#include <fontconfig/fontconfig.h>
-

Description

s2 in +> in . This test is case-insensitive for all proper UTF-8 encoded strings. -

Up

Name

Synopsis
#include <fontconfig/fontconfig.h> -
Description
to the equivalent lower case letter. -

Up

Name

Synopsis
#include <fontconfig/fontconfig.h> -
Description
and returns the number of bytes needed to encode the char. -

Up

Name

Synopsis
#include <fontconfig/fontconfig.h> -
Description
is a well-formed UTF16 string. -

Up

Name

Synopsis
#include <fontconfig/fontconfig.h> -
Description
endian. -

Up

Name

Synopsis
#include <fontconfig/fontconfig.h> -
Description
is a well-formed UTF8 string. -

Up

Name
Synopsis
#include <fontconfig/fontconfig.h> -
Description
len bytes long. -
Up
#include <fontconfig/fontconfig.h> -
. Values of type FcTypeString, FcTypeMatrix and FcTypeCharSet reference memory, the other types do not. -
#include <fontconfig/fontconfig.h> -
Compares two values. Integers and Doubles are compared as numbers; otherwise the two values have to be the same type to be considered equal. Strings are compared ignoring case. -
#include <fontconfig/fontconfig.h> -
to stdout. The format should not be considered part of the library specification as it may change in the future. -
#include <fontconfig/fontconfig.h> -
may be safely destroyed without harming the new value. -
Name
Synopsis
#include <fontconfig/fontconfig.h> -
Description
Since
Up
Name
Synopsis
#include <fontconfig/fontconfig.h> -
Description
FcWeightFromOpenTypeDouble but with integer arguments. Use the other function instead. -
Since
Up
Name
Synopsis
#include <fontconfig/fontconfig.h> -
Description
. If the input is less than FC_WEIGHT_THIN or greater than FC_WEIGHT_EXTRABLACK, returns -1. Otherwise returns a number in the range 1 to 1000. -
Since
Up
Name
Synopsis
#include <fontconfig/fontconfig.h> -
Description
FcWeightToOpenTypeDouble but with integer arguments. Use the other function instead. -
Since
Up
-Copyright © 2002 Keith Packard -
Copyright © 2002 Keith Packard +
Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that @@ -56,7 +55,7 @@ specific, written prior permission. The authors make no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. -
THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO @@ -65,7 +64,7 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -
Fontconfig Developers Reference, Version 2.14.1 +>Fontconfig Developers Reference, Version 2.14.2 Fontconfig Developers Reference, Version 2.14.1Fontconfig Developers Reference, Version 2.14.2
FcValue is a structure containing a type tag and a union of all possible -datatypes. The tag is an enum of type +datatypes. The tag is an enum of type FcType -- Lookup symbolic constant
FcNameGetConstantFor -- Lookup symbolic constant For object
FcNameConstant -- Get the value for a symbolic constant
FcWeight
FcBlanks
FcAtomic
File and Directory routines
FcCache routines
FcStrSet and FcStrList
String utilities
The intent is to make font configurations relatively static, and shared by diff -Nru fontconfig-2.14.1/doc/fontconfig-devel/x31.html fontconfig-2.14.2/doc/fontconfig-devel/x31.html --- fontconfig-2.14.1/doc/fontconfig-devel/x31.html 2022-10-21 07:35:16.000000000 +0000 +++ fontconfig-2.14.2/doc/fontconfig-devel/x31.html 2023-01-27 08:23:12.000000000 +0000 @@ -206,9 +206,9 @@ double d; const FcMatrix *m; const FcCharSet *c; - void *f; - const FcLangSet *l; - const FcRange *r; + void *f; + const FcLangSet *l; + const FcRange *r; } u; } FcValue; + + const FcConstant * FcNameGetConstantFor(FcChar8 *string, char + *object); + +Description + + Return the FcConstant structure related to symbolic constant + string for object. + FcNameConstant Name diff -Nru fontconfig-2.14.1/doc/fontconfig-user.html fontconfig-2.14.2/doc/fontconfig-user.html --- fontconfig-2.14.1/doc/fontconfig-user.html 2022-10-21 07:35:15.000000000 +0000 +++ fontconfig-2.14.2/doc/fontconfig-user.html 2023-01-27 08:23:12.000000000 +0000 @@ -1646,7 +1646,7 @@ >
Version
Fontconfig version 2.14.1 +>Fontconfig version 2.14.2
pixel conversions (deprecated) - dpi Double Target dots per inch - rgba Int unknown, rgb, bgr, vrgb, vbgr, - none - subpixel geometry - lcdfilter Int Type of LCD filter - minspace Bool Eliminate leading from line spacing - charset CharSet Unicode chars encoded by the font - lang String List of RFC-3066-style languages this - font supports - fontversion Int Version number of the font - capability String List of layout capabilities in the font - fontformat String String name of the font format - embolden Bool Rasterizer should synthetically embolden the font - embeddedbitmap Bool Use the embedded bitmap instead of the outline - decorative Bool Whether the style is a decorative variant - fontfeatures String List of the feature tags in OpenType to be enabled - namelang String Language name to be used for the default value of - familylang, stylelang, and fullnamelang - prgname String String Name of the running program - postscriptname String Font family name in PostScript - fonthashint Bool Whether the font has hinting - order Int Order number of the font +Property Type Description +-------------------------------------------------------------- +family String Font family names +familylang String Languages corresponding to each family +style String Font style. Overrides weight and slant +stylelang String Languages corresponding to each style +fullname String Font full names (often includes style) +fullnamelang String Languages corresponding to each fullname +slant Int Italic, oblique or roman +weight Int Light, medium, demibold, bold or black +size Double Point size +width Int Condensed, normal or expanded +aspect Double Stretches glyphs horizontally before hinting +pixelsize Double Pixel size +spacing Int Proportional, dual-width, monospace or charcell +foundry String Font foundry name +antialias Bool Whether glyphs can be antialiased +hinting Bool Whether the rasterizer should use hinting +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 (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 +rasterizer String Which rasterizer is in use (deprecated) +outline Bool Whether the glyphs are outlines +scalable Bool Whether glyphs can be scaled +color Bool Whether any glyphs have color +scale Double Scale factor for point->pixel conversions + (deprecated) +dpi Double Target dots per inch +rgba Int unknown, rgb, bgr, vrgb, vbgr, + none - subpixel geometry +lcdfilter Int Type of LCD filter +minspace Bool Eliminate leading from line spacing +charset CharSet Unicode chars encoded by the font +lang String List of RFC-3066-style languages this + font supports +fontversion Int Version number of the font +capability String List of layout capabilities in the font +fontformat String String name of the font format +embolden Bool Rasterizer should synthetically embolden the font +embeddedbitmap Bool Use the embedded bitmap instead of the outline +decorative Bool Whether the style is a decorative variant +fontfeatures String List of the feature tags in OpenType to be enabled +namelang String Language name to be used for the default value of + familylang, stylelang, and fullnamelang +prgname String String Name of the running program +postscriptname String Font family name in PostScript +fonthashint Bool Whether the font has hinting +order Int Order number of the font .sp .fi @@ -174,7 +175,7 @@ additional properties: .sp .nf - -:=:=\&... +-:=:=\&... .sp .fi @@ -185,13 +186,13 @@ Here are some examples: .sp .nf - Name Meaning - ---------------------------------------------------------- - Times-12 12 point Times Roman - Times-12:bold 12 point Times Bold - Courier:italic Courier Italic in the default size - Monospace:matrix=1 .1 0 1 The users preferred monospace font - with artificial obliquing +Name Meaning +---------------------------------------------------------- +Times-12 12 point Times Roman +Times-12:bold 12 point Times Bold +Courier:italic Courier Italic in the default size +Monospace:matrix=1 .1 0 1 The users preferred monospace font + with artificial obliquing .sp .fi @@ -210,21 +211,21 @@ debugging messages. .sp .nf - Name Value Meaning - --------------------------------------------------------- - MATCH 1 Brief information about font matching - MATCHV 2 Extensive font matching information - EDIT 4 Monitor match/test/edit execution - FONTSET 8 Track loading of font information at startup - CACHE 16 Watch cache files being written - CACHEV 32 Extensive cache file writing information - PARSE 64 (no longer in use) - SCAN 128 Watch font files being scanned to build caches - SCANV 256 Verbose font file scanning information - MEMORY 512 Monitor fontconfig memory usage - CONFIG 1024 Monitor which config files are loaded - LANGSET 2048 Dump char sets used to construct lang values - MATCH2 4096 Display font-matching transformation in patterns +Name Value Meaning +--------------------------------------------------------- +MATCH 1 Brief information about font matching +MATCHV 2 Extensive font matching information +EDIT 4 Monitor match/test/edit execution +FONTSET 8 Track loading of font information at startup +CACHE 16 Watch cache files being written +CACHEV 32 Extensive cache file writing information +PARSE 64 (no longer in use) +SCAN 128 Watch font files being scanned to build caches +SCANV 256 Verbose font file scanning information +MEMORY 512 Monitor fontconfig memory usage +CONFIG 1024 Monitor which config files are loaded +LANGSET 2048 Dump char sets used to construct lang values +MATCH2 4096 Display font-matching transformation in patterns .sp .fi @@ -264,11 +265,11 @@ following structure: .sp .nf - - - + + + \&... - + .sp .fi @@ -361,7 +362,8 @@ .SS "" .PP Glob elements hold shell-style filename matching patterns (including ? and -*) which match fonts based on their complete pathnames. This can be used to +*) which match fonts based on their complete pathnames. If it starts with '~', +it refers to a directory in the users home directory. This can be used to exclude a set of directories (/usr/share/fonts/uglyfont*), or particular font file types (*.pcf.gz), but the latter mechanism relies rather heavily on filenaming conventions which can't be relied upon. Note that globs @@ -392,7 +394,7 @@ .SS "" .PP This element contains a single value which is compared with the target -('pattern', 'font', 'scan' or 'default') property "property" (substitute any of the property names seen +('pattern', 'font', 'scan' or 'default') property "property" (substitute any of the property names seen above). 'compare' can be one of "eq", "not_eq", "less", "less_eq", "more", "more_eq", "contains" or "not_contains". 'qual' may either be the default, "any", in which case the match succeeds if any value associated with the property matches the test value, or @@ -414,16 +416,16 @@ \&'mode' is one of: .sp .nf - Mode With Match Without Match - --------------------------------------------------------------------- - "assign" Replace matching value Replace all values - "assign_replace" Replace all values Replace all values - "prepend" Insert before matching Insert at head of list - "prepend_first" Insert at head of list Insert at head of list - "append" Append after matching Append at end of list - "append_last" Append at end of list Append at end of list - "delete" Delete matching value Delete all values - "delete_all" Delete all values Delete all values +Mode With Match Without Match +--------------------------------------------------------------------- +"assign" Replace matching value Replace all values +"assign_replace" Replace all values Replace all values +"prepend" Insert before matching Insert at head of list +"prepend_first" Insert at head of list Insert at head of list +"append" Append after matching Append at end of list +"append_last" Append at end of list Append at end of list +"delete" Delete matching value Delete all values +"delete_all" Delete all values Delete all values .sp .fi @@ -467,54 +469,57 @@ symbolic names for common font values: .sp .nf - Constant Property Value - ------------------------------------- - thin weight 0 - extralight weight 40 - ultralight weight 40 - light weight 50 - demilight weight 55 - semilight weight 55 - book weight 75 - regular weight 80 - normal weight 80 - medium weight 100 - demibold weight 180 - semibold weight 180 - bold weight 200 - extrabold weight 205 - black weight 210 - heavy weight 210 - roman slant 0 - italic slant 100 - oblique slant 110 - ultracondensed width 50 - extracondensed width 63 - condensed width 75 - semicondensed width 87 - normal width 100 - semiexpanded width 113 - expanded width 125 - extraexpanded width 150 - ultraexpanded width 200 - proportional spacing 0 - dual spacing 90 - mono spacing 100 - charcell spacing 110 - unknown rgba 0 - rgb rgba 1 - bgr rgba 2 - vrgb rgba 3 - vbgr rgba 4 - none rgba 5 - lcdnone lcdfilter 0 - lcddefault lcdfilter 1 - lcdlight lcdfilter 2 - lcdlegacy lcdfilter 3 - hintnone hintstyle 0 - hintslight hintstyle 1 - hintmedium hintstyle 2 - hintfull hintstyle 3 +Constant Property Value +------------------------------------- +thin weight 0 +extralight weight 40 +ultralight weight 40 +light weight 50 +demilight weight 55 +semilight weight 55 +book weight 75 +regular weight 80 +normal weight 80 +medium weight 100 +demibold weight 180 +semibold weight 180 +bold weight 200 +extrabold weight 205 +ultrabold weight 205 +black weight 210 +heavy weight 210 +extrablack weight 215 +ultrablack weight 215 +roman slant 0 +italic slant 100 +oblique slant 110 +ultracondensed width 50 +extracondensed width 63 +condensed width 75 +semicondensed width 87 +normal width 100 +semiexpanded width 113 +expanded width 125 +extraexpanded width 150 +ultraexpanded width 200 +proportional spacing 0 +dual spacing 90 +mono spacing 100 +charcell spacing 110 +unknown rgba 0 +rgb rgba 1 +bgr rgba 2 +vrgb rgba 3 +vbgr rgba 4 +none rgba 5 +lcdnone lcdfilter 0 +lcddefault lcdfilter 1 +lcdlight lcdfilter 2 +lcdlegacy lcdfilter 3 +hintnone hintstyle 0 +hintslight hintstyle 1 +hintmedium hintstyle 2 +hintfull hintstyle 3 .sp .fi @@ -558,103 +563,135 @@ - -/usr/share/fonts -/usr/X11R6/lib/X11/fonts + + /usr/share/fonts + /usr/X11R6/lib/X11/fonts - - - mono - monospace - + + + + mono + + + monospace + + - - - sans-serif - serif - monospace - sans-serif - + + + + sans-serif + + + serif + + + monospace + + + sans-serif + + - -fontconfig/fonts.conf + + + fontconfig/fonts.conf + - -conf.d -local.conf + + conf.d + local.conf - - - Times - Times New Roman - serif - - - Helvetica - Arial - sans - - - Courier - Courier New - monospace - + + + Times + + Times New Roman + + + serif + + + + Helvetica + + Arial + + + sans + + + + Courier + + Courier New + + + monospace + + - - - serif - Times New Roman - - - sans - Arial - - - monospace - Andale Mono - + + + serif + + Times New Roman + + + + sans + + Arial + + + + monospace + + Andale Mono + + -<-- - The example of the requirements of OR operator; - If the 'family' contains 'Courier New' OR 'Courier' - add 'monospace' as the alternative ---> - - - Courier New - - - monospace - - - - - Courier - - - monospace - - + <-- + The example of the requirements of OR operator; + If the 'family' contains 'Courier New' OR 'Courier' + add 'monospace' as the alternative + --> + + + Courier New + + + monospace + + + + + Courier + + + monospace + + @@ -668,57 +705,61 @@ .nf - - - -fonts + - - - rgb - - - - - - zh - - - serif - - - WenQuanYi Zen Hei - - - - - - ja - - - sans-serif - - - VL Gothic - - + + fonts + + + + + rgb + + + + + + + zh + + + serif + + + WenQuanYi Zen Hei + + + + + + ja + + + sans-serif + + + VL Gothic + + .sp @@ -736,7 +777,7 @@ managed by external applications or the local administrator. The filenames starting with decimal digits are sorted in lexicographic order and used as additional configuration files. All of these files are in XML -format. The master fonts.conf file references this directory in an +format. The master fonts.conf file references this directory in an directive. .PP \fBfonts.dtd\fR @@ -784,4 +825,4 @@ fc-cat(1), fc-cache(1), fc-list(1), fc-match(1), fc-query(1), SOURCE_DATE_EPOCH \&. .SH "VERSION" .PP -Fontconfig version 2.14.1 +Fontconfig version 2.14.2 diff -Nru fontconfig-2.14.1/doc/func.sgml fontconfig-2.14.2/doc/func.sgml --- fontconfig-2.14.1/doc/func.sgml 2019-10-16 10:05:28.000000000 +0000 +++ fontconfig-2.14.2/doc/func.sgml 2023-01-25 00:17:17.000000000 +0000 @@ -1,8 +1,8 @@ @@ -68,15 +68,15 @@ - - + + - + @@ -108,14 +108,14 @@ - - - - - Raise an error if there are no fonts in - or directories - in the configuration if not given. - + + + + + Raise an error if there are no fonts in + or directories + in the configuration if not given. + @@ -152,13 +152,13 @@ - - - - - - Prepend to all paths for scanning. - + + + + + + Prepend to all paths for scanning. + @@ -190,18 +190,18 @@ RETURN CODES fc-cache returns zero if the caches successfully generated. otherwise non-zero. - + FILES %cachedir%/*-%arch%.cache-%version% - - These files are generated by &dhpackage; + + These files are generated by &dhpackage; and contain maps from file names to font properties. They are read by the fontconfig library at application startup to locate appropriate fonts. - + diff -Nru fontconfig-2.14.1/fc-cache/Makefile.in fontconfig-2.14.2/fc-cache/Makefile.in --- fontconfig-2.14.1/fc-cache/Makefile.in 2022-10-21 07:33:39.000000000 +0000 +++ fontconfig-2.14.2/fc-cache/Makefile.in 2023-01-27 08:22:14.000000000 +0000 @@ -346,6 +346,7 @@ PKG_EXPAT_LIBS = @PKG_EXPAT_LIBS@ POSUB = @POSUB@ PREFERRED_HINTING = @PREFERRED_HINTING@ +PREFERRED_SUB_PIXEL_RENDERING = @PREFERRED_SUB_PIXEL_RENDERING@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ diff -Nru fontconfig-2.14.1/fc-case/Makefile.in fontconfig-2.14.2/fc-case/Makefile.in --- fontconfig-2.14.1/fc-case/Makefile.in 2022-10-21 07:33:39.000000000 +0000 +++ fontconfig-2.14.2/fc-case/Makefile.in 2023-01-27 08:22:14.000000000 +0000 @@ -313,6 +313,7 @@ PKG_EXPAT_LIBS = @PKG_EXPAT_LIBS@ POSUB = @POSUB@ PREFERRED_HINTING = @PREFERRED_HINTING@ +PREFERRED_SUB_PIXEL_RENDERING = @PREFERRED_SUB_PIXEL_RENDERING@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ diff -Nru fontconfig-2.14.1/fc-cat/fc-cat.sgml fontconfig-2.14.2/fc-cat/fc-cat.sgml --- fontconfig-2.14.1/fc-cat/fc-cat.sgml 2020-12-03 11:45:00.000000000 +0000 +++ fontconfig-2.14.2/fc-cat/fc-cat.sgml 2023-01-25 00:17:35.000000000 +0000 @@ -28,13 +28,13 @@ less'. A typical entry in a Makefile or Makefile.am is: manpage.1: manpage.sgml - docbook-to-man $< > $@ + docbook-to-man $< > $@ - - The docbook-to-man binary is found in the docbook-to-man package. - Please remember that if you create the nroff version in one of the - debian/rules file targets (such as build), you will need to include - docbook-to-man in your Build-Depends control field. + + The docbook-to-man binary is found in the docbook-to-man package. + Please remember that if you create the nroff version in one of the + debian/rules file targets (such as build), you will need to include + docbook-to-man in your Build-Depends control field. --> @@ -95,7 +95,7 @@ - + diff -Nru fontconfig-2.14.1/fc-cat/Makefile.in fontconfig-2.14.2/fc-cat/Makefile.in --- fontconfig-2.14.1/fc-cat/Makefile.in 2022-10-21 07:33:39.000000000 +0000 +++ fontconfig-2.14.2/fc-cat/Makefile.in 2023-01-27 08:22:14.000000000 +0000 @@ -346,6 +346,7 @@ PKG_EXPAT_LIBS = @PKG_EXPAT_LIBS@ POSUB = @POSUB@ PREFERRED_HINTING = @PREFERRED_HINTING@ +PREFERRED_SUB_PIXEL_RENDERING = @PREFERRED_SUB_PIXEL_RENDERING@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ diff -Nru fontconfig-2.14.1/fc-conflist/fc-conflist.sgml fontconfig-2.14.2/fc-conflist/fc-conflist.sgml --- fontconfig-2.14.1/fc-conflist/fc-conflist.sgml 2021-12-21 11:14:00.000000000 +0000 +++ fontconfig-2.14.2/fc-conflist/fc-conflist.sgml 2023-01-25 00:17:35.000000000 +0000 @@ -28,13 +28,13 @@ less'. A typical entry in a Makefile or Makefile.am is: manpage.1: manpage.sgml - docbook-to-man $< > $@ + docbook-to-man $< > $@ - The docbook-to-man binary is found in the docbook-to-man package. - Please remember that if you create the nroff version in one of the - debian/rules file targets (such as build), you will need to include - docbook-to-man in your Build-Depends control field. + The docbook-to-man binary is found in the docbook-to-man package. + Please remember that if you create the nroff version in one of the + debian/rules file targets (such as build), you will need to include + docbook-to-man in your Build-Depends control field. --> diff -Nru fontconfig-2.14.1/fc-conflist/Makefile.in fontconfig-2.14.2/fc-conflist/Makefile.in --- fontconfig-2.14.1/fc-conflist/Makefile.in 2022-10-21 07:33:39.000000000 +0000 +++ fontconfig-2.14.2/fc-conflist/Makefile.in 2023-01-27 08:22:14.000000000 +0000 @@ -348,6 +348,7 @@ PKG_EXPAT_LIBS = @PKG_EXPAT_LIBS@ POSUB = @POSUB@ PREFERRED_HINTING = @PREFERRED_HINTING@ +PREFERRED_SUB_PIXEL_RENDERING = @PREFERRED_SUB_PIXEL_RENDERING@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ diff -Nru fontconfig-2.14.1/fc-lang/Makefile.in fontconfig-2.14.2/fc-lang/Makefile.in --- fontconfig-2.14.1/fc-lang/Makefile.in 2022-10-21 07:33:39.000000000 +0000 +++ fontconfig-2.14.2/fc-lang/Makefile.in 2023-01-27 08:22:14.000000000 +0000 @@ -313,6 +313,7 @@ PKG_EXPAT_LIBS = @PKG_EXPAT_LIBS@ POSUB = @POSUB@ PREFERRED_HINTING = @PREFERRED_HINTING@ +PREFERRED_SUB_PIXEL_RENDERING = @PREFERRED_SUB_PIXEL_RENDERING@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ diff -Nru fontconfig-2.14.1/fc-list/fc-list.sgml fontconfig-2.14.2/fc-list/fc-list.sgml --- fontconfig-2.14.1/fc-list/fc-list.sgml 2019-10-16 10:05:28.000000000 +0000 +++ fontconfig-2.14.2/fc-list/fc-list.sgml 2023-01-25 00:17:35.000000000 +0000 @@ -6,13 +6,13 @@ less'. A typical entry in a Makefile or Makefile.am is: manpage.1: manpage.sgml - docbook-to-man $< > $@ + docbook-to-man $< > $@ - - The docbook-to-man binary is found in the docbook-to-man package. - Please remember that if you create the nroff version in one of the - debian/rules file targets (such as build), you will need to include - docbook-to-man in your Build-Depends control field. + + The docbook-to-man binary is found in the docbook-to-man package. + Please remember that if you create the nroff version in one of the + debian/rules file targets (such as build), you will need to include + docbook-to-man in your Build-Depends control field. --> @@ -70,14 +70,14 @@ - - + + - + @@ -103,27 +103,27 @@ Print verbose output of the whole font pattern for each match, - or elements if any is - provided. + or elements if any is + provided. - + Format output according to the format specifier - format. + format. - - - - - Suppress all normal output. returns 1 as the error code if no fonts matched. - + + + + + Suppress all normal output. returns 1 as the error code if no fonts matched. + diff -Nru fontconfig-2.14.1/fc-list/Makefile.in fontconfig-2.14.2/fc-list/Makefile.in --- fontconfig-2.14.1/fc-list/Makefile.in 2022-10-21 07:33:39.000000000 +0000 +++ fontconfig-2.14.2/fc-list/Makefile.in 2023-01-27 08:22:14.000000000 +0000 @@ -346,6 +346,7 @@ PKG_EXPAT_LIBS = @PKG_EXPAT_LIBS@ POSUB = @POSUB@ PREFERRED_HINTING = @PREFERRED_HINTING@ +PREFERRED_SUB_PIXEL_RENDERING = @PREFERRED_SUB_PIXEL_RENDERING@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ diff -Nru fontconfig-2.14.1/fc-match/fc-match.sgml fontconfig-2.14.2/fc-match/fc-match.sgml --- fontconfig-2.14.1/fc-match/fc-match.sgml 2020-12-03 11:45:00.000000000 +0000 +++ fontconfig-2.14.2/fc-match/fc-match.sgml 2023-01-25 00:17:35.000000000 +0000 @@ -28,13 +28,13 @@ less'. A typical entry in a Makefile or Makefile.am is: manpage.1: manpage.sgml - docbook-to-man $< > $@ + docbook-to-man $< > $@ - - The docbook-to-man binary is found in the docbook-to-man package. - Please remember that if you create the nroff version in one of the - debian/rules file targets (such as build), you will need to include - docbook-to-man in your Build-Depends control field. + + The docbook-to-man binary is found in the docbook-to-man package. + Please remember that if you create the nroff version in one of the + debian/rules file targets (such as build), you will need to include + docbook-to-man in your Build-Depends control field. --> @@ -97,7 +97,7 @@ - + @@ -128,7 +128,7 @@ Displays sorted list of best matching fonts, but do not do any - pruning on the list. + pruning on the list. @@ -145,18 +145,18 @@ Print verbose output of the whole font pattern for each match, - or elements if any is - provided. + or elements if any is + provided. - + Format output according to the format specifier - format. + format. @@ -199,27 +199,27 @@ - fc-match sans - Display the best matching font categorized into sans-serif generic family, filtered by current locale + fc-match sans + Display the best matching font categorized into sans-serif generic family, filtered by current locale - fc-match sans:lang=en - Display the best matching font categorized into sans-serif generic family, filtered by English language + fc-match sans:lang=en + Display the best matching font categorized into sans-serif generic family, filtered by English language - fc-match sans:lang=en:weight=bold - Display the best matching font categorized into sans-serif generic family, filtered by English language and weight is bold. + fc-match sans:lang=en:weight=bold + Display the best matching font categorized into sans-serif generic family, filtered by English language and weight is bold. - + SEE ALSO diff -Nru fontconfig-2.14.1/fc-match/Makefile.in fontconfig-2.14.2/fc-match/Makefile.in --- fontconfig-2.14.1/fc-match/Makefile.in 2022-10-21 07:33:39.000000000 +0000 +++ fontconfig-2.14.2/fc-match/Makefile.in 2023-01-27 08:22:14.000000000 +0000 @@ -346,6 +346,7 @@ PKG_EXPAT_LIBS = @PKG_EXPAT_LIBS@ POSUB = @POSUB@ PREFERRED_HINTING = @PREFERRED_HINTING@ +PREFERRED_SUB_PIXEL_RENDERING = @PREFERRED_SUB_PIXEL_RENDERING@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ diff -Nru fontconfig-2.14.1/fc-pattern/fc-pattern.sgml fontconfig-2.14.2/fc-pattern/fc-pattern.sgml --- fontconfig-2.14.1/fc-pattern/fc-pattern.sgml 2016-07-11 02:41:06.000000000 +0000 +++ fontconfig-2.14.2/fc-pattern/fc-pattern.sgml 2023-01-25 00:17:35.000000000 +0000 @@ -6,13 +6,13 @@ less'. A typical entry in a Makefile or Makefile.am is: manpage.1: manpage.sgml - docbook-to-man $< > $@ + docbook-to-man $< > $@ - - The docbook-to-man binary is found in the docbook-to-man package. - Please remember that if you create the nroff version in one of the - debian/rules file targets (such as build), you will need to include - docbook-to-man in your Build-Depends control field. + + The docbook-to-man binary is found in the docbook-to-man package. + Please remember that if you create the nroff version in one of the + debian/rules file targets (such as build), you will need to include + docbook-to-man in your Build-Depends control field. --> @@ -74,7 +74,7 @@ - + @@ -116,11 +116,11 @@ - + Format output according to the format specifier - format. + format. diff -Nru fontconfig-2.14.1/fc-pattern/Makefile.in fontconfig-2.14.2/fc-pattern/Makefile.in --- fontconfig-2.14.1/fc-pattern/Makefile.in 2022-10-21 07:33:39.000000000 +0000 +++ fontconfig-2.14.2/fc-pattern/Makefile.in 2023-01-27 08:22:14.000000000 +0000 @@ -346,6 +346,7 @@ PKG_EXPAT_LIBS = @PKG_EXPAT_LIBS@ POSUB = @POSUB@ PREFERRED_HINTING = @PREFERRED_HINTING@ +PREFERRED_SUB_PIXEL_RENDERING = @PREFERRED_SUB_PIXEL_RENDERING@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ diff -Nru fontconfig-2.14.1/fc-query/fc-query.sgml fontconfig-2.14.2/fc-query/fc-query.sgml --- fontconfig-2.14.1/fc-query/fc-query.sgml 2020-12-03 11:45:00.000000000 +0000 +++ fontconfig-2.14.2/fc-query/fc-query.sgml 2023-01-25 00:17:35.000000000 +0000 @@ -6,13 +6,13 @@ less'. A typical entry in a Makefile or Makefile.am is: manpage.1: manpage.sgml - docbook-to-man $< > $@ + docbook-to-man $< > $@ - The docbook-to-man binary is found in the docbook-to-man package. - Please remember that if you create the nroff version in one of the - debian/rules file targets (such as build), you will need to include - docbook-to-man in your Build-Depends control field. + The docbook-to-man binary is found in the docbook-to-man package. + Please remember that if you create the nroff version in one of the + debian/rules file targets (such as build), you will need to include + docbook-to-man in your Build-Depends control field. --> @@ -65,8 +65,8 @@ - - + + @@ -101,31 +101,31 @@ - - - - - Ignore blanks to compute languages - + + + + + Ignore blanks to compute languages + - + Only query face indexed index of - each file. + each file. - + Format output according to the format specifier - format. + format. diff -Nru fontconfig-2.14.1/fc-query/Makefile.in fontconfig-2.14.2/fc-query/Makefile.in --- fontconfig-2.14.1/fc-query/Makefile.in 2022-10-21 07:33:39.000000000 +0000 +++ fontconfig-2.14.2/fc-query/Makefile.in 2023-01-27 08:22:14.000000000 +0000 @@ -346,6 +346,7 @@ PKG_EXPAT_LIBS = @PKG_EXPAT_LIBS@ POSUB = @POSUB@ PREFERRED_HINTING = @PREFERRED_HINTING@ +PREFERRED_SUB_PIXEL_RENDERING = @PREFERRED_SUB_PIXEL_RENDERING@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ diff -Nru fontconfig-2.14.1/fc-scan/fc-scan.sgml fontconfig-2.14.2/fc-scan/fc-scan.sgml --- fontconfig-2.14.1/fc-scan/fc-scan.sgml 2018-06-05 10:36:38.000000000 +0000 +++ fontconfig-2.14.2/fc-scan/fc-scan.sgml 2023-01-25 00:17:35.000000000 +0000 @@ -6,13 +6,13 @@ less'. A typical entry in a Makefile or Makefile.am is: manpage.1: manpage.sgml - docbook-to-man $< > $@ + docbook-to-man $< > $@ - The docbook-to-man binary is found in the docbook-to-man package. - Please remember that if you create the nroff version in one of the - debian/rules file targets (such as build), you will need to include - docbook-to-man in your Build-Depends control field. + The docbook-to-man binary is found in the docbook-to-man package. + Please remember that if you create the nroff version in one of the + debian/rules file targets (such as build), you will need to include + docbook-to-man in your Build-Depends control field. --> @@ -93,11 +93,11 @@ - + Format output according to the format specifier - format. + format. diff -Nru fontconfig-2.14.1/fc-scan/Makefile.in fontconfig-2.14.2/fc-scan/Makefile.in --- fontconfig-2.14.1/fc-scan/Makefile.in 2022-10-21 07:33:39.000000000 +0000 +++ fontconfig-2.14.2/fc-scan/Makefile.in 2023-01-27 08:22:14.000000000 +0000 @@ -346,6 +346,7 @@ PKG_EXPAT_LIBS = @PKG_EXPAT_LIBS@ POSUB = @POSUB@ PREFERRED_HINTING = @PREFERRED_HINTING@ +PREFERRED_SUB_PIXEL_RENDERING = @PREFERRED_SUB_PIXEL_RENDERING@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ diff -Nru fontconfig-2.14.1/fc-validate/fc-validate.sgml fontconfig-2.14.2/fc-validate/fc-validate.sgml --- fontconfig-2.14.1/fc-validate/fc-validate.sgml 2020-12-03 11:45:00.000000000 +0000 +++ fontconfig-2.14.2/fc-validate/fc-validate.sgml 2023-01-25 00:17:35.000000000 +0000 @@ -28,13 +28,13 @@ less'. A typical entry in a Makefile or Makefile.am is: manpage.1: manpage.sgml - docbook-to-man $< > $@ + docbook-to-man $< > $@ - The docbook-to-man binary is found in the docbook-to-man package. - Please remember that if you create the nroff version in one of the - debian/rules file targets (such as build), you will need to include - docbook-to-man in your Build-Depends control field. + The docbook-to-man binary is found in the docbook-to-man package. + Please remember that if you create the nroff version in one of the + debian/rules file targets (such as build), you will need to include + docbook-to-man in your Build-Depends control field. --> @@ -91,8 +91,8 @@ - - + + @@ -122,29 +122,29 @@ - + Only query face indexed index of - each file. + each file. - - - - - - Set lang as a language instead of current locale. this is used for . - + + + + + + Set lang as a language instead of current locale. this is used for . + - - - - - Show more detailed information. - + + + + + Show more detailed information. + diff -Nru fontconfig-2.14.1/fc-validate/Makefile.in fontconfig-2.14.2/fc-validate/Makefile.in --- fontconfig-2.14.1/fc-validate/Makefile.in 2022-10-21 07:33:39.000000000 +0000 +++ fontconfig-2.14.2/fc-validate/Makefile.in 2023-01-27 08:22:14.000000000 +0000 @@ -348,6 +348,7 @@ PKG_EXPAT_LIBS = @PKG_EXPAT_LIBS@ POSUB = @POSUB@ PREFERRED_HINTING = @PREFERRED_HINTING@ +PREFERRED_SUB_PIXEL_RENDERING = @PREFERRED_SUB_PIXEL_RENDERING@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ diff -Nru fontconfig-2.14.1/fontconfig/fontconfig.h fontconfig-2.14.2/fontconfig/fontconfig.h --- fontconfig-2.14.1/fontconfig/fontconfig.h 2022-10-21 05:14:03.000000000 +0000 +++ fontconfig-2.14.2/fontconfig/fontconfig.h 2023-01-27 05:46:22.000000000 +0000 @@ -53,7 +53,7 @@ #define FC_MAJOR 2 #define FC_MINOR 14 -#define FC_REVISION 1 +#define FC_REVISION 2 #define FC_VERSION ((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION)) @@ -128,6 +128,7 @@ #define FC_POSTSCRIPT_NAME "postscriptname" /* String */ #define FC_FONT_HAS_HINT "fonthashint" /* Bool - true if font has hinting */ #define FC_ORDER "order" /* Integer */ +#define FC_DESKTOP_NAME "desktop" /* String */ #define FC_CACHE_SUFFIX ".cache-" FC_CACHE_VERSION #define FC_DIR_CACHE_FILE "fonts.cache-" FC_CACHE_VERSION @@ -285,7 +286,7 @@ int sobject; const char **objects; } FcObjectSet; - + typedef enum _FcMatchKind { FcMatchPattern, FcMatchFont, FcMatchScan, FcMatchKindEnd, @@ -400,7 +401,7 @@ FcPublic FcChar8 * FcConfigFilename (const FcChar8 *url); - + FcPublic FcConfig * FcConfigCreate (void); @@ -418,7 +419,7 @@ FcPublic FcBool FcConfigUptoDate (FcConfig *config); - + FcPublic FcBool FcConfigBuildFonts (FcConfig *config); @@ -548,12 +549,12 @@ #define FC_CHARSET_DONE ((FcChar32) -1) FcPublic FcChar32 -FcCharSetFirstPage (const FcCharSet *a, +FcCharSetFirstPage (const FcCharSet *a, FcChar32 map[FC_CHARSET_MAP_SIZE], FcChar32 *next); FcPublic FcChar32 -FcCharSetNextPage (const FcCharSet *a, +FcCharSetNextPage (const FcCharSet *a, FcChar32 map[FC_CHARSET_MAP_SIZE], FcChar32 *next); @@ -609,7 +610,7 @@ FcPublic FcCache * FcDirCacheRescan (const FcChar8 *dir, FcConfig *config); - + FcPublic FcCache * FcDirCacheRead (const FcChar8 *dir, FcBool force, FcConfig *config); @@ -772,7 +773,7 @@ FcPublic FcPattern * FcFontMatch (FcConfig *config, - FcPattern *p, + FcPattern *p, FcResult *result); FcPublic FcPattern * @@ -842,6 +843,9 @@ FcPublic const FcConstant * FcNameGetConstant (const FcChar8 *string); +FcPublic const FcConstant * +FcNameGetConstantFor (const FcChar8 *string, const char *object); + FcPublic FcBool FcNameConstant (const FcChar8 *string, int *result); @@ -890,10 +894,10 @@ FcPublic FcBool FcPatternAdd (FcPattern *p, const char *object, FcValue value, FcBool append); - + FcPublic FcBool FcPatternAddWeak (FcPattern *p, const char *object, FcValue value, FcBool append); - + FcPublic FcResult FcPatternGet (const FcPattern *p, const char *object, int id, FcValue *v); @@ -956,7 +960,7 @@ FcPublic FcPattern * FcPatternVaBuild (FcPattern *p, va_list va); - + FcPublic FcPattern * FcPatternBuild (FcPattern *p, ...) FC_ATTRIBUTE_SENTINEL(0); @@ -1025,10 +1029,10 @@ FcPublic FcChar8 * FcStrCopyFilename (const FcChar8 *s); - + FcPublic FcChar8 * FcStrPlus (const FcChar8 *s1, const FcChar8 *s2); - + FcPublic void FcStrFree (FcChar8 *s); @@ -1145,7 +1149,7 @@ * Deprecated functions are placed here to help users fix their code without * digging through documentation */ - + #define FcConfigGetRescanInverval FcConfigGetRescanInverval_REPLACE_BY_FcConfigGetRescanInterval #define FcConfigSetRescanInverval FcConfigSetRescanInverval_REPLACE_BY_FcConfigSetRescanInterval diff -Nru fontconfig-2.14.1/fontconfig/Makefile.in fontconfig-2.14.2/fontconfig/Makefile.in --- fontconfig-2.14.1/fontconfig/Makefile.in 2022-10-21 07:33:39.000000000 +0000 +++ fontconfig-2.14.2/fontconfig/Makefile.in 2023-01-27 08:22:14.000000000 +0000 @@ -312,6 +312,7 @@ PKG_EXPAT_LIBS = @PKG_EXPAT_LIBS@ POSUB = @POSUB@ PREFERRED_HINTING = @PREFERRED_HINTING@ +PREFERRED_SUB_PIXEL_RENDERING = @PREFERRED_SUB_PIXEL_RENDERING@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ diff -Nru fontconfig-2.14.1/its/Makefile.in fontconfig-2.14.2/its/Makefile.in --- fontconfig-2.14.1/its/Makefile.in 2022-10-21 07:33:39.000000000 +0000 +++ fontconfig-2.14.2/its/Makefile.in 2023-01-27 08:22:14.000000000 +0000 @@ -295,6 +295,7 @@ PKG_EXPAT_LIBS = @PKG_EXPAT_LIBS@ POSUB = @POSUB@ PREFERRED_HINTING = @PREFERRED_HINTING@ +PREFERRED_SUB_PIXEL_RENDERING = @PREFERRED_SUB_PIXEL_RENDERING@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ diff -Nru fontconfig-2.14.1/Makefile.in fontconfig-2.14.2/Makefile.in --- fontconfig-2.14.1/Makefile.in 2022-10-21 07:33:38.000000000 +0000 +++ fontconfig-2.14.2/Makefile.in 2023-01-27 08:22:14.000000000 +0000 @@ -382,6 +382,7 @@ PKG_EXPAT_LIBS = @PKG_EXPAT_LIBS@ POSUB = @POSUB@ PREFERRED_HINTING = @PREFERRED_HINTING@ +PREFERRED_SUB_PIXEL_RENDERING = @PREFERRED_SUB_PIXEL_RENDERING@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ diff -Nru fontconfig-2.14.1/meson.build fontconfig-2.14.2/meson.build --- fontconfig-2.14.1/meson.build 2022-10-21 05:14:03.000000000 +0000 +++ fontconfig-2.14.2/meson.build 2023-01-27 05:46:22.000000000 +0000 @@ -1,5 +1,5 @@ project('fontconfig', 'c', - version: '2.14.1', + version: '2.14.2', meson_version : '>= 0.57.0', default_options: [ 'buildtype=debugoptimized'], ) @@ -30,7 +30,7 @@ # Give another shot using CMake if not freetype_dep.found() freetype_dep = dependency('freetype', method: 'cmake', version: freetype_req_cmake, - fallback: ['freetype2', 'freetype_dep']) + fallback: ['freetype2', 'freetype_dep'], default_options: 'werror=false') endif # Linking expat should not be so difficult... see: https://github.com/mesonbuild/meson/issues/10516 @@ -315,39 +315,33 @@ fonts_conf.set('CONFIGDIR', fc_configdir.split(fc_baseconfigdir + '/')[1]) endif -# It will automatically fallback to subproject if not found on system -gperf = find_program('gperf') +gperf = find_program('gperf', required: false) +gperf_len_type = '' -sh = find_program('sh', required : false) - -if not sh.found() # host_machine.system() == 'windows' or not sh.found() - # TODO: This is not always correct - if cc.get_id() == 'msvc' - gperf_len_type = 'size_t' - else - gperf_len_type = 'unsigned' - endif -else +if gperf.found() gperf_test_format = ''' #include const char * in_word_set(const char *, @0@); @1@ ''' - gperf_snippet_format = 'echo foo,bar | @0@ -L ANSI-C' - gperf_snippet = run_command(sh, '-c', gperf_snippet_format.format(gperf.full_path()), - check: true) - gperf_test = gperf_test_format.format('size_t', gperf_snippet.stdout()) + gperf_snippet = run_command(gperf, '-L', 'ANSI-C', files('meson-cc-tests/gperf.txt'), + check: true).stdout() - if cc.compiles(gperf_test) - gperf_len_type = 'size_t' - else - gperf_test = gperf_test_format.format('unsigned', gperf_snippet.stdout()) - if cc.compiles(gperf_test) - gperf_len_type = 'unsigned' - else - error('unable to determine gperf len type') + foreach type : ['size_t', 'unsigned'] + if cc.compiles(gperf_test_format.format(type, gperf_snippet)) + gperf_len_type = type + break endif + endforeach + + if gperf_len_type == '' + error('unable to determine gperf len type') endif +else + # Fallback to subproject + gperf = find_program('gperf') + # assume if we are compiling from the wrap, the size is just size_t + gperf_len_type = 'size_t' endif message('gperf len type is @0@'.format(gperf_len_type)) diff -Nru fontconfig-2.14.1/meson-cc-tests/gperf.txt fontconfig-2.14.2/meson-cc-tests/gperf.txt --- fontconfig-2.14.1/meson-cc-tests/gperf.txt 1970-01-01 00:00:00.000000000 +0000 +++ fontconfig-2.14.2/meson-cc-tests/gperf.txt 2022-10-26 11:35:37.000000000 +0000 @@ -0,0 +1 @@ +foo,bar diff -Nru fontconfig-2.14.1/meson_options.txt fontconfig-2.14.2/meson_options.txt --- fontconfig-2.14.1/meson_options.txt 2022-09-29 08:55:13.000000000 +0000 +++ fontconfig-2.14.2/meson_options.txt 2022-11-28 09:17:51.000000000 +0000 @@ -18,6 +18,9 @@ option('default-hinting', type: 'combo', choices: ['none', 'slight', 'medium', 'full'], value: 'slight', description: 'Preferred hinting configuration') +option('default-sub-pixel-rendering', type: 'combo', choices: ['none', 'bgr', 'rgb', 'vbgr', 'vrgb'], value: 'none', + description: 'Preferred sub-pixel rendering configuration') + option('default-fonts-dirs', type: 'array', value: ['yes'], description: 'Use fonts from DIR1,DIR2,... when config is busted (set to "yes" for generic system-specific defaults)') diff -Nru fontconfig-2.14.1/po/fontconfig.pot fontconfig-2.14.2/po/fontconfig.pot --- fontconfig-2.14.1/po/fontconfig.pot 2022-10-21 07:35:41.000000000 +0000 +++ fontconfig-2.14.2/po/fontconfig.pot 2023-01-27 08:24:03.000000000 +0000 @@ -6,10 +6,10 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: fontconfig 2.14.1\n" +"Project-Id-Version: fontconfig 2.14.2\n" "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/fontconfig/fontconfig/" "issues/new\n" -"POT-Creation-Date: 2022-10-21 16:35+0900\n" +"POT-Creation-Date: 2023-01-27 17:24+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -607,6 +607,6 @@ msgid "%s:%d Satisfy the coverage for %s language\n" msgstr "" -#: src/fccfg.c:3243 +#: src/fccfg.c:3251 msgid "No description" msgstr "" diff -Nru fontconfig-2.14.1/po/ka.po fontconfig-2.14.2/po/ka.po --- fontconfig-2.14.1/po/ka.po 2022-10-21 07:35:42.000000000 +0000 +++ fontconfig-2.14.2/po/ka.po 2023-01-27 08:24:03.000000000 +0000 @@ -8,7 +8,7 @@ "Project-Id-Version: fontconfig 2.14.0\n" "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/fontconfig/fontconfig/" "issues/new\n" -"POT-Creation-Date: 2022-10-21 16:35+0900\n" +"POT-Creation-Date: 2023-01-27 17:24+0900\n" "PO-Revision-Date: 2022-10-01 10:53+0200\n" "Last-Translator: Temuri Doghonadze \n" "Language-Team: Georgian <(none)>\n" @@ -654,6 +654,6 @@ msgid "%s:%d Satisfy the coverage for %s language\n" msgstr "%s:%d აკმაყოფილებს დაფარვას ენისთვის: %s\n" -#: src/fccfg.c:3243 +#: src/fccfg.c:3251 msgid "No description" msgstr "აღწერის გარეშე" diff -Nru fontconfig-2.14.1/po/zh_CN.po fontconfig-2.14.2/po/zh_CN.po --- fontconfig-2.14.1/po/zh_CN.po 2022-10-21 07:35:42.000000000 +0000 +++ fontconfig-2.14.2/po/zh_CN.po 2023-01-27 08:24:03.000000000 +0000 @@ -12,7 +12,7 @@ "Project-Id-Version: fontconfig 2.12.92\n" "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/fontconfig/fontconfig/" "issues/new\n" -"POT-Creation-Date: 2022-10-21 16:35+0900\n" +"POT-Creation-Date: 2023-01-27 17:24+0900\n" "PO-Revision-Date: 2018-02-16 01:41-0600\n" "Last-Translator: Mingcong Bai \n" "Language-Team: AOSC\n" @@ -634,6 +634,6 @@ msgid "%s:%d Satisfy the coverage for %s language\n" msgstr "%s:%d 完全满足 %s 语言的覆盖需求\n" -#: src/fccfg.c:3243 +#: src/fccfg.c:3251 msgid "No description" msgstr "无描述" diff -Nru fontconfig-2.14.1/po-conf/fontconfig-conf.pot fontconfig-2.14.2/po-conf/fontconfig-conf.pot --- fontconfig-2.14.1/po-conf/fontconfig-conf.pot 2022-10-21 07:35:42.000000000 +0000 +++ fontconfig-2.14.2/po-conf/fontconfig-conf.pot 2023-01-27 08:24:03.000000000 +0000 @@ -6,10 +6,10 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: fontconfig 2.14.1\n" +"Project-Id-Version: fontconfig 2.14.2\n" "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/fontconfig/fontconfig/" "issues/new\n" -"POT-Creation-Date: 2022-10-21 16:35+0900\n" +"POT-Creation-Date: 2023-01-27 17:24+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,6 +18,10 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#: conf.d/09-autohint-if-no-hinting.conf:4 +msgid "Enable autohinter if font doesn't have any hinting" +msgstr "" + #: conf.d/10-autohint.conf:4 msgid "Enable autohinter" msgstr "" @@ -38,8 +42,8 @@ msgid "Set hintslight to hintstyle" msgstr "" -#: conf.d/10-no-sub-pixel.conf:4 -msgid "Disable sub-pixel rendering" +#: conf.d/10-no-antialias.conf:4 +msgid "Disable antialiasing" msgstr "" #: conf.d/10-scale-bitmap-fonts.conf:4 @@ -50,6 +54,10 @@ msgid "Enable sub-pixel rendering with the BGR stripes layout" msgstr "" +#: conf.d/10-sub-pixel-none.conf:4 +msgid "Disable sub-pixel rendering" +msgstr "" + #: conf.d/10-sub-pixel-rgb.conf:4 msgid "Enable sub-pixel rendering with the RGB stripes layout" msgstr "" @@ -66,6 +74,10 @@ msgid "Disable hinting" msgstr "" +#: conf.d/10-yes-antialias.conf:4 +msgid "Enable antialiasing" +msgstr "" + #: conf.d/11-lcdfilter-default.conf:4 msgid "Use lcddefault as default for LCD filter" msgstr "" @@ -103,6 +115,10 @@ msgid "Set substitutions for Latin fonts" msgstr "" +#: conf.d/48-spacing.conf:4 +msgid "Add mono to the family when spacing is 100" +msgstr "" + #: conf.d/49-sansserif.conf:4 msgid "Add sans-serif to the family when no generic name" msgstr "" diff -Nru fontconfig-2.14.1/po-conf/ka.po fontconfig-2.14.2/po-conf/ka.po --- fontconfig-2.14.1/po-conf/ka.po 2022-10-21 07:35:42.000000000 +0000 +++ fontconfig-2.14.2/po-conf/ka.po 2023-01-27 08:24:03.000000000 +0000 @@ -8,7 +8,7 @@ "Project-Id-Version: fontconfig 2.14.0\n" "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/fontconfig/fontconfig/" "issues/new\n" -"POT-Creation-Date: 2022-10-21 16:35+0900\n" +"POT-Creation-Date: 2023-01-27 17:24+0900\n" "PO-Revision-Date: 2022-10-01 11:01+0200\n" "Last-Translator: Temuri Doghonadze \n" "Language-Team: Georgian <(nothing)>\n" @@ -19,6 +19,10 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 3.1.1\n" +#: conf.d/09-autohint-if-no-hinting.conf:4 +msgid "Enable autohinter if font doesn't have any hinting" +msgstr "" + #: conf.d/10-autohint.conf:4 msgid "Enable autohinter" msgstr "autohinter-ის ჩართვა" @@ -39,9 +43,10 @@ msgid "Set hintslight to hintstyle" msgstr "hintstyle-ის hintslight-ზე დაყენება" -#: conf.d/10-no-sub-pixel.conf:4 -msgid "Disable sub-pixel rendering" -msgstr "ქვეპიქსელის რენდერის გამორთვა" +#: conf.d/10-no-antialias.conf:4 +#, fuzzy +msgid "Disable antialiasing" +msgstr "მომრგვალების გამორთვა" #: conf.d/10-scale-bitmap-fonts.conf:4 msgid "Bitmap scaling" @@ -51,6 +56,10 @@ msgid "Enable sub-pixel rendering with the BGR stripes layout" msgstr "ქვეპიქსელების რენდერის ჩართვა BGR ზოლების განლაგებით" +#: conf.d/10-sub-pixel-none.conf:4 +msgid "Disable sub-pixel rendering" +msgstr "ქვეპიქსელის რენდერის გამორთვა" + #: conf.d/10-sub-pixel-rgb.conf:4 msgid "Enable sub-pixel rendering with the RGB stripes layout" msgstr "ქვეპიქსელების რენდერის ჩართვა RGB ზოლების განლაგებით" @@ -67,6 +76,11 @@ msgid "Disable hinting" msgstr "მომრგვალების გამორთვა" +#: conf.d/10-yes-antialias.conf:4 +#, fuzzy +msgid "Enable antialiasing" +msgstr "autohinter-ის ჩართვა" + #: conf.d/11-lcdfilter-default.conf:4 msgid "Use lcddefault as default for LCD filter" msgstr "ნაგულისხმებ LCD ფილტრად lcddefault -ის გამოყენება" @@ -106,6 +120,11 @@ msgid "Set substitutions for Latin fonts" msgstr "Latin ფონტების ჩამნაცვლებლების დაყენება" +#: conf.d/48-spacing.conf:4 +#, fuzzy +msgid "Add mono to the family when spacing is 100" +msgstr "როცა ზოგადი სახელი არ არსებობს, ოჯახისთვის sans-serif-ის დამატება" + #: conf.d/49-sansserif.conf:4 msgid "Add sans-serif to the family when no generic name" msgstr "როცა ზოგადი სახელი არ არსებობს, ოჯახისთვის sans-serif-ის დამატება" diff -Nru fontconfig-2.14.1/po-conf/POTFILES.in fontconfig-2.14.2/po-conf/POTFILES.in --- fontconfig-2.14.1/po-conf/POTFILES.in 2019-10-16 10:05:28.000000000 +0000 +++ fontconfig-2.14.2/po-conf/POTFILES.in 2022-11-28 09:17:51.000000000 +0000 @@ -1,15 +1,18 @@ +conf.d/09-autohint-if-no-hinting.conf conf.d/10-autohint.conf conf.d/10-hinting-full.conf conf.d/10-hinting-medium.conf conf.d/10-hinting-none.conf conf.d/10-hinting-slight.conf -conf.d/10-no-sub-pixel.conf +conf.d/10-no-antialias.conf conf.d/10-scale-bitmap-fonts.conf conf.d/10-sub-pixel-bgr.conf +conf.d/10-sub-pixel-none.conf conf.d/10-sub-pixel-rgb.conf conf.d/10-sub-pixel-vbgr.conf conf.d/10-sub-pixel-vrgb.conf conf.d/10-unhinted.conf +conf.d/10-yes-antialias.conf conf.d/11-lcdfilter-default.conf conf.d/11-lcdfilter-legacy.conf conf.d/11-lcdfilter-light.conf @@ -19,6 +22,7 @@ conf.d/40-nonlatin.conf conf.d/45-generic.conf conf.d/45-latin.conf +conf.d/48-spacing.conf conf.d/49-sansserif.conf conf.d/50-user.conf conf.d/51-local.conf diff -Nru fontconfig-2.14.1/po-conf/zh_CN.po fontconfig-2.14.2/po-conf/zh_CN.po --- fontconfig-2.14.1/po-conf/zh_CN.po 2022-10-21 07:35:42.000000000 +0000 +++ fontconfig-2.14.2/po-conf/zh_CN.po 2023-01-27 08:24:03.000000000 +0000 @@ -11,7 +11,7 @@ "Project-Id-Version: fontconfig 2.12.92\n" "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/fontconfig/fontconfig/" "issues/new\n" -"POT-Creation-Date: 2022-10-21 16:35+0900\n" +"POT-Creation-Date: 2023-01-27 17:24+0900\n" "PO-Revision-Date: 2018-02-16 01:19-0600\n" "Last-Translator: Mingcong Bai \n" "Language-Team: AOSC\n" @@ -22,6 +22,10 @@ "X-Generator: Poedit 2.0.5\n" "Plural-Forms: nplurals=1; plural=0;\n" +#: conf.d/09-autohint-if-no-hinting.conf:4 +msgid "Enable autohinter if font doesn't have any hinting" +msgstr "" + #: conf.d/10-autohint.conf:4 msgid "Enable autohinter" msgstr "启用自动微调" @@ -42,9 +46,10 @@ msgid "Set hintslight to hintstyle" msgstr "设置微调风格为“轻微 (hintslight)”" -#: conf.d/10-no-sub-pixel.conf:4 -msgid "Disable sub-pixel rendering" -msgstr "禁用次像素渲染" +#: conf.d/10-no-antialias.conf:4 +#, fuzzy +msgid "Disable antialiasing" +msgstr "禁用微调" #: conf.d/10-scale-bitmap-fonts.conf:4 msgid "Bitmap scaling" @@ -54,6 +59,10 @@ msgid "Enable sub-pixel rendering with the BGR stripes layout" msgstr "启用蓝绿红 (BGR) 像素布局的次像素渲染" +#: conf.d/10-sub-pixel-none.conf:4 +msgid "Disable sub-pixel rendering" +msgstr "禁用次像素渲染" + #: conf.d/10-sub-pixel-rgb.conf:4 msgid "Enable sub-pixel rendering with the RGB stripes layout" msgstr "启用红绿蓝 (RGB) 像素布局的次像素渲染" @@ -70,6 +79,11 @@ msgid "Disable hinting" msgstr "禁用微调" +#: conf.d/10-yes-antialias.conf:4 +#, fuzzy +msgid "Enable antialiasing" +msgstr "启用自动微调" + #: conf.d/11-lcdfilter-default.conf:4 msgid "Use lcddefault as default for LCD filter" msgstr "将 lcddefault 设为默认 LCD 滤镜" @@ -107,6 +121,11 @@ msgid "Set substitutions for Latin fonts" msgstr "为拉丁语言字体设置替换" +#: conf.d/48-spacing.conf:4 +#, fuzzy +msgid "Add mono to the family when spacing is 100" +msgstr "在没有通用名称时添加 sans-serif 到字体家族" + #: conf.d/49-sansserif.conf:4 msgid "Add sans-serif to the family when no generic name" msgstr "在没有通用名称时添加 sans-serif 到字体家族" diff -Nru fontconfig-2.14.1/README fontconfig-2.14.2/README --- fontconfig-2.14.1/README 2022-10-21 05:14:03.000000000 +0000 +++ fontconfig-2.14.2/README 2023-01-27 05:46:22.000000000 +0000 @@ -1,12 +1,44 @@ Fontconfig Font configuration and customization library - Version 2.14.1 - 2022-10-21 + Version 2.14.2 + 2023-01-27 Check INSTALL for compilation and installation instructions. Report bugs to https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/new. +2.14.2 + +Akira TAGOH (13): + Fix the build issue on meson when -g option is added to c_args + Store artifacts for meson windows CI + Add FC_DESKTOP_NAME property + Add --with-default-sub-pixel-rendering option + Update po-conf/POTFILES.in + Ignore null pointer on Fc*Destroy functions + Convert tabs to spaces + Convert more tabs to spaces in docs + src/meson.build: Store correct paths to fontconfig.pc. + Fix a typo in description for HAVE_STDATOMIC_PRIMITIVES + Report more detailed logs instead of assertion. + Add some missing constant names for weight. + Adujst indentation between programlisting in fontconfig-user.sgml + +Christopher Degawa (1): + meson: modify gperf test to remove sh dependency + +Jason Francis (1): + meson: Update freetype2 git repository to upstream + +Jean Abou Samra (1): + Ignore LC_CTYPE if set to "UTF-8" + +Ondrej Balaz (1): + Expand ~ in glob + +lilinjie (1): + fix typo + 2.14.1 Akira TAGOH (6): @@ -1433,7 +1465,7 @@ Bug 26830 - Add search for libiconv non-default directory Bug 28491 - Allow matching on FC_FILE Bug 48573 - platform without regex do not have also REG_XXX defines - Bug 27526 - Compatibility fix for old windows sytems + Bug 27526 - Compatibility fix for old windows systems Add --with-expat, --with-expat-includes and --with-expat-lib back. doc: Fix a typo of the environment variable name. Bug 25151 - Move cleanCacheDirectory() from fc-cache.c into diff -Nru fontconfig-2.14.1/src/cutout.py fontconfig-2.14.2/src/cutout.py --- fontconfig-2.14.1/src/cutout.py 2021-02-15 13:17:43.000000000 +0000 +++ fontconfig-2.14.2/src/cutout.py 2022-10-27 07:07:25.000000000 +0000 @@ -24,7 +24,8 @@ break cpp = args[1] - ret = subprocess.run(cpp + host_cargs + [args[0].input], stdout=subprocess.PIPE, check=True) + cpp_args = [i for i in host_cargs + [args[0].input] if not i.startswith('-g')] + ret = subprocess.run(cpp + cpp_args, stdout=subprocess.PIPE, check=True) stdout = ret.stdout.decode('utf8') diff -Nru fontconfig-2.14.1/src/fcatomic.c fontconfig-2.14.2/src/fcatomic.c --- fontconfig-2.14.1/src/fcatomic.c 2020-12-03 11:45:00.000000000 +0000 +++ fontconfig-2.14.2/src/fcatomic.c 2022-12-05 12:57:09.000000000 +0000 @@ -229,7 +229,8 @@ void FcAtomicDestroy (FcAtomic *atomic) { - free (atomic); + if (atomic) + free (atomic); } #define __fcatomic__ #include "fcaliastail.h" diff -Nru fontconfig-2.14.1/src/fccache.c fontconfig-2.14.2/src/fccache.c --- fontconfig-2.14.1/src/fccache.c 2021-10-05 08:19:35.000000000 +0000 +++ fontconfig-2.14.2/src/fccache.c 2023-01-25 10:11:57.000000000 +0000 @@ -287,7 +287,7 @@ ret = FcFalse; goto bail; } - + while ((cache_dir = FcStrListNext (list))) { if (sysroot) @@ -381,7 +381,7 @@ list = FcStrListCreate (config->cacheDirs); if (!list) return FcFalse; - + while ((cache_dir = FcStrListNext (list))) { FcChar8 *cache_hashed; @@ -794,20 +794,17 @@ { int i; - for (i = 0; i < FC_CACHE_MAX_LEVEL; i++) + if (FcDebug() & FC_DBG_CACHE) { - if (FcDebug() & FC_DBG_CACHE) + for (i = 0; i < FC_CACHE_MAX_LEVEL; i++) { if (fcCacheChains[i] != NULL) { FcCacheSkip *s = fcCacheChains[i]; - printf("Fontconfig error: not freed %p (dir: %s, refcount %" FC_ATOMIC_INT_FORMAT ")\n", s->cache, FcCacheDir(s->cache), s->ref.count); + fprintf(stderr, "Fontconfig error: not freed %p (dir: %s, refcount %" FC_ATOMIC_INT_FORMAT ")\n", s->cache, FcCacheDir(s->cache), s->ref.count); } } - else - assert (fcCacheChains[i] == NULL); } - assert (fcCacheMaxLevel == 0); free_lock (); } @@ -1019,7 +1016,7 @@ /* Mark allocated caches so they're freed rather than unmapped */ if (allocated) cache->magic = FC_CACHE_MAGIC_ALLOC; - + return cache; } @@ -1711,7 +1708,7 @@ for (i = 0; i < old->nfont; i++) { FcPattern *font = FcFontSetFont (old, i); - + FcPatternReference (font); if (!FcFontSetAdd (new, font)) { diff -Nru fontconfig-2.14.1/src/fccfg.c fontconfig-2.14.2/src/fccfg.c --- fontconfig-2.14.1/src/fccfg.c 2021-10-14 06:33:37.000000000 +0000 +++ fontconfig-2.14.2/src/fccfg.c 2023-01-25 05:37:45.000000000 +0000 @@ -362,40 +362,43 @@ FcExprPage *page; FcMatchKind k; - if (FcRefDec (&config->ref) != 1) - return; + if (config) + { + if (FcRefDec (&config->ref) != 1) + return; - (void) fc_atomic_ptr_cmpexch (&_fcConfig, config, NULL); + (void) fc_atomic_ptr_cmpexch (&_fcConfig, config, NULL); - FcStrSetDestroy (config->configDirs); - FcStrSetDestroy (config->configMapDirs); - FcStrSetDestroy (config->fontDirs); - FcStrSetDestroy (config->cacheDirs); - FcStrSetDestroy (config->configFiles); - FcStrSetDestroy (config->acceptGlobs); - FcStrSetDestroy (config->rejectGlobs); - FcFontSetDestroy (config->acceptPatterns); - FcFontSetDestroy (config->rejectPatterns); - - for (k = FcMatchKindBegin; k < FcMatchKindEnd; k++) - FcPtrListDestroy (config->subst[k]); - FcPtrListDestroy (config->rulesetList); - FcStrSetDestroy (config->availConfigFiles); - for (set = FcSetSystem; set <= FcSetApplication; set++) - if (config->fonts[set]) - FcFontSetDestroy (config->fonts[set]); - - page = config->expr_pool; - while (page) - { - FcExprPage *next = page->next_page; - free (page); - page = next; - } - if (config->sysRoot) + FcStrSetDestroy (config->configDirs); + FcStrSetDestroy (config->configMapDirs); + FcStrSetDestroy (config->fontDirs); + FcStrSetDestroy (config->cacheDirs); + FcStrSetDestroy (config->configFiles); + FcStrSetDestroy (config->acceptGlobs); + FcStrSetDestroy (config->rejectGlobs); + FcFontSetDestroy (config->acceptPatterns); + FcFontSetDestroy (config->rejectPatterns); + + for (k = FcMatchKindBegin; k < FcMatchKindEnd; k++) + FcPtrListDestroy (config->subst[k]); + FcPtrListDestroy (config->rulesetList); + FcStrSetDestroy (config->availConfigFiles); + for (set = FcSetSystem; set <= FcSetApplication; set++) + if (config->fonts[set]) + FcFontSetDestroy (config->fonts[set]); + + page = config->expr_pool; + while (page) + { + FcExprPage *next = page->next_page; + free (page); + page = next; + } + if (config->sysRoot) FcStrFree (config->sysRoot); - free (config); + free (config); + } } /* @@ -421,7 +424,7 @@ if (fs) { int nref = 0; - + for (i = 0; i < fs->nfont; i++) { FcPattern *font = FcFontSetFont (fs, i); @@ -505,7 +508,7 @@ dirlist = FcStrListCreate (dirSet); if (!dirlist) return FcFalse; - + while ((dir = FcStrListNext (dirlist))) { if (FcDebug () & FC_DBG_FONTSET) @@ -534,7 +537,7 @@ config = FcConfigReference (config); if (!config) return FcFalse; - + fonts = FcFontSetCreate (); if (!fonts) { @@ -1331,7 +1334,7 @@ v.u.b = FcConfigCompareValue (&vl, e->op, &vr); FcValueDestroy (vl); FcValueDestroy (vr); - break; + break; case FcOpOr: case FcOpAnd: case FcOpPlus: @@ -1347,7 +1350,7 @@ switch ((int) vle.type) { case FcTypeDouble: switch ((int) op) { - case FcOpPlus: + case FcOpPlus: v.type = FcTypeDouble; v.u.d = vle.u.d + vre.u.d; break; @@ -1396,7 +1399,7 @@ str = FcStrPlus (vle.u.s, vre.u.s); v.u.s = FcStrdup (str); FcStrFree (str); - + if (!v.u.s) v.type = FcTypeVoid; break; @@ -2829,7 +2832,7 @@ } FcConfigSetFonts (config, set, FcSetApplication); } - + if (!FcFileScanConfig (set, subdirs, file, config)) { FcStrSetDestroy (subdirs); @@ -2920,8 +2923,13 @@ FcBool accept) { FcStrSet *set = accept ? config->acceptGlobs : config->rejectGlobs; + FcChar8 *realglob = FcStrCopyFilename(glob); + if (!realglob) + return FcFalse; - return FcStrSetAdd (set, glob); + FcBool ret = FcStrSetAdd (set, realglob); + FcStrFree(realglob); + return ret; } static FcBool diff -Nru fontconfig-2.14.1/src/fcdefault.c fontconfig-2.14.2/src/fcdefault.c --- fontconfig-2.14.1/src/fcdefault.c 2020-12-03 11:45:00.000000000 +0000 +++ fontconfig-2.14.2/src/fcdefault.c 2023-01-25 00:17:59.000000000 +0000 @@ -62,7 +62,17 @@ if (!langs || !langs[0]) langs = getenv ("LC_ALL"); if (!langs || !langs[0]) - langs = getenv ("LC_CTYPE"); + { + langs = getenv ("LC_CTYPE"); + // On some macOS systems, LC_CTYPE is set to "UTF-8", which doesn't + // give any languge information. In this case, ignore LC_CTYPE and + // continue the search with LANG. + if (langs && (FcStrCmpIgnoreCase((const FcChar8 *) langs, + (const FcChar8 *)"UTF-8") == 0)) + { + langs = NULL; + } + } if (!langs || !langs[0]) langs = getenv ("LANG"); if (langs && langs[0]) @@ -211,28 +221,73 @@ return prgname; } +static FcChar8 *default_desktop_name; + +FcChar8 * +FcGetDesktopName (void) +{ + FcChar8 *desktop_name; +retry: + desktop_name = fc_atomic_ptr_get (&default_desktop_name); + if (!desktop_name) + { + char *s = getenv ("XDG_CURRENT_DESKTOP"); + + if (!s) + desktop_name = FcStrdup (""); + else + desktop_name = FcStrdup (s); + if (!desktop_name) + { + fprintf (stderr, "Fontconfig error: out of memory in %s\n", + __FUNCTION__); + return NULL; + } + + if (!fc_atomic_ptr_cmpexch(&default_desktop_name, NULL, desktop_name)) + { + free (desktop_name); + goto retry; + } + } + if (desktop_name && !desktop_name[0]) + return NULL; + + return desktop_name; +} + void FcDefaultFini (void) { FcChar8 *lang; FcStrSet *langs; FcChar8 *prgname; + FcChar8 *desktop; lang = fc_atomic_ptr_get (&default_lang); - if (lang && fc_atomic_ptr_cmpexch (&default_lang, lang, NULL)) { + if (lang && fc_atomic_ptr_cmpexch (&default_lang, lang, NULL)) + { free (lang); } langs = fc_atomic_ptr_get (&default_langs); - if (langs && fc_atomic_ptr_cmpexch (&default_langs, langs, NULL)) { + if (langs && fc_atomic_ptr_cmpexch (&default_langs, langs, NULL)) + { FcRefInit (&langs->ref, 1); FcStrSetDestroy (langs); } prgname = fc_atomic_ptr_get (&default_prgname); - if (prgname && fc_atomic_ptr_cmpexch (&default_prgname, prgname, NULL)) { + if (prgname && fc_atomic_ptr_cmpexch (&default_prgname, prgname, NULL)) + { free (prgname); } + + desktop = fc_atomic_ptr_get (&default_desktop_name); + if (desktop && fc_atomic_ptr_cmpexch(&default_desktop_name, desktop, NULL)) + { + free (desktop); + } } void @@ -336,6 +391,13 @@ FcPatternObjectAddString (pattern, FC_PRGNAME_OBJECT, prgname); } + if (FcPatternObjectGet (pattern, FC_DESKTOP_NAME_OBJECT, 0, &v) == FcResultNoMatch) + { + FcChar8 *desktop = FcGetDesktopName (); + if (desktop) + FcPatternObjectAddString (pattern, FC_DESKTOP_NAME_OBJECT, desktop); + } + if (!FcPatternFindObjectIter (pattern, &iter, FC_ORDER_OBJECT)) FcPatternObjectAddInteger (pattern, FC_ORDER_OBJECT, 0); } diff -Nru fontconfig-2.14.1/src/fcfs.c fontconfig-2.14.2/src/fcfs.c --- fontconfig-2.14.1/src/fcfs.c 2019-10-16 10:05:28.000000000 +0000 +++ fontconfig-2.14.2/src/fcfs.c 2022-12-05 12:57:09.000000000 +0000 @@ -42,13 +42,16 @@ void FcFontSetDestroy (FcFontSet *s) { - int i; + if (s) + { + int i; - for (i = 0; i < s->nfont; i++) - FcPatternDestroy (s->fonts[i]); - if (s->fonts) - free (s->fonts); - free (s); + for (i = 0; i < s->nfont; i++) + FcPatternDestroy (s->fonts[i]); + if (s->fonts) + free (s->fonts); + free (s); + } } FcBool diff -Nru fontconfig-2.14.1/src/fcint.h fontconfig-2.14.2/src/fcint.h --- fontconfig-2.14.1/src/fcint.h 2021-12-03 10:48:08.000000000 +0000 +++ fontconfig-2.14.2/src/fcint.h 2022-11-26 06:10:36.000000000 +0000 @@ -199,7 +199,7 @@ } FcValueList; #define FcValueListNext(vl) FcPointerMember(vl,next,FcValueList) - + typedef int FcObject; /* The 1024 is to leave some room for future added internal objects, such @@ -238,7 +238,7 @@ FcFontSetFonts(fs)[i], \ FcPattern) : \ fs->fonts[i]) - + typedef enum _FcOp { FcOpInteger, FcOpDouble, FcOpString, FcOpMatrix, FcOpRange, FcOpBool, FcOpCharSet, FcOpLangSet, FcOpNil, @@ -909,6 +909,9 @@ FcPrivate FcChar8 * FcGetPrgname (void); +FcPrivate FcChar8 * +FcGetDesktopName (void); + FcPrivate void FcDefaultFini (void); diff -Nru fontconfig-2.14.1/src/fclist.c fontconfig-2.14.2/src/fclist.c --- fontconfig-2.14.1/src/fclist.c 2020-12-03 11:45:00.000000000 +0000 +++ fontconfig-2.14.2/src/fclist.c 2022-12-05 12:57:09.000000000 +0000 @@ -92,14 +92,17 @@ { int i; - if (os->objects) + if (os) { - for (i = 0; i < os->nobject; i++) - FcFree (os->objects[i]); + if (os->objects) + { + for (i = 0; i < os->nobject; i++) + FcFree (os->objects[i]); - free ((void *) os->objects); + free ((void *) os->objects); + } + free (os); } - free (os); } FcObjectSet * diff -Nru fontconfig-2.14.1/src/fcname.c fontconfig-2.14.2/src/fcname.c --- fontconfig-2.14.1/src/fcname.c 2019-10-16 10:05:28.000000000 +0000 +++ fontconfig-2.14.2/src/fcname.c 2023-01-25 14:38:40.000000000 +0000 @@ -143,6 +143,7 @@ { (FcChar8 *) "light", "weight", FC_WEIGHT_LIGHT, }, { (FcChar8 *) "book", "weight", FC_WEIGHT_BOOK, }, { (FcChar8 *) "regular", "weight", FC_WEIGHT_REGULAR, }, + { (FcChar8 *) "normal", "weight", FC_WEIGHT_NORMAL, }, { (FcChar8 *) "medium", "weight", FC_WEIGHT_MEDIUM, }, { (FcChar8 *) "demibold", "weight", FC_WEIGHT_DEMIBOLD, }, { (FcChar8 *) "semibold", "weight", FC_WEIGHT_DEMIBOLD, }, @@ -151,6 +152,8 @@ { (FcChar8 *) "ultrabold", "weight", FC_WEIGHT_EXTRABOLD, }, { (FcChar8 *) "black", "weight", FC_WEIGHT_BLACK, }, { (FcChar8 *) "heavy", "weight", FC_WEIGHT_HEAVY, }, + { (FcChar8 *) "extrablack", "weight", FC_WEIGHT_EXTRABLACK, }, + { (FcChar8 *) "ultrablack", "weight", FC_WEIGHT_ULTRABLACK, }, { (FcChar8 *) "roman", "slant", FC_SLANT_ROMAN, }, { (FcChar8 *) "italic", "slant", FC_SLANT_ITALIC, }, @@ -228,6 +231,19 @@ return 0; } +const FcConstant * +FcNameGetConstantFor (const FcChar8 *string, const char *object) +{ + unsigned int i; + + for (i = 0; i < NUM_FC_CONSTANTS; i++) + if (!FcStrCmpIgnoreCase (string, _FcBaseConstants[i].name) && + !FcStrCmpIgnoreCase ((const FcChar8 *)object, (const FcChar8 *)_FcBaseConstants[i].object)) + return &_FcBaseConstants[i]; + + return 0; +} + FcBool FcNameConstant (const FcChar8 *string, int *result) { @@ -246,13 +262,19 @@ { const FcConstant *c; - if ((c = FcNameGetConstant(string))) + if ((c = FcNameGetConstantFor(string, object))) + { + *result = c->value; + return FcTrue; + } + else if ((c = FcNameGetConstant(string))) { if (strcmp (c->object, object) != 0) { fprintf (stderr, "Fontconfig error: Unexpected constant name `%s' used for object `%s': should be `%s'\n", string, object, c->object); return FcFalse; } + /* Unlikely to reach out */ *result = c->value; return FcTrue; } @@ -655,7 +677,7 @@ if (!strcmp (o->object, FC_FAMILY) || !strcmp (o->object, FC_SIZE)) continue; - + e = FcPatternObjectFindElt (pat, id); if (e) { diff -Nru fontconfig-2.14.1/src/fcobjs.h fontconfig-2.14.2/src/fcobjs.h --- fontconfig-2.14.1/src/fcobjs.h 2020-12-03 11:45:00.000000000 +0000 +++ fontconfig-2.14.2/src/fcobjs.h 2022-11-26 06:10:36.000000000 +0000 @@ -74,4 +74,5 @@ FC_OBJECT (VARIABLE, FcTypeBool, FcCompareBool) FC_OBJECT (FONT_HAS_HINT, FcTypeBool, FcCompareBool) FC_OBJECT (ORDER, FcTypeInteger, FcCompareNumber) +FC_OBJECT (DESKTOP_NAME, FcTypeString, NULL) /* ^-------------- Add new objects here. */ diff -Nru fontconfig-2.14.1/src/fcpat.c fontconfig-2.14.2/src/fcpat.c --- fontconfig-2.14.1/src/fcpat.c 2022-02-01 05:24:09.000000000 +0000 +++ fontconfig-2.14.2/src/fcpat.c 2022-12-05 12:57:09.000000000 +0000 @@ -533,17 +533,17 @@ p->size++; } } - + e = FcPatternElts(p); /* move elts up */ memmove (e + i + 1, e + i, sizeof (FcPatternElt) * (FcPatternObjectCount (p) - i)); - + /* bump count */ p->num++; - + e[i].object = object; e[i].values = NULL; } @@ -1559,7 +1559,7 @@ FcValueList); else head_serialized = vl_serialized; - + vl_serialized->next = NULL; vl_serialized->value.type = vl->value.type; switch ((int) vl->value.type) { diff -Nru fontconfig-2.14.1/src/fcptrlist.c fontconfig-2.14.2/src/fcptrlist.c --- fontconfig-2.14.1/src/fcptrlist.c 2019-10-16 10:05:28.000000000 +0000 +++ fontconfig-2.14.2/src/fcptrlist.c 2022-12-05 12:57:09.000000000 +0000 @@ -57,15 +57,18 @@ { FcPtrListIter iter; - FcPtrListIterInit (list, &iter); - do + if (list) { - if (FcPtrListIterGetValue (list, &iter)) - list->destroy_func (FcPtrListIterGetValue (list, &iter)); - FcPtrListIterRemove (list, &iter); - } while (FcPtrListIterIsValid (list, &iter)); + FcPtrListIterInit (list, &iter); + do + { + if (FcPtrListIterGetValue (list, &iter)) + list->destroy_func (FcPtrListIterGetValue (list, &iter)); + FcPtrListIterRemove (list, &iter); + } while (FcPtrListIterIsValid (list, &iter)); - free (list); + free (list); + } } void diff -Nru fontconfig-2.14.1/src/fcrange.c fontconfig-2.14.2/src/fcrange.c --- fontconfig-2.14.1/src/fcrange.c 2019-10-16 10:05:28.000000000 +0000 +++ fontconfig-2.14.2/src/fcrange.c 2022-12-05 12:57:09.000000000 +0000 @@ -56,7 +56,8 @@ void FcRangeDestroy (FcRange *range) { - free (range); + if (range) + free (range); } FcRange * diff -Nru fontconfig-2.14.1/src/fcstdint.h fontconfig-2.14.2/src/fcstdint.h --- fontconfig-2.14.1/src/fcstdint.h 2022-10-21 07:34:03.000000000 +0000 +++ fontconfig-2.14.2/src/fcstdint.h 2023-01-27 08:22:41.000000000 +0000 @@ -1,8 +1,8 @@ #ifndef _FONTCONFIG_SRC_FCSTDINT_H #define _FONTCONFIG_SRC_FCSTDINT_H 1 #ifndef _GENERATED_STDINT_H -#define _GENERATED_STDINT_H "fontconfig 2.14.1" -/* generated using gnu compiler gcc (GCC) 12.2.1 20220819 (Red Hat 12.2.1-2) */ +#define _GENERATED_STDINT_H "fontconfig 2.14.2" +/* generated using gnu compiler gcc (GCC) 13.0.1 20230117 (Red Hat 13.0.1-0) */ #define _STDINT_HAVE_STDINT_H 1 #include #endif diff -Nru fontconfig-2.14.1/src/fcstr.c fontconfig-2.14.2/src/fcstr.c --- fontconfig-2.14.1/src/fcstr.c 2022-09-29 08:55:13.000000000 +0000 +++ fontconfig-2.14.2/src/fcstr.c 2022-12-05 12:57:09.000000000 +0000 @@ -122,7 +122,7 @@ int mid = (min + max) >> 1; FcChar32 low = fcCaseFold[mid].upper; FcChar32 high = low + FcCaseFoldUpperCount (&fcCaseFold[mid]); - + if (high <= ucs4) min = mid + 1; else if (ucs4 < low) @@ -131,7 +131,7 @@ { const FcCaseFold *fold = &fcCaseFold[mid]; int dlen; - + switch (fold->method) { case FC_CASE_FOLD_EVEN_ODD: if ((ucs4 & 1) != (fold->upper & 1)) @@ -145,10 +145,10 @@ memcpy (w->utf8, fcCaseFoldChars + fold->offset, dlen); break; } - + /* consume rest of src utf-8 bytes */ w->src += slen - 1; - + /* read from temp buffer */ w->utf8[dlen] = '\0'; w->read = w->utf8; @@ -441,7 +441,7 @@ FcBool wordStart = FcTrue; int s1len = strlen ((char *) s1); int s2len = strlen ((char *) s2); - + while (s1len >= s2len) { if (wordStart && @@ -684,10 +684,10 @@ { result <<= 6; s = *src++; - + if ((s & 0xc0) != 0x80) return -1; - + result |= s & 0x3f; } *dst = result; @@ -1590,20 +1590,23 @@ void FcStrSetDestroy (FcStrSet *set) { - int i; + if (set) + { + int i; - /* We rely on this in FcGetDefaultLangs for caching. */ - if (FcRefIsConst (&set->ref)) - return; + /* We rely on this in FcGetDefaultLangs for caching. */ + if (FcRefIsConst (&set->ref)) + return; - if (FcRefDec (&set->ref) != 1) - return; + if (FcRefDec (&set->ref) != 1) + return; - for (i = 0; i < set->num; i++) - FcStrFree (set->strs[i]); - if (set->strs) - free (set->strs); - free (set); + for (i = 0; i < set->num; i++) + FcStrFree (set->strs[i]); + if (set->strs) + free (set->strs); + free (set); + } } FcStrList * diff -Nru fontconfig-2.14.1/src/fcxml.c fontconfig-2.14.2/src/fcxml.c --- fontconfig-2.14.1/src/fcxml.c 2022-01-31 08:43:01.000000000 +0000 +++ fontconfig-2.14.2/src/fcxml.c 2023-01-25 05:37:45.000000000 +0000 @@ -367,7 +367,7 @@ FcElementDescription, FcElementRemapDir, FcElementResetDirs, - + FcElementRescan, FcElementPrefer, @@ -731,7 +731,7 @@ if (o) FcTypecheckValue (parse, o->type, type); } - else + else FcConfigMessage (parse, FcSevereWarning, "invalid constant used : %s", expr->u.constant); @@ -794,7 +794,7 @@ if (test) { const FcObjectType *o; - + test->kind = kind; test->qual = qual; test->object = FcObjectFromName ((const char *) field); @@ -1533,7 +1533,7 @@ { char buf[128]; int slen = strlen (s); - + if (slen + dlen > (int) sizeof (buf)) { if (end) @@ -2960,7 +2960,10 @@ vstack->u.string, element == FcElementAcceptfont)) { - FcConfigMessage (parse, FcSevereError, "out of memory"); + if (FcStrUsesHome(vstack->u.string) && FcConfigHome() == NULL) + FcConfigMessage (parse, FcSevereWarning, "Home is disabled"); + else + FcConfigMessage (parse, FcSevereError, "out of memory"); } else { @@ -3101,7 +3104,7 @@ FcConfigMessage (parse, FcSevereError, "out of memory"); return; } - + while ((vstack = FcVStackPeek (parse))) { switch ((int) vstack->tag) { @@ -3176,7 +3179,7 @@ case FcElementRescan: FcParseRescan (parse); break; - + case FcElementPrefer: FcParseFamilies (parse, FcVStackPrefer); break; @@ -3512,7 +3515,7 @@ XML_SetDoctypeDeclHandler (p, FcStartDoctypeDecl, FcEndDoctypeDecl); XML_SetElementHandler (p, FcStartElement, FcEndElement); XML_SetCharacterDataHandler (p, FcCharacterData); - + #endif /* ENABLE_LIBXML2 */ #ifndef ENABLE_LIBXML2 diff -Nru fontconfig-2.14.1/src/Makefile.in fontconfig-2.14.2/src/Makefile.in --- fontconfig-2.14.1/src/Makefile.in 2022-10-21 07:33:39.000000000 +0000 +++ fontconfig-2.14.2/src/Makefile.in 2023-01-27 08:22:14.000000000 +0000 @@ -376,6 +376,7 @@ PKG_EXPAT_LIBS = @PKG_EXPAT_LIBS@ POSUB = @POSUB@ PREFERRED_HINTING = @PREFERRED_HINTING@ +PREFERRED_SUB_PIXEL_RENDERING = @PREFERRED_SUB_PIXEL_RENDERING@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ diff -Nru fontconfig-2.14.1/src/meson.build fontconfig-2.14.2/src/meson.build --- fontconfig-2.14.1/src/meson.build 2021-06-28 12:43:20.000000000 +0000 +++ fontconfig-2.14.2/src/meson.build 2023-01-25 00:18:08.000000000 +0000 @@ -88,6 +88,6 @@ variables: [ 'sysconfdir=@0@'.format(join_paths(prefix, get_option('sysconfdir'))), 'localstatedir=@0@'.format(join_paths(prefix, get_option('localstatedir'))), - 'confdir=${sysconfdir}/fonts', - 'cachedir=${localstatedir}/cache/fontconfig', + 'confdir=@0@'.format(fc_baseconfigdir), + 'cachedir=@0@'.format(fc_cachedir), ]) diff -Nru fontconfig-2.14.1/subprojects/freetype2.wrap fontconfig-2.14.2/subprojects/freetype2.wrap --- fontconfig-2.14.1/subprojects/freetype2.wrap 2020-12-03 11:45:00.000000000 +0000 +++ fontconfig-2.14.2/subprojects/freetype2.wrap 2022-10-27 07:07:25.000000000 +0000 @@ -1,5 +1,5 @@ [wrap-git] directory=freetype2 -url=https://github.com/centricular/freetype2.git -push-url=git@github.com:centricular/freetype2.git -revision=meson +url=https://gitlab.freedesktop.org/freetype/freetype.git +push-url=git@gitlab.freedesktop.org:freetype/freetype.git +revision=master diff -Nru fontconfig-2.14.1/test/Makefile.in fontconfig-2.14.2/test/Makefile.in --- fontconfig-2.14.1/test/Makefile.in 2022-10-21 07:33:39.000000000 +0000 +++ fontconfig-2.14.2/test/Makefile.in 2023-01-27 08:22:14.000000000 +0000 @@ -635,6 +635,7 @@ PKG_EXPAT_LIBS = @PKG_EXPAT_LIBS@ POSUB = @POSUB@ PREFERRED_HINTING = @PREFERRED_HINTING@ +PREFERRED_SUB_PIXEL_RENDERING = @PREFERRED_SUB_PIXEL_RENDERING@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ diff -Nru fontconfig-2.14.1/test/test-name-parse.c fontconfig-2.14.2/test/test-name-parse.c --- fontconfig-2.14.1/test/test-name-parse.c 2019-10-16 10:05:28.000000000 +0000 +++ fontconfig-2.14.2/test/test-name-parse.c 2023-01-25 14:38:40.000000000 +0000 @@ -65,13 +65,13 @@ goto bail; } END (expect); BEGIN (expect) { - FcPatternAddInteger (expect, FC_WIDTH, FC_WIDTH_NORMAL); - if ((ret = test ((const FcChar8 *)":normal", expect)) != 0) + FcPatternAddInteger (expect, FC_WEIGHT, FC_WEIGHT_NORMAL); + if ((ret = test ((const FcChar8 *)":weight=normal", expect)) != 0) goto bail; } END (expect); BEGIN (expect) { FcPatternAddInteger (expect, FC_WIDTH, FC_WIDTH_NORMAL); - if ((ret = test ((const FcChar8 *)":normal", expect)) != 0) + if ((ret = test ((const FcChar8 *)":width=normal", expect)) != 0) goto bail; } END (expect); BEGIN (expect) {