Commit 6cca5578b64e279f74e43a024b61eea89b0b3004
2000-07-12T05:52:59
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 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
diff --git a/include/freetype/tttables.h b/include/freetype/tttables.h
index 0ac83e6..cbdd9c7 100644
--- a/include/freetype/tttables.h
+++ b/include/freetype/tttables.h
@@ -4,27 +4,30 @@
/* */
/* Basic SFNT/TrueType tables definitions and interface */
/* */
-/* */
/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
-/* This file is part of the FreeType project, and may only be used */
-/* modified and distributed under the terms of the FreeType project */
+/* This file is part of the FreeType project, and may only be used, */
+/* modified, and distributed under the terms of the FreeType project */
/* license, LICENSE.TXT. By continuing to use, modify, or distribute */
/* this file you indicate that you have read the license and */
/* understand and accept it fully. */
/* */
/***************************************************************************/
+
#ifndef TTTABLES_H
#define TTTABLES_H
+
#include <freetype/freetype.h>
+
#ifdef __cplusplus
extern "C" {
#endif
+
/*************************************************************************/
/* */
/* <Struct> */
@@ -303,6 +306,7 @@
} TT_VertHeader;
+
/*************************************************************************/
/* */
/* <Struct> */
@@ -358,7 +362,8 @@
FT_ULong ulCodePageRange1; /* Bits 0-31 */
FT_ULong ulCodePageRange2; /* Bits 32-63 */
- /* only version 2 tables */
+ /* only version 2 tables: */
+
FT_Short sxHeight;
FT_Short sCapHeight;
FT_UShort usDefaultChar;
@@ -396,35 +401,37 @@
} TT_Postscript;
+
/*************************************************************************/
/* */
/* <Struct> */
/* TT_PCLT */
/* */
/* <Description> */
- /* A structure used to model a TrueType PCLT table. All fields */
+ /* A structure used to model a TrueType PCLT table. All fields */
/* comply to the TrueType table. */
/* */
typedef struct TT_PCLT_
{
FT_Fixed Version;
- FT_ULong FontNumber;
- FT_UShort Pitch;
- FT_UShort xHeight;
- FT_UShort Style;
- FT_UShort TypeFamily;
- FT_UShort CapHeight;
- FT_UShort SymbolSet;
- FT_Char TypeFace[16];
- FT_Char CharacterComplement[8];
- FT_Char FileName[6];
- FT_Char StrokeWeight;
- FT_Char WidthType;
- FT_Byte SerifStyle;
- FT_Byte Reserved;
-
+ FT_ULong FontNumber;
+ FT_UShort Pitch;
+ FT_UShort xHeight;
+ FT_UShort Style;
+ FT_UShort TypeFamily;
+ FT_UShort CapHeight;
+ FT_UShort SymbolSet;
+ FT_Char TypeFace[16];
+ FT_Char CharacterComplement[8];
+ FT_Char FileName[6];
+ FT_Char StrokeWeight;
+ FT_Char WidthType;
+ FT_Byte SerifStyle;
+ FT_Byte Reserved;
+
} TT_PCLT;
+
/*************************************************************************/
/* */
/* <Struct> */
@@ -513,8 +520,6 @@
} TT_MaxProfile;
-
-
typedef enum
{
ft_sfnt_head = 0,
@@ -523,43 +528,48 @@
ft_sfnt_hhea = 3,
ft_sfnt_vhea = 4,
ft_sfnt_post = 5,
- ft_sfnt_pclt = 6,
+ ft_sfnt_pclt = 6,
sfnt_max /* don't remove */
} FT_Sfnt_Tag;
+
/* internal use only */
- typedef void* (*FT_Get_Sfnt_Table_Func)( FT_Face face, FT_Sfnt_Tag tag );
-
- /***************************************************************************
- *
- * <Function>
- * FT_Get_Sfnt_Table
- *
- * <Description>
- * Returns a pointer to a given SFNT table within a face.
- *
- * <Input>
- * face :: handle to source
- * tag :: index if SFNT table
- *
- * <Return>
- * type-less pointer to the table. This will be 0 in case of error, or
- * when the corresponding table was not found *OR* loaded from the file.
- *
- * <Note>
- * The table is owned by the face object, and disappears with it.
- *
- * This function is only useful to access Sfnt tables that are loaded
- * by the sfnt/truetype/opentype drivers. See FT_Sfnt_tag for a list.
- *
- * You can load any table with a different function.. XXX
- *
- ***************************************************************************/
-
- FT_EXPORT_DEF(void*) FT_Get_Sfnt_Table( FT_Face face,
- FT_Sfnt_Tag tag );
+ typedef void* (*FT_Get_Sfnt_Table_Func)( FT_Face face,
+ FT_Sfnt_Tag tag );
+
+
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* FT_Get_Sfnt_Table */
+ /* */
+ /* <Description> */
+ /* Returns a pointer to a given SFNT table within a face. */
+ /* */
+ /* <Input> */
+ /* face :: A handle to the source. */
+ /* */
+ /* tag :: The index of the SFNT table. */
+ /* */
+ /* <Return> */
+ /* A type-less pointer to the table. This will be 0 in case of */
+ /* error, or if the corresponding table was not found *OR* loaded */
+ /* from the file. */
+ /* */
+ /* <Note> */
+ /* The table is owned by the face object and disappears with it. */
+ /* */
+ /* This function is only useful to access SFNT tables that are loaded */
+ /* by the sfnt/truetype/opentype drivers. See FT_Sfnt_tag for a */
+ /* list. */
+ /* */
+ /* You can load any table using the (internal) SFNT_Interface */
+ /* structure -- this is available via FT_Get_Module_Interface(). */
+ /* */
+ FT_EXPORT_DEF( void* ) FT_Get_Sfnt_Table( FT_Face face,
+ FT_Sfnt_Tag tag );
#ifdef __cplusplus
}
@@ -568,3 +578,5 @@
#endif /* TTTABLES_H */
+
+/* END */
diff --git a/include/freetype/tttags.h b/include/freetype/tttags.h
index ed00d3d..7d9af15 100644
--- a/include/freetype/tttags.h
+++ b/include/freetype/tttags.h
@@ -7,8 +7,8 @@
/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
-/* This file is part of the FreeType project, and may only be used */
-/* modified and distributed under the terms of the FreeType project */
+/* This file is part of the FreeType project, and may only be used, */
+/* modified, and distributed under the terms of the FreeType project */
/* license, LICENSE.TXT. By continuing to use, modify, or distribute */
/* this file you indicate that you have read the license and */
/* understand and accept it fully. */
@@ -22,6 +22,7 @@
#include <freetype/freetype.h> /* for MAKE_TT_TAG() */
+
#define TTAG_cmap FT_MAKE_TAG( 'c', 'm', 'a', 'p' )
#define TTAG_cvt FT_MAKE_TAG( 'c', 'v', 't', ' ' )
#define TTAG_CFF FT_MAKE_TAG( 'C', 'F', 'F', ' ' )