Commit 4db32ecbc5781f191a22e64e35f61e943aa5d09f
2006-03-24T11:54:53
* docs/CHANGES: Updated. * src/tools/docmaker/tohtml.py (html_header_2): Add horizontal padding between table elements. Formatting, copyright years.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391
diff --git a/ChangeLog b/ChangeLog
index 7d616e0..bb7dca9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,25 @@
+2006-03-23 Werner Lemberg <wl@gnu.org>
+
+ * docs/CHANGES: Updated.
+
+ * src/tools/docmaker/tohtml.py (html_header_2): Add horizontal
+ padding between table elements.
+
2006-03-23 David Turner <david@freetype.org>
- * include/freetype/freetype.h, include/freetype/internal/ftgloadr.h,
- src/base/ftobjs.c: adding FT_Get_SubGlyph_Info API to retrieve subglyph
- data. Note that we do not expose FT_SubGlyphRec here !
+ Add FT_Get_SubGlyph_Info API to retrieve subglyph data. Note that
+ we do not expose the FT_SubGlyphRec structure.
+
+ * include/freetype/internal/ftgloadr.h (FT_SUBGLYPH_FLAGS_*): Moved
+ to...
+ * include/freetype/freetype.h (FT_SUBGLYPH_FLAGS_*): Here.
+ (FT_Get_SybGlyph_Info): New declaration.
+
+ * src/base/ftobjs.c (FT_Get_SubGlyph_Info): New function.
+
- * src/autofit/afloader.c: compute lsb_delta and rsb_delta correctly
- in edge cases
+ * src/autofit/afloader.c (af_loader_load_g): Compute lsb_delta and
+ rsb_delta correctly in edge cases.
2006-03-22 Werner Lemberg <wl@gnu.org>
diff --git a/devel/ftoption.h b/devel/ftoption.h
index d326089..da3559a 100644
--- a/devel/ftoption.h
+++ b/devel/ftoption.h
@@ -436,7 +436,7 @@ FT_BEGIN_HEADER
/* Do not #undef this macro here, since the build system might */
/* define it for certain configurations only. */
/* */
-#define xxTT_CONFIG_OPTION_BYTECODE_INTERPRETER
+#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
/*************************************************************************/
diff --git a/docs/CHANGES b/docs/CHANGES
index b46e913..b1bc147 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -21,6 +21,7 @@ LATEST CHANGES BETWEEN 2.2 and 2.1.10
command. Consequently, a number of rogue clients which directly
access FreeType's internal functions and structures won't
compile without modification.
+
We provide patches for most of those rogue clients. See the
following page for more information:
@@ -57,7 +58,7 @@ LATEST CHANGES BETWEEN 2.2 and 2.1.10
FT_Renderer_RenderFunc
FT_Renderer_TransformFunc
- Note that this doesn't affect binary backwards compatibility.
+ Note that this doesn't affect binary backward compatibility.
- On MacOS, new APIs have been added as replacements for legacy
APIs: `FT_New_Face_From_FSRef' for `FT_New_Face_From_FSSpec',
@@ -65,11 +66,14 @@ LATEST CHANGES BETWEEN 2.2 and 2.1.10
`FT_GetFile_From_Mac_Name'. Legacy APIs are still available, if
FreeType is built without disabling them.
- - A new API `FT_Select_Size' is added to select a bitmap strike by
- its index. Code using other functions to select bitmap strikes
- should be updated to use this function.
+ - A new API `FT_Select_Size' has been added to select a bitmap
+ strike by its index. Code using other functions to select
+ bitmap strikes should be updated to use this function.
+
+ - A new API `FT_Get_SubGlyph_Info' has been added to retrieve
+ subglyph data.
- - In 2.1.10, the behaviour of `FT_Set_Pixel_Sizes' is changed for
+ - In 2.1.10, the behaviour of `FT_Set_Pixel_Sizes' was changed for
BDF/PCF fonts, and only for them. This causes inconsistency.
In this release, we undo the change. The intent of the change
in 2.1.10 is to allow size selection through real dimensions,
@@ -87,9 +91,9 @@ LATEST CHANGES BETWEEN 2.2 and 2.1.10
used to specify the hinting algorithm, the other to specify the
pixel rendering mode.
- - FT_New_Face() and FT_New_Face_From_FSSpec() in ftmac.c are
+ - FT_New_Face() and FT_New_Face_From_FSSpec() in ftmac.c have been
changed to count supported scalable faces (sfnt, LWFN) only, and
- returns the number of available faces via face->num_faces.
+ to return the number of available faces via face->num_faces.
Unsupported bitmap faces (fbit, NFNT) are ignored.
- builds/unix/configure has been improved for MacOS X. It now
@@ -1326,7 +1330,7 @@ LATEST CHANGES BETWEEN 2.0.6 and 2.0.5
- Important updates to the Mac-specific parts of the library.
- The caching sub-system has been completely re-designed, and its
- API has evolved (the old one is still supported for backwards
+ API has evolved (the old one is still supported for backward
compatibility).
The documentation for it is not yet completed, sorry. For now,
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index 488bc54..7ea1b30 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -1403,14 +1403,14 @@ FT_BEGIN_HEADER
/* */
/* format :: This field indicates the format of the image */
/* contained in the glyph slot. Typically */
- /* FT_GLYPH_FORMAT_BITMAP, */
- /* FT_GLYPH_FORMAT_OUTLINE, and */
- /* FT_GLYPH_FORMAT_COMPOSITE, but others are */
+ /* @FT_GLYPH_FORMAT_BITMAP, */
+ /* @FT_GLYPH_FORMAT_OUTLINE, or */
+ /* @FT_GLYPH_FORMAT_COMPOSITE, but others are */
/* possible. */
/* */
/* bitmap :: This field is used as a bitmap descriptor */
/* when the slot format is */
- /* FT_GLYPH_FORMAT_BITMAP. Note that the */
+ /* @FT_GLYPH_FORMAT_BITMAP. Note that the */
/* address and content of the bitmap buffer can */
/* change between calls of @FT_Load_Glyph and a */
/* few other functions. */
@@ -1418,7 +1418,7 @@ FT_BEGIN_HEADER
/* bitmap_left :: This is the bitmap's left bearing expressed */
/* in integer pixels. Of course, this is only */
/* valid if the format is */
- /* FT_GLYPH_FORMAT_BITMAP. */
+ /* @FT_GLYPH_FORMAT_BITMAP. */
/* */
/* bitmap_top :: This is the bitmap's top bearing expressed in */
/* integer pixels. Remember that this is the */
@@ -1428,7 +1428,7 @@ FT_BEGIN_HEADER
/* */
/* outline :: The outline descriptor for the current glyph */
/* image if its format is */
- /* FT_GLYPH_FORMAT_OUTLINE. Once a glyph is */
+ /* @FT_GLYPH_FORMAT_OUTLINE. Once a glyph is */
/* loaded, `outline' can be transformed, */
/* distorted, embolded, etc. However, it must */
/* not be freed. */
@@ -1482,7 +1482,7 @@ FT_BEGIN_HEADER
/* Note that `slot->bitmap_left' and `slot->bitmap_top' are also used */
/* to specify the position of the bitmap relative to the current pen */
/* position (e.g. coordinates [0,0] on the baseline). Of course, */
- /* `slot->format' is also changed to `FT_GLYPH_FORMAT_BITMAP' . */
+ /* `slot->format' is also changed to @FT_GLYPH_FORMAT_BITMAP. */
/* */
/* <Note> */
/* Here a small pseudo code fragment which shows how to use */
@@ -3222,21 +3222,26 @@ FT_BEGIN_HEADER
FT_Vector_Transform( FT_Vector* vec,
const FT_Matrix* matrix );
- /**
- * @macro: FT_SUBGLYPH_FLAG_XXX
- *
- * @description:
- * a list of constant used to describe each subglyph
- *
- * @values:
- * FT_SUBGLYPH_FLAG_ARGS_ARE_WORDS ::
- * FT_SUBGLYPH_FLAG_ARGS_ARE_XY_VALUES ::
- * FT_SUBGLYPH_FLAG_ROUND_XY_TO_GRID ::
- * FT_SUBGLYPH_FLAG_SCALE ::
- * FT_SUBGLYPH_FLAG_XY_SCALE ::
- * FT_SUBGLYPH_FLAG_2X2 ::
- * FT_SUBGLYPH_FLAG_USE_MY_METRICS ::
- */
+
+ /*************************************************************************
+ *
+ * @macro:
+ * FT_SUBGLYPH_FLAG_XXX
+ *
+ * @description:
+ * A list of constants used to describe subglyphs. Please refer to the
+ * TrueType specification for the meaning of the various flags.
+ *
+ * @values:
+ * FT_SUBGLYPH_FLAG_ARGS_ARE_WORDS ::
+ * FT_SUBGLYPH_FLAG_ARGS_ARE_XY_VALUES ::
+ * FT_SUBGLYPH_FLAG_ROUND_XY_TO_GRID ::
+ * FT_SUBGLYPH_FLAG_SCALE ::
+ * FT_SUBGLYPH_FLAG_XY_SCALE ::
+ * FT_SUBGLYPH_FLAG_2X2 ::
+ * FT_SUBGLYPH_FLAG_USE_MY_METRICS ::
+ *
+ */
#define FT_SUBGLYPH_FLAG_ARGS_ARE_WORDS 1
#define FT_SUBGLYPH_FLAG_ARGS_ARE_XY_VALUES 2
#define FT_SUBGLYPH_FLAG_ROUND_XY_TO_GRID 4
@@ -3245,41 +3250,57 @@ FT_BEGIN_HEADER
#define FT_SUBGLYPH_FLAG_2X2 0x80
#define FT_SUBGLYPH_FLAG_USE_MY_METRICS 0x200
- /**
- * @func: FT_Get_SubGlyph_Info
- *
- * @description:
- * a function used to retrieve a description of a given subglyph.
- * only use it when 'glyph->format' is FT_GLYPH_FORMAT_COMPOSITE, or
- * an error will be returned
- *
- * @input:
- * glyph :: source glyph slot
- * sub_index :: index of subglyph. must be less than 'glyph->num_subglyphs'
- *
- * @output:
- * p_index :: subglyph glyph index
- * p_flags :: subglyph flags, see @FT_SUBGLYPH_FLAG_XXX
- * p_arg1 :: subglyph first argument (if any)
- * p_arg2 :: subglyph second argument (if any)
- * p_transform :: subglyph transform (if any)
- *
- * @return:
- * error code. 0 means success
- *
- * @note:
- * the values of *p_arg1, *p_arg2 and *p_transform must be interpreted
- * depending on the flags returns in *p_flags. See the TrueType specification
- * for details
- */
+
+ /*************************************************************************
+ *
+ * @func:
+ * FT_Get_SubGlyph_Info
+ *
+ * @description:
+ * Retrieve a description of a given subglyph. Only use it if
+ * `glyph->format' is @FT_GLYPH_FORMAT_COMPOSITE, or an error is
+ * returned.
+ *
+ * @input:
+ * glyph ::
+ * The source glyph slot.
+ *
+ * sub_index ::
+ * The index of subglyph. Must be less than `glyph->num_subglyphs'.
+ *
+ * @output:
+ * p_index ::
+ * The glyph index of the subglyph.
+ *
+ * p_flags ::
+ * The subglyph flags, see @FT_SUBGLYPH_FLAG_XXX.
+ *
+ * p_arg1 ::
+ * The subglyph's first argument (if any).
+ *
+ * p_arg2 ::
+ * The subglyph's second argument (if any).
+ *
+ * p_transform ::
+ * The subglyph transformation (if any).
+ *
+ * @return:
+ * FreeType error code. 0 means success.
+ *
+ * @note:
+ * The values of *p_arg1, *p_arg2 and *p_transform must be interpreted
+ * depending on the flags returns in *p_flags. See the TrueType
+ * specification for details.
+ *
+ */
FT_EXPORT( FT_Error )
FT_Get_SubGlyph_Info( FT_GlyphSlot glyph,
FT_UInt sub_index,
- FT_Int *p_index,
- FT_UInt *p_flags,
- FT_Int *p_arg1,
- FT_Int *p_arg2,
- FT_Matrix *p_transform );
+ FT_Int *p_index,
+ FT_UInt *p_flags,
+ FT_Int *p_arg1,
+ FT_Int *p_arg2,
+ FT_Matrix *p_transform );
/* */
diff --git a/include/freetype/internal/ftgloadr.h b/include/freetype/internal/ftgloadr.h
index 1b83c68..b2e35fe 100644
--- a/include/freetype/internal/ftgloadr.h
+++ b/include/freetype/internal/ftgloadr.h
@@ -4,7 +4,7 @@
/* */
/* The FreeType glyph loader (specification). */
/* */
-/* Copyright 2002, 2003, 2005 by */
+/* Copyright 2002, 2003, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -43,7 +43,7 @@ FT_BEGIN_HEADER
typedef struct FT_GlyphLoaderRec_* FT_GlyphLoader ;
-#if 0 /* now in freetype.h since 2.2 */
+#if 0 /* moved to freetype.h in version 2.2 */
#define FT_SUBGLYPH_FLAG_ARGS_ARE_WORDS 1
#define FT_SUBGLYPH_FLAG_ARGS_ARE_XY_VALUES 2
#define FT_SUBGLYPH_FLAG_ROUND_XY_TO_GRID 4
@@ -53,6 +53,7 @@ FT_BEGIN_HEADER
#define FT_SUBGLYPH_FLAG_USE_MY_METRICS 0x200
#endif
+
typedef struct FT_SubGlyphRec_
{
FT_Int index;
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 5ebfdf5..ccd0ed5 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -3865,29 +3865,31 @@
FT_EXPORT_DEF( FT_Error )
FT_Get_SubGlyph_Info( FT_GlyphSlot glyph,
FT_UInt sub_index,
- FT_Int *p_index,
- FT_UInt *p_flags,
- FT_Int *p_arg1,
- FT_Int *p_arg2,
- FT_Matrix *p_transform )
- {
- FT_Error error = FT_Err_Invalid_Argument;
-
- if ( glyph != NULL &&
- glyph->format == FT_GLYPH_FORMAT_COMPOSITE &&
- sub_index < glyph->num_subglyphs )
- {
+ FT_Int *p_index,
+ FT_UInt *p_flags,
+ FT_Int *p_arg1,
+ FT_Int *p_arg2,
+ FT_Matrix *p_transform )
+ {
+ FT_Error error = FT_Err_Invalid_Argument;
+
+
+ if ( glyph != NULL &&
+ glyph->format == FT_GLYPH_FORMAT_COMPOSITE &&
+ sub_index < glyph->num_subglyphs )
+ {
FT_SubGlyph subg = glyph->subglyphs + sub_index;
-
- *p_index = subg->index;
- *p_flags = subg->flags;
- *p_arg1 = subg->arg1;
- *p_arg2 = subg->arg2;
- *p_transform = subg->transform;
- }
- return error;
+
+
+ *p_index = subg->index;
+ *p_flags = subg->flags;
+ *p_arg1 = subg->arg1;
+ *p_arg2 = subg->arg2;
+ *p_transform = subg->transform;
+ }
+
+ return error;
}
-
-
+
/* END */
diff --git a/src/tools/docmaker/tohtml.py b/src/tools/docmaker/tohtml.py
index 355133f..bdd5a03 100644
--- a/src/tools/docmaker/tohtml.py
+++ b/src/tools/docmaker/tohtml.py
@@ -23,6 +23,7 @@ html_header_2= """ API Reference</title>
p { text-align: justify; }
h1 { text-align: center; }
li { text-align: justify; }
+ td { padding: 0 0.5em 0 0.5em }
a:link { color: #0000EF; }
a:visited { color: #51188E; }