@img/sharp-libvips-dev 1.1.0-rc4 → 1.1.0-rc5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/include/archive.h +3 -3
- package/include/archive_entry.h +3 -2
- package/include/expat.h +3 -3
- package/include/expat_config.h +3 -3
- package/include/fontconfig/fcfreetype.h +5 -5
- package/include/fontconfig/fcprivate.h +86 -92
- package/include/fontconfig/fontconfig.h +327 -320
- package/include/harfbuzz/hb-buffer.h +62 -3
- package/include/harfbuzz/hb-common.h +11 -0
- package/include/harfbuzz/hb-draw.h +10 -2
- package/include/harfbuzz/hb-face.h +14 -0
- package/include/harfbuzz/hb-font.h +6 -0
- package/include/harfbuzz/hb-ft.h +4 -0
- package/include/harfbuzz/hb-paint.h +8 -0
- package/include/harfbuzz/hb-version.h +3 -3
- package/include/librsvg-2.0/librsvg/rsvg-version.h +3 -3
- package/include/libxml2/libxml/xmlversion.h +4 -4
- package/include/pango-1.0/pango/pango-features.h +2 -2
- package/include/pango-1.0/pango/pango-font.h +1 -1
- package/package.json +1 -1
- package/versions.json +7 -7
|
@@ -25,27 +25,27 @@
|
|
|
25
25
|
#ifndef _FONTCONFIG_H_
|
|
26
26
|
#define _FONTCONFIG_H_
|
|
27
27
|
|
|
28
|
-
#include <sys/types.h>
|
|
29
|
-
#include <sys/stat.h>
|
|
30
|
-
#include <stdarg.h>
|
|
31
28
|
#include <limits.h>
|
|
29
|
+
#include <stdarg.h>
|
|
30
|
+
#include <sys/stat.h>
|
|
31
|
+
#include <sys/types.h>
|
|
32
32
|
|
|
33
33
|
#if defined(__GNUC__) && (__GNUC__ >= 4)
|
|
34
|
-
#define FC_ATTRIBUTE_SENTINEL(x) __attribute__((__sentinel__(0)))
|
|
35
|
-
#define FC_ATTRIBUTE_MAY_ALIAS
|
|
34
|
+
# define FC_ATTRIBUTE_SENTINEL(x) __attribute__ ((__sentinel__ (0)))
|
|
35
|
+
# define FC_ATTRIBUTE_MAY_ALIAS __attribute__ ((may_alias))
|
|
36
36
|
#else
|
|
37
|
-
#define FC_ATTRIBUTE_SENTINEL(x)
|
|
38
|
-
#define FC_ATTRIBUTE_MAY_ALIAS
|
|
37
|
+
# define FC_ATTRIBUTE_SENTINEL(x)
|
|
38
|
+
# define FC_ATTRIBUTE_MAY_ALIAS
|
|
39
39
|
#endif
|
|
40
40
|
|
|
41
41
|
#ifndef FcPublic
|
|
42
|
-
#define FcPublic
|
|
42
|
+
# define FcPublic
|
|
43
43
|
#endif
|
|
44
44
|
|
|
45
|
-
typedef unsigned char
|
|
46
|
-
typedef unsigned short
|
|
47
|
-
typedef unsigned int
|
|
48
|
-
typedef int
|
|
45
|
+
typedef unsigned char FcChar8;
|
|
46
|
+
typedef unsigned short FcChar16;
|
|
47
|
+
typedef unsigned int FcChar32;
|
|
48
|
+
typedef int FcBool;
|
|
49
49
|
|
|
50
50
|
/*
|
|
51
51
|
* Current Fontconfig version number. This same number
|
|
@@ -53,11 +53,11 @@ typedef int FcBool;
|
|
|
53
53
|
* it'a a pain to synchronize version numbers like this.
|
|
54
54
|
*/
|
|
55
55
|
|
|
56
|
-
#define FC_MAJOR
|
|
57
|
-
#define FC_MINOR
|
|
58
|
-
#define FC_REVISION
|
|
56
|
+
#define FC_MAJOR 2
|
|
57
|
+
#define FC_MINOR 16
|
|
58
|
+
#define FC_REVISION 1
|
|
59
59
|
|
|
60
|
-
#define FC_VERSION
|
|
60
|
+
#define FC_VERSION ((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
|
|
61
61
|
|
|
62
62
|
/*
|
|
63
63
|
* Current font cache file format version
|
|
@@ -69,139 +69,139 @@ typedef int FcBool;
|
|
|
69
69
|
* it means multiple copies of the font information.
|
|
70
70
|
*/
|
|
71
71
|
|
|
72
|
-
#define FC_CACHE_VERSION_NUMBER
|
|
73
|
-
#define _FC_STRINGIFY_(s)
|
|
74
|
-
#define _FC_STRINGIFY(s)
|
|
75
|
-
#define FC_CACHE_VERSION
|
|
76
|
-
|
|
77
|
-
#define FcFalse
|
|
78
|
-
#define FcTrue
|
|
79
|
-
#define FcDontCare
|
|
80
|
-
|
|
81
|
-
#define FC_FAMILY
|
|
82
|
-
#define FC_STYLE
|
|
83
|
-
#define FC_SLANT
|
|
84
|
-
#define FC_WEIGHT
|
|
85
|
-
#define FC_SIZE
|
|
86
|
-
#define FC_ASPECT
|
|
87
|
-
#define FC_PIXEL_SIZE
|
|
88
|
-
#define FC_SPACING
|
|
89
|
-
#define FC_FOUNDRY
|
|
90
|
-
#define FC_ANTIALIAS
|
|
91
|
-
#define FC_HINTING
|
|
92
|
-
#define FC_HINT_STYLE
|
|
93
|
-
#define FC_VERTICAL_LAYOUT
|
|
94
|
-
#define FC_AUTOHINT
|
|
72
|
+
#define FC_CACHE_VERSION_NUMBER 9
|
|
73
|
+
#define _FC_STRINGIFY_(s) #s
|
|
74
|
+
#define _FC_STRINGIFY(s) _FC_STRINGIFY_ (s)
|
|
75
|
+
#define FC_CACHE_VERSION _FC_STRINGIFY (FC_CACHE_VERSION_NUMBER)
|
|
76
|
+
|
|
77
|
+
#define FcFalse 0
|
|
78
|
+
#define FcTrue 1
|
|
79
|
+
#define FcDontCare 2
|
|
80
|
+
|
|
81
|
+
#define FC_FAMILY "family" /* String */
|
|
82
|
+
#define FC_STYLE "style" /* String */
|
|
83
|
+
#define FC_SLANT "slant" /* Int */
|
|
84
|
+
#define FC_WEIGHT "weight" /* Int */
|
|
85
|
+
#define FC_SIZE "size" /* Range (double) */
|
|
86
|
+
#define FC_ASPECT "aspect" /* Double */
|
|
87
|
+
#define FC_PIXEL_SIZE "pixelsize" /* Double */
|
|
88
|
+
#define FC_SPACING "spacing" /* Int */
|
|
89
|
+
#define FC_FOUNDRY "foundry" /* String */
|
|
90
|
+
#define FC_ANTIALIAS "antialias" /* Bool (depends) */
|
|
91
|
+
#define FC_HINTING "hinting" /* Bool (true) */
|
|
92
|
+
#define FC_HINT_STYLE "hintstyle" /* Int */
|
|
93
|
+
#define FC_VERTICAL_LAYOUT "verticallayout" /* Bool (false) */
|
|
94
|
+
#define FC_AUTOHINT "autohint" /* Bool (false) */
|
|
95
95
|
/* FC_GLOBAL_ADVANCE is deprecated. this is simply ignored on freetype 2.4.5 or later */
|
|
96
|
-
#define FC_GLOBAL_ADVANCE
|
|
97
|
-
#define FC_WIDTH
|
|
98
|
-
#define FC_FILE
|
|
99
|
-
#define FC_INDEX
|
|
100
|
-
#define FC_FT_FACE
|
|
101
|
-
#define FC_RASTERIZER
|
|
102
|
-
#define FC_OUTLINE
|
|
103
|
-
#define FC_SCALABLE
|
|
104
|
-
#define FC_COLOR
|
|
105
|
-
#define FC_VARIABLE
|
|
106
|
-
#define FC_SCALE
|
|
107
|
-
#define FC_SYMBOL
|
|
108
|
-
#define FC_DPI
|
|
109
|
-
#define FC_RGBA
|
|
110
|
-
#define FC_MINSPACE
|
|
111
|
-
#define FC_SOURCE
|
|
112
|
-
#define FC_CHARSET
|
|
113
|
-
#define FC_LANG
|
|
114
|
-
#define FC_FONTVERSION
|
|
115
|
-
#define FC_FULLNAME
|
|
116
|
-
#define FC_FAMILYLANG
|
|
117
|
-
#define FC_STYLELANG
|
|
118
|
-
#define FC_FULLNAMELANG
|
|
119
|
-
#define FC_CAPABILITY
|
|
120
|
-
#define FC_FONTFORMAT
|
|
121
|
-
#define FC_EMBOLDEN
|
|
122
|
-
#define FC_EMBEDDED_BITMAP
|
|
123
|
-
#define FC_DECORATIVE
|
|
124
|
-
#define FC_LCD_FILTER
|
|
125
|
-
#define FC_FONT_FEATURES
|
|
126
|
-
#define FC_FONT_VARIATIONS
|
|
127
|
-
#define FC_NAMELANG
|
|
128
|
-
#define FC_PRGNAME
|
|
129
|
-
#define FC_HASH
|
|
130
|
-
#define FC_POSTSCRIPT_NAME
|
|
131
|
-
#define FC_FONT_HAS_HINT
|
|
132
|
-
#define FC_ORDER
|
|
133
|
-
#define FC_DESKTOP_NAME
|
|
134
|
-
#define FC_NAMED_INSTANCE
|
|
135
|
-
#define FC_FONT_WRAPPER
|
|
136
|
-
|
|
137
|
-
#define FC_CACHE_SUFFIX
|
|
138
|
-
#define FC_DIR_CACHE_FILE
|
|
139
|
-
#define FC_USER_CACHE_FILE
|
|
96
|
+
#define FC_GLOBAL_ADVANCE "globaladvance" /* Bool (true) */
|
|
97
|
+
#define FC_WIDTH "width" /* Int */
|
|
98
|
+
#define FC_FILE "file" /* String */
|
|
99
|
+
#define FC_INDEX "index" /* Int */
|
|
100
|
+
#define FC_FT_FACE "ftface" /* FT_Face */
|
|
101
|
+
#define FC_RASTERIZER "rasterizer" /* String (deprecated) */
|
|
102
|
+
#define FC_OUTLINE "outline" /* Bool */
|
|
103
|
+
#define FC_SCALABLE "scalable" /* Bool */
|
|
104
|
+
#define FC_COLOR "color" /* Bool */
|
|
105
|
+
#define FC_VARIABLE "variable" /* Bool */
|
|
106
|
+
#define FC_SCALE "scale" /* double (deprecated) */
|
|
107
|
+
#define FC_SYMBOL "symbol" /* Bool */
|
|
108
|
+
#define FC_DPI "dpi" /* double */
|
|
109
|
+
#define FC_RGBA "rgba" /* Int */
|
|
110
|
+
#define FC_MINSPACE "minspace" /* Bool use minimum line spacing */
|
|
111
|
+
#define FC_SOURCE "source" /* String (deprecated) */
|
|
112
|
+
#define FC_CHARSET "charset" /* CharSet */
|
|
113
|
+
#define FC_LANG "lang" /* LangSet Set of RFC 3066 langs */
|
|
114
|
+
#define FC_FONTVERSION "fontversion" /* Int from 'head' table */
|
|
115
|
+
#define FC_FULLNAME "fullname" /* String */
|
|
116
|
+
#define FC_FAMILYLANG "familylang" /* String RFC 3066 langs */
|
|
117
|
+
#define FC_STYLELANG "stylelang" /* String RFC 3066 langs */
|
|
118
|
+
#define FC_FULLNAMELANG "fullnamelang" /* String RFC 3066 langs */
|
|
119
|
+
#define FC_CAPABILITY "capability" /* String */
|
|
120
|
+
#define FC_FONTFORMAT "fontformat" /* String */
|
|
121
|
+
#define FC_EMBOLDEN "embolden" /* Bool - true if emboldening needed*/
|
|
122
|
+
#define FC_EMBEDDED_BITMAP "embeddedbitmap" /* Bool - true to enable embedded bitmaps */
|
|
123
|
+
#define FC_DECORATIVE "decorative" /* Bool - true if style is a decorative variant */
|
|
124
|
+
#define FC_LCD_FILTER "lcdfilter" /* Int */
|
|
125
|
+
#define FC_FONT_FEATURES "fontfeatures" /* String */
|
|
126
|
+
#define FC_FONT_VARIATIONS "fontvariations" /* String */
|
|
127
|
+
#define FC_NAMELANG "namelang" /* String RFC 3866 langs */
|
|
128
|
+
#define FC_PRGNAME "prgname" /* String */
|
|
129
|
+
#define FC_HASH "hash" /* String (deprecated) */
|
|
130
|
+
#define FC_POSTSCRIPT_NAME "postscriptname" /* String */
|
|
131
|
+
#define FC_FONT_HAS_HINT "fonthashint" /* Bool - true if font has hinting */
|
|
132
|
+
#define FC_ORDER "order" /* Integer */
|
|
133
|
+
#define FC_DESKTOP_NAME "desktop" /* String */
|
|
134
|
+
#define FC_NAMED_INSTANCE "namedinstance" /* Bool - true if font is named instance */
|
|
135
|
+
#define FC_FONT_WRAPPER "fontwrapper" /* String */
|
|
136
|
+
|
|
137
|
+
#define FC_CACHE_SUFFIX ".cache-" FC_CACHE_VERSION
|
|
138
|
+
#define FC_DIR_CACHE_FILE "fonts.cache-" FC_CACHE_VERSION
|
|
139
|
+
#define FC_USER_CACHE_FILE ".fonts.cache-" FC_CACHE_VERSION
|
|
140
140
|
|
|
141
141
|
/* Adjust outline rasterizer */
|
|
142
|
-
#define FC_CHARWIDTH
|
|
143
|
-
#define FC_CHAR_WIDTH
|
|
144
|
-
#define FC_CHAR_HEIGHT
|
|
145
|
-
#define FC_MATRIX
|
|
146
|
-
|
|
147
|
-
#define FC_WEIGHT_THIN
|
|
148
|
-
#define FC_WEIGHT_EXTRALIGHT
|
|
149
|
-
#define FC_WEIGHT_ULTRALIGHT
|
|
150
|
-
#define FC_WEIGHT_LIGHT
|
|
151
|
-
#define FC_WEIGHT_DEMILIGHT
|
|
152
|
-
#define FC_WEIGHT_SEMILIGHT
|
|
153
|
-
#define FC_WEIGHT_BOOK
|
|
154
|
-
#define FC_WEIGHT_REGULAR
|
|
155
|
-
#define FC_WEIGHT_NORMAL
|
|
156
|
-
#define FC_WEIGHT_MEDIUM
|
|
157
|
-
#define FC_WEIGHT_DEMIBOLD
|
|
158
|
-
#define FC_WEIGHT_SEMIBOLD
|
|
159
|
-
#define FC_WEIGHT_BOLD
|
|
160
|
-
#define FC_WEIGHT_EXTRABOLD
|
|
161
|
-
#define FC_WEIGHT_ULTRABOLD
|
|
162
|
-
#define FC_WEIGHT_BLACK
|
|
163
|
-
#define FC_WEIGHT_HEAVY
|
|
164
|
-
#define FC_WEIGHT_EXTRABLACK
|
|
165
|
-
#define FC_WEIGHT_ULTRABLACK
|
|
166
|
-
|
|
167
|
-
#define FC_SLANT_ROMAN
|
|
168
|
-
#define FC_SLANT_ITALIC
|
|
169
|
-
#define FC_SLANT_OBLIQUE
|
|
170
|
-
|
|
171
|
-
#define FC_WIDTH_ULTRACONDENSED
|
|
172
|
-
#define FC_WIDTH_EXTRACONDENSED
|
|
173
|
-
#define FC_WIDTH_CONDENSED
|
|
174
|
-
#define FC_WIDTH_SEMICONDENSED
|
|
175
|
-
#define FC_WIDTH_NORMAL
|
|
176
|
-
#define FC_WIDTH_SEMIEXPANDED
|
|
177
|
-
#define FC_WIDTH_EXPANDED
|
|
178
|
-
#define FC_WIDTH_EXTRAEXPANDED
|
|
179
|
-
#define FC_WIDTH_ULTRAEXPANDED
|
|
180
|
-
|
|
181
|
-
#define FC_PROPORTIONAL
|
|
182
|
-
#define FC_DUAL
|
|
183
|
-
#define FC_MONO
|
|
184
|
-
#define FC_CHARCELL
|
|
142
|
+
#define FC_CHARWIDTH "charwidth" /* Int */
|
|
143
|
+
#define FC_CHAR_WIDTH FC_CHARWIDTH
|
|
144
|
+
#define FC_CHAR_HEIGHT "charheight" /* Int */
|
|
145
|
+
#define FC_MATRIX "matrix" /* FcMatrix */
|
|
146
|
+
|
|
147
|
+
#define FC_WEIGHT_THIN 0
|
|
148
|
+
#define FC_WEIGHT_EXTRALIGHT 40
|
|
149
|
+
#define FC_WEIGHT_ULTRALIGHT FC_WEIGHT_EXTRALIGHT
|
|
150
|
+
#define FC_WEIGHT_LIGHT 50
|
|
151
|
+
#define FC_WEIGHT_DEMILIGHT 55
|
|
152
|
+
#define FC_WEIGHT_SEMILIGHT FC_WEIGHT_DEMILIGHT
|
|
153
|
+
#define FC_WEIGHT_BOOK 75
|
|
154
|
+
#define FC_WEIGHT_REGULAR 80
|
|
155
|
+
#define FC_WEIGHT_NORMAL FC_WEIGHT_REGULAR
|
|
156
|
+
#define FC_WEIGHT_MEDIUM 100
|
|
157
|
+
#define FC_WEIGHT_DEMIBOLD 180
|
|
158
|
+
#define FC_WEIGHT_SEMIBOLD FC_WEIGHT_DEMIBOLD
|
|
159
|
+
#define FC_WEIGHT_BOLD 200
|
|
160
|
+
#define FC_WEIGHT_EXTRABOLD 205
|
|
161
|
+
#define FC_WEIGHT_ULTRABOLD FC_WEIGHT_EXTRABOLD
|
|
162
|
+
#define FC_WEIGHT_BLACK 210
|
|
163
|
+
#define FC_WEIGHT_HEAVY FC_WEIGHT_BLACK
|
|
164
|
+
#define FC_WEIGHT_EXTRABLACK 215
|
|
165
|
+
#define FC_WEIGHT_ULTRABLACK FC_WEIGHT_EXTRABLACK
|
|
166
|
+
|
|
167
|
+
#define FC_SLANT_ROMAN 0
|
|
168
|
+
#define FC_SLANT_ITALIC 100
|
|
169
|
+
#define FC_SLANT_OBLIQUE 110
|
|
170
|
+
|
|
171
|
+
#define FC_WIDTH_ULTRACONDENSED 50
|
|
172
|
+
#define FC_WIDTH_EXTRACONDENSED 63
|
|
173
|
+
#define FC_WIDTH_CONDENSED 75
|
|
174
|
+
#define FC_WIDTH_SEMICONDENSED 87
|
|
175
|
+
#define FC_WIDTH_NORMAL 100
|
|
176
|
+
#define FC_WIDTH_SEMIEXPANDED 113
|
|
177
|
+
#define FC_WIDTH_EXPANDED 125
|
|
178
|
+
#define FC_WIDTH_EXTRAEXPANDED 150
|
|
179
|
+
#define FC_WIDTH_ULTRAEXPANDED 200
|
|
180
|
+
|
|
181
|
+
#define FC_PROPORTIONAL 0
|
|
182
|
+
#define FC_DUAL 90
|
|
183
|
+
#define FC_MONO 100
|
|
184
|
+
#define FC_CHARCELL 110
|
|
185
185
|
|
|
186
186
|
/* sub-pixel order */
|
|
187
|
-
#define FC_RGBA_UNKNOWN
|
|
188
|
-
#define FC_RGBA_RGB
|
|
189
|
-
#define FC_RGBA_BGR
|
|
190
|
-
#define FC_RGBA_VRGB
|
|
191
|
-
#define FC_RGBA_VBGR
|
|
192
|
-
#define FC_RGBA_NONE
|
|
187
|
+
#define FC_RGBA_UNKNOWN 0
|
|
188
|
+
#define FC_RGBA_RGB 1
|
|
189
|
+
#define FC_RGBA_BGR 2
|
|
190
|
+
#define FC_RGBA_VRGB 3
|
|
191
|
+
#define FC_RGBA_VBGR 4
|
|
192
|
+
#define FC_RGBA_NONE 5
|
|
193
193
|
|
|
194
194
|
/* hinting style */
|
|
195
|
-
#define FC_HINT_NONE
|
|
196
|
-
#define FC_HINT_SLIGHT
|
|
197
|
-
#define FC_HINT_MEDIUM
|
|
198
|
-
#define FC_HINT_FULL
|
|
195
|
+
#define FC_HINT_NONE 0
|
|
196
|
+
#define FC_HINT_SLIGHT 1
|
|
197
|
+
#define FC_HINT_MEDIUM 2
|
|
198
|
+
#define FC_HINT_FULL 3
|
|
199
199
|
|
|
200
200
|
/* LCD filter */
|
|
201
|
-
#define FC_LCD_NONE
|
|
202
|
-
#define FC_LCD_DEFAULT
|
|
203
|
-
#define FC_LCD_LIGHT
|
|
204
|
-
#define FC_LCD_LEGACY
|
|
201
|
+
#define FC_LCD_NONE 0
|
|
202
|
+
#define FC_LCD_DEFAULT 1
|
|
203
|
+
#define FC_LCD_LIGHT 2
|
|
204
|
+
#define FC_LCD_LEGACY 3
|
|
205
205
|
|
|
206
206
|
typedef enum _FcType {
|
|
207
207
|
FcTypeUnknown = -1,
|
|
@@ -221,8 +221,8 @@ typedef struct _FcMatrix {
|
|
|
221
221
|
double xx, xy, yx, yy;
|
|
222
222
|
} FcMatrix;
|
|
223
223
|
|
|
224
|
-
#define FcMatrixInit(m)
|
|
225
|
-
|
|
224
|
+
#define FcMatrixInit(m) ((m)->xx = (m)->yy = 1, \
|
|
225
|
+
(m)->xy = (m)->yx = 0)
|
|
226
226
|
|
|
227
227
|
/*
|
|
228
228
|
* A data structure to represent the available glyphs in a font.
|
|
@@ -232,67 +232,74 @@ typedef struct _FcMatrix {
|
|
|
232
232
|
typedef struct _FcCharSet FcCharSet;
|
|
233
233
|
|
|
234
234
|
typedef struct _FcObjectType {
|
|
235
|
-
char
|
|
236
|
-
FcType
|
|
235
|
+
char *object;
|
|
236
|
+
FcType type;
|
|
237
237
|
} FcObjectType;
|
|
238
238
|
|
|
239
239
|
typedef struct _FcConstant {
|
|
240
|
-
const FcChar8
|
|
241
|
-
const char
|
|
242
|
-
int
|
|
240
|
+
const FcChar8 *name;
|
|
241
|
+
const char *object;
|
|
242
|
+
int value;
|
|
243
243
|
} FcConstant;
|
|
244
244
|
|
|
245
245
|
typedef enum _FcResult {
|
|
246
|
-
FcResultMatch,
|
|
246
|
+
FcResultMatch,
|
|
247
|
+
FcResultNoMatch,
|
|
248
|
+
FcResultTypeMismatch,
|
|
249
|
+
FcResultNoId,
|
|
247
250
|
FcResultOutOfMemory
|
|
248
251
|
} FcResult;
|
|
249
252
|
|
|
250
253
|
typedef enum _FcValueBinding {
|
|
251
|
-
FcValueBindingWeak,
|
|
254
|
+
FcValueBindingWeak,
|
|
255
|
+
FcValueBindingStrong,
|
|
256
|
+
FcValueBindingSame,
|
|
252
257
|
/* to make sure sizeof (FcValueBinding) == 4 even with -fshort-enums */
|
|
253
258
|
FcValueBindingEnd = INT_MAX
|
|
254
259
|
} FcValueBinding;
|
|
255
260
|
|
|
256
|
-
typedef struct _FcPattern
|
|
261
|
+
typedef struct _FcPattern FcPattern;
|
|
257
262
|
|
|
258
263
|
typedef struct FC_ATTRIBUTE_MAY_ALIAS _FcPatternIter {
|
|
259
264
|
void *dummy1;
|
|
260
265
|
void *dummy2;
|
|
261
266
|
} FcPatternIter;
|
|
262
267
|
|
|
263
|
-
typedef struct _FcLangSet
|
|
268
|
+
typedef struct _FcLangSet FcLangSet;
|
|
264
269
|
|
|
265
|
-
typedef struct _FcRange
|
|
270
|
+
typedef struct _FcRange FcRange;
|
|
266
271
|
|
|
267
272
|
typedef struct _FcValue {
|
|
268
|
-
FcType
|
|
273
|
+
FcType type;
|
|
269
274
|
union {
|
|
270
|
-
const FcChar8
|
|
271
|
-
int
|
|
272
|
-
FcBool
|
|
273
|
-
double
|
|
274
|
-
const FcMatrix
|
|
275
|
-
const FcCharSet
|
|
276
|
-
void
|
|
277
|
-
const FcLangSet
|
|
278
|
-
const FcRange
|
|
275
|
+
const FcChar8 *s;
|
|
276
|
+
int i;
|
|
277
|
+
FcBool b;
|
|
278
|
+
double d;
|
|
279
|
+
const FcMatrix *m;
|
|
280
|
+
const FcCharSet *c;
|
|
281
|
+
void *f;
|
|
282
|
+
const FcLangSet *l;
|
|
283
|
+
const FcRange *r;
|
|
279
284
|
} u;
|
|
280
285
|
} FcValue;
|
|
281
286
|
|
|
282
287
|
typedef struct _FcFontSet {
|
|
283
|
-
int
|
|
284
|
-
int
|
|
285
|
-
FcPattern
|
|
288
|
+
int nfont;
|
|
289
|
+
int sfont;
|
|
290
|
+
FcPattern **fonts;
|
|
286
291
|
} FcFontSet;
|
|
287
292
|
|
|
288
293
|
typedef struct _FcObjectSet {
|
|
289
|
-
int
|
|
290
|
-
int
|
|
291
|
-
const char
|
|
294
|
+
int nobject;
|
|
295
|
+
int sobject;
|
|
296
|
+
const char **objects;
|
|
292
297
|
} FcObjectSet;
|
|
293
298
|
|
|
294
299
|
typedef enum _FcMatchKind {
|
|
295
|
-
FcMatchPattern,
|
|
300
|
+
FcMatchPattern,
|
|
301
|
+
FcMatchFont,
|
|
302
|
+
FcMatchScan,
|
|
296
303
|
FcMatchKindEnd,
|
|
297
304
|
FcMatchKindBegin = FcMatchPattern
|
|
298
305
|
} FcMatchKind;
|
|
@@ -310,37 +317,38 @@ typedef enum _FcSetName {
|
|
|
310
317
|
} FcSetName;
|
|
311
318
|
|
|
312
319
|
typedef struct _FcConfigFileInfoIter {
|
|
313
|
-
void
|
|
314
|
-
void
|
|
315
|
-
void
|
|
320
|
+
void *dummy1;
|
|
321
|
+
void *dummy2;
|
|
322
|
+
void *dummy3;
|
|
316
323
|
} FcConfigFileInfoIter;
|
|
317
324
|
|
|
318
325
|
typedef struct _FcAtomic FcAtomic;
|
|
319
326
|
|
|
320
327
|
#if defined(__cplusplus) || defined(c_plusplus) /* for C++ V2.0 */
|
|
321
|
-
#define _FCFUNCPROTOBEGIN extern "C" {
|
|
322
|
-
#define _FCFUNCPROTOEND
|
|
328
|
+
# define _FCFUNCPROTOBEGIN extern "C" { /* do not leave open across includes */
|
|
329
|
+
# define _FCFUNCPROTOEND }
|
|
323
330
|
#else
|
|
324
|
-
#define _FCFUNCPROTOBEGIN
|
|
325
|
-
#define _FCFUNCPROTOEND
|
|
331
|
+
# define _FCFUNCPROTOBEGIN
|
|
332
|
+
# define _FCFUNCPROTOEND
|
|
326
333
|
#endif
|
|
327
334
|
|
|
328
|
-
typedef enum { FcEndianBig,
|
|
335
|
+
typedef enum { FcEndianBig,
|
|
336
|
+
FcEndianLittle } FcEndian;
|
|
329
337
|
|
|
330
|
-
typedef struct _FcConfig
|
|
338
|
+
typedef struct _FcConfig FcConfig;
|
|
331
339
|
|
|
332
|
-
typedef struct _FcGlobalCache
|
|
340
|
+
typedef struct _FcGlobalCache FcFileCache;
|
|
333
341
|
|
|
334
|
-
typedef struct _FcBlanks
|
|
342
|
+
typedef struct _FcBlanks FcBlanks;
|
|
335
343
|
|
|
336
|
-
typedef struct _FcStrList
|
|
344
|
+
typedef struct _FcStrList FcStrList;
|
|
337
345
|
|
|
338
|
-
typedef struct _FcStrSet
|
|
346
|
+
typedef struct _FcStrSet FcStrSet;
|
|
339
347
|
|
|
340
|
-
typedef struct _FcCache
|
|
348
|
+
typedef struct _FcCache FcCache;
|
|
341
349
|
|
|
342
|
-
typedef void (*
|
|
343
|
-
typedef FcBool (*
|
|
350
|
+
typedef void (*FcDestroyFunc) (void *data);
|
|
351
|
+
typedef FcBool (*FcFilterFontSetFunc) (const FcPattern *font, void *user_data);
|
|
344
352
|
|
|
345
353
|
_FCFUNCPROTOBEGIN
|
|
346
354
|
|
|
@@ -360,10 +368,10 @@ FcBlanksIsMember (FcBlanks *b, FcChar32 ucs4);
|
|
|
360
368
|
/* fccache.c */
|
|
361
369
|
|
|
362
370
|
FcPublic const FcChar8 *
|
|
363
|
-
FcCacheDir(const FcCache *c);
|
|
371
|
+
FcCacheDir (const FcCache *c);
|
|
364
372
|
|
|
365
373
|
FcPublic FcFontSet *
|
|
366
|
-
FcCacheCopySet(const FcCache *c);
|
|
374
|
+
FcCacheCopySet (const FcCache *c);
|
|
367
375
|
|
|
368
376
|
FcPublic const FcChar8 *
|
|
369
377
|
FcCacheSubdir (const FcCache *c, int i);
|
|
@@ -388,12 +396,12 @@ FcCacheCreateTagFile (FcConfig *config);
|
|
|
388
396
|
|
|
389
397
|
FcPublic FcBool
|
|
390
398
|
FcDirCacheCreateUUID (FcChar8 *dir,
|
|
391
|
-
|
|
392
|
-
|
|
399
|
+
FcBool force,
|
|
400
|
+
FcConfig *config);
|
|
393
401
|
|
|
394
402
|
FcPublic FcBool
|
|
395
|
-
FcDirCacheDeleteUUID (const FcChar8
|
|
396
|
-
|
|
403
|
+
FcDirCacheDeleteUUID (const FcChar8 *dir,
|
|
404
|
+
FcConfig *config);
|
|
397
405
|
|
|
398
406
|
/* fccfg.c */
|
|
399
407
|
FcPublic FcChar8 *
|
|
@@ -404,7 +412,7 @@ FcConfigEnableHome (FcBool enable);
|
|
|
404
412
|
|
|
405
413
|
FcPublic FcChar8 *
|
|
406
414
|
FcConfigGetFilename (FcConfig *config,
|
|
407
|
-
|
|
415
|
+
const FcChar8 *url);
|
|
408
416
|
|
|
409
417
|
FcPublic FcChar8 *
|
|
410
418
|
FcConfigFilename (const FcChar8 *url);
|
|
@@ -431,22 +439,22 @@ FcPublic FcBool
|
|
|
431
439
|
FcConfigBuildFonts (FcConfig *config);
|
|
432
440
|
|
|
433
441
|
FcPublic FcStrList *
|
|
434
|
-
FcConfigGetFontDirs (FcConfig
|
|
442
|
+
FcConfigGetFontDirs (FcConfig *config);
|
|
435
443
|
|
|
436
444
|
FcPublic FcStrList *
|
|
437
|
-
FcConfigGetConfigDirs (FcConfig
|
|
445
|
+
FcConfigGetConfigDirs (FcConfig *config);
|
|
438
446
|
|
|
439
447
|
FcPublic FcStrList *
|
|
440
|
-
FcConfigGetConfigFiles (FcConfig
|
|
448
|
+
FcConfigGetConfigFiles (FcConfig *config);
|
|
441
449
|
|
|
442
450
|
FcPublic FcChar8 *
|
|
443
|
-
FcConfigGetCache (FcConfig
|
|
451
|
+
FcConfigGetCache (FcConfig *config);
|
|
444
452
|
|
|
445
453
|
FcPublic FcBlanks *
|
|
446
454
|
FcConfigGetBlanks (FcConfig *config);
|
|
447
455
|
|
|
448
456
|
FcPublic FcStrList *
|
|
449
|
-
FcConfigGetCacheDirs (FcConfig
|
|
457
|
+
FcConfigGetCacheDirs (FcConfig *config);
|
|
450
458
|
|
|
451
459
|
FcPublic int
|
|
452
460
|
FcConfigGetRescanInterval (FcConfig *config);
|
|
@@ -455,69 +463,69 @@ FcPublic FcBool
|
|
|
455
463
|
FcConfigSetRescanInterval (FcConfig *config, int rescanInterval);
|
|
456
464
|
|
|
457
465
|
FcPublic FcFontSet *
|
|
458
|
-
FcConfigGetFonts (FcConfig
|
|
459
|
-
|
|
466
|
+
FcConfigGetFonts (FcConfig *config,
|
|
467
|
+
FcSetName set);
|
|
460
468
|
|
|
461
469
|
FcPublic FcBool
|
|
462
|
-
FcConfigAcceptFont (FcConfig
|
|
463
|
-
|
|
470
|
+
FcConfigAcceptFont (FcConfig *config,
|
|
471
|
+
const FcPattern *font);
|
|
464
472
|
|
|
465
473
|
FcPublic FcBool
|
|
466
474
|
FcConfigAcceptFilter (FcConfig *config,
|
|
467
|
-
|
|
475
|
+
const FcPattern *font);
|
|
468
476
|
|
|
469
477
|
FcPublic FcBool
|
|
470
|
-
FcConfigAppFontAddFile (FcConfig
|
|
471
|
-
|
|
478
|
+
FcConfigAppFontAddFile (FcConfig *config,
|
|
479
|
+
const FcChar8 *file);
|
|
472
480
|
|
|
473
481
|
FcPublic FcBool
|
|
474
|
-
FcConfigAppFontAddDir (FcConfig
|
|
475
|
-
|
|
482
|
+
FcConfigAppFontAddDir (FcConfig *config,
|
|
483
|
+
const FcChar8 *dir);
|
|
476
484
|
|
|
477
485
|
FcPublic void
|
|
478
|
-
FcConfigAppFontClear (FcConfig
|
|
486
|
+
FcConfigAppFontClear (FcConfig *config);
|
|
479
487
|
|
|
480
488
|
FcPublic FcBool
|
|
481
|
-
FcConfigSubstituteWithPat (FcConfig
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
|
|
489
|
+
FcConfigSubstituteWithPat (FcConfig *config,
|
|
490
|
+
FcPattern *p,
|
|
491
|
+
FcPattern *p_pat,
|
|
492
|
+
FcMatchKind kind);
|
|
485
493
|
|
|
486
494
|
FcPublic FcBool
|
|
487
|
-
FcConfigSubstitute (FcConfig
|
|
488
|
-
|
|
489
|
-
|
|
495
|
+
FcConfigSubstitute (FcConfig *config,
|
|
496
|
+
FcPattern *p,
|
|
497
|
+
FcMatchKind kind);
|
|
490
498
|
|
|
491
499
|
FcPublic const FcChar8 *
|
|
492
500
|
FcConfigGetSysRoot (const FcConfig *config);
|
|
493
501
|
|
|
494
502
|
FcPublic void
|
|
495
503
|
FcConfigSetSysRoot (FcConfig *config,
|
|
496
|
-
|
|
504
|
+
const FcChar8 *sysroot);
|
|
497
505
|
|
|
498
506
|
FcPublic FcConfig *
|
|
499
|
-
FcConfigSetFontSetFilter (FcConfig
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
|
|
507
|
+
FcConfigSetFontSetFilter (FcConfig *config,
|
|
508
|
+
FcFilterFontSetFunc filter_func,
|
|
509
|
+
FcDestroyFunc destroy_data_func,
|
|
510
|
+
void *user_data);
|
|
503
511
|
|
|
504
512
|
FcPublic void
|
|
505
|
-
FcConfigFileInfoIterInit (FcConfig
|
|
506
|
-
|
|
513
|
+
FcConfigFileInfoIterInit (FcConfig *config,
|
|
514
|
+
FcConfigFileInfoIter *iter);
|
|
507
515
|
|
|
508
516
|
FcPublic FcBool
|
|
509
|
-
FcConfigFileInfoIterNext (FcConfig
|
|
510
|
-
|
|
517
|
+
FcConfigFileInfoIterNext (FcConfig *config,
|
|
518
|
+
FcConfigFileInfoIter *iter);
|
|
511
519
|
|
|
512
520
|
FcPublic FcBool
|
|
513
|
-
FcConfigFileInfoIterGet (FcConfig
|
|
514
|
-
|
|
515
|
-
|
|
516
|
-
|
|
517
|
-
|
|
521
|
+
FcConfigFileInfoIterGet (FcConfig *config,
|
|
522
|
+
FcConfigFileInfoIter *iter,
|
|
523
|
+
FcChar8 **name,
|
|
524
|
+
FcChar8 **description,
|
|
525
|
+
FcBool *enabled);
|
|
518
526
|
|
|
519
527
|
/* fccharset.c */
|
|
520
|
-
FcPublic FcCharSet*
|
|
528
|
+
FcPublic FcCharSet *
|
|
521
529
|
FcCharSetCreate (void);
|
|
522
530
|
|
|
523
531
|
/* deprecated alias for FcCharSetCreate */
|
|
@@ -533,19 +541,19 @@ FcCharSetAddChar (FcCharSet *fcs, FcChar32 ucs4);
|
|
|
533
541
|
FcPublic FcBool
|
|
534
542
|
FcCharSetDelChar (FcCharSet *fcs, FcChar32 ucs4);
|
|
535
543
|
|
|
536
|
-
FcPublic FcCharSet*
|
|
544
|
+
FcPublic FcCharSet *
|
|
537
545
|
FcCharSetCopy (FcCharSet *src);
|
|
538
546
|
|
|
539
547
|
FcPublic FcBool
|
|
540
548
|
FcCharSetEqual (const FcCharSet *a, const FcCharSet *b);
|
|
541
549
|
|
|
542
|
-
FcPublic FcCharSet*
|
|
550
|
+
FcPublic FcCharSet *
|
|
543
551
|
FcCharSetIntersect (const FcCharSet *a, const FcCharSet *b);
|
|
544
552
|
|
|
545
|
-
FcPublic FcCharSet*
|
|
553
|
+
FcPublic FcCharSet *
|
|
546
554
|
FcCharSetUnion (const FcCharSet *a, const FcCharSet *b);
|
|
547
555
|
|
|
548
|
-
FcPublic FcCharSet*
|
|
556
|
+
FcPublic FcCharSet *
|
|
549
557
|
FcCharSetSubtract (const FcCharSet *a, const FcCharSet *b);
|
|
550
558
|
|
|
551
559
|
FcPublic FcBool
|
|
@@ -566,18 +574,18 @@ FcCharSetSubtractCount (const FcCharSet *a, const FcCharSet *b);
|
|
|
566
574
|
FcPublic FcBool
|
|
567
575
|
FcCharSetIsSubset (const FcCharSet *a, const FcCharSet *b);
|
|
568
576
|
|
|
569
|
-
#define FC_CHARSET_MAP_SIZE (256/32)
|
|
570
|
-
#define FC_CHARSET_DONE
|
|
577
|
+
#define FC_CHARSET_MAP_SIZE (256 / 32)
|
|
578
|
+
#define FC_CHARSET_DONE ((FcChar32) - 1)
|
|
571
579
|
|
|
572
580
|
FcPublic FcChar32
|
|
573
581
|
FcCharSetFirstPage (const FcCharSet *a,
|
|
574
|
-
|
|
575
|
-
|
|
582
|
+
FcChar32 map[FC_CHARSET_MAP_SIZE],
|
|
583
|
+
FcChar32 *next);
|
|
576
584
|
|
|
577
585
|
FcPublic FcChar32
|
|
578
|
-
FcCharSetNextPage (const FcCharSet
|
|
579
|
-
|
|
580
|
-
|
|
586
|
+
FcCharSetNextPage (const FcCharSet *a,
|
|
587
|
+
FcChar32 map[FC_CHARSET_MAP_SIZE],
|
|
588
|
+
FcChar32 *next);
|
|
581
589
|
|
|
582
590
|
/*
|
|
583
591
|
* old coverage API, rather hard to use correctly
|
|
@@ -608,20 +616,20 @@ FcPublic FcBool
|
|
|
608
616
|
FcFileIsDir (const FcChar8 *file);
|
|
609
617
|
|
|
610
618
|
FcPublic FcBool
|
|
611
|
-
FcFileScan (FcFontSet
|
|
612
|
-
|
|
613
|
-
|
|
614
|
-
|
|
615
|
-
|
|
616
|
-
|
|
619
|
+
FcFileScan (FcFontSet *set,
|
|
620
|
+
FcStrSet *dirs,
|
|
621
|
+
FcFileCache *cache,
|
|
622
|
+
FcBlanks *blanks,
|
|
623
|
+
const FcChar8 *file,
|
|
624
|
+
FcBool force);
|
|
617
625
|
|
|
618
626
|
FcPublic FcBool
|
|
619
|
-
FcDirScan (FcFontSet
|
|
620
|
-
|
|
621
|
-
|
|
622
|
-
|
|
623
|
-
|
|
624
|
-
|
|
627
|
+
FcDirScan (FcFontSet *set,
|
|
628
|
+
FcStrSet *dirs,
|
|
629
|
+
FcFileCache *cache,
|
|
630
|
+
FcBlanks *blanks,
|
|
631
|
+
const FcChar8 *dir,
|
|
632
|
+
FcBool force);
|
|
625
633
|
|
|
626
634
|
FcPublic FcBool
|
|
627
635
|
FcDirSave (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir);
|
|
@@ -646,7 +654,7 @@ FcPublic FcPattern *
|
|
|
646
654
|
FcFreeTypeQuery (const FcChar8 *file, unsigned int id, FcBlanks *blanks, int *count);
|
|
647
655
|
|
|
648
656
|
FcPublic unsigned int
|
|
649
|
-
FcFreeTypeQueryAll(const FcChar8 *file, unsigned int id, FcBlanks *blanks, int *count, FcFontSet *set);
|
|
657
|
+
FcFreeTypeQueryAll (const FcChar8 *file, unsigned int id, FcBlanks *blanks, int *count, FcFontSet *set);
|
|
650
658
|
|
|
651
659
|
/* fcfs.c */
|
|
652
660
|
|
|
@@ -691,13 +699,13 @@ FcLangNormalize (const FcChar8 *lang);
|
|
|
691
699
|
FcPublic const FcCharSet *
|
|
692
700
|
FcLangGetCharSet (const FcChar8 *lang);
|
|
693
701
|
|
|
694
|
-
FcPublic FcLangSet*
|
|
702
|
+
FcPublic FcLangSet *
|
|
695
703
|
FcLangSetCreate (void);
|
|
696
704
|
|
|
697
705
|
FcPublic void
|
|
698
706
|
FcLangSetDestroy (FcLangSet *ls);
|
|
699
707
|
|
|
700
|
-
FcPublic FcLangSet*
|
|
708
|
+
FcPublic FcLangSet *
|
|
701
709
|
FcLangSetCopy (const FcLangSet *ls);
|
|
702
710
|
|
|
703
711
|
FcPublic FcBool
|
|
@@ -744,24 +752,24 @@ FcPublic FcObjectSet *
|
|
|
744
752
|
FcObjectSetVaBuild (const char *first, va_list va);
|
|
745
753
|
|
|
746
754
|
FcPublic FcObjectSet *
|
|
747
|
-
FcObjectSetBuild (const char *first, ...) FC_ATTRIBUTE_SENTINEL(0);
|
|
755
|
+
FcObjectSetBuild (const char *first, ...) FC_ATTRIBUTE_SENTINEL (0);
|
|
748
756
|
|
|
749
757
|
FcPublic FcFontSet *
|
|
750
|
-
FcFontSetList (FcConfig
|
|
751
|
-
|
|
752
|
-
|
|
753
|
-
|
|
754
|
-
|
|
758
|
+
FcFontSetList (FcConfig *config,
|
|
759
|
+
FcFontSet **sets,
|
|
760
|
+
int nsets,
|
|
761
|
+
FcPattern *p,
|
|
762
|
+
FcObjectSet *os);
|
|
755
763
|
|
|
756
764
|
FcPublic FcFontSet *
|
|
757
|
-
FcFontList (FcConfig
|
|
758
|
-
|
|
759
|
-
|
|
765
|
+
FcFontList (FcConfig *config,
|
|
766
|
+
FcPattern *p,
|
|
767
|
+
FcObjectSet *os);
|
|
760
768
|
|
|
761
769
|
/* fcatomic.c */
|
|
762
770
|
|
|
763
771
|
FcPublic FcAtomic *
|
|
764
|
-
FcAtomicCreate (const FcChar8
|
|
772
|
+
FcAtomicCreate (const FcChar8 *file);
|
|
765
773
|
|
|
766
774
|
FcPublic FcBool
|
|
767
775
|
FcAtomicLock (FcAtomic *atomic);
|
|
@@ -786,37 +794,37 @@ FcAtomicDestroy (FcAtomic *atomic);
|
|
|
786
794
|
|
|
787
795
|
/* fcmatch.c */
|
|
788
796
|
FcPublic FcPattern *
|
|
789
|
-
FcFontSetMatch (FcConfig
|
|
790
|
-
|
|
791
|
-
|
|
792
|
-
|
|
793
|
-
|
|
797
|
+
FcFontSetMatch (FcConfig *config,
|
|
798
|
+
FcFontSet **sets,
|
|
799
|
+
int nsets,
|
|
800
|
+
FcPattern *p,
|
|
801
|
+
FcResult *result);
|
|
794
802
|
|
|
795
803
|
FcPublic FcPattern *
|
|
796
|
-
FcFontMatch (FcConfig
|
|
797
|
-
|
|
798
|
-
|
|
804
|
+
FcFontMatch (FcConfig *config,
|
|
805
|
+
FcPattern *p,
|
|
806
|
+
FcResult *result);
|
|
799
807
|
|
|
800
808
|
FcPublic FcPattern *
|
|
801
|
-
FcFontRenderPrepare (FcConfig
|
|
802
|
-
|
|
803
|
-
|
|
809
|
+
FcFontRenderPrepare (FcConfig *config,
|
|
810
|
+
FcPattern *pat,
|
|
811
|
+
FcPattern *font);
|
|
804
812
|
|
|
805
813
|
FcPublic FcFontSet *
|
|
806
|
-
FcFontSetSort (FcConfig
|
|
807
|
-
|
|
808
|
-
|
|
809
|
-
|
|
810
|
-
|
|
811
|
-
|
|
812
|
-
|
|
814
|
+
FcFontSetSort (FcConfig *config,
|
|
815
|
+
FcFontSet **sets,
|
|
816
|
+
int nsets,
|
|
817
|
+
FcPattern *p,
|
|
818
|
+
FcBool trim,
|
|
819
|
+
FcCharSet **csp,
|
|
820
|
+
FcResult *result);
|
|
813
821
|
|
|
814
822
|
FcPublic FcFontSet *
|
|
815
|
-
FcFontSort (FcConfig
|
|
816
|
-
|
|
817
|
-
|
|
818
|
-
|
|
819
|
-
|
|
823
|
+
FcFontSort (FcConfig *config,
|
|
824
|
+
FcPattern *p,
|
|
825
|
+
FcBool trim,
|
|
826
|
+
FcCharSet **csp,
|
|
827
|
+
FcResult *result);
|
|
820
828
|
|
|
821
829
|
FcPublic void
|
|
822
830
|
FcFontSetSortDestroy (FcFontSet *fs);
|
|
@@ -962,7 +970,7 @@ FcPublic FcResult
|
|
|
962
970
|
FcPatternGetDouble (const FcPattern *p, const char *object, int n, double *d);
|
|
963
971
|
|
|
964
972
|
FcPublic FcResult
|
|
965
|
-
FcPatternGetString (const FcPattern *p, const char *object, int n, FcChar8 **
|
|
973
|
+
FcPatternGetString (const FcPattern *p, const char *object, int n, FcChar8 **s);
|
|
966
974
|
|
|
967
975
|
FcPublic FcResult
|
|
968
976
|
FcPatternGetMatrix (const FcPattern *p, const char *object, int n, FcMatrix **s);
|
|
@@ -983,7 +991,7 @@ FcPublic FcPattern *
|
|
|
983
991
|
FcPatternVaBuild (FcPattern *p, va_list va);
|
|
984
992
|
|
|
985
993
|
FcPublic FcPattern *
|
|
986
|
-
FcPatternBuild (FcPattern *p, ...) FC_ATTRIBUTE_SENTINEL(0);
|
|
994
|
+
FcPatternBuild (FcPattern *p, ...) FC_ATTRIBUTE_SENTINEL (0);
|
|
987
995
|
|
|
988
996
|
FcPublic FcChar8 *
|
|
989
997
|
FcPatternFormat (FcPattern *pat, const FcChar8 *format);
|
|
@@ -1002,7 +1010,7 @@ FcPublic FcRange *
|
|
|
1002
1010
|
FcRangeCopy (const FcRange *r);
|
|
1003
1011
|
|
|
1004
1012
|
FcPublic FcBool
|
|
1005
|
-
FcRangeGetDouble(const FcRange *range, double *begin, double *end);
|
|
1013
|
+
FcRangeGetDouble (const FcRange *range, double *begin, double *end);
|
|
1006
1014
|
|
|
1007
1015
|
FcPublic void
|
|
1008
1016
|
FcPatternIterStart (const FcPattern *pat, FcPatternIter *iter);
|
|
@@ -1012,7 +1020,7 @@ FcPatternIterNext (const FcPattern *pat, FcPatternIter *iter);
|
|
|
1012
1020
|
|
|
1013
1021
|
FcPublic FcBool
|
|
1014
1022
|
FcPatternIterEqual (const FcPattern *p1, FcPatternIter *i1,
|
|
1015
|
-
|
|
1023
|
+
const FcPattern *p2, FcPatternIter *i2);
|
|
1016
1024
|
|
|
1017
1025
|
FcPublic FcBool
|
|
1018
1026
|
FcPatternFindIter (const FcPattern *pat, FcPatternIter *iter, const char *object);
|
|
@@ -1058,9 +1066,9 @@ FcPublic void
|
|
|
1058
1066
|
FcStrFree (FcChar8 *s);
|
|
1059
1067
|
|
|
1060
1068
|
/* These are ASCII only, suitable only for pattern element names */
|
|
1061
|
-
#define FcIsUpper(c)
|
|
1062
|
-
#define FcIsLower(c)
|
|
1063
|
-
#define FcToLower(c)
|
|
1069
|
+
#define FcIsUpper(c) ((0101 <= (c) && (c) <= 0132))
|
|
1070
|
+
#define FcIsLower(c) ((0141 <= (c) && (c) <= 0172))
|
|
1071
|
+
#define FcToLower(c) (FcIsUpper (c) ? (c) - 0101 + 0141 : (c))
|
|
1064
1072
|
|
|
1065
1073
|
FcPublic FcChar8 *
|
|
1066
1074
|
FcStrDowncase (const FcChar8 *s);
|
|
@@ -1079,37 +1087,37 @@ FcStrStr (const FcChar8 *s1, const FcChar8 *s2);
|
|
|
1079
1087
|
|
|
1080
1088
|
FcPublic int
|
|
1081
1089
|
FcUtf8ToUcs4 (const FcChar8 *src_orig,
|
|
1082
|
-
|
|
1083
|
-
|
|
1090
|
+
FcChar32 *dst,
|
|
1091
|
+
int len);
|
|
1084
1092
|
|
|
1085
1093
|
FcPublic FcBool
|
|
1086
|
-
FcUtf8Len (const FcChar8
|
|
1087
|
-
|
|
1088
|
-
|
|
1089
|
-
|
|
1094
|
+
FcUtf8Len (const FcChar8 *string,
|
|
1095
|
+
int len,
|
|
1096
|
+
int *nchar,
|
|
1097
|
+
int *wchar);
|
|
1090
1098
|
|
|
1091
|
-
#define FC_UTF8_MAX_LEN
|
|
1099
|
+
#define FC_UTF8_MAX_LEN 6
|
|
1092
1100
|
|
|
1093
1101
|
FcPublic int
|
|
1094
|
-
FcUcs4ToUtf8 (FcChar32
|
|
1095
|
-
|
|
1102
|
+
FcUcs4ToUtf8 (FcChar32 ucs4,
|
|
1103
|
+
FcChar8 dest[FC_UTF8_MAX_LEN]);
|
|
1096
1104
|
|
|
1097
1105
|
FcPublic int
|
|
1098
|
-
FcUtf16ToUcs4 (const FcChar8
|
|
1099
|
-
|
|
1100
|
-
|
|
1101
|
-
|
|
1106
|
+
FcUtf16ToUcs4 (const FcChar8 *src_orig,
|
|
1107
|
+
FcEndian endian,
|
|
1108
|
+
FcChar32 *dst,
|
|
1109
|
+
int len); /* in bytes */
|
|
1102
1110
|
|
|
1103
1111
|
FcPublic FcBool
|
|
1104
|
-
FcUtf16Len (const FcChar8
|
|
1105
|
-
|
|
1106
|
-
|
|
1107
|
-
|
|
1108
|
-
|
|
1112
|
+
FcUtf16Len (const FcChar8 *string,
|
|
1113
|
+
FcEndian endian,
|
|
1114
|
+
int len, /* in bytes */
|
|
1115
|
+
int *nchar,
|
|
1116
|
+
int *wchar);
|
|
1109
1117
|
|
|
1110
1118
|
FcPublic FcChar8 *
|
|
1111
1119
|
FcStrBuildFilename (const FcChar8 *path,
|
|
1112
|
-
|
|
1120
|
+
...);
|
|
1113
1121
|
|
|
1114
1122
|
FcPublic FcChar8 *
|
|
1115
1123
|
FcStrDirname (const FcChar8 *file);
|
|
@@ -1155,16 +1163,15 @@ FcPublic FcBool
|
|
|
1155
1163
|
FcConfigParseAndLoad (FcConfig *config, const FcChar8 *file, FcBool complain);
|
|
1156
1164
|
|
|
1157
1165
|
FcPublic FcBool
|
|
1158
|
-
FcConfigParseAndLoadFromMemory (FcConfig
|
|
1159
|
-
|
|
1160
|
-
|
|
1166
|
+
FcConfigParseAndLoadFromMemory (FcConfig *config,
|
|
1167
|
+
const FcChar8 *buffer,
|
|
1168
|
+
FcBool complain);
|
|
1161
1169
|
|
|
1162
1170
|
_FCFUNCPROTOEND
|
|
1163
1171
|
|
|
1164
1172
|
#undef FC_ATTRIBUTE_SENTINEL
|
|
1165
1173
|
#undef FC_ATTRIBUTE_MAY_ALIAS
|
|
1166
1174
|
|
|
1167
|
-
|
|
1168
1175
|
#ifndef _FCINT_H_
|
|
1169
1176
|
|
|
1170
1177
|
/*
|
|
@@ -1172,8 +1179,8 @@ _FCFUNCPROTOEND
|
|
|
1172
1179
|
* digging through documentation
|
|
1173
1180
|
*/
|
|
1174
1181
|
|
|
1175
|
-
#define FcConfigGetRescanInverval
|
|
1176
|
-
#define FcConfigSetRescanInverval
|
|
1182
|
+
# define FcConfigGetRescanInverval FcConfigGetRescanInverval_REPLACE_BY_FcConfigGetRescanInterval
|
|
1183
|
+
# define FcConfigSetRescanInverval FcConfigSetRescanInverval_REPLACE_BY_FcConfigSetRescanInterval
|
|
1177
1184
|
|
|
1178
1185
|
#endif
|
|
1179
1186
|
|