ref: 3681e37db911f419ed93fb382c5b4506e27a74af
parent: 2786758c2edf945f3298cf96034d369afe7520b8
author: Werner Lemberg <[email protected]>
date: Sat Dec 22 19:56:36 EST 2001
Formatting.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,16 +1,14 @@
2001-12-22 David Turner <[email protected]>
- * src/autohint/ahhint.c (ah_hinter_load): auto-hinted glyphs had an
- incorrect glyph advance in the case of mono-width fonts (like Courier,
- Andale Mono, etc..)
+ * src/autohint/ahhint.c (ah_hinter_load): Auto-hinted glyphs had an
+ incorrect glyph advance in the case of mono-width fonts (like
+ Courier, Andale Mono, and others).
-
2001-12-22 Detlef W�rkner <[email protected]>
* builds/amiga/*: Adaptations to latest changes.
Support added for MorphOS.
-
2001-12-22 Werner Lemberg <[email protected]>
* src/pshinter/pshrec.c (FT_COMPONENT): Redefine to `trace_pshrec'.
@@ -25,7 +23,6 @@
* docs/modules.txt: New file.
-
2001-12-21 David Turner <[email protected]>
* src/pshinter/pshrec.c (ps_hints_t2mask, ps_hints_t2counter):
@@ -39,29 +36,9 @@
(T1_Decoder_Parse_Charstrings), src/pshinter/pshalgo2.c (*), Fixed a
bug where the X and Y axis where inversed in the postscript hinter.
This caused problem when displaying on non-square surfaces.
->>>>>>> 1.289
-<<<<<<< ChangeLog
- * src/cff/cffgload.c: added a comment regarding "cntrmask" operator
-
- * src/pshinter/pshrec.c: now ignores invalid "hintmask" and "cntrmask"
- operators (instead of returning an error). Glyph 2028 of the CFF font
- "MSung-Light-Acro" couldn't be rendered otherwise (it seems its
- charstring is buggy, though this requires more analysis)..
-
- * src/cff/cffgload.c, src/psaux/t1decode.c, src/pshinter/pshrec.c,
- src/pshinter/ahalgo2.c, src/pshinter/pshglob.h: fixed a bug where
- the X and Y axis where inversed in the postscript hinter. this
- caused problem when displaying on non-square surfaces..
-
- * include/freetype/cache/ftcmanag.h, include/freetype/cache/ftcimage.h,
- include/freetype/cache/ftcsbits.h: updating documentation to better
- explain the use of the "anode" output parameter in lookup functions
-
-=======
* src/pshinter/pshalgo2.c: s/vertical/dimension/.
->>>>>>> 1.289
* src/pshinter/pshglob.c (psh_globals_new): Replaced a floating
point constant with a fixed-float equivalent. For some reasons not
all compilers are capable of directly computing a floating pointer
--- a/README
+++ b/README
@@ -1,10 +1,10 @@
- Special note to Unix users !!
- =============================
+ Special note to Unix users
+ ==========================
Please read the file "README.UNX", it contains important information
regarding the installation of FreeType on Unix systems, especially
- Linux ones !!
+ GNU based operating systems like GNU/Linux.
FreeType 2.0.6
--- a/src/autohint/ahhint.c
+++ b/src/autohint/ahhint.c
@@ -1291,14 +1291,15 @@
slot->metrics.horiBearingX = bbox.xMin;
slot->metrics.horiBearingY = bbox.yMax;
- /* for mono-width fonts (like Andale, Courier, etc..), we need */
- /* to keep the original rounded advance.. */
+ /* for mono-width fonts (like Andale, Courier, etc.), we need */
+ /* to keep the original rounded advance width */
if ( !FT_IS_FIXED_WIDTH( slot->face ) )
- slot->metrics.horiAdvance = hinter->pp2.x - hinter->pp1.x;
+ slot->metrics.horiAdvance = hinter->pp2.x - hinter->pp1.x;
else
- slot->metrics.horiAdvance = FT_MulFix( slot->metrics.horiAdvance, x_scale );
+ slot->metrics.horiAdvance = FT_MulFix( slot->metrics.horiAdvance,
+ x_scale );
- slot->metrics.horiAdvance = (slot->metrics.horiAdvance+32) & -64;
+ slot->metrics.horiAdvance = ( slot->metrics.horiAdvance + 32 ) & -64;
/* now copy outline into glyph slot */
ah_loader_rewind( slot->internal->loader );