formatting
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
diff --git a/ChangeLog b/ChangeLog
index 3382006..a901fea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,9 @@
* src/sfnt/ttcmap0.c (TT_Build_CMaps): Removed compiler warnings.
- * src/sfnt/sfobjs.c (tt_face_get_name): Bug-fix.
+ * src/sfnt/sfobjs.c (tt_name_entry_ascii_from_{utf16,ucs4,other}:
+ New functions.
+ (tt_face_get_name): Use them to properly extract an ascii font name.
2002-03-30 Werner Lemberg <wl@gnu.org>
diff --git a/include/freetype/internal/tttypes.h b/include/freetype/internal/tttypes.h
index e6d8c1a..bdd888b 100644
--- a/include/freetype/internal/tttypes.h
+++ b/include/freetype/internal/tttypes.h
@@ -1333,11 +1333,11 @@ FT_BEGIN_HEADER
/* not loaded by the driver on face opening. */
/* See the `ttpost' module for more details. */
/* */
- /* cmap_table :: Address of the face's 'cmap' SFNT table */
+ /* cmap_table :: Address of the face's `cmap' SFNT table */
/* in memory (it's an extracted frame). */
/* */
- /* cmap_size :: The size in bytes of the 'cmap_table' */
- /* described above.. */
+ /* cmap_size :: The size in bytes of the `cmap_table' */
+ /* described above. */
/* */
/* num_charmaps :: The number of character mappings in the */
/* font. */
@@ -1359,19 +1359,19 @@ FT_BEGIN_HEADER
/* given glyph within the face's font file. */
/* */
/* forget_glyph_frame :: A function used to forget the frame of a */
- /* given glyph when all data has been loaded */
+ /* given glyph when all data has been loaded. */
/* */
/* read_glyph_header :: A function used to read a glyph header. */
- /* It must be called between an 'access' and */
- /* 'forget' */
+ /* It must be called between an `access' and */
+ /* `forget'. */
/* */
/* read_simple_glyph :: A function used to read a simple glyph. */
/* It must be called after the header was */
- /* read, and before the 'forget' */
+ /* read, and before the `forget'. */
/* */
/* read_composite_glyph :: A function used to read a composite glyph. */
/* It must be called after the header was */
- /* read, and before the 'forget' */
+ /* read, and before the `forget'. */
/* */
/* sfnt :: A pointer to the SFNT `driver' interface. */
/* */
@@ -1386,7 +1386,7 @@ FT_BEGIN_HEADER
/* table (`gasp'). This table is optional in */
/* TrueType/OpenType fonts. */
/* */
- /* pclt :: The 'pclt' SFNT table */
+ /* pclt :: The `pclt' SFNT table. */
/* */
/* num_sbit_strikes :: The number of sbit strikes, i.e., bitmap */
/* sizes, embedded in this font. */
@@ -1454,7 +1454,7 @@ FT_BEGIN_HEADER
/* interpreters field is also used to hook */
/* the debugger in `ttdebug'. */
/* */
- /* extra :: reserved for third-party font drivers.. */
+ /* extra :: Reserved for third-party font drivers. */
/* */
typedef struct TT_FaceRec_
{