ref: 665279f0d578f00f83e3d20ff7bebe8f4f70c324
parent: ebf5585dd09c44c8bb94d955c28c85e4952045de
author: David Turner <[email protected]>
date: Tue Mar 22 17:10:45 EST 2005
removing the 'autohint' module from the library, since it is now replaced by 'autofit'
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-22 David Turner <[email protected]>
+
+ * src/autohint/*, Jamfile: removing the 'autohint' module
+ from the build.
+
2005-03-15 David Turner <[email protected]>
* src/bdf/bdflib.c: Remove compiler warnings.
--- a/Jamfile
+++ b/Jamfile
@@ -62,7 +62,6 @@
# if you modify this list or provide your own.
#
FT2_COMPONENTS ?= autofit # auto-fitter
- autohint # auto-hinter
base # base component (public APIs)
bdf # BDF font driver
cache # cache sub-system
--- a/src/autohint/CatharonLicense.txt
+++ /dev/null
@@ -1,123 +1,0 @@
- The Catharon Open Source LICENSE
- ----------------------------
-
- 2000-Jul-04
-
- Copyright (C) 2000 by Catharon Productions, Inc.
-
-
-
-Introduction
-============
-
- This license applies to source files distributed by Catharon
- Productions, Inc. in several archive packages. This license
- applies to all files found in such packages which do not fall
- under their own explicit license.
-
- This license was inspired by the BSD, Artistic, and IJG
- (Independent JPEG Group) licenses, which all encourage inclusion
- and use of free software in commercial and freeware products
- alike. As a consequence, its main points are that:
-
- o We don't promise that this software works. However, we are
- interested in any kind of bug reports. (`as is' distribution)
-
- o You can use this software for whatever you want, in parts or
- full form, without having to pay us. (`royalty-free' usage)
-
- o You may not pretend that you wrote this software. If you use
- it, or only parts of it, in a program, you must acknowledge
- somewhere in your documentation that you have used the
- Catharon Code. (`credits')
-
- We specifically permit and encourage the inclusion of this
- software, with or without modifications, in commercial products.
- We disclaim all warranties covering the packages distributed by
- Catharon Productions, Inc. and assume no liability related to
- their use.
-
-
-Legal Terms
-===========
-
-0. Definitions
---------------
-
- Throughout this license, the terms `Catharon Package', `package',
- and `Catharon Code' refer to the set of files originally
- distributed by Catharon Productions, Inc.
-
- `You' refers to the licensee, or person using the project, where
- `using' is a generic term including compiling the project's source
- code as well as linking it to form a `program' or `executable'.
- This program is referred to as `a program using one of the
- Catharon Packages'.
-
- This license applies to all files distributed in the original
- Catharon Package(s), including all source code, binaries and
- documentation, unless otherwise stated in the file in its
- original, unmodified form as distributed in the original archive.
- If you are unsure whether or not a particular file is covered by
- this license, you must contact us to verify this.
-
- The Catharon Packages are copyright (C) 2000 by Catharon
- Productions, Inc. All rights reserved except as specified below.
-
-1. No Warranty
---------------
-
- THE CATHARON PACKAGES ARE PROVIDED `AS IS' WITHOUT WARRANTY OF ANY
- KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE. IN NO EVENT WILL ANY OF THE AUTHORS OR COPYRIGHT HOLDERS
- BE LIABLE FOR ANY DAMAGES CAUSED BY THE USE OF OR THE INABILITY TO
- USE THE CATHARON PACKAGE.
-
-2. Redistribution
------------------
-
- This license grants a worldwide, royalty-free, perpetual and
- irrevocable right and license to use, execute, perform, compile,
- display, copy, create derivative works of, distribute and
- sublicense the Catharon Packages (in both source and object code
- forms) and derivative works thereof for any purpose; and to
- authorize others to exercise some or all of the rights granted
- herein, subject to the following conditions:
-
- o Redistribution of source code must retain this license file
- (`license.txt') unaltered; any additions, deletions or changes
- to the original files must be clearly indicated in
- accompanying documentation. The copyright notices of the
- unaltered, original files must be preserved in all copies of
- source files.
-
- o Redistribution in binary form must provide a disclaimer that
- states that the software is based in part on the work of
- Catharon Productions, Inc. in the distribution documentation.
-
- These conditions apply to any software derived from or based on
- the Catharon Packages, not just the unmodified files. If you use
- our work, you must acknowledge us. However, no fee need be paid
- to us.
-
-3. Advertising
---------------
-
- Neither Catharon Productions, Inc. and contributors nor you shall
- use the name of the other for commercial, advertising, or
- promotional purposes without specific prior written permission.
-
- We suggest, but do not require, that you use the following phrase
- to refer to this software in your documentation: 'this software is
- based in part on the Catharon Typography Project'.
-
- As you have not signed this license, you are not required to
- accept it. However, as the Catharon Packages are copyrighted
- material, only this license, or another one contracted with the
- authors, grants you the right to use, distribute, and modify it.
- Therefore, by using, distributing, or modifying the Catharon
- Packages, you indicate that you understand and accept all the
- terms of this license.
-
---- end of license.txt ---
--- a/src/autohint/Jamfile
+++ /dev/null
@@ -1,21 +1,0 @@
-# FreeType 2 src/autohint Jamfile (c) 2001 David Turner
-#
-
-SubDir FT2_TOP $(FT2_SRC_DIR) autohint ;
-
-{- local _sources ;
-
- if $(FT2_MULTI)
- {- _sources = ahangles ahglobal ahglyph ahhint ahmodule ;
- }
- else
- {- _sources = autohint ;
- }
-
- Library $(FT2_LIB) : $(_sources).c ;
-}
-
-# end of src/autohint Jamfile
--- a/src/autohint/ahangles.c
+++ /dev/null
@@ -1,148 +1,0 @@
-/***************************************************************************/
-/* */
-/* ahangles.c */
-/* */
-/* Routines used to compute vector angles with limited accuracy */
-/* and very high speed (body). */
-/* */
-/* Copyright 2000-2001, 2002, 2005 Catharon Productions Inc. */
-/* Author: David Turner */
-/* */
-/* This file is part of the Catharon Typography Project and shall only */
-/* be used, modified, and distributed under the terms of the Catharon */
-/* Open Source License that should come with this file under the name */
-/* `CatharonLicense.txt'. By continuing to use, modify, or distribute */
-/* this file you indicate that you have read the license and */
-/* understand and accept it fully. */
-/* */
-/* Note that this license is compatible with the FreeType license. */
-/* */
-/***************************************************************************/
-
-
-#include <ft2build.h>
-#include "ahangles.h"
-
-
- /* the following table has been automatically generated with */
- /* the `mather.py' Python script */
-
- const AH_Angle ah_arctan[1L << AH_ATAN_BITS] =
- {- 0, 0, 1, 1, 1, 2, 2, 2,
- 3, 3, 3, 3, 4, 4, 4, 5,
- 5, 5, 6, 6, 6, 7, 7, 7,
- 8, 8, 8, 9, 9, 9, 10, 10,
- 10, 10, 11, 11, 11, 12, 12, 12,
- 13, 13, 13, 14, 14, 14, 14, 15,
- 15, 15, 16, 16, 16, 17, 17, 17,
- 18, 18, 18, 18, 19, 19, 19, 20,
- 20, 20, 21, 21, 21, 21, 22, 22,
- 22, 23, 23, 23, 24, 24, 24, 24,
- 25, 25, 25, 26, 26, 26, 26, 27,
- 27, 27, 28, 28, 28, 28, 29, 29,
- 29, 30, 30, 30, 30, 31, 31, 31,
- 31, 32, 32, 32, 33, 33, 33, 33,
- 34, 34, 34, 34, 35, 35, 35, 35,
- 36, 36, 36, 36, 37, 37, 37, 38,
- 38, 38, 38, 39, 39, 39, 39, 40,
- 40, 40, 40, 41, 41, 41, 41, 42,
- 42, 42, 42, 42, 43, 43, 43, 43,
- 44, 44, 44, 44, 45, 45, 45, 45,
- 46, 46, 46, 46, 46, 47, 47, 47,
- 47, 48, 48, 48, 48, 48, 49, 49,
- 49, 49, 50, 50, 50, 50, 50, 51,
- 51, 51, 51, 51, 52, 52, 52, 52,
- 52, 53, 53, 53, 53, 53, 54, 54,
- 54, 54, 54, 55, 55, 55, 55, 55,
- 56, 56, 56, 56, 56, 57, 57, 57,
- 57, 57, 57, 58, 58, 58, 58, 58,
- 59, 59, 59, 59, 59, 59, 60, 60,
- 60, 60, 60, 61, 61, 61, 61, 61,
- 61, 62, 62, 62, 62, 62, 62, 63,
- 63, 63, 63, 63, 63, 64, 64, 64
- };
-
-
- FT_LOCAL_DEF( AH_Angle )
- ah_angle( FT_Vector* v )
- {- FT_Pos dx, dy;
- AH_Angle angle;
-
-
- dx = v->x;
- dy = v->y;
-
- /* check trivial cases */
- if ( dy == 0 )
- {- angle = 0;
- if ( dx < 0 )
- angle = AH_PI;
- return angle;
- }
- else if ( dx == 0 )
- {- angle = AH_HALF_PI;
- if ( dy < 0 )
- angle = -AH_HALF_PI;
- return angle;
- }
-
- angle = 0;
- if ( dx < 0 )
- {- dx = -v->x;
- dy = -v->y;
- angle = AH_PI;
- }
-
- if ( dy < 0 )
- {- FT_Pos tmp;
-
-
- tmp = dx;
- dx = -dy;
- dy = tmp;
- angle -= AH_HALF_PI;
- }
-
- if ( dx == 0 && dy == 0 )
- return 0;
-
- if ( dx == dy )
- angle += AH_PI / 4;
- else if ( dx > dy )
- angle += ah_arctan[FT_DivFix( dy, dx ) >> ( 16 - AH_ATAN_BITS )];
- else
- angle += AH_HALF_PI -
- ah_arctan[FT_DivFix( dx, dy ) >> ( 16 - AH_ATAN_BITS )];
-
- if ( angle > AH_PI )
- angle -= AH_2PI;
-
- return angle;
- }
-
-
- FT_LOCAL_DEF( AH_Angle )
- ah_angle_diff( AH_Angle angle1,
- AH_Angle angle2 )
- {- AH_Angle delta;
-
-
- delta = ( angle2 - angle1 );
- if ( delta < 0 )
- delta += AH_2PI;
-
- if ( delta > AH_PI )
- delta -= AH_2PI;
-
- return delta;
- }
-
-
-/* END */
--- a/src/autohint/ahangles.h
+++ /dev/null
@@ -1,64 +1,0 @@
-/***************************************************************************/
-/* */
-/* ahangles.h */
-/* */
-/* A routine used to compute vector angles with limited accuracy */
-/* and very high speed (specification). */
-/* */
-/* Copyright 2000-2001, 2002 Catharon Productions Inc. */
-/* Author: David Turner */
-/* */
-/* This file is part of the Catharon Typography Project and shall only */
-/* be used, modified, and distributed under the terms of the Catharon */
-/* Open Source License that should come with this file under the name */
-/* `CatharonLicense.txt'. By continuing to use, modify, or distribute */
-/* this file you indicate that you have read the license and */
-/* understand and accept it fully. */
-/* */
-/* Note that this license is compatible with the FreeType license. */
-/* */
-/***************************************************************************/
-
-
-#ifndef __AHANGLES_H__
-#define __AHANGLES_H__
-
-
-#include <ft2build.h>
-#include FT_INTERNAL_OBJECTS_H
-#include "ahtypes.h"
-
-
-FT_BEGIN_HEADER
-
-
- /* PI expressed in ah_angles -- we don't really need an important */
- /* precision, so 256 should be enough */
-#define AH_PI 256
-#define AH_2PI ( AH_PI * 2 )
-#define AH_HALF_PI ( AH_PI / 2 )
-#define AH_2PIMASK ( AH_2PI - 1 )
-
- /* the number of bits used to express an arc tangent; */
- /* see the structure of the lookup table */
-#define AH_ATAN_BITS 8
-
- extern
- const AH_Angle ah_arctan[1L << AH_ATAN_BITS];
-
-
- FT_LOCAL( AH_Angle )
- ah_angle( FT_Vector* v );
-
-
- FT_LOCAL( AH_Angle )
- ah_angle_diff( AH_Angle angle1,
- AH_Angle angle2 );
-
-
-FT_END_HEADER
-
-#endif /* __AHANGLES_H__ */
-
-
-/* END */
--- a/src/autohint/aherrors.h
+++ /dev/null
@@ -1,40 +1,0 @@
-/***************************************************************************/
-/* */
-/* aherrors.h */
-/* */
-/* Autohinter error codes (specification only). */
-/* */
-/* Copyright 2001 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 */
-/* 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. */
-/* */
-/***************************************************************************/
-
-
- /*************************************************************************/
- /* */
- /* This file is used to define the Autohinter error enumeration */
- /* constants. */
- /* */
- /*************************************************************************/
-
-#ifndef __AHERRORS_H__
-#define __AHERRORS_H__
-
-#include FT_MODULE_ERRORS_H
-
-#undef __FTERRORS_H__
-
-#define FT_ERR_PREFIX AH_Err_
-#define FT_ERR_BASE FT_Mod_Err_Autohint
-
-#include FT_ERRORS_H
-
-#endif /* __AHERRORS_H__ */
-
-/* END */
--- a/src/autohint/ahglobal.c
+++ /dev/null
@@ -1,402 +1,0 @@
-/***************************************************************************/
-/* */
-/* ahglobal.c */
-/* */
-/* Routines used to compute global metrics automatically (body). */
-/* */
-/* Copyright 2000-2001, 2002, 2003, 2004 Catharon Productions Inc. */
-/* Author: David Turner */
-/* */
-/* This file is part of the Catharon Typography Project and shall only */
-/* be used, modified, and distributed under the terms of the Catharon */
-/* Open Source License that should come with this file under the name */
-/* `CatharonLicense.txt'. By continuing to use, modify, or distribute */
-/* this file you indicate that you have read the license and */
-/* understand and accept it fully. */
-/* */
-/* Note that this license is compatible with the FreeType license. */
-/* */
-/***************************************************************************/
-
-
-#include <ft2build.h>
-#include FT_INTERNAL_DEBUG_H
-#include "ahglobal.h"
-#include "ahglyph.h"
-
-
-#define MAX_TEST_CHARACTERS 12
-
- /* cf. AH_BLUE_XXX constants in ahtypes.h */
-
- static
- const char* const blue_chars[AH_BLUE_MAX] =
- {- "THEZOCQS",
- "HEZLOCUS",
-#ifdef FT_CONFIG_CHESTER_SMALL_F
- "fijkdbh",
-#endif
- "xzroesc",
- "xzroesc",
- "pqgjy"
- };
-
-
- /* simple insertion sort */
- static void
- sort_values( FT_Int count,
- FT_Pos* table )
- {- FT_Int i, j;
- FT_Pos swap;
-
-
- for ( i = 1; i < count; i++ )
- {- for ( j = i; j > 0; j-- )
- {- if ( table[j] > table[j - 1] )
- break;
-
- swap = table[j];
- table[j] = table[j - 1];
- table[j - 1] = swap;
- }
- }
- }
-
-
- static FT_Error
- ah_hinter_compute_blues( AH_Hinter hinter )
- {- AH_Blue blue;
- AH_Globals globals = &hinter->globals->design;
- FT_Pos flats [MAX_TEST_CHARACTERS];
- FT_Pos rounds[MAX_TEST_CHARACTERS];
- FT_Int num_flats;
- FT_Int num_rounds;
-
- FT_Face face;
- FT_GlyphSlot glyph;
- FT_Error error;
- FT_CharMap charmap;
-
-
- face = hinter->face;
- glyph = face->glyph;
-
- /* save current charmap */
- charmap = face->charmap;
-
- /* do we have a Unicode charmap in there? */
- error = FT_Select_Charmap( face, FT_ENCODING_UNICODE );
- if ( error )
- goto Exit;
-
- /* we compute the blues simply by loading each character from the */
- /* `blue_chars[blues]' string, then compute its top-most or */
- /* bottom-most points (depending on `AH_IS_TOP_BLUE') */
-
- AH_LOG(( "blue zones computation\n" ));
- AH_LOG(( "------------------------------------------------\n" ));
-
- for ( blue = AH_BLUE_CAPITAL_TOP; blue < AH_BLUE_MAX; blue++ )
- {- const char* p = blue_chars[blue];
- const char* limit = p + MAX_TEST_CHARACTERS;
-
- FT_Pos *blue_ref, *blue_shoot;
-
-
- AH_LOG(( "blue %3d: ", blue ));
-
- num_flats = 0;
- num_rounds = 0;
-
- for ( ; p < limit; p++ )
- {- FT_UInt glyph_index;
- FT_Vector* extremum;
- FT_Vector* points;
- FT_Vector* point_limit;
- FT_Vector* point;
- FT_Bool round;
-
-
- /* exit if we reach the end of the string */
- if ( !*p )
- break;
-
- AH_LOG(( "`%c'", *p ));
-
- /* load the character in the face -- skip unknown or empty ones */
- glyph_index = FT_Get_Char_Index( face, (FT_UInt)*p );
- if ( glyph_index == 0 )
- continue;
-
- error = FT_Load_Glyph( face, glyph_index, FT_LOAD_NO_SCALE );
- if ( error || glyph->outline.n_points <= 0 )
- continue;
-
- /* now compute min or max point indices and coordinates */
- points = glyph->outline.points;
- point_limit = points + glyph->outline.n_points;
- point = points;
- extremum = point;
- point++;
-
- if ( AH_IS_TOP_BLUE( blue ) )
- {- for ( ; point < point_limit; point++ )
- if ( point->y > extremum->y )
- extremum = point;
- }
- else
- {- for ( ; point < point_limit; point++ )
- if ( point->y < extremum->y )
- extremum = point;
- }
-
- AH_LOG(( "%5d", (int)extremum->y ));
-
- /* now, check whether the point belongs to a straight or round */
- /* segment; we first need to find in which contour the extremum */
- /* lies, then see its previous and next points */
- {- FT_Int idx = (FT_Int)( extremum - points );
- FT_Int n;
- FT_Int first, last, prev, next, end;
- FT_Pos dist;
-
-
- last = -1;
- first = 0;
-
- for ( n = 0; n < glyph->outline.n_contours; n++ )
- {- end = glyph->outline.contours[n];
- if ( end >= idx )
- {- last = end;
- break;
- }
- first = end + 1;
- }
-
- /* XXX: should never happen! */
- if ( last < 0 )
- continue;
-
- /* now look for the previous and next points that are not on the */
- /* same Y coordinate. Threshold the `closeness'... */
-
- prev = idx;
- next = prev;
-
- do
- {- if ( prev > first )
- prev--;
- else
- prev = last;
-
- dist = points[prev].y - extremum->y;
- if ( dist < -5 || dist > 5 )
- break;
-
- } while ( prev != idx );
-
- do
- {- if ( next < last )
- next++;
- else
- next = first;
-
- dist = points[next].y - extremum->y;
- if ( dist < -5 || dist > 5 )
- break;
-
- } while ( next != idx );
-
- /* now, set the `round' flag depending on the segment's kind */
- round = FT_BOOL(
- FT_CURVE_TAG( glyph->outline.tags[prev] ) != FT_CURVE_TAG_ON ||
- FT_CURVE_TAG( glyph->outline.tags[next] ) != FT_CURVE_TAG_ON );
-
- AH_LOG(( "%c ", round ? 'r' : 'f' ));
- }
-
- if ( round )
- rounds[num_rounds++] = extremum->y;
- else
- flats[num_flats++] = extremum->y;
- }
-
- AH_LOG(( "\n" ));
-
- /* we have computed the contents of the `rounds' and `flats' tables, */
- /* now determine the reference and overshoot position of the blue -- */
- /* we simply take the median value after a simple sort */
- sort_values( num_rounds, rounds );
- sort_values( num_flats, flats );
-
- blue_ref = globals->blue_refs + blue;
- blue_shoot = globals->blue_shoots + blue;
- if ( num_flats == 0 && num_rounds == 0 )
- {- *blue_ref = -10000;
- *blue_shoot = -10000;
- }
- else if ( num_flats == 0 )
- {- *blue_ref =
- *blue_shoot = rounds[num_rounds / 2];
- }
- else if ( num_rounds == 0 )
- {- *blue_ref =
- *blue_shoot = flats[num_flats / 2];
- }
- else
- {- *blue_ref = flats[num_flats / 2];
- *blue_shoot = rounds[num_rounds / 2];
- }
-
- /* there are sometimes problems: if the overshoot position of top */
- /* zones is under its reference position, or the opposite for bottom */
- /* zones. We must thus check everything there and correct the errors */
- if ( *blue_shoot != *blue_ref )
- {- FT_Pos ref = *blue_ref;
- FT_Pos shoot = *blue_shoot;
- FT_Bool over_ref = FT_BOOL( shoot > ref );
-
-
- if ( AH_IS_TOP_BLUE( blue ) ^ over_ref )
- *blue_shoot = *blue_ref = ( shoot + ref ) / 2;
- }
-
- AH_LOG(( "-- ref = %ld, shoot = %ld\n", *blue_ref, *blue_shoot ));
- }
-
- /* reset original face charmap */
- FT_Set_Charmap( face, charmap );
- error = 0;
-
- Exit:
- return error;
- }
-
-
- static FT_Error
- ah_hinter_compute_widths( AH_Hinter hinter )
- {- /* scan the array of segments in each direction */
- AH_Outline outline = hinter->glyph;
- AH_Segment segments;
- AH_Segment limit;
- AH_Globals globals = &hinter->globals->design;
- FT_Pos* widths;
- FT_Int dimension;
- FT_Int* p_num_widths;
- FT_Error error = 0;
- FT_Pos edge_distance_threshold = 32000;
-
-
- globals->num_widths = 0;
- globals->num_heights = 0;
-
- /* For now, compute the standard width and height from the `o' */
- /* character. I started computing the stem width of the `i' and the */
- /* stem height of the "-", but it wasn't too good. Moreover, we now */
- /* have a single character that gives us standard width and height. */
- {- FT_UInt glyph_index;
-
-
- glyph_index = FT_Get_Char_Index( hinter->face, 'o' );
- if ( glyph_index == 0 )
- return 0;
-
- error = FT_Load_Glyph( hinter->face, glyph_index, FT_LOAD_NO_SCALE );
- if ( error )
- goto Exit;
-
- error = ah_outline_load( hinter->glyph, 0x10000L, 0x10000L,
- hinter->face );
- if ( error )
- goto Exit;
-
- ah_outline_compute_segments( hinter->glyph );
- ah_outline_link_segments( hinter->glyph );
- }
-
- segments = outline->horz_segments;
- limit = segments + outline->num_hsegments;
- widths = globals->heights;
- p_num_widths = &globals->num_heights;
-
- for ( dimension = 1; dimension >= 0; dimension-- )
- {- AH_Segment seg = segments;
- AH_Segment link;
- FT_Int num_widths = 0;
-
-
- for ( ; seg < limit; seg++ )
- {- link = seg->link;
- /* we only consider stem segments there! */
- if ( link && link->link == seg && link > seg )
- {- FT_Pos dist;
-
-
- dist = seg->pos - link->pos;
- if ( dist < 0 )
- dist = -dist;
-
- if ( num_widths < AH_MAX_WIDTHS )
- widths[num_widths++] = dist;
- }
- }
-
- sort_values( num_widths, widths );
- *p_num_widths = num_widths;
-
- /* we will now try to find the smallest width */
- if ( num_widths > 0 && widths[0] < edge_distance_threshold )
- edge_distance_threshold = widths[0];
-
- segments = outline->vert_segments;
- limit = segments + outline->num_vsegments;
- widths = globals->widths;
- p_num_widths = &globals->num_widths;
- }
-
- /* Now, compute the edge distance threshold as a fraction of the */
- /* smallest width in the font. Set it in `hinter->glyph' too! */
- if ( edge_distance_threshold == 32000 )
- edge_distance_threshold = 50;
-
- /* let's try 20% */
- hinter->glyph->edge_distance_threshold = edge_distance_threshold / 5;
-
- Exit:
- return error;
- }
-
-
- FT_LOCAL_DEF( FT_Error )
- ah_hinter_compute_globals( AH_Hinter hinter )
- {- return ah_hinter_compute_widths( hinter ) ||
- ah_hinter_compute_blues ( hinter );
- }
-
-
-/* END */
--- a/src/autohint/ahglobal.h
+++ /dev/null
@@ -1,59 +1,0 @@
-/***************************************************************************/
-/* */
-/* ahglobal.h */
-/* */
-/* Routines used to compute global metrics automatically */
-/* (specification). */
-/* */
-/* Copyright 2000-2001, 2002, 2003 Catharon Productions Inc. */
-/* Author: David Turner */
-/* */
-/* This file is part of the Catharon Typography Project and shall only */
-/* be used, modified, and distributed under the terms of the Catharon */
-/* Open Source License that should come with this file under the name */
-/* `CatharonLicense.txt'. By continuing to use, modify, or distribute */
-/* this file you indicate that you have read the license and */
-/* understand and accept it fully. */
-/* */
-/* Note that this license is compatible with the FreeType license. */
-/* */
-/***************************************************************************/
-
-
-#ifndef __AHGLOBAL_H__
-#define __AHGLOBAL_H__
-
-
-#include <ft2build.h>
-#include "ahtypes.h"
-#include FT_INTERNAL_OBJECTS_H
-
-
-FT_BEGIN_HEADER
-
-
-#ifdef FT_CONFIG_CHESTER_SMALL_F
-
-#define AH_IS_TOP_BLUE( b ) ( (b) == AH_BLUE_CAPITAL_TOP || \
- (b) == AH_BLUE_SMALL_F_TOP || \
- (b) == AH_BLUE_SMALL_TOP )
-
-#else /* !FT_CONFIG_CHESTER_SMALL_F */
-
-#define AH_IS_TOP_BLUE( b ) ( (b) == AH_BLUE_CAPITAL_TOP || \
- (b) == AH_BLUE_SMALL_TOP )
-
-#endif /* !FT_CONFIG_CHESTER_SMALL_F */
-
-
- /* compute global metrics automatically */
- FT_LOCAL( FT_Error )
- ah_hinter_compute_globals( AH_Hinter hinter );
-
-
-FT_END_HEADER
-
-#endif /* __AHGLOBAL_H__ */
-
-
-/* END */
--- a/src/autohint/ahglyph.c
+++ /dev/null
@@ -1,1566 +1,0 @@
-/***************************************************************************/
-/* */
-/* ahglyph.c */
-/* */
-/* Routines used to load and analyze a given glyph before hinting */
-/* (body). */
-/* */
-/* Copyright 2000-2001, 2002, 2003, 2004, 2005 Catharon Productions Inc. */
-/* Author: David Turner */
-/* */
-/* This file is part of the Catharon Typography Project and shall only */
-/* be used, modified, and distributed under the terms of the Catharon */
-/* Open Source License that should come with this file under the name */
-/* `CatharonLicense.txt'. By continuing to use, modify, or distribute */
-/* this file you indicate that you have read the license and */
-/* understand and accept it fully. */
-/* */
-/* Note that this license is compatible with the FreeType license. */
-/* */
-/***************************************************************************/
-
-
-#include <ft2build.h>
-#include FT_OUTLINE_H
-
-#include "ahglyph.h"
-#include "ahangles.h"
-#include "ahglobal.h"
-#include "aherrors.h"
-
-
-#ifdef AH_DEBUG
-
-#include <stdio.h>
-
- void
- ah_dump_edges( AH_Outline outline )
- {- AH_Edge edges;
- AH_Edge edge_limit;
- AH_Segment segments;
- FT_Int dimension;
-
-
- edges = outline->horz_edges;
- edge_limit = edges + outline->num_hedges;
- segments = outline->horz_segments;
-
- for ( dimension = 1; dimension >= 0; dimension-- )
- {- AH_Edge edge;
-
-
- printf ( "Table of %s edges:\n",
- !dimension ? "vertical" : "horizontal" );
- printf ( " [ index | pos | dir | link |"
- " serif | blue | opos | pos ]\n" );
-
- for ( edge = edges; edge < edge_limit; edge++ )
- {- printf ( " [ %5d | %4d | %5s | %4d | %5d | %c | %5.2f | %5.2f ]\n",
- edge - edges,
- (int)edge->fpos,
- edge->dir == AH_DIR_UP
- ? "up"
- : ( edge->dir == AH_DIR_DOWN
- ? "down"
- : ( edge->dir == AH_DIR_LEFT
- ? "left"
- : ( edge->dir == AH_DIR_RIGHT
- ? "right"
- : "none" ) ) ),
- edge->link ? ( edge->link - edges ) : -1,
- edge->serif ? ( edge->serif - edges ) : -1,
- edge->blue_edge ? 'y' : 'n',
- edge->opos / 64.0,
- edge->pos / 64.0 );
- }
-
- edges = outline->vert_edges;
- edge_limit = edges + outline->num_vedges;
- segments = outline->vert_segments;
- }
- }
-
-
- /* A function used to dump the array of linked segments */
- void
- ah_dump_segments( AH_Outline outline )
- {- AH_Segment segments;
- AH_Segment segment_limit;
- AH_Point points;
- FT_Int dimension;
-
-
- points = outline->points;
- segments = outline->horz_segments;
- segment_limit = segments + outline->num_hsegments;
-
- for ( dimension = 1; dimension >= 0; dimension-- )
- {- AH_Segment seg;
-
-
- printf ( "Table of %s segments:\n",
- !dimension ? "vertical" : "horizontal" );
- printf ( " [ index | pos | dir | link | serif |"
- " numl | first | start ]\n" );
-
- for ( seg = segments; seg < segment_limit; seg++ )
- {- printf ( " [ %5d | %4d | %5s | %4d | %5d | %4d | %5d | %5d ]\n",
- seg - segments,
- (int)seg->pos,
- seg->dir == AH_DIR_UP
- ? "up"
- : ( seg->dir == AH_DIR_DOWN
- ? "down"
- : ( seg->dir == AH_DIR_LEFT
- ? "left"
- : ( seg->dir == AH_DIR_RIGHT
- ? "right"
- : "none" ) ) ),
- seg->link ? ( seg->link - segments ) : -1,
- seg->serif ? ( seg->serif - segments ) : -1,
- (int)seg->num_linked,
- seg->first - points,
- seg->last - points );
- }
-
- segments = outline->vert_segments;
- segment_limit = segments + outline->num_vsegments;
- }
- }
-
-#endif /* AH_DEBUG */
-
-
- /* compute the direction value of a given vector */
- static AH_Direction
- ah_compute_direction( FT_Pos dx,
- FT_Pos dy )
- {- AH_Direction dir;
- FT_Pos ax = FT_ABS( dx );
- FT_Pos ay = FT_ABS( dy );
-
-
- dir = AH_DIR_NONE;
-
- /* atan(1/12) == 4.7 degrees */
-
- /* test for vertical direction */
- if ( ax * 12 < ay )
- {- dir = dy > 0 ? AH_DIR_UP : AH_DIR_DOWN;
- }
- /* test for horizontal direction */
- else if ( ay * 12 < ax )
- {- dir = dx > 0 ? AH_DIR_RIGHT : AH_DIR_LEFT;
- }
-
- return dir;
- }
-
-
- /*************************************************************************/
- /* */
- /* <Function> */
- /* ah_outline_new */
- /* */
- /* <Description> */
- /* Creates a new and empty AH_OutlineRec object. */
- /* */
- FT_LOCAL_DEF( FT_Error )
- ah_outline_new( FT_Memory memory,
- AH_Outline* aoutline )
- {- FT_Error error;
- AH_Outline outline;
-
-
- if ( !FT_NEW( outline ) )
- {- outline->memory = memory;
- *aoutline = outline;
- }
-
- return error;
- }
-
-
- /*************************************************************************/
- /* */
- /* <Function> */
- /* ah_outline_done */
- /* */
- /* <Description> */
- /* Destroys a given AH_OutlineRec object. */
- /* */
- FT_LOCAL_DEF( void )
- ah_outline_done( AH_Outline outline )
- {- FT_Memory memory = outline->memory;
-
-
- FT_FREE( outline->horz_edges );
- FT_FREE( outline->horz_segments );
- FT_FREE( outline->contours );
- FT_FREE( outline->points );
-
- FT_FREE( outline );
- }
-
-
- /*************************************************************************/
- /* */
- /* <Function> */
- /* ah_outline_save */
- /* */
- /* <Description> */
- /* Saves the contents of a given AH_OutlineRec object into a face's */
- /* glyph slot. */
- /* */
- FT_LOCAL_DEF( void )
- ah_outline_save( AH_Outline outline,
- AH_Loader gloader )
- {- AH_Point point = outline->points;
- AH_Point point_limit = point + outline->num_points;
- FT_Vector* vec = gloader->current.outline.points;
- char* tag = gloader->current.outline.tags;
-
-
- /* we assume that the glyph loader has already been checked for storage */
- for ( ; point < point_limit; point++, vec++, tag++ )
- {- vec->x = point->x;
- vec->y = point->y;
-
- if ( point->flags & AH_FLAG_CONIC )
- tag[0] = FT_CURVE_TAG_CONIC;
- else if ( point->flags & AH_FLAG_CUBIC )
- tag[0] = FT_CURVE_TAG_CUBIC;
- else
- tag[0] = FT_CURVE_TAG_ON;
- }
- }
-
-
- /*************************************************************************/
- /* */
- /* <Function> */
- /* ah_outline_load */
- /* */
- /* <Description> */
- /* Loads an unscaled outline from a glyph slot into an AH_OutlineRec */
- /* object. */
- /* */
- FT_LOCAL_DEF( FT_Error )
- ah_outline_load( AH_Outline outline,
- FT_Fixed x_scale,
- FT_Fixed y_scale,
- FT_Face face )
- {- FT_Memory memory = outline->memory;
- FT_Error error = AH_Err_Ok;
- FT_Outline* source = &face->glyph->outline;
- FT_Int num_points = source->n_points;
- FT_Int num_contours = source->n_contours;
- AH_Point points;
-
-
- /* check arguments */
- if ( !face ||
- !face->size ||
- face->glyph->format != FT_GLYPH_FORMAT_OUTLINE )
- return AH_Err_Invalid_Argument;
-
- /* first of all, reallocate the contours array if necessary */
- if ( num_contours > outline->max_contours )
- {- FT_Int new_contours = FT_PAD_CEIL( num_contours, 4 );
-
-
- if ( FT_RENEW_ARRAY( outline->contours,
- outline->max_contours,
- new_contours ) )
- goto Exit;
-
- outline->max_contours = new_contours;
- }
-
- /* then, reallocate the points, segments & edges arrays if needed -- */
- /* note that we reserved two additional point positions, used to */
- /* hint metrics appropriately */
- /* */
- if ( num_points + 2 > outline->max_points )
- {- FT_Int news = FT_PAD_CEIL( num_points + 2, 8 );
- FT_Int max = outline->max_points;
-
-
- if ( FT_RENEW_ARRAY( outline->points, max, news ) ||
- FT_RENEW_ARRAY( outline->horz_edges, max * 2, news * 2 ) )
- goto Exit;
-
- outline->vert_edges = outline->horz_edges + news;
-
- if ( FT_RENEW_ARRAY( outline->horz_segments, max * 2, news * 2 ) )
- goto Exit;
-
- /* readjust some pointers */
- outline->vert_segments = outline->horz_segments + news;
- outline->max_points = news;
- }
-
- outline->num_points = num_points;
- outline->num_contours = num_contours;
-
- outline->num_hedges = 0;
- outline->num_vedges = 0;
- outline->num_hsegments = 0;
- outline->num_vsegments = 0;
-
- /* We can't rely on the value of `FT_Outline.flags' to know the fill */
- /* direction used for a glyph, given that some fonts are broken (e.g. */
- /* the Arphic ones). We thus recompute it each time we need to. */
- /* */
- outline->vert_major_dir = AH_DIR_UP;
- outline->horz_major_dir = AH_DIR_LEFT;
-
- if ( FT_Outline_Get_Orientation( source ) == FT_ORIENTATION_POSTSCRIPT )
- {- outline->vert_major_dir = AH_DIR_DOWN;
- outline->horz_major_dir = AH_DIR_RIGHT;
- }
-
- outline->x_scale = x_scale;
- outline->y_scale = y_scale;
-
- points = outline->points;
- if ( outline->num_points == 0 )
- goto Exit;
-
- {- /* do one thing at a time -- it is easier to understand, and */
- /* the code is clearer */
- AH_Point point;
- AH_Point point_limit = points + outline->num_points;
-
-
- /* compute coordinates */
- {- FT_Vector* vec = source->points;
-
-
- for ( point = points; point < point_limit; vec++, point++ )
- {- point->fx = vec->x;
- point->fy = vec->y;
- point->ox = point->x = FT_MulFix( vec->x, x_scale );
- point->oy = point->y = FT_MulFix( vec->y, y_scale );
-
- point->flags = 0;
- }
- }
-
- /* compute Bezier flags */
- {- char* tag = source->tags;
-
-
- for ( point = points; point < point_limit; point++, tag++ )
- {- switch ( FT_CURVE_TAG( *tag ) )
- {- case FT_CURVE_TAG_CONIC:
- point->flags = AH_FLAG_CONIC;
- break;
- case FT_CURVE_TAG_CUBIC:
- point->flags = AH_FLAG_CUBIC;
- break;
- default:
- ;
- }
- }
- }
-
- /* compute `next' and `prev' */
- {- FT_Int contour_index;
- AH_Point prev;
- AH_Point first;
- AH_Point end;
-
-
- contour_index = 0;
-
- first = points;
- end = points + source->contours[0];
- prev = end;
-
- for ( point = points; point < point_limit; point++ )
- {- point->prev = prev;
- if ( point < end )
- {- point->next = point + 1;
- prev = point;
- }
- else
- {- point->next = first;
- contour_index++;
- if ( point + 1 < point_limit )
- {- end = points + source->contours[contour_index];
- first = point + 1;
- prev = end;
- }
- }
- }
- }
-
- /* set-up the contours array */
- {- AH_Point* contour = outline->contours;
- AH_Point* contour_limit = contour + outline->num_contours;
- short* end = source->contours;
- short idx = 0;
-
-
- for ( ; contour < contour_limit; contour++, end++ )
- {- contour[0] = points + idx;
- idx = (short)( end[0] + 1 );
- }
- }
-
- /* compute directions of in & out vectors */
- {- for ( point = points; point < point_limit; point++ )
- {- AH_Point prev;
- AH_Point next;
- FT_Vector ivec, ovec;
-
-
- prev = point->prev;
- ivec.x = point->fx - prev->fx;
- ivec.y = point->fy - prev->fy;
-
- point->in_dir = ah_compute_direction( ivec.x, ivec.y );
-
- next = point->next;
- ovec.x = next->fx - point->fx;
- ovec.y = next->fy - point->fy;
-
- point->out_dir = ah_compute_direction( ovec.x, ovec.y );
-
-#ifndef AH_OPTION_NO_WEAK_INTERPOLATION
- if ( point->flags & ( AH_FLAG_CONIC | AH_FLAG_CUBIC ) )
- {- Is_Weak_Point:
- point->flags |= AH_FLAG_WEAK_INTERPOLATION;
- }
- else if ( point->out_dir == point->in_dir )
- {- AH_Angle angle_in, angle_out, delta;
-
-
- if ( point->out_dir != AH_DIR_NONE )
- goto Is_Weak_Point;
-
- angle_in = ah_angle( &ivec );
- angle_out = ah_angle( &ovec );
- delta = angle_in - angle_out;
-
- if ( delta > AH_PI )
- delta = AH_2PI - delta;
-
- if ( delta < 0 )
- delta = -delta;
-
- if ( delta < 2 )
- goto Is_Weak_Point;
- }
- else if ( point->in_dir == -point->out_dir )
- goto Is_Weak_Point;
-#endif
- }
- }
- }
-
- Exit:
- return error;
- }
-
-
- FT_LOCAL_DEF( void )
- ah_setup_uv( AH_Outline outline,
- AH_UV source )
- {- AH_Point point = outline->points;
- AH_Point point_limit = point + outline->num_points;
-
-
- switch ( source )
- {- case AH_UV_FXY:
- for ( ; point < point_limit; point++ )
- {- point->u = point->fx;
- point->v = point->fy;
- }
- break;
-
- case AH_UV_FYX:
- for ( ; point < point_limit; point++ )
- {- point->u = point->fy;
- point->v = point->fx;
- }
- break;
-
- case AH_UV_OXY:
- for ( ; point < point_limit; point++ )
- {- point->u = point->ox;
- point->v = point->oy;
- }
- break;
-
- case AH_UV_OYX:
- for ( ; point < point_limit; point++ )
- {- point->u = point->oy;
- point->v = point->ox;
- }
- break;
-
- case AH_UV_YX:
- for ( ; point < point_limit; point++ )
- {- point->u = point->y;
- point->v = point->x;
- }
- break;
-
- case AH_UV_OX:
- for ( ; point < point_limit; point++ )
- {- point->u = point->x;
- point->v = point->ox;
- }
- break;
-
- case AH_UV_OY:
- for ( ; point < point_limit; point++ )
- {- point->u = point->y;
- point->v = point->oy;
- }
- break;
-
- default:
- for ( ; point < point_limit; point++ )
- {- point->u = point->x;
- point->v = point->y;
- }
- }
- }
-
-
- /* compute all inflex points in a given glyph */
- static void
- ah_outline_compute_inflections( AH_Outline outline )
- {- AH_Point* contour = outline->contours;
- AH_Point* contour_limit = contour + outline->num_contours;
-
-
- /* load original coordinates in (u,v) */
- ah_setup_uv( outline, AH_UV_FXY );
-
- /* do each contour separately */
- for ( ; contour < contour_limit; contour++ )
- {- FT_Vector vec;
- AH_Point point = contour[0];
- AH_Point first = point;
- AH_Point start = point;
- AH_Point end = point;
- AH_Point before;
- AH_Point after;
- AH_Angle angle_in, angle_seg, angle_out;
- AH_Angle diff_in, diff_out;
- FT_Int finished = 0;
-
-
- /* compute first segment in contour */
- first = point;
-
- start = end = first;
- do
- {- end = end->next;
- if ( end == first )
- goto Skip;
-
- } while ( end->u == first->u && end->v == first->v );
-
- vec.x = end->u - start->u;
- vec.y = end->v - start->v;
- angle_seg = ah_angle( &vec );
-
- /* extend the segment start whenever possible */
- before = start;
- do
- {- do
- {- start = before;
- before = before->prev;
- if ( before == first )
- goto Skip;
-
- } while ( before->u == start->u && before->v == start->v );
-
- vec.x = start->u - before->u;
- vec.y = start->v - before->v;
- angle_in = ah_angle( &vec );
-
- } while ( angle_in == angle_seg );
-
- first = start;
- diff_in = ah_angle_diff( angle_in, angle_seg );
-
- /* now, process all segments in the contour */
- do
- {- /* first, extend current segment's end whenever possible */
- after = end;
- do
- {- do
- {- end = after;
- after = after->next;
- if ( after == first )
- finished = 1;
-
- } while ( end->u == after->u && end->v == after->v );
-
- vec.x = after->u - end->u;
- vec.y = after->v - end->v;
- angle_out = ah_angle( &vec );
-
- } while ( angle_out == angle_seg );
-
- diff_out = ah_angle_diff( angle_seg, angle_out );
-
- if ( ( diff_in ^ diff_out ) < 0 )
- {- /* diff_in and diff_out have different signs, we have */
- /* inflection points here... */
- do
- {- start->flags |= AH_FLAG_INFLECTION;
- start = start->next;
-
- } while ( start != end );
-
- start->flags |= AH_FLAG_INFLECTION;
- }
-
- start = end;
- end = after;
- angle_seg = angle_out;
- diff_in = diff_out;
-
- } while ( !finished );
-
- Skip:
- ;
- }
- }
-
-
- FT_LOCAL_DEF( void )
- ah_outline_compute_segments( AH_Outline outline )
- {- int dimension;
- AH_Segment segments;
- FT_Int* p_num_segments;
- AH_Direction segment_dir;
- AH_Direction major_dir;
-
-
- segments = outline->horz_segments;
- p_num_segments = &outline->num_hsegments;
- major_dir = AH_DIR_RIGHT; /* This value must be positive! */
- segment_dir = major_dir;
-
- /* set up (u,v) in each point */
- ah_setup_uv( outline, AH_UV_FYX );
-
- for ( dimension = 1; dimension >= 0; dimension-- )
- {- AH_Point* contour = outline->contours;
- AH_Point* contour_limit = contour + outline->num_contours;
- AH_Segment segment = segments;
- FT_Int num_segments = 0;
-
-#ifdef AH_HINT_METRICS
- AH_Point min_point = 0;
- AH_Point max_point = 0;
- FT_Pos min_coord = 32000;
- FT_Pos max_coord = -32000;
-#endif
-
-
- /* do each contour separately */
- for ( ; contour < contour_limit; contour++ )
- {- AH_Point point = contour[0];
- AH_Point last = point->prev;
- int on_edge = 0;
- FT_Pos min_pos = 32000; /* minimum segment pos != min_coord */
- FT_Pos max_pos = -32000; /* maximum segment pos != max_coord */
- FT_Bool passed;
-
-
-#ifdef AH_HINT_METRICS
- if ( point->u < min_coord )
- {- min_coord = point->u;
- min_point = point;
- }
- if ( point->u > max_coord )
- {- max_coord = point->u;
- max_point = point;
- }
-#endif
-
- if ( point == last ) /* skip singletons -- just in case */
- continue;
-
- if ( FT_ABS( last->out_dir ) == major_dir &&
- FT_ABS( point->out_dir ) == major_dir )
- {- /* we are already on an edge, try to locate its start */
- last = point;
-
- for (;;)
- {- point = point->prev;
- if ( FT_ABS( point->out_dir ) != major_dir )
- {- point = point->next;
- break;
- }
- if ( point == last )
- break;
- }
- }
-
- last = point;
- passed = 0;
-
- for (;;)
- {- FT_Pos u, v;
-
-
- if ( on_edge )
- {- u = point->u;
- if ( u < min_pos )
- min_pos = u;
- if ( u > max_pos )
- max_pos = u;
-
- if ( point->out_dir != segment_dir || point == last )
- {- /* we are just leaving an edge; record a new segment! */
- segment->last = point;
- segment->pos = ( min_pos + max_pos ) >> 1;
-
- /* a segment is round if either its first or last point */
- /* is a control point */
- if ( ( segment->first->flags | point->flags ) &
- AH_FLAG_CONTROL )
- segment->flags |= AH_EDGE_ROUND;
-
- /* compute segment size */
- min_pos = max_pos = point->v;
-
- v = segment->first->v;
- if ( v < min_pos )
- min_pos = v;
- if ( v > max_pos )
- max_pos = v;
-
- segment->min_coord = min_pos;
- segment->max_coord = max_pos;
-
- on_edge = 0;
- num_segments++;
- segment++;
- /* fallthrough */
- }
- }
-
- /* now exit if we are at the start/end point */
- if ( point == last )
- {- if ( passed )
- break;
- passed = 1;
- }
-
- if ( !on_edge && FT_ABS( point->out_dir ) == major_dir )
- {- /* this is the start of a new segment! */
- segment_dir = point->out_dir;
-
- /* clear all segment fields */
- FT_ZERO( segment );
-
- segment->dir = segment_dir;
- segment->flags = AH_EDGE_NORMAL;
- min_pos = max_pos = point->u;
- segment->first = point;
- segment->last = point;
- segment->contour = contour;
- segment->score = 32000;
- segment->link = NULL;
- on_edge = 1;
-
-#ifdef AH_HINT_METRICS
- if ( point == max_point )
- max_point = 0;
-
- if ( point == min_point )
- min_point = 0;
-#endif
- }
-
- point = point->next;
- }
-
- } /* contours */
-
-#ifdef AH_HINT_METRICS
- /* we need to ensure that there are edges on the left-most and */
- /* right-most points of the glyph in order to hint the metrics; */
- /* we do this by inserting fake segments when needed */
- if ( dimension == 0 )
- {- AH_Point point = outline->points;
- AH_Point point_limit = point + outline->num_points;
-
- FT_Pos min_pos = 32000;
- FT_Pos max_pos = -32000;
-
-
- min_point = 0;
- max_point = 0;
-
- /* compute minimum and maximum points */
- for ( ; point < point_limit; point++ )
- {- FT_Pos x = point->fx;
-
-
- if ( x < min_pos )
- {- min_pos = x;
- min_point = point;
- }
- if ( x > max_pos )
- {- max_pos = x;
- max_point = point;
- }
- }
-
- /* insert minimum segment */
- if ( min_point )
- {- /* clear all segment fields */
- FT_ZERO( segment );
-
- segment->dir = segment_dir;
- segment->flags = AH_EDGE_NORMAL;
- segment->first = min_point;
- segment->last = min_point;
- segment->pos = min_pos;
- segment->score = 32000;
- segment->link = NULL;
-
- num_segments++;
- segment++;
- }
-
- /* insert maximum segment */
- if ( max_point )
- {- /* clear all segment fields */
- FT_ZERO( segment );
-
- segment->dir = segment_dir;
- segment->flags = AH_EDGE_NORMAL;
- segment->first = max_point;
- segment->last = max_point;
- segment->pos = max_pos;
- segment->score = 32000;
- segment->link = NULL;
-
- num_segments++;
- segment++;
- }
- }
-#endif /* AH_HINT_METRICS */
-
- *p_num_segments = num_segments;
-
- segments = outline->vert_segments;
- major_dir = AH_DIR_UP;
- p_num_segments = &outline->num_vsegments;
-
- ah_setup_uv( outline, AH_UV_FXY );
- }
- }
-
-
- FT_LOCAL_DEF( void )
- ah_outline_link_segments( AH_Outline outline )
- {- AH_Segment segments;
- AH_Segment segment_limit;
- AH_Direction major_dir;
- int dimension;
-
-
- segments = outline->horz_segments;
- segment_limit = segments + outline->num_hsegments;
- major_dir = outline->horz_major_dir;
-
- for ( dimension = 1; dimension >= 0; dimension-- )
- {- AH_Segment seg1;
- AH_Segment seg2;
-
-#if 0
- /* now compare each segment to the others */
- for ( seg1 = segments; seg1 < segment_limit; seg1++ )
- {- FT_Pos best_score;
- AH_Segment best_segment;
-
-
- /* the fake segments are introduced to hint the metrics -- */
- /* we must never link them to anything */
- if ( seg1->first == seg1->last )
- continue;
-
- best_segment = seg1->link;
- if ( best_segment )
- best_score = seg1->score;
- else
- best_score = +32000;
-
- for ( seg2 = segments; seg2 < segment_limit; seg2++ )
- if ( seg1 != seg2 && seg1->dir + seg2->dir == 0 )
- {- FT_Pos pos1 = seg1->pos;
- FT_Pos pos2 = seg2->pos;
- FT_Bool is_dir;
- FT_Bool is_pos;
-
-
- /* check that the segments are correctly oriented and */
- /* positioned to form a black distance */
-
- is_dir = (FT_Bool)( seg1->dir == outline->horz_major_dir ||
- seg1->dir == outline->vert_major_dir );
- is_pos = (FT_Bool)( pos1 > pos2 );
-
- if ( pos1 == pos2 || !(is_dir ^ is_pos) )
- continue;
-
- {- FT_Pos min = seg1->min_coord;
- FT_Pos max = seg1->max_coord;
- FT_Pos len, dist, score;
-
-
- if ( min < seg2->min_coord )
- min = seg2->min_coord;
-
- if ( max > seg2->max_coord )
- max = seg2->max_coord;
-
- len = max - min;
- if ( len >= 8 )
- {- dist = seg2->pos - seg1->pos;
- if ( dist < 0 )
- dist = -dist;
-
- score = dist + 3000 / len;
-
- if ( score < best_score )
- {- best_score = score;
- best_segment = seg2;
- }
- }
- }
- }
-
- if ( best_segment )
- {- seg1->link = best_segment;
- seg1->score = best_score;
- best_segment->num_linked++;
- }
- }
-#endif /* 0 */
-
-#if 1
- /* the following code does the same, but much faster! */
-
- /* now compare each segment to the others */
- for ( seg1 = segments; seg1 < segment_limit; seg1++ )
- {- /* the fake segments are introduced to hint the metrics -- */
- /* we must never link them to anything */
- if ( seg1->first == seg1->last || seg1->dir != major_dir )
- continue;
-
- for ( seg2 = segments; seg2 < segment_limit; seg2++ )
- if ( seg2 != seg1 && seg1->dir + seg2->dir == 0 )
- {- FT_Pos pos1 = seg1->pos;
- FT_Pos pos2 = seg2->pos;
- FT_Pos dist = pos2 - pos1;
-
-
- if ( dist < 0 )
- continue;
-
- {- FT_Pos min = seg1->min_coord;
- FT_Pos max = seg1->max_coord;
- FT_Pos len, score;
-
-
- if ( min < seg2->min_coord )
- min = seg2->min_coord;
-
- if ( max > seg2->max_coord )
- max = seg2->max_coord;
-
- len = max - min;
- if ( len >= 8 )
- {- score = dist + 3000 / len;
-
- if ( score < seg1->score )
- {- seg1->score = score;
- seg1->link = seg2;
- }
-
- if ( score < seg2->score )
- {- seg2->score = score;
- seg2->link = seg1;
- }
- }
- }
- }
- }
-#endif /* 1 */
-
- /* now, compute the `serif' segments */
- for ( seg1 = segments; seg1 < segment_limit; seg1++ )
- {- seg2 = seg1->link;
-
- if ( seg2 )
- {- seg2->num_linked++;
- if ( seg2->link != seg1 )
- {- seg1->link = 0;
- seg1->serif = seg2->link;
- }
- }
- }
-
- segments = outline->vert_segments;
- segment_limit = segments + outline->num_vsegments;
- major_dir = outline->vert_major_dir;
- }
- }
-
-
- static void
- ah_outline_compute_edges( AH_Outline outline )
- {- AH_Edge edges;
- AH_Segment segments;
- AH_Segment segment_limit;
- AH_Direction up_dir;
- FT_Int* p_num_edges;
- FT_Int dimension;
- FT_Fixed scale;
- FT_Pos edge_distance_threshold;
-
-
- edges = outline->horz_edges;
- segments = outline->horz_segments;
- segment_limit = segments + outline->num_hsegments;
- p_num_edges = &outline->num_hedges;
- up_dir = AH_DIR_RIGHT;
- scale = outline->y_scale;
-
- for ( dimension = 1; dimension >= 0; dimension-- )
- {- AH_Edge edge;
- AH_Edge edge_limit; /* really == edge + num_edges */
- AH_Segment seg;
-
-
- /*********************************************************************/
- /* */
- /* We will begin by generating a sorted table of edges for the */
- /* current direction. To do so, we simply scan each segment and try */
- /* to find an edge in our table that corresponds to its position. */
- /* */
- /* If no edge is found, we create and insert a new edge in the */
- /* sorted table. Otherwise, we simply add the segment to the edge's */
- /* list which will be processed in the second step to compute the */
- /* edge's properties. */
- /* */
- /* Note that the edges table is sorted along the segment/edge */
- /* position. */
- /* */
- /*********************************************************************/
-
- edge_distance_threshold = FT_MulFix( outline->edge_distance_threshold,
- scale );
- if ( edge_distance_threshold > 64 / 4 )
- edge_distance_threshold = 64 / 4;
-
- edge_distance_threshold = FT_DivFix( edge_distance_threshold,
- scale );
-
- edge_limit = edges;
- for ( seg = segments; seg < segment_limit; seg++ )
- {- AH_Edge found = 0;
-
-
- /* look for an edge corresponding to the segment */
- for ( edge = edges; edge < edge_limit; edge++ )
- {- FT_Pos dist;
-
-
- dist = seg->pos - edge->fpos;
- if ( dist < 0 )
- dist = -dist;
-
- if ( dist < edge_distance_threshold )
- {- found = edge;
- break;
- }
- }
-
- if ( !found )
- {- /* insert a new edge in the list and */
- /* sort according to the position */
- while ( edge > edges && edge[-1].fpos > seg->pos )
- {- edge[0] = edge[-1];
- edge--;
- }
- edge_limit++;
-
- /* clear all edge fields */
- FT_MEM_ZERO( edge, sizeof ( *edge ) );
-
- /* add the segment to the new edge's list */
- edge->first = seg;
- edge->last = seg;
- edge->fpos = seg->pos;
- edge->opos = edge->pos = FT_MulFix( seg->pos, scale );
- seg->edge_next = seg;
- }
- else
- {- /* if an edge was found, simply add the segment to the edge's */
- /* list */
- seg->edge_next = edge->first;
- edge->last->edge_next = seg;
- edge->last = seg;
- }
- }
- *p_num_edges = (FT_Int)( edge_limit - edges );
-
-
- /*********************************************************************/
- /* */
- /* Good, we will now compute each edge's properties according to */
- /* segments found on its position. Basically, these are: */
- /* */
- /* - edge's main direction */
- /* - stem edge, serif edge or both (which defaults to stem then) */
- /* - rounded edge, straight or both (which defaults to straight) */
- /* - link for edge */
- /* */
- /*********************************************************************/
-
- /* first of all, set the `edge' field in each segment -- this is */
- /* required in order to compute edge links */
-
- /* Note that I've tried to remove this loop, setting
- * the "edge" field of each segment directly in the
- * code above. For some reason, it slows down execution
- * speed -- on a Sun.
- */
- for ( edge = edges; edge < edge_limit; edge++ )
- {- seg = edge->first;
- if ( seg )
- do
- {- seg->edge = edge;
- seg = seg->edge_next;
- }
- while ( seg != edge->first );
- }
-
- /* now, compute each edge properties */
- for ( edge = edges; edge < edge_limit; edge++ )
- {- FT_Int is_round = 0; /* does it contain round segments? */
- FT_Int is_straight = 0; /* does it contain straight segments? */
- FT_Pos ups = 0; /* number of upwards segments */
- FT_Pos downs = 0; /* number of downwards segments */
-
-
- seg = edge->first;
-
- do
- {- FT_Bool is_serif;
-
-
- /* check for roundness of segment */
- if ( seg->flags & AH_EDGE_ROUND )
- is_round++;
- else
- is_straight++;
-
- /* check for segment direction */
- if ( seg->dir == up_dir )
- ups += seg->max_coord-seg->min_coord;
- else
- downs += seg->max_coord-seg->min_coord;
-
- /* check for links -- if seg->serif is set, then seg->link must */
- /* be ignored */
- is_serif = (FT_Bool)( seg->serif && seg->serif->edge != edge );
-
- if ( seg->link || is_serif )
- {- AH_Edge edge2;
- AH_Segment seg2;
-
-
- edge2 = edge->link;
- seg2 = seg->link;
-
- if ( is_serif )
- {- seg2 = seg->serif;
- edge2 = edge->serif;
- }
-
- if ( edge2 )
- {- FT_Pos edge_delta;
- FT_Pos seg_delta;
-
-
- edge_delta = edge->fpos - edge2->fpos;
- if ( edge_delta < 0 )
- edge_delta = -edge_delta;
-
- seg_delta = seg->pos - seg2->pos;
- if ( seg_delta < 0 )
- seg_delta = -seg_delta;
-
- if ( seg_delta < edge_delta )
- edge2 = seg2->edge;
- }
- else
- edge2 = seg2->edge;
-
-#ifdef FT_CONFIG_CHESTER_SERIF
- if ( is_serif )
- {- edge->serif = edge2;
- edge2->flags |= AH_EDGE_SERIF;
- }
- else
- edge->link = edge2;
-#else /* !FT_CONFIG_CHESTER_SERIF */
- if ( is_serif )
- edge->serif = edge2;
- else
- edge->link = edge2;
-#endif /* !FT_CONFIG_CHESTER_SERIF */
- }
-
- seg = seg->edge_next;
-
- } while ( seg != edge->first );
-
- /* set the round/straight flags */
- edge->flags = AH_EDGE_NORMAL;
-
- if ( is_round > 0 && is_round >= is_straight )
- edge->flags |= AH_EDGE_ROUND;
-
- /* set the edge's main direction */
- edge->dir = AH_DIR_NONE;
-
- if ( ups > downs )
- edge->dir = up_dir;
-
- else if ( ups < downs )
- edge->dir = -up_dir;
-
- else if ( ups == downs )
- edge->dir = 0; /* both up and down! */
-
- /* gets rid of serifs if link is set */
- /* XXX: This gets rid of many unpleasant artefacts! */
- /* Example: the `c' in cour.pfa at size 13 */
-
- if ( edge->serif && edge->link )
- edge->serif = 0;
- }
-
- edges = outline->vert_edges;
- segments = outline->vert_segments;
- segment_limit = segments + outline->num_vsegments;
- p_num_edges = &outline->num_vedges;
- up_dir = AH_DIR_UP;
- scale = outline->x_scale;
- }
- }
-
-
- /*************************************************************************/
- /* */
- /* <Function> */
- /* ah_outline_detect_features */
- /* */
- /* <Description> */
- /* Performs feature detection on a given AH_OutlineRec object. */
- /* */
- FT_LOCAL_DEF( void )
- ah_outline_detect_features( AH_Outline outline )
- {- ah_outline_compute_segments ( outline );
- ah_outline_link_segments ( outline );
- ah_outline_compute_edges ( outline );
- ah_outline_compute_inflections( outline );
- }
-
-
- /*************************************************************************/
- /* */
- /* <Function> */
- /* ah_outline_compute_blue_edges */
- /* */
- /* <Description> */
- /* Computes the `blue edges' in a given outline (i.e. those that must */
- /* be snapped to a blue zone edge (top or bottom). */
- /* */
- FT_LOCAL_DEF( void )
- ah_outline_compute_blue_edges( AH_Outline outline,
- AH_Face_Globals face_globals )
- {- AH_Edge edge = outline->horz_edges;
- AH_Edge edge_limit = edge + outline->num_hedges;
- AH_Globals globals = &face_globals->design;
- FT_Fixed y_scale = outline->y_scale;
-
- FT_Bool blue_active[AH_BLUE_MAX];
-
-
- /* compute which blue zones are active, i.e. have their scaled */
- /* size < 3/4 pixels */
- {- AH_Blue blue;
- FT_Bool check = 0;
-
-
- for ( blue = AH_BLUE_CAPITAL_TOP; blue < AH_BLUE_MAX; blue++ )
- {- FT_Pos ref, shoot, dist;
-
-
- ref = globals->blue_refs[blue];
- shoot = globals->blue_shoots[blue];
- dist = ref - shoot;
- if ( dist < 0 )
- dist = -dist;
-
- blue_active[blue] = 0;
-
- if ( FT_MulFix( dist, y_scale ) < 48 )
- {- blue_active[blue] = 1;
- check = 1;
- }
- }
-
- /* return immediately if no blue zone is active */
- if ( !check )
- return;
- }
-
- /* for each horizontal edge search the blue zone which is closest */
- for ( ; edge < edge_limit; edge++ )
- {- AH_Blue blue;
- FT_Pos* best_blue = 0;
- FT_Pos best_dist; /* initial threshold */
-
-
- /* compute the initial threshold as a fraction of the EM size */
- best_dist = FT_MulFix( face_globals->face->units_per_EM / 40, y_scale );
-
-#ifdef FT_CONFIG_CHESTER_SMALL_F
- if ( best_dist > 64 / 2 )
- best_dist = 64 / 2;
-#else
- if ( best_dist > 64 / 4 )
- best_dist = 64 / 4;
-#endif
-
- for ( blue = AH_BLUE_CAPITAL_TOP; blue < AH_BLUE_MAX; blue++ )
- {- /* if it is a top zone, check for right edges -- if it is a bottom */
- /* zone, check for left edges */
- /* */
- /* of course, that's for TrueType XXX */
- FT_Bool is_top_blue =
- FT_BOOL( AH_IS_TOP_BLUE( blue ) );
- FT_Bool is_major_dir =
- FT_BOOL( edge->dir == outline->horz_major_dir );
-
-
- if ( !blue_active[blue] )
- continue;
-
- /* if it is a top zone, the edge must be against the major */
- /* direction; if it is a bottom zone, it must be in the major */
- /* direction */
- if ( is_top_blue ^ is_major_dir )
- {- FT_Pos dist;
- FT_Pos* blue_pos = globals->blue_refs + blue;
-
-
- /* first of all, compare it to the reference position */
- dist = edge->fpos - *blue_pos;
- if ( dist < 0 )
- dist = -dist;
-
- dist = FT_MulFix( dist, y_scale );
- if ( dist < best_dist )
- {- best_dist = dist;
- best_blue = blue_pos;
- }
-
- /* now, compare it to the overshoot position if the edge is */
- /* rounded, and if the edge is over the reference position of a */
- /* top zone, or under the reference position of a bottom zone */
- if ( edge->flags & AH_EDGE_ROUND && dist != 0 )
- {- FT_Bool is_under_ref = FT_BOOL( edge->fpos < *blue_pos );
-
-
- if ( is_top_blue ^ is_under_ref )
- {- blue_pos = globals->blue_shoots + blue;
- dist = edge->fpos - *blue_pos;
- if ( dist < 0 )
- dist = -dist;
-
- dist = FT_MulFix( dist, y_scale );
- if ( dist < best_dist )
- {- best_dist = dist;
- best_blue = blue_pos;
- }
- }
- }
- }
- }
-
- if ( best_blue )
- edge->blue_edge = best_blue;
- }
- }
-
-
- /*************************************************************************/
- /* */
- /* <Function> */
- /* ah_outline_scale_blue_edges */
- /* */
- /* <Description> */
- /* This function must be called before hinting in order to re-adjust */
- /* the contents of the detected edges (basically change the `blue */
- /* edge' pointer from `design units' to `scaled ones'). */
- /* */
- FT_LOCAL_DEF( void )
- ah_outline_scale_blue_edges( AH_Outline outline,
- AH_Face_Globals globals )
- {- AH_Edge edge = outline->horz_edges;
- AH_Edge edge_limit = edge + outline->num_hedges;
- FT_Pos delta;
-
-
- delta = globals->scaled.blue_refs - globals->design.blue_refs;
-
- for ( ; edge < edge_limit; edge++ )
- {- if ( edge->blue_edge )
- edge->blue_edge += delta;
- }
- }
-
-
-/* END */
--- a/src/autohint/ahglyph.h
+++ /dev/null
@@ -1,95 +1,0 @@
-/***************************************************************************/
-/* */
-/* ahglyph.h */
-/* */
-/* Routines used to load and analyze a given glyph before hinting */
-/* (specification). */
-/* */
-/* Copyright 2000-2001, 2002 Catharon Productions Inc. */
-/* Author: David Turner */
-/* */
-/* This file is part of the Catharon Typography Project and shall only */
-/* be used, modified, and distributed under the terms of the Catharon */
-/* Open Source License that should come with this file under the name */
-/* `CatharonLicense.txt'. By continuing to use, modify, or distribute */
-/* this file you indicate that you have read the license and */
-/* understand and accept it fully. */
-/* */
-/* Note that this license is compatible with the FreeType license. */
-/* */
-/***************************************************************************/
-
-
-#ifndef __AHGLYPH_H__
-#define __AHGLYPH_H__
-
-
-#include <ft2build.h>
-#include "ahtypes.h"
-
-
-FT_BEGIN_HEADER
-
-
- typedef enum AH_UV_
- {- AH_UV_FXY,
- AH_UV_FYX,
- AH_UV_OXY,
- AH_UV_OYX,
- AH_UV_OX,
- AH_UV_OY,
- AH_UV_YX,
- AH_UV_XY /* should always be last! */
-
- } AH_UV;
-
-
- FT_LOCAL( void )
- ah_setup_uv( AH_Outline outline,
- AH_UV source );
-
-
- /* AH_OutlineRec functions - they should be typically called in this order */
-
- FT_LOCAL( FT_Error )
- ah_outline_new( FT_Memory memory,
- AH_Outline* aoutline );
-
- FT_LOCAL( FT_Error )
- ah_outline_load( AH_Outline outline,
- FT_Fixed x_scale,
- FT_Fixed y_scale,
- FT_Face face );
-
- FT_LOCAL( void )
- ah_outline_compute_segments( AH_Outline outline );
-
- FT_LOCAL( void )
- ah_outline_link_segments( AH_Outline outline );
-
- FT_LOCAL( void )
- ah_outline_detect_features( AH_Outline outline );
-
- FT_LOCAL( void )
- ah_outline_compute_blue_edges( AH_Outline outline,
- AH_Face_Globals globals );
-
- FT_LOCAL( void )
- ah_outline_scale_blue_edges( AH_Outline outline,
- AH_Face_Globals globals );
-
- FT_LOCAL( void )
- ah_outline_save( AH_Outline outline,
- AH_Loader loader );
-
- FT_LOCAL( void )
- ah_outline_done( AH_Outline outline );
-
-
-FT_END_HEADER
-
-#endif /* __AHGLYPH_H__ */
-
-
-/* END */
--- a/src/autohint/ahhint.c
+++ /dev/null
@@ -1,1937 +1,0 @@
-/***************************************************************************/
-/* */
-/* ahhint.c */
-/* */
-/* Glyph hinter (body). */
-/* */
-/* Copyright 2000-2001, 2002, 2003, 2004 Catharon Productions Inc. */
-/* Author: David Turner */
-/* */
-/* This file is part of the Catharon Typography Project and shall only */
-/* be used, modified, and distributed under the terms of the Catharon */
-/* Open Source License that should come with this file under the name */
-/* `CatharonLicense.txt'. By continuing to use, modify, or distribute */
-/* this file you indicate that you have read the license and */
-/* understand and accept it fully. */
-/* */
-/* Note that this license is compatible with the FreeType license. */
-/* */
-/***************************************************************************/
-
-
-#include <ft2build.h>
-#include "ahhint.h"
-#include "ahglyph.h"
-#include "ahangles.h"
-#include "aherrors.h"
-#include FT_OUTLINE_H
-
-
-#define FACE_GLOBALS( face ) ( (AH_Face_Globals)(face)->autohint.data )
-
-#define AH_USE_IUP
-#define OPTIM_STEM_SNAP
-
-
- /*************************************************************************/
- /*************************************************************************/
- /**** ****/
- /**** Hinting routines ****/
- /**** ****/
- /*************************************************************************/
- /*************************************************************************/
-
- /* snap a given width in scaled coordinates to one of the */
- /* current standard widths */
- static FT_Pos
- ah_snap_width( FT_Pos* widths,
- FT_Int count,
- FT_Pos width )
- {- int n;
- FT_Pos best = 64 + 32 + 2;
- FT_Pos reference = width;
- FT_Pos scaled;
-
-
- for ( n = 0; n < count; n++ )
- {- FT_Pos w;
- FT_Pos dist;
-
-
- w = widths[n];
- dist = width - w;
- if ( dist < 0 )
- dist = -dist;
- if ( dist < best )
- {- best = dist;
- reference = w;
- }
- }
-
- scaled = FT_PIX_ROUND( reference );
-
- if ( width >= reference )
- {- if ( width < scaled + 48 )
- width = reference;
- }
- else
- {- if ( width > scaled - 48 )
- width = reference;
- }
-
- return width;
- }
-
-
- /* compute the snapped width of a given stem */
-
-#ifdef FT_CONFIG_CHESTER_SERIF
-
- static FT_Pos
- ah_compute_stem_width( AH_Hinter hinter,
- int vertical,
- FT_Pos width,
- AH_Edge_Flags base_flags,
- AH_Edge_Flags stem_flags )
- {- AH_Globals globals = &hinter->globals->scaled;
- FT_Pos dist = width;
- FT_Int sign = 0;
-
-
- if ( dist < 0 )
- {- dist = -width;
- sign = 1;
- }
-
- if ( !hinter->do_stem_adjust )
- {- /* leave stem widths unchanged */
- }
- else if ( ( vertical && !hinter->do_vert_snapping ) ||
- ( !vertical && !hinter->do_horz_snapping ) )
- {- /* smooth hinting process: very lightly quantize the stem width */
- /* */
-
- /* leave the widths of serifs alone */
-
- if ( ( stem_flags & AH_EDGE_SERIF ) && vertical && ( dist < 3 * 64 ) )
- goto Done_Width;
-
- else if ( ( base_flags & AH_EDGE_ROUND ) )
- {- if ( dist < 80 )
- dist = 64;
- }
- else if ( dist < 56 )
- dist = 56;
-
- {- FT_Pos delta = dist - globals->stds[vertical];
-
-
- if ( delta < 0 )
- delta = -delta;
-
- if ( delta < 40 )
- {- dist = globals->stds[vertical];
- if ( dist < 48 )
- dist = 48;
-
- goto Done_Width;
- }
-
- if ( dist < 3 * 64 )
- {- delta = dist & 63;
- dist &= -64;
-
- if ( delta < 10 )
- dist += delta;
-
- else if ( delta < 32 )
- dist += 10;
-
- else if ( delta < 54 )
- dist += 54;
-
- else
- dist += delta;
- }
- else
- dist = ( dist + 32 ) & ~63;
- }
- }
- else
- {- /* strong hinting process: snap the stem width to integer pixels */
- /* */
- if ( vertical )
- {- dist = ah_snap_width( globals->heights, globals->num_heights, dist );
-
- /* in the case of vertical hinting, always round */
- /* the stem heights to integer pixels */
- if ( dist >= 64 )
- dist = ( dist + 16 ) & ~63;
- else
- dist = 64;
- }
- else
- {- dist = ah_snap_width( globals->widths, globals->num_widths, dist );
-
- if ( hinter->flags & AH_HINTER_MONOCHROME )
- {- /* monochrome horizontal hinting: snap widths to integer pixels */
- /* with a different threshold */
- if ( dist < 64 )
- dist = 64;
- else
- dist = ( dist + 32 ) & ~63;
- }
- else
- {- /* for horizontal anti-aliased hinting, we adopt a more subtle */
- /* approach: we strengthen small stems, round stems whose size */
- /* is between 1 and 2 pixels to an integer, otherwise nothing */
- if ( dist < 48 )
- dist = ( dist + 64 ) >> 1;
-
- else if ( dist < 128 )
- dist = ( dist + 22 ) & ~63;
- else
- /* XXX: round otherwise to prevent color fringes in LCD mode */
- dist = ( dist + 32 ) & ~63;
- }
- }
- }
-
- Done_Width:
- if ( sign )
- dist = -dist;
-
- return dist;
- }
-
-#else /* !FT_CONFIG_CHESTER_SERIF */
-
- static FT_Pos
- ah_compute_stem_width( AH_Hinter hinter,
- int vertical,
- FT_Pos width )
- {- AH_Globals globals = &hinter->globals->scaled;
- FT_Pos dist = width;
- FT_Int sign = 0;
-
-
- if ( dist < 0 )
- {- dist = -width;
- sign = 1;
- }
-
- if ( !hinter->do_stem_adjust )
- {- /* leave stem widths unchanged */
- }
- else if ( ( vertical && !hinter->do_vert_snapping ) ||
- ( !vertical && !hinter->do_horz_snapping ) )
- {- /* smooth hinting process: very lightly quantize the stem width */
- /* */
- if ( dist < 64 )
- dist = 64;
-
- {- FT_Pos delta = dist - globals->stds[vertical];
-
-
- if ( delta < 0 )
- delta = -delta;
-
- if ( delta < 40 )
- {- dist = globals->stds[vertical];
- if ( dist < 48 )
- dist = 48;
- }
-
- if ( dist < 3 * 64 )
- {- delta = dist & 63;
- dist &= -64;
-
- if ( delta < 10 )
- dist += delta;
-
- else if ( delta < 32 )
- dist += 10;
-
- else if ( delta < 54 )
- dist += 54;
-
- else
- dist += delta;
- }
- else
- dist = ( dist + 32 ) & ~63;
- }
- }
- else
- {- /* strong hinting process: snap the stem width to integer pixels */
- /* */
- if ( vertical )
- {- dist = ah_snap_width( globals->heights, globals->num_heights, dist );
-
- /* in the case of vertical hinting, always round */
- /* the stem heights to integer pixels */
- if ( dist >= 64 )
- dist = ( dist + 16 ) & ~63;
- else
- dist = 64;
- }
- else
- {- dist = ah_snap_width( globals->widths, globals->num_widths, dist );
-
- if ( hinter->flags & AH_HINTER_MONOCHROME )
- {- /* monochrome horizontal hinting: snap widths to integer pixels */
- /* with a different threshold */
- if ( dist < 64 )
- dist = 64;
- else
- dist = ( dist + 32 ) & ~63;
- }
- else
- {- /* for horizontal anti-aliased hinting, we adopt a more subtle */
- /* approach: we strengthen small stems, round stems whose size */
- /* is between 1 and 2 pixels to an integer, otherwise nothing */
- if ( dist < 48 )
- dist = ( dist + 64 ) >> 1;
-
- else if ( dist < 128 )
- dist = ( dist + 22 ) & ~63;
- else
- /* XXX: round otherwise to prevent color fringes in LCD mode */
- dist = ( dist + 32 ) & ~63;
- }
- }
- }
-
- if ( sign )
- dist = -dist;
-
- return dist;
- }
-
-#endif /* !FT_CONFIG_CHESTER_SERIF */
-
-
- /* align one stem edge relative to the previous stem edge */
- static void
- ah_align_linked_edge( AH_Hinter hinter,
- AH_Edge base_edge,
- AH_Edge stem_edge,
- int vertical )
- {- FT_Pos dist = stem_edge->opos - base_edge->opos;
-
-#ifdef FT_CONFIG_CHESTER_SERIF
-
- FT_Pos fitted_width = ah_compute_stem_width( hinter,
- vertical,
- dist,
- base_edge->flags,
- stem_edge->flags );
-
-
- stem_edge->pos = base_edge->pos + fitted_width;
-
-#else
-
- stem_edge->pos = base_edge->pos +
- ah_compute_stem_width( hinter, vertical, dist );
-
-#endif
-
- }
-
-
- static void
- ah_align_serif_edge( AH_Hinter hinter,
- AH_Edge base,
- AH_Edge serif,
- int vertical )
- {- FT_Pos dist;
- FT_Pos sign = 1;
-
- FT_UNUSED( hinter );
- FT_UNUSED( vertical );
-
-
- dist = serif->opos - base->opos;
- if ( dist < 0 )
- {- dist = -dist;
- sign = -1;
- }
-
-#if 0
- /* do not touch serifs widths! */
- if ( base->flags & AH_EDGE_DONE )
- {- if ( dist >= 64 )
- dist = ( dist + 8 ) & ~63;
-
- else if ( dist <= 32 && !vertical )
- dist = ( dist + 33 ) >> 1;
-
- else
- dist = 0;
- }
-#endif
-
- serif->pos = base->pos + sign * dist;
- }
-
-
- /*************************************************************************/
- /*************************************************************************/
- /*************************************************************************/
- /**** ****/
- /**** E D G E H I N T I N G ****/
- /**** ****/
- /*************************************************************************/
- /*************************************************************************/
- /*************************************************************************/
-
-
- FT_LOCAL_DEF( void )
- ah_hinter_hint_edges( AH_Hinter hinter )
- {- AH_Edge edges;
- AH_Edge edge_limit;
- AH_Outline outline = hinter->glyph;
- FT_Int dimension;
- FT_Int n_edges;
-
-
- edges = outline->horz_edges;
- edge_limit = edges + outline->num_hedges;
-
- for ( dimension = 1; dimension >= 0; dimension-- )
- {- AH_Edge edge;
- AH_Edge anchor = 0;
- int has_serifs = 0;
-
-
- if ( !hinter->do_horz_hints && !dimension )
- goto Next_Dimension;
-
- if ( !hinter->do_vert_hints && dimension )
- goto Next_Dimension;
-
- /* we begin by aligning all stems relative to the blue zone */
- /* if needed -- that's only for horizontal edges */
- if ( dimension )
- {- for ( edge = edges; edge < edge_limit; edge++ )
- {- FT_Pos* blue;
- AH_EdgeRec *edge1, *edge2;
-
-
- if ( edge->flags & AH_EDGE_DONE )
- continue;
-
- blue = edge->blue_edge;
- edge1 = 0;
- edge2 = edge->link;
-
- if ( blue )
- {- edge1 = edge;
- }
- else if ( edge2 && edge2->blue_edge )
- {- blue = edge2->blue_edge;
- edge1 = edge2;
- edge2 = edge;
- }
-
- if ( !edge1 )
- continue;
-
- edge1->pos = blue[0];
- edge1->flags |= AH_EDGE_DONE;
-
- if ( edge2 && !edge2->blue_edge )
- {- ah_align_linked_edge( hinter, edge1, edge2, dimension );
- edge2->flags |= AH_EDGE_DONE;
- }
-
- if ( !anchor )
- anchor = edge;
- }
- }
-
- /* now we will align all stem edges, trying to maintain the */
- /* relative order of stems in the glyph */
- for ( edge = edges; edge < edge_limit; edge++ )
- {- AH_EdgeRec* edge2;
-
-
- if ( edge->flags & AH_EDGE_DONE )
- continue;
-
- /* skip all non-stem edges */
- edge2 = edge->link;
- if ( !edge2 )
- {- has_serifs++;
- continue;
- }
-
- /* now align the stem */
-
- /* this should not happen, but it's better to be safe */
- if ( edge2->blue_edge || edge2 < edge )
- {- ah_align_linked_edge( hinter, edge2, edge, dimension );
- edge->flags |= AH_EDGE_DONE;
- continue;
- }
-
- if ( !anchor )
- {-
-#ifdef FT_CONFIG_CHESTER_STEM
-
- FT_Pos org_len, org_center, cur_len;
- FT_Pos cur_pos1, error1, error2, u_off, d_off;
-
-
- org_len = edge2->opos - edge->opos;
- cur_len = ah_compute_stem_width( hinter, dimension, org_len,
- edge->flags, edge2->flags );
-
- if ( cur_len <= 64 )
- u_off = d_off = 32;
- else
- {- u_off = 38;
- d_off = 26;
- }
-
- if ( cur_len < 96 )
- {- org_center = edge->opos + ( org_len >> 1 );
-
- cur_pos1 = FT_PIX_ROUND( org_center );
-
- error1 = org_center - ( cur_pos1 - u_off );
- if ( error1 < 0 )
- error1 = -error1;
-
- error2 = org_center - ( cur_pos1 + d_off );
- if ( error2 < 0 )
- error2 = -error2;
-
- if ( error1 < error2 )
- cur_pos1 -= u_off;
- else
- cur_pos1 += d_off;
-
- edge->pos = cur_pos1 - cur_len / 2;
- edge2->pos = cur_pos1 + cur_len / 2;
-
- }
- else
- edge->pos = FT_PIX_ROUND( edge->opos );
-
- anchor = edge;
-
- edge->flags |= AH_EDGE_DONE;
-
- ah_align_linked_edge( hinter, edge, edge2, dimension );
-
-#else /* !FT_CONFIG_CHESTER_STEM */
-
- edge->pos = FT_PIX_ROUND( edge->opos );
- anchor = edge;
-
- edge->flags |= AH_EDGE_DONE;
-
- ah_align_linked_edge( hinter, edge, edge2, dimension );
-
-#endif /* !FT_CONFIG_CHESTER_STEM */
-
- }
- else
- {- FT_Pos org_pos, org_len, org_center, cur_len;
- FT_Pos cur_pos1, cur_pos2, delta1, delta2;
-
-
- org_pos = anchor->pos + ( edge->opos - anchor->opos );
- org_len = edge2->opos - edge->opos;
- org_center = org_pos + ( org_len >> 1 );
-
-#ifdef FT_CONFIG_CHESTER_SERIF
-
- cur_len = ah_compute_stem_width( hinter, dimension, org_len,
- edge->flags, edge2->flags );
-
-
-#else /* !FT_CONFIG_CHESTER_SERIF */
-
- cur_len = ah_compute_stem_width( hinter, dimension, org_len );
-
-#endif /* !FT_CONFIG_CHESTER_SERIF */
-
-#ifdef FT_CONFIG_CHESTER_STEM
-
- if ( cur_len < 96 )
- {- FT_Pos u_off, d_off;
-
-
- cur_pos1 = FT_PIX_ROUND( org_center );
-
- if (cur_len <= 64 )
- u_off = d_off = 32;
- else
- {- u_off = 38;
- d_off = 26;
- }
-
- delta1 = org_center - ( cur_pos1 - u_off );
- if ( delta1 < 0 )
- delta1 = -delta1;
-
- delta2 = org_center - ( cur_pos1 + d_off );
- if ( delta2 < 0 )
- delta2 = -delta2;
-
- if ( delta1 < delta2 )
- cur_pos1 -= u_off;
- else
- cur_pos1 += d_off;
-
- edge->pos = cur_pos1 - cur_len / 2;
- edge2->pos = cur_pos1 + cur_len / 2;
- }
- else
- {- org_pos = anchor->pos + ( edge->opos - anchor->opos );
- org_len = edge2->opos - edge->opos;
- org_center = org_pos + ( org_len >> 1 );
-
- cur_len = ah_compute_stem_width( hinter, dimension, org_len,
- edge->flags, edge2->flags );
-
- cur_pos1 = FT_PIX_ROUND( org_pos );
- delta1 = ( cur_pos1 + ( cur_len >> 1 ) - org_center );
- if ( delta1 < 0 )
- delta1 = -delta1;
-
- cur_pos2 = FT_PIX_ROUND( org_pos + org_len ) - cur_len;
- delta2 = ( cur_pos2 + ( cur_len >> 1 ) - org_center );
- if ( delta2 < 0 )
- delta2 = -delta2;
-
- edge->pos = ( delta1 < delta2 ) ? cur_pos1 : cur_pos2;
- edge2->pos = edge->pos + cur_len;
- }
-
-#else /* !FT_CONFIG_CHESTER_STEM */
-
- cur_pos1 = FT_PIX_ROUND( org_pos );
- delta1 = ( cur_pos1 + ( cur_len >> 1 ) - org_center );
- if ( delta1 < 0 )
- delta1 = -delta1;
-
- cur_pos2 = FT_PIX_ROUND( org_pos + org_len ) - cur_len;
- delta2 = ( cur_pos2 + ( cur_len >> 1 ) - org_center );
- if ( delta2 < 0 )
- delta2 = -delta2;
-
- edge->pos = ( delta1 <= delta2 ) ? cur_pos1 : cur_pos2;
- edge2->pos = edge->pos + cur_len;
-
-#endif /* !FT_CONFIG_CHESTER_STEM */
-
- edge->flags |= AH_EDGE_DONE;
- edge2->flags |= AH_EDGE_DONE;
-
- if ( edge > edges && edge->pos < edge[-1].pos )
- edge->pos = edge[-1].pos;
- }
- }
-
- /* make sure that lowercase m's maintain their symmetry */
-
- /* In general, lowercase m's have six vertical edges if they are sans */
- /* serif, or twelve if they are avec serif. This implementation is */
- /* based on that assumption, and seems to work very well with most */
- /* faces. However, if for a certain face this assumption is not */
- /* true, the m is just rendered like before. In addition, any stem */
- /* correction will only be applied to symmetrical glyphs (even if the */
- /* glyph is not an m), so the potential for unwanted distortion is */
- /* relatively low. */
-
- /* We don't handle horizontal edges since we can't easily assure that */
- /* the third (lowest) stem aligns with the base line; it might end up */
- /* one pixel higher or lower. */
-
- n_edges = (FT_Int)( edge_limit - edges );
- if ( !dimension && ( n_edges == 6 || n_edges == 12 ) )
- {- AH_EdgeRec *edge1, *edge2, *edge3;
- FT_Pos dist1, dist2, span, delta;
-
-
- if ( n_edges == 6 )
- {- edge1 = edges;
- edge2 = edges + 2;
- edge3 = edges + 4;
- }
- else
- {- edge1 = edges + 1;
- edge2 = edges + 5;
- edge3 = edges + 9;
- }
-
- dist1 = edge2->opos - edge1->opos;
- dist2 = edge3->opos - edge2->opos;
-
- span = dist1 - dist2;
- if ( span < 0 )
- span = -span;
-
- if ( span < 8 )
- {- delta = edge3->pos - ( 2 * edge2->pos - edge1->pos );
- edge3->pos -= delta;
- if ( edge3->link )
- edge3->link->pos -= delta;
-
- /* move the serifs along with the stem */
- if ( n_edges == 12 )
- {- ( edges + 8 )->pos -= delta;
- ( edges + 11 )->pos -= delta;
- }
-
- edge3->flags |= AH_EDGE_DONE;
- if ( edge3->link )
- edge3->link->flags |= AH_EDGE_DONE;
- }
- }
-
- if ( !has_serifs )
- goto Next_Dimension;
-
- /* now hint the remaining edges (serifs and single) in order */
- /* to complete our processing */
- for ( edge = edges; edge < edge_limit; edge++ )
- {- if ( edge->flags & AH_EDGE_DONE )
- continue;
-
- if ( edge->serif )
- ah_align_serif_edge( hinter, edge->serif, edge, dimension );
- else if ( !anchor )
- {- edge->pos = FT_PIX_ROUND( edge->opos );
- anchor = edge;
- }
- else
- edge->pos = anchor->pos +
- FT_PIX_ROUND( edge->opos - anchor->opos );
-
- edge->flags |= AH_EDGE_DONE;
-
- if ( edge > edges && edge->pos < edge[-1].pos )
- edge->pos = edge[-1].pos;
-
- if ( edge + 1 < edge_limit &&
- edge[1].flags & AH_EDGE_DONE &&
- edge->pos > edge[1].pos )
- edge->pos = edge[1].pos;
- }
-
- Next_Dimension:
- edges = outline->vert_edges;
- edge_limit = edges + outline->num_vedges;
- }
- }
-
-
- /*************************************************************************/
- /*************************************************************************/
- /*************************************************************************/
- /**** ****/
- /**** P O I N T H I N T I N G ****/
- /**** ****/
- /*************************************************************************/
- /*************************************************************************/
- /*************************************************************************/
-
- static void
- ah_hinter_align_edge_points( AH_Hinter hinter )
- {- AH_Outline outline = hinter->glyph;
- AH_Edge edges;
- AH_Edge edge_limit;
- FT_Int dimension;
-
-
- edges = outline->horz_edges;
- edge_limit = edges + outline->num_hedges;
-
- for ( dimension = 1; dimension >= 0; dimension-- )
- {- AH_Edge edge;
-
-
- edge = edges;
- for ( ; edge < edge_limit; edge++ )
- {- /* move the points of each segment */
- /* in each edge to the edge's position */
- AH_Segment seg = edge->first;
-
-
- do
- {- AH_Point point = seg->first;
-
-
- for (;;)
- {- if ( dimension )
- {- point->y = edge->pos;
- point->flags |= AH_FLAG_TOUCH_Y;
- }
- else
- {- point->x = edge->pos;
- point->flags |= AH_FLAG_TOUCH_X;
- }
-
- if ( point == seg->last )
- break;
-
- point = point->next;
- }
-
- seg = seg->edge_next;
-
- } while ( seg != edge->first );
- }
-
- edges = outline->vert_edges;
- edge_limit = edges + outline->num_vedges;
- }
- }
-
-
- /* hint the strong points -- this is equivalent to the TrueType `IP' */
- /* hinting instruction */
- static void
- ah_hinter_align_strong_points( AH_Hinter hinter )
- {- AH_Outline outline = hinter->glyph;
- FT_Int dimension;
- AH_Edge edges;
- AH_Edge edge_limit;
- AH_Point points;
- AH_Point point_limit;
- AH_Flags touch_flag;
-
-
- points = outline->points;
- point_limit = points + outline->num_points;
-
- edges = outline->horz_edges;
- edge_limit = edges + outline->num_hedges;
- touch_flag = AH_FLAG_TOUCH_Y;
-
- for ( dimension = 1; dimension >= 0; dimension-- )
- {- AH_Point point;
- AH_Edge edge;
-
-
- if ( edges < edge_limit )
- for ( point = points; point < point_limit; point++ )
- {- FT_Pos u, ou, fu; /* point position */
- FT_Pos delta;
-
-
- if ( point->flags & touch_flag )
- continue;
-
-#ifndef AH_OPTION_NO_WEAK_INTERPOLATION
- /* if this point is candidate to weak interpolation, we will */
- /* interpolate it after all strong points have been processed */
- if ( ( point->flags & AH_FLAG_WEAK_INTERPOLATION ) &&
- !( point->flags & AH_FLAG_INFLECTION ) )
- continue;
-#endif
-
- if ( dimension )
- {- u = point->fy;
- ou = point->oy;
- }
- else
- {- u = point->fx;
- ou = point->ox;
- }
-
- fu = u;
-
- /* is the point before the first edge? */
- edge = edges;
- delta = edge->fpos - u;
- if ( delta >= 0 )
- {- u = edge->pos - ( edge->opos - ou );
- goto Store_Point;
- }
-
- /* is the point after the last edge? */
- edge = edge_limit - 1;
- delta = u - edge->fpos;
- if ( delta >= 0 )
- {- u = edge->pos + ( ou - edge->opos );
- goto Store_Point;
- }
-
-#if 1
- {- FT_UInt min, max, mid;
- FT_Pos fpos;
-
-
- /* find enclosing edges */
- min = 0;
- max = (FT_UInt)( edge_limit - edges );
-
- while ( min < max )
- {- mid = ( max + min ) >> 1;
- edge = edges + mid;
- fpos = edge->fpos;
-
- if ( u < fpos )
- max = mid;
- else if ( u > fpos )
- min = mid + 1;
- else
- {- /* we are on the edge */
- u = edge->pos;
- goto Store_Point;
- }
- }
-
- {- AH_Edge before = edges + min - 1;
- AH_Edge after = edges + min + 0;
-
-
- /* assert( before && after && before != after ) */
- if ( before->scale == 0 )
- before->scale = FT_DivFix( after->pos - before->pos,
- after->fpos - before->fpos );
-
- u = before->pos + FT_MulFix( fu - before->fpos,
- before->scale );
- }
- }
-
-#else /* !0 */
-
- /* otherwise, interpolate the point in between */
- {- AH_Edge before = 0;
- AH_Edge after = 0;
-
-
- for ( edge = edges; edge < edge_limit; edge++ )
- {- if ( u == edge->fpos )
- {- u = edge->pos;
- goto Store_Point;
- }
- if ( u < edge->fpos )
- break;
- before = edge;
- }
-
- for ( edge = edge_limit - 1; edge >= edges; edge-- )
- {- if ( u == edge->fpos )
- {- u = edge->pos;
- goto Store_Point;
- }
- if ( u > edge->fpos )
- break;
- after = edge;
- }
-
- if ( before->scale == 0 )
- before->scale = FT_DivFix( after->pos - before->pos,
- after->fpos - before->fpos );
-
- u = before->pos + FT_MulFix( fu - before->fpos,
- before->scale );
- }
-
-#endif /* !0 */
-
- Store_Point:
-
- /* save the point position */
- if ( dimension )
- point->y = u;
- else
- point->x = u;
-
- point->flags |= touch_flag;
- }
-
- edges = outline->vert_edges;
- edge_limit = edges + outline->num_vedges;
- touch_flag = AH_FLAG_TOUCH_X;
- }
- }
-
-
-#ifndef AH_OPTION_NO_WEAK_INTERPOLATION
-
- static void
- ah_iup_shift( AH_Point p1,
- AH_Point p2,
- AH_Point ref )
- {- AH_Point p;
- FT_Pos delta = ref->u - ref->v;
-
-
- for ( p = p1; p < ref; p++ )
- p->u = p->v + delta;
-
- for ( p = ref + 1; p <= p2; p++ )
- p->u = p->v + delta;
- }
-
-
- static void
- ah_iup_interp( AH_Point p1,
- AH_Point p2,
- AH_Point ref1,
- AH_Point ref2 )
- {- AH_Point p;
- FT_Pos u;
- FT_Pos v1 = ref1->v;
- FT_Pos v2 = ref2->v;
- FT_Pos d1 = ref1->u - v1;
- FT_Pos d2 = ref2->u - v2;
-
-
- if ( p1 > p2 )
- return;
-
- if ( v1 == v2 )
- {- for ( p = p1; p <= p2; p++ )
- {- u = p->v;
-
- if ( u <= v1 )
- u += d1;
- else
- u += d2;
-
- p->u = u;
- }
- return;
- }
-
- if ( v1 < v2 )
- {- for ( p = p1; p <= p2; p++ )
- {- u = p->v;
-
- if ( u <= v1 )
- u += d1;
- else if ( u >= v2 )
- u += d2;
- else
- u = ref1->u + FT_MulDiv( u - v1, ref2->u - ref1->u, v2 - v1 );
-
- p->u = u;
- }
- }
- else
- {- for ( p = p1; p <= p2; p++ )
- {- u = p->v;
-
- if ( u <= v2 )
- u += d2;
- else if ( u >= v1 )
- u += d1;
- else
- u = ref1->u + FT_MulDiv( u - v1, ref2->u - ref1->u, v2 - v1 );
-
- p->u = u;
- }
- }
- }
-
-
- /* interpolate weak points -- this is equivalent to the TrueType `IUP' */
- /* hinting instruction */
- static void
- ah_hinter_align_weak_points( AH_Hinter hinter )
- {- AH_Outline outline = hinter->glyph;
- FT_Int dimension;
- AH_Point points;
- AH_Point point_limit;
- AH_Point* contour_limit;
- AH_Flags touch_flag;
-
-
- points = outline->points;
- point_limit = points + outline->num_points;
-
- /* PASS 1: Move segment points to edge positions */
-
- touch_flag = AH_FLAG_TOUCH_Y;
-
- contour_limit = outline->contours + outline->num_contours;
-
- ah_setup_uv( outline, AH_UV_OY );
-
- for ( dimension = 1; dimension >= 0; dimension-- )
- {- AH_Point point;
- AH_Point end_point;
- AH_Point first_point;
- AH_Point* contour;
-
-
- point = points;
- contour = outline->contours;
-
- for ( ; contour < contour_limit; contour++ )
- {- point = *contour;
- end_point = point->prev;
- first_point = point;
-
- while ( point <= end_point && !( point->flags & touch_flag ) )
- point++;
-
- if ( point <= end_point )
- {- AH_Point first_touched = point;
- AH_Point cur_touched = point;
-
-
- point++;
- while ( point <= end_point )
- {- if ( point->flags & touch_flag )
- {- /* we found two successive touched points; we interpolate */
- /* all contour points between them */
- ah_iup_interp( cur_touched + 1, point - 1,
- cur_touched, point );
- cur_touched = point;
- }
- point++;
- }
-
- if ( cur_touched == first_touched )
- {- /* this is a special case: only one point was touched in the */
- /* contour; we thus simply shift the whole contour */
- ah_iup_shift( first_point, end_point, cur_touched );
- }
- else
- {- /* now interpolate after the last touched point to the end */
- /* of the contour */
- ah_iup_interp( cur_touched + 1, end_point,
- cur_touched, first_touched );
-
- /* if the first contour point isn't touched, interpolate */
- /* from the contour start to the first touched point */
- if ( first_touched > points )
- ah_iup_interp( first_point, first_touched - 1,
- cur_touched, first_touched );
- }
- }
- }
-
- /* now save the interpolated values back to x/y */
- if ( dimension )
- {- for ( point = points; point < point_limit; point++ )
- point->y = point->u;
-
- touch_flag = AH_FLAG_TOUCH_X;
- ah_setup_uv( outline, AH_UV_OX );
- }
- else
- {- for ( point = points; point < point_limit; point++ )
- point->x = point->u;
-
- break; /* exit loop */
- }
- }
- }
-
-#endif /* !AH_OPTION_NO_WEAK_INTERPOLATION */
-
-
- FT_LOCAL_DEF( void )
- ah_hinter_align_points( AH_Hinter hinter )
- {- ah_hinter_align_edge_points( hinter );
-
-#ifndef AH_OPTION_NO_STRONG_INTERPOLATION
- ah_hinter_align_strong_points( hinter );
-#endif
-
-#ifndef AH_OPTION_NO_WEAK_INTERPOLATION
- ah_hinter_align_weak_points( hinter );
-#endif
- }
-
-
- /*************************************************************************/
- /*************************************************************************/
- /*************************************************************************/
- /**** ****/
- /**** H I N T E R O B J E C T M E T H O D S ****/
- /**** ****/
- /*************************************************************************/
- /*************************************************************************/
- /*************************************************************************/
-
-
- /* scale and fit the global metrics */
- static void
- ah_hinter_scale_globals( AH_Hinter hinter,
- FT_Fixed x_scale,
- FT_Fixed y_scale )
- {- FT_Int n;
- AH_Face_Globals globals = hinter->globals;
- AH_Globals design = &globals->design;
- AH_Globals scaled = &globals->scaled;
-
-
- /* copy content */
- *scaled = *design;
-
- /* scale the standard widths & heights */
- for ( n = 0; n < design->num_widths; n++ )
- scaled->widths[n] = FT_MulFix( design->widths[n], x_scale );
-
- for ( n = 0; n < design->num_heights; n++ )
- scaled->heights[n] = FT_MulFix( design->heights[n], y_scale );
-
- scaled->stds[0] = ( design->num_widths > 0 ) ? scaled->widths[0] : 32000;
- scaled->stds[1] = ( design->num_heights > 0 ) ? scaled->heights[0] : 32000;
-
- /* scale the blue zones */
- for ( n = 0; n < AH_BLUE_MAX; n++ )
- {- FT_Pos delta, delta2;
-
-
- delta = design->blue_shoots[n] - design->blue_refs[n];
- delta2 = delta;
- if ( delta < 0 )
- delta2 = -delta2;
- delta2 = FT_MulFix( delta2, y_scale );
-
- if ( delta2 < 32 )
- delta2 = 0;
- else if ( delta2 < 64 )
- delta2 = 32 + ( ( ( delta2 - 32 ) + 16 ) & ~31 );
- else
- delta2 = FT_PIX_ROUND( delta2 );
-
- if ( delta < 0 )
- delta2 = -delta2;
-
- scaled->blue_refs[n] =
- FT_PIX_ROUND( FT_MulFix( design->blue_refs[n], y_scale ) );
-
- scaled->blue_shoots[n] = scaled->blue_refs[n] + delta2;
- }
-
- globals->x_scale = x_scale;
- globals->y_scale = y_scale;
- }
-
-
- static void
- ah_hinter_align( AH_Hinter hinter )
- {- ah_hinter_align_edge_points( hinter );
- ah_hinter_align_points( hinter );
- }
-
-
- /* finalize a hinter object */
- FT_LOCAL_DEF( void )
- ah_hinter_done( AH_Hinter hinter )
- {- if ( hinter )
- {- FT_Memory memory = hinter->memory;
-
-
- ah_loader_done( hinter->loader );
- ah_outline_done( hinter->glyph );
-
- /* note: the `globals' pointer is _not_ owned by the hinter */
- /* but by the current face object; we don't need to */
- /* release it */
- hinter->globals = 0;
- hinter->face = 0;
-
- FT_FREE( hinter );
- }
- }
-
-
- /* create a new empty hinter object */
- FT_LOCAL_DEF( FT_Error )
- ah_hinter_new( FT_Library library,
- AH_Hinter *ahinter )
- {- AH_Hinter hinter = 0;
- FT_Memory memory = library->memory;
- FT_Error error;
-
-
- *ahinter = 0;
-
- /* allocate object */
- if ( FT_NEW( hinter ) )
- goto Exit;
-
- hinter->memory = memory;
- hinter->flags = 0;
-
- /* allocate outline and loader */
- error = ah_outline_new( memory, &hinter->glyph ) ||
- ah_loader_new ( memory, &hinter->loader ) ||
- ah_loader_create_extra( hinter->loader );
- if ( error )
- goto Exit;
-
- *ahinter = hinter;
-
- Exit:
- if ( error )
- ah_hinter_done( hinter );
-
- return error;
- }
-
-
- /* create a face's autohint globals */
- FT_LOCAL_DEF( FT_Error )
- ah_hinter_new_face_globals( AH_Hinter hinter,
- FT_Face face,
- AH_Globals globals )
- {- FT_Error error;
- FT_Memory memory = hinter->memory;
- AH_Face_Globals face_globals;
-
-
- if ( FT_NEW( face_globals ) )
- goto Exit;
-
- hinter->face = face;
- hinter->globals = face_globals;
-
- if ( globals )
- face_globals->design = *globals;
- else
- ah_hinter_compute_globals( hinter );
-
- face->autohint.data = face_globals;
- face->autohint.finalizer = (FT_Generic_Finalizer)
- ah_hinter_done_face_globals;
- face_globals->face = face;
-
- Exit:
- return error;
- }
-
-
- /* discard a face's autohint globals */
- FT_LOCAL_DEF( void )
- ah_hinter_done_face_globals( AH_Face_Globals globals )
- {- FT_Face face = globals->face;
- FT_Memory memory = face->memory;
-
-
- FT_FREE( globals );
- }
-
-
- static FT_Error
- ah_hinter_load( AH_Hinter hinter,
- FT_UInt glyph_index,
- FT_Int32 load_flags,
- FT_UInt depth )
- {- FT_Face face = hinter->face;
- FT_GlyphSlot slot = face->glyph;
- FT_Slot_Internal internal = slot->internal;
- FT_Fixed x_scale = hinter->globals->x_scale;
- FT_Fixed y_scale = hinter->globals->y_scale;
- FT_Error error;
- AH_Outline outline = hinter->glyph;
- AH_Loader gloader = hinter->loader;
-
-
- /* load the glyph */
- error = FT_Load_Glyph( face, glyph_index, load_flags );
- if ( error )
- goto Exit;
-
- /* Set `hinter->transformed' after loading with FT_LOAD_NO_RECURSE. */
- hinter->transformed = internal->glyph_transformed;
-
- if ( hinter->transformed )
- {- FT_Matrix imatrix;
-
-
- imatrix = internal->glyph_matrix;
- hinter->trans_delta = internal->glyph_delta;
- hinter->trans_matrix = imatrix;
-
- FT_Matrix_Invert( &imatrix );
- FT_Vector_Transform( &hinter->trans_delta, &imatrix );
- }
-
- /* set linear horizontal metrics */
- slot->linearHoriAdvance = slot->metrics.horiAdvance;
- slot->linearVertAdvance = slot->metrics.vertAdvance;
-
- switch ( slot->format )
- {- case FT_GLYPH_FORMAT_OUTLINE:
-
- /* translate glyph outline if we need to */
- if ( hinter->transformed )
- {- FT_UInt n = slot->outline.n_points;
- FT_Vector* point = slot->outline.points;
-
-
- for ( ; n > 0; point++, n-- )
- {- point->x += hinter->trans_delta.x;
- point->y += hinter->trans_delta.y;
- }
- }
-
- /* copy the outline points in the loader's current */
- /* extra points which is used to keep original glyph coordinates */
- error = ah_loader_check_points( gloader, slot->outline.n_points + 4,
- slot->outline.n_contours );
- if ( error )
- goto Exit;
-
- FT_ARRAY_COPY( gloader->current.extra_points, slot->outline.points,
- slot->outline.n_points );
-
- FT_ARRAY_COPY( gloader->current.outline.contours, slot->outline.contours,
- slot->outline.n_contours );
-
- FT_ARRAY_COPY( gloader->current.outline.tags, slot->outline.tags,
- slot->outline.n_points );
-
- gloader->current.outline.n_points = slot->outline.n_points;
- gloader->current.outline.n_contours = slot->outline.n_contours;
-
- /* compute original horizontal phantom points, ignoring vertical ones */
- hinter->pp1.x = 0;
- hinter->pp1.y = 0;
- hinter->pp2.x = FT_MulFix( slot->metrics.horiAdvance, x_scale );
- hinter->pp2.y = 0;
-
- /* be sure to check for spacing glyphs */
- if ( slot->outline.n_points == 0 )
- goto Hint_Metrics;
-
- /* now load the slot image into the auto-outline and run the */
- /* automatic hinting process */
- error = ah_outline_load( outline, x_scale, y_scale, face );
- if ( error )
- goto Exit;
-
- /* perform feature detection */
- ah_outline_detect_features( outline );
-
- if ( hinter->do_vert_hints )
- {- ah_outline_compute_blue_edges( outline, hinter->globals );
- ah_outline_scale_blue_edges( outline, hinter->globals );
- }
-
- /* perform alignment control */
- ah_hinter_hint_edges( hinter );
- ah_hinter_align( hinter );
-
- /* now save the current outline into the loader's current table */
- ah_outline_save( outline, gloader );
-
- /* we now need to hint the metrics according to the change in */
- /* width/positioning that occurred during the hinting process */
- if ( outline->num_vedges > 0 )
- {- FT_Pos old_advance, old_rsb, old_lsb, new_lsb, pp1x_uh, pp2x_uh;
- AH_Edge edge1 = outline->vert_edges; /* leftmost edge */
- AH_Edge edge2 = edge1 +
- outline->num_vedges - 1; /* rightmost edge */
-
-
- old_advance = hinter->pp2.x;
- old_rsb = old_advance - edge2->opos;
- old_lsb = edge1->opos;
- new_lsb = edge1->pos;
-
- /* remember unhinted values to later account for rounding errors */
-
- pp1x_uh = new_lsb - old_lsb;
- pp2x_uh = edge2->pos + old_rsb;
-
- /* prefer too much space over too little space for very small sizes */
-
- if ( old_lsb < 24 )
- pp1x_uh -= 5;
-
- if ( old_rsb < 24 )
- pp2x_uh += 5;
-
- hinter->pp1.x = FT_PIX_ROUND( pp1x_uh );
- hinter->pp2.x = FT_PIX_ROUND( pp2x_uh );
-
- slot->lsb_delta = hinter->pp1.x - pp1x_uh;
- slot->rsb_delta = hinter->pp2.x - pp2x_uh;
-
-#if 0
- /* try to fix certain bad advance computations */
- if ( hinter->pp2.x + hinter->pp1.x == edge2->pos && old_rsb > 4 )
- hinter->pp2.x += 64;
-#endif
- }
-
- else
- {- hinter->pp1.x = ( hinter->pp1.x + 32 ) & -64;
- hinter->pp2.x = ( hinter->pp2.x + 32 ) & -64;
- }
-
- /* good, we simply add the glyph to our loader's base */
- ah_loader_add( gloader );
- break;
-
- case FT_GLYPH_FORMAT_COMPOSITE:
- {- FT_UInt nn, num_subglyphs = slot->num_subglyphs;
- FT_UInt num_base_subgs, start_point;
- FT_SubGlyph subglyph;
-
-
- start_point = gloader->base.outline.n_points;
-
- /* first of all, copy the subglyph descriptors in the glyph loader */
- error = ah_loader_check_subglyphs( gloader, num_subglyphs );
- if ( error )
- goto Exit;
-
- FT_ARRAY_COPY( gloader->current.subglyphs, slot->subglyphs,
- num_subglyphs );
-
- gloader->current.num_subglyphs = num_subglyphs;
- num_base_subgs = gloader->base.num_subglyphs;
-
- /* now, read each subglyph independently */
- for ( nn = 0; nn < num_subglyphs; nn++ )
- {- FT_Vector pp1, pp2;
- FT_Pos x, y;
- FT_UInt num_points, num_new_points, num_base_points;
-
-
- /* gloader.current.subglyphs can change during glyph loading due */
- /* to re-allocation -- we must recompute the current subglyph on */
- /* each iteration */
- subglyph = gloader->base.subglyphs + num_base_subgs + nn;
-
- pp1 = hinter->pp1;
- pp2 = hinter->pp2;
-
- num_base_points = gloader->base.outline.n_points;
-
- error = ah_hinter_load( hinter, subglyph->index,
- load_flags, depth + 1 );
- if ( error )
- goto Exit;
-
- /* recompute subglyph pointer */
- subglyph = gloader->base.subglyphs + num_base_subgs + nn;
-
- if ( subglyph->flags & FT_SUBGLYPH_FLAG_USE_MY_METRICS )
- {- pp1 = hinter->pp1;
- pp2 = hinter->pp2;
- }
- else
- {- hinter->pp1 = pp1;
- hinter->pp2 = pp2;
- }
-
- num_points = gloader->base.outline.n_points;
- num_new_points = num_points - num_base_points;
-
- /* now perform the transform required for this subglyph */
-
- if ( subglyph->flags & ( FT_SUBGLYPH_FLAG_SCALE |
- FT_SUBGLYPH_FLAG_XY_SCALE |
- FT_SUBGLYPH_FLAG_2X2 ) )
- {- FT_Vector* cur = gloader->base.outline.points +
- num_base_points;
- FT_Vector* org = gloader->base.extra_points +
- num_base_points;
- FT_Vector* limit = cur + num_new_points;
-
-
- for ( ; cur < limit; cur++, org++ )
- {- FT_Vector_Transform( cur, &subglyph->transform );
- FT_Vector_Transform( org, &subglyph->transform );
- }
- }
-
- /* apply offset */
-
- if ( !( subglyph->flags & FT_SUBGLYPH_FLAG_ARGS_ARE_XY_VALUES ) )
- {- FT_Int k = subglyph->arg1;
- FT_UInt l = subglyph->arg2;
- FT_Vector* p1;
- FT_Vector* p2;
-
-
- if ( start_point + k >= num_base_points ||
- l >= (FT_UInt)num_new_points )
- {- error = AH_Err_Invalid_Composite;
- goto Exit;
- }
-
- l += num_base_points;
-
- /* for now, only use the current point coordinates; */
- /* we may consider another approach in the near future */
- p1 = gloader->base.outline.points + start_point + k;
- p2 = gloader->base.outline.points + start_point + l;
-
- x = p1->x - p2->x;
- y = p1->y - p2->y;
- }
- else
- {- x = FT_MulFix( subglyph->arg1, x_scale );
- y = FT_MulFix( subglyph->arg2, y_scale );
-
- x = FT_PIX_ROUND(x);
- y = FT_PIX_ROUND(y);
- }
-
- {- FT_Outline dummy = gloader->base.outline;
-
-
- dummy.points += num_base_points;
- dummy.n_points = (short)num_new_points;
-
- FT_Outline_Translate( &dummy, x, y );
- }
- }
- }
- break;
-
- default:
- /* we don't support other formats (yet?) */
- error = AH_Err_Unimplemented_Feature;
- }
-
- Hint_Metrics:
- if ( depth == 0 )
- {- FT_BBox bbox;
-
-
- /* transform the hinted outline if needed */
- if ( hinter->transformed )
- FT_Outline_Transform( &gloader->base.outline, &hinter->trans_matrix );
-
- /* we must translate our final outline by -pp1.x and compute */
- /* the new metrics */
- if ( hinter->pp1.x )
- FT_Outline_Translate( &gloader->base.outline, -hinter->pp1.x, 0 );
-
- FT_Outline_Get_CBox( &gloader->base.outline, &bbox );
- bbox.xMin = FT_PIX_FLOOR( bbox.xMin );
- bbox.yMin = FT_PIX_FLOOR( bbox.yMin );
- bbox.xMax = FT_PIX_CEIL( bbox.xMax );
- bbox.yMax = FT_PIX_CEIL( bbox.yMax );
-
- slot->metrics.width = bbox.xMax - bbox.xMin;
- slot->metrics.height = bbox.yMax - bbox.yMin;
- 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 width */
- if ( !FT_IS_FIXED_WIDTH( slot->face ) )
- slot->metrics.horiAdvance = hinter->pp2.x - hinter->pp1.x;
- else
- slot->metrics.horiAdvance = FT_MulFix( slot->metrics.horiAdvance,
- x_scale );
-
- slot->metrics.horiAdvance = FT_PIX_ROUND( slot->metrics.horiAdvance );
-
- /* now copy outline into glyph slot */
- ah_loader_rewind( slot->internal->loader );
- error = ah_loader_copy_points( slot->internal->loader, gloader );
- if ( error )
- goto Exit;
-
- slot->outline = slot->internal->loader->base.outline;
- slot->format = FT_GLYPH_FORMAT_OUTLINE;
- }
-
-#ifdef DEBUG_HINTER
- ah_debug_hinter = hinter;
-#endif
-
- Exit:
- return error;
- }
-
-
- /* load and hint a given glyph */
- FT_LOCAL_DEF( FT_Error )
- ah_hinter_load_glyph( AH_Hinter hinter,
- FT_GlyphSlot slot,
- FT_Size size,
- FT_UInt glyph_index,
- FT_Int32 load_flags )
- {- FT_Face face = slot->face;
- FT_Error error;
- FT_Fixed x_scale = size->metrics.x_scale;
- FT_Fixed y_scale = size->metrics.y_scale;
- AH_Face_Globals face_globals = FACE_GLOBALS( face );
- FT_Render_Mode hint_mode = FT_LOAD_TARGET_MODE( load_flags );
-
-
- /* first of all, we need to check that we're using the correct face and */
- /* global hints to load the glyph */
- if ( hinter->face != face || hinter->globals != face_globals )
- {- hinter->face = face;
- if ( !face_globals )
- {- error = ah_hinter_new_face_globals( hinter, face, 0 );
- if ( error )
- goto Exit;
-
- }
- hinter->globals = FACE_GLOBALS( face );
- face_globals = FACE_GLOBALS( face );
-
- }
-
-#ifdef FT_CONFIG_CHESTER_BLUE_SCALE
-
- /* try to optimize the y_scale so that the top of non-capital letters
- * is aligned on a pixel boundary whenever possible
- */
- {- AH_Globals design = &face_globals->design;
- FT_Pos shoot = design->blue_shoots[AH_BLUE_SMALL_TOP];
-
-
- /* the value of 'shoot' will be -1000 if the font doesn't have */
- /* small latin letters; we simply check the sign here... */
- if ( shoot > 0 )
- {- FT_Pos scaled = FT_MulFix( shoot, y_scale );
- FT_Pos fitted = FT_PIX_ROUND( scaled );
-
-
- if ( scaled != fitted )
- {- /* adjust y_scale
- */
- y_scale = FT_MulDiv( y_scale, fitted, scaled );
-
- /* adust x_scale
- */
- if ( fitted < scaled )
- x_scale -= x_scale / 50; /* x_scale*0.98 with integers */
- }
- }
- }
-
-#endif /* FT_CONFIG_CHESTER_BLUE_SCALE */
-
- /* now, we must check the current character pixel size to see if we */
- /* need to rescale the global metrics */
- if ( face_globals->x_scale != x_scale ||
- face_globals->y_scale != y_scale )
- ah_hinter_scale_globals( hinter, x_scale, y_scale );
-
- ah_loader_rewind( hinter->loader );
-
- /* reset hinting flags according to load flags and current render target */
- hinter->do_horz_hints = FT_BOOL( !(load_flags & FT_LOAD_NO_AUTOHINT) );
- hinter->do_vert_hints = FT_BOOL( !(load_flags & FT_LOAD_NO_AUTOHINT) );
-
-#ifdef DEBUG_HINTER
- hinter->do_horz_hints = !ah_debug_disable_vert; /* not a bug, the meaning */
- hinter->do_vert_hints = !ah_debug_disable_horz; /* of h/v is inverted! */
-#endif
-
- /* we snap the width of vertical stems for the monochrome and */
- /* horizontal LCD rendering targets only. Corresponds to X snapping. */
- hinter->do_horz_snapping = FT_BOOL( hint_mode == FT_RENDER_MODE_MONO ||
- hint_mode == FT_RENDER_MODE_LCD );
-
- /* we snap the width of horizontal stems for the monochrome and */
- /* vertical LCD rendering targets only. Corresponds to Y snapping. */
- hinter->do_vert_snapping = FT_BOOL( hint_mode == FT_RENDER_MODE_MONO ||
- hint_mode == FT_RENDER_MODE_LCD_V );
-
- hinter->do_stem_adjust = FT_BOOL( hint_mode != FT_RENDER_MODE_LIGHT );
-
- load_flags |= FT_LOAD_NO_SCALE
- | FT_LOAD_IGNORE_TRANSFORM;
- load_flags &= ~FT_LOAD_RENDER;
-
- error = ah_hinter_load( hinter, glyph_index, load_flags, 0 );
-
- Exit:
- return error;
- }
-
-
- /* retrieve a face's autohint globals for client applications */
- FT_LOCAL_DEF( void )
- ah_hinter_get_global_hints( AH_Hinter hinter,
- FT_Face face,
- void** global_hints,
- long* global_len )
- {- AH_Globals globals = 0;
- FT_Memory memory = hinter->memory;
- FT_Error error;
-
-
- /* allocate new master globals */
- if ( FT_NEW( globals ) )
- goto Fail;
-
- /* compute face globals if needed */
- if ( !FACE_GLOBALS( face ) )
- {- error = ah_hinter_new_face_globals( hinter, face, 0 );
- if ( error )
- goto Fail;
- }
-
- *globals = FACE_GLOBALS( face )->design;
- *global_hints = globals;
- *global_len = sizeof( *globals );
-
- return;
-
- Fail:
- FT_FREE( globals );
-
- *global_hints = 0;
- *global_len = 0;
- }
-
-
- FT_LOCAL_DEF( void )
- ah_hinter_done_global_hints( AH_Hinter hinter,
- void* global_hints )
- {- FT_Memory memory = hinter->memory;
-
-
- FT_FREE( global_hints );
- }
-
-
-/* END */
--- a/src/autohint/ahhint.h
+++ /dev/null
@@ -1,75 +1,0 @@
-/***************************************************************************/
-/* */
-/* ahhint.h */
-/* */
-/* Glyph hinter (declaration). */
-/* */
-/* Copyright 2000-2001, 2002 Catharon Productions Inc. */
-/* Author: David Turner */
-/* */
-/* This file is part of the Catharon Typography Project and shall only */
-/* be used, modified, and distributed under the terms of the Catharon */
-/* Open Source License that should come with this file under the name */
-/* `CatharonLicense.txt'. By continuing to use, modify, or distribute */
-/* this file you indicate that you have read the license and */
-/* understand and accept it fully. */
-/* */
-/* Note that this license is compatible with the FreeType license. */
-/* */
-/***************************************************************************/
-
-
-#ifndef __AHHINT_H__
-#define __AHHINT_H__
-
-
-#include <ft2build.h>
-#include "ahglobal.h"
-
-
-FT_BEGIN_HEADER
-
-
-#define AH_HINT_DEFAULT 0
-#define AH_HINT_NO_ALIGNMENT 1
-#define AH_HINT_NO_HORZ_EDGES 0x200000L /* temporary hack */
-#define AH_HINT_NO_VERT_EDGES 0x400000L /* temporary hack */
-
-
- /* create a new empty hinter object */
- FT_LOCAL( FT_Error )
- ah_hinter_new( FT_Library library,
- AH_Hinter* ahinter );
-
- /* Load a hinted glyph in the hinter */
- FT_LOCAL( FT_Error )
- ah_hinter_load_glyph( AH_Hinter hinter,
- FT_GlyphSlot slot,
- FT_Size size,
- FT_UInt glyph_index,
- FT_Int32 load_flags );
-
- /* finalize a hinter object */
- FT_LOCAL( void )
- ah_hinter_done( AH_Hinter hinter );
-
- FT_LOCAL( void )
- ah_hinter_done_face_globals( AH_Face_Globals globals );
-
- FT_LOCAL( void )
- ah_hinter_get_global_hints( AH_Hinter hinter,
- FT_Face face,
- void** global_hints,
- long* global_len );
-
- FT_LOCAL( void )
- ah_hinter_done_global_hints( AH_Hinter hinter,
- void* global_hints );
-
-
-FT_END_HEADER
-
-#endif /* __AHHINT_H__ */
-
-
-/* END */
--- a/src/autohint/ahloader.h
+++ /dev/null
@@ -1,61 +1,0 @@
-/***************************************************************************/
-/* */
-/* ahloader.h */
-/* */
-/* Glyph loader for the auto-hinting module (declaration only). */
-/* */
-/* Copyright 2000-2001, 2002 Catharon Productions Inc. */
-/* Author: David Turner */
-/* */
-/* This file is part of the Catharon Typography Project and shall only */
-/* be used, modified, and distributed under the terms of the Catharon */
-/* Open Source License that should come with this file under the name */
-/* `CatharonLicense.txt'. By continuing to use, modify, or distribute */
-/* this file you indicate that you have read the license and */
-/* understand and accept it fully. */
-/* */
-/* Note that this license is compatible with the FreeType license. */
-/* */
-/***************************************************************************/
-
-
- /*************************************************************************/
- /* */
- /* This defines the AH_GlyphLoader type; it is simply a typedef to */
- /* FT_GlyphLoader. */
- /* */
- /*************************************************************************/
-
-
-#ifndef __AHLOADER_H__
-#define __AHLOADER_H__
-
-
-#include <ft2build.h>
-
-
-FT_BEGIN_HEADER
-
-#include FT_INTERNAL_GLYPH_LOADER_H
-
- #define AH_Load FT_GlyphLoad
- #define AH_Loader FT_GlyphLoader
-
- #define ah_loader_new FT_GlyphLoader_New
- #define ah_loader_done FT_GlyphLoader_Done
- #define ah_loader_reset FT_GlyphLoader_Reset
- #define ah_loader_rewind FT_GlyphLoader_Rewind
- #define ah_loader_create_extra FT_GlyphLoader_CreateExtra
- #define ah_loader_check_points FT_GlyphLoader_CheckPoints
- #define ah_loader_check_subglyphs FT_GlyphLoader_CheckSubGlyphs
- #define ah_loader_prepare FT_GlyphLoader_Prepare
- #define ah_loader_add FT_GlyphLoader_Add
- #define ah_loader_copy_points FT_GlyphLoader_CopyPoints
-
-
-FT_END_HEADER
-
-#endif /* __AHLOADER_H__ */
-
-
-/* END */
--- a/src/autohint/ahmodule.c
+++ /dev/null
@@ -1,143 +1,0 @@
-/***************************************************************************/
-/* */
-/* ahmodule.c */
-/* */
-/* Auto-hinting module implementation (declaration). */
-/* */
-/* Copyright 2000-2001, 2002, 2003, 2004 Catharon Productions Inc. */
-/* Author: David Turner */
-/* */
-/* This file is part of the Catharon Typography Project and shall only */
-/* be used, modified, and distributed under the terms of the Catharon */
-/* Open Source License that should come with this file under the name */
-/* `CatharonLicense.txt'. By continuing to use, modify, or distribute */
-/* this file you indicate that you have read the license and */
-/* understand and accept it fully. */
-/* */
-/* Note that this license is compatible with the FreeType license. */
-/* */
-/***************************************************************************/
-
-
-#include <ft2build.h>
-#include FT_MODULE_H
-#include "ahhint.h"
-
-
-#ifdef DEBUG_HINTER
- AH_Hinter ah_debug_hinter = NULL;
- FT_Bool ah_debug_disable_horz = 0;
- FT_Bool ah_debug_disable_vert = 0;
-#endif
-
- typedef struct FT_AutoHinterRec_
- {- FT_ModuleRec root;
- AH_Hinter hinter;
-
- } FT_AutoHinterRec;
-
-
- FT_CALLBACK_DEF( FT_Error )
- ft_autohinter_init( FT_Module module ) /* FT_AutoHinter */
- {- FT_AutoHinter autohinter = (FT_AutoHinter)module;
- FT_Error error;
-
-
- error = ah_hinter_new( module->library, &autohinter->hinter );
-
-#ifdef DEBUG_HINTER
- if ( !error )
- ah_debug_hinter = autohinter->hinter;
-#endif
-
- return error;
- }
-
-
- FT_CALLBACK_DEF( void )
- ft_autohinter_done( FT_Module module )
- {- FT_AutoHinter autohinter = (FT_AutoHinter)module;
-
-
- ah_hinter_done( autohinter->hinter );
-
-#ifdef DEBUG_HINTER
- ah_debug_hinter = NULL;
-#endif
- }
-
-
- FT_CALLBACK_DEF( FT_Error )
- ft_autohinter_load_glyph( FT_AutoHinter module,
- FT_GlyphSlot slot,
- FT_Size size,
- FT_UInt glyph_index,
- FT_Int32 load_flags )
- {- return ah_hinter_load_glyph( module->hinter,
- slot, size, glyph_index, load_flags );
- }
-
-
- FT_CALLBACK_DEF( void )
- ft_autohinter_reset_globals( FT_AutoHinter module,
- FT_Face face )
- {- FT_UNUSED( module );
-
- if ( face->autohint.data )
- ah_hinter_done_face_globals( (AH_Face_Globals)(face->autohint.data) );
- }
-
-
- FT_CALLBACK_DEF( void )
- ft_autohinter_get_globals( FT_AutoHinter module,
- FT_Face face,
- void** global_hints,
- long* global_len )
- {- ah_hinter_get_global_hints( module->hinter, face,
- global_hints, global_len );
- }
-
-
- FT_CALLBACK_DEF( void )
- ft_autohinter_done_globals( FT_AutoHinter module,
- void* global_hints )
- {- ah_hinter_done_global_hints( module->hinter, global_hints );
- }
-
-
- FT_CALLBACK_TABLE_DEF
- const FT_AutoHinter_ServiceRec ft_autohinter_service =
- {- ft_autohinter_reset_globals,
- ft_autohinter_get_globals,
- ft_autohinter_done_globals,
- ft_autohinter_load_glyph
- };
-
-
- FT_CALLBACK_TABLE_DEF
- const FT_Module_Class autohint_module_class =
- {- FT_MODULE_HINTER,
- sizeof ( FT_AutoHinterRec ),
-
- "autohinter",
- 0x10000L, /* version 1.0 of the autohinter */
- 0x20000L, /* requires FreeType 2.0 or above */
-
- (const void*) &ft_autohinter_service,
-
- ft_autohinter_init,
- ft_autohinter_done,
- 0 /* FT_Module_Requester */
- };
-
-
-/* END */
--- a/src/autohint/ahmodule.h
+++ /dev/null
@@ -1,42 +1,0 @@
-/***************************************************************************/
-/* */
-/* ahmodule.h */
-/* */
-/* Auto-hinting module (declaration). */
-/* */
-/* Copyright 2000-2001 Catharon Productions Inc. */
-/* Author: David Turner */
-/* */
-/* This file is part of the Catharon Typography Project and shall only */
-/* be used, modified, and distributed under the terms of the Catharon */
-/* Open Source License that should come with this file under the name */
-/* `CatharonLicense.txt'. By continuing to use, modify, or distribute */
-/* this file you indicate that you have read the license and */
-/* understand and accept it fully. */
-/* */
-/* Note that this license is compatible with the FreeType license. */
-/* */
-/***************************************************************************/
-
-
-#ifndef __AHMODULE_H__
-#define __AHMODULE_H__
-
-
-#include <ft2build.h>
-#include FT_MODULE_H
-
-
-FT_BEGIN_HEADER
-
-
- FT_CALLBACK_TABLE
- const FT_Module_Class autohint_module_class;
-
-
-FT_END_HEADER
-
-#endif /* __AHMODULE_H__ */
-
-
-/* END */
--- a/src/autohint/ahtypes.h
+++ /dev/null
@@ -1,527 +1,0 @@
-/***************************************************************************/
-/* */
-/* ahtypes.h */
-/* */
-/* General types and definitions for the auto-hint module */
-/* (specification only). */
-/* */
-/* Copyright 2000-2001, 2002, 2003, 2004 Catharon Productions Inc. */
-/* Author: David Turner */
-/* */
-/* This file is part of the Catharon Typography Project and shall only */
-/* be used, modified, and distributed under the terms of the Catharon */
-/* Open Source License that should come with this file under the name */
-/* `CatharonLicense.txt'. By continuing to use, modify, or distribute */
-/* this file you indicate that you have read the license and */
-/* understand and accept it fully. */
-/* */
-/* Note that this license is compatible with the FreeType license. */
-/* */
-/***************************************************************************/
-
-
-#ifndef __AHTYPES_H__
-#define __AHTYPES_H__
-
-
-#include <ft2build.h>
-#include FT_INTERNAL_OBJECTS_H
-
-#ifdef DEBUG_HINTER
-#include <../src/autohint/ahloader.h>
-#else
-#include "ahloader.h"
-#endif
-
-
-#define xxAH_DEBUG
-
-
-#ifdef AH_DEBUG
-
-#include <stdio.h>
-#define AH_LOG( x ) printf ## x
-
-#else
-
-#define AH_LOG( x ) do ; while ( 0 ) /* nothing */
-
-#endif /* AH_DEBUG */
-
-
-FT_BEGIN_HEADER
-
-
- /*************************************************************************/
- /*************************************************************************/
- /*************************************************************************/
- /**** ****/
- /**** COMPILE-TIME BUILD OPTIONS ****/
- /**** ****/
- /**** Toggle these configuration macros to experiment with `features' ****/
- /**** of the auto-hinter. ****/
- /**** ****/
- /*************************************************************************/
- /*************************************************************************/
- /*************************************************************************/
-
-
- /*************************************************************************/
- /* */
- /* If this option is defined, only strong interpolation will be used to */
- /* place the points between edges. Otherwise, `smooth' points are */
- /* detected and later hinted through weak interpolation to correct some */
- /* unpleasant artefacts. */
- /* */
-#undef AH_OPTION_NO_WEAK_INTERPOLATION
-
-
- /*************************************************************************/
- /* */
- /* Undefine this macro if you don't want to hint the metrics. There is */
- /* no reason to do this (at least for non-CJK scripts), except for */
- /* experimentation. */
- /* */
-#undef AH_HINT_METRICS
-
-
- /*************************************************************************/
- /* */
- /* Define this macro if you do not want to insert extra edges at a */
- /* glyph's x and y extremum (if there isn't one already available). */
- /* This helps to reduce a number of artefacts and allows hinting of */
- /* metrics. */
- /* */
-#undef AH_OPTION_NO_EXTREMUM_EDGES
-
-
- /* don't touch for now */
-#define AH_MAX_WIDTHS 12
-#define AH_MAX_HEIGHTS 12
-
-
- /*************************************************************************/
- /*************************************************************************/
- /*************************************************************************/
- /**** ****/
- /**** TYPE DEFINITIONS ****/
- /**** ****/
- /*************************************************************************/
- /*************************************************************************/
- /*************************************************************************/
-
-
- /* see ahangles.h */
- typedef FT_Int AH_Angle;
-
-
- /* hint flags */
-#define AH_FLAG_NONE 0
-
- /* bezier control points flags */
-#define AH_FLAG_CONIC 1
-#define AH_FLAG_CUBIC 2
-#define AH_FLAG_CONTROL ( AH_FLAG_CONIC | AH_FLAG_CUBIC )
-
- /* extrema flags */
-#define AH_FLAG_EXTREMA_X 4
-#define AH_FLAG_EXTREMA_Y 8
-
- /* roundness */
-#define AH_FLAG_ROUND_X 16
-#define AH_FLAG_ROUND_Y 32
-
- /* touched */
-#define AH_FLAG_TOUCH_X 64
-#define AH_FLAG_TOUCH_Y 128
-
- /* weak interpolation */
-#define AH_FLAG_WEAK_INTERPOLATION 256
-#define AH_FLAG_INFLECTION 512
-
- typedef FT_Int AH_Flags;
-
-
- /* edge hint flags */
-#define AH_EDGE_NORMAL 0
-#define AH_EDGE_ROUND 1
-#define AH_EDGE_SERIF 2
-#define AH_EDGE_DONE 4
-
- typedef FT_Int AH_Edge_Flags;
-
-
- /* hint directions -- the values are computed so that two vectors are */
- /* in opposite directions iff `dir1+dir2 == 0' */
-#define AH_DIR_NONE 4
-#define AH_DIR_RIGHT 1
-#define AH_DIR_LEFT -1
-#define AH_DIR_UP 2
-#define AH_DIR_DOWN -2
-
- typedef FT_Int AH_Direction;
-
-
- typedef struct AH_PointRec_* AH_Point;
- typedef struct AH_SegmentRec_* AH_Segment;
- typedef struct AH_EdgeRec_* AH_Edge;
-
-
- /*************************************************************************/
- /* */
- /* <Struct> */
- /* AH_PointRec */
- /* */
- /* <Description> */
- /* A structure used to model an outline point to the AH_OutlineRec */
- /* type. */
- /* */
- /* <Fields> */
- /* flags :: The current point hint flags. */
- /* */
- /* ox, oy :: The current original scaled coordinates. */
- /* */
- /* fx, fy :: The current coordinates in font units. */
- /* */
- /* x, y :: The current hinted coordinates. */
- /* */
- /* u, v :: Point coordinates -- meaning varies with context. */
- /* */
- /* in_dir :: The direction of the inwards vector (prev->point). */
- /* */
- /* out_dir :: The direction of the outwards vector (point->next). */
- /* */
- /* next :: The next point in same contour. */
- /* */
- /* prev :: The previous point in same contour. */
- /* */
- typedef struct AH_PointRec_
- {- AH_Flags flags; /* point flags used by hinter */
- FT_Pos ox, oy;
- FT_Pos fx, fy;
- FT_Pos x, y;
- FT_Pos u, v;
-
- AH_Direction in_dir; /* direction of inwards vector */
- AH_Direction out_dir; /* direction of outwards vector */
-
- AH_Point next; /* next point in contour */
- AH_Point prev; /* previous point in contour */
-
- } AH_PointRec;
-
-
- /*************************************************************************/
- /* */
- /* <Struct> */
- /* AH_SegmentRec */
- /* */
- /* <Description> */
- /* A structure used to describe an edge segment to the auto-hinter. */
- /* A segment is simply a sequence of successive points located on the */
- /* same horizontal or vertical `position', in a given direction. */
- /* */
- /* <Fields> */
- /* flags :: The segment edge flags (straight, rounded, etc.). */
- /* */
- /* dir :: The segment direction. */
- /* */
- /* min_coord :: The minimum coordinate of the segment. */
- /* */
- /* max_coord :: The maximum coordinate of the segment. */
- /* */
- /* edge :: The edge of the current segment. */
- /* */
- /* edge_next :: The next segment on the same edge. */
- /* */
- /* link :: The pairing segment for this edge. */
- /* */
- /* serif :: The primary segment for serifs. */
- /* */
- /* num_linked :: The number of other segments that link to this one. */
- /* */
- /* score :: Used to score the segment when selecting them. */
- /* */
- /* first :: The first point in the segment. */
- /* */
- /* last :: The last point in the segment. */
- /* */
- /* contour :: A pointer to the first point of the segment's */
- /* contour. */
- /* */
- typedef struct AH_SegmentRec_
- {- AH_Edge_Flags flags;
- AH_Direction dir;
- FT_Pos pos; /* position of segment */
- FT_Pos min_coord; /* minimum coordinate of segment */
- FT_Pos max_coord; /* maximum coordinate of segment */
-
- AH_Edge edge;
- AH_Segment edge_next;
-
- AH_Segment link; /* link segment */
- AH_Segment serif; /* primary segment for serifs */
- FT_Pos num_linked; /* number of linked segments */
- FT_Pos score;
-
- AH_Point first; /* first point in edge segment */
- AH_Point last; /* last point in edge segment */
- AH_Point* contour; /* ptr to first point of segment's contour */
-
- } AH_SegmentRec;
-
-
- /*************************************************************************/
- /* */
- /* <Struct> */
- /* AH_EdgeRec */
- /* */
- /* <Description> */
- /* A structure used to describe an edge, which really is a horizontal */
- /* or vertical coordinate to be hinted depending on the segments */
- /* located on it. */
- /* */
- /* <Fields> */
- /* fpos :: The original edge position in font units. */
- /* */
- /* opos :: The original scaled edge position. */
- /* */
- /* pos :: The hinted edge position. */
- /* */
- /* flags :: The segment edge flags (straight, rounded, etc.). */
- /* */
- /* dir :: The main segment direction on this edge. */
- /* */
- /* scale :: Scaling factor between original and hinted edge */
- /* positions. */
- /* */
- /* blue_edge :: Indicate the blue zone edge this edge is related to. */
- /* Only set for some of the horizontal edges in a latin */
- /* font. */
- /* */
- /* link :: The linked edge. */
- /* */
- /* serif :: The serif edge. */
- /* */
- /* num_linked :: The number of other edges that pair to this one. */
- /* */
- /* score :: Used to score the edge when selecting them. */
- /* */
- /* first :: The first edge segment. */
- /* */
- /* last :: The last edge segment. */
- /* */
- typedef struct AH_EdgeRec_
- {- FT_Pos fpos;
- FT_Pos opos;
- FT_Pos pos;
-
- AH_Edge_Flags flags;
- AH_Direction dir;
- FT_Fixed scale;
- FT_Pos* blue_edge;
-
- AH_Edge link;
- AH_Edge serif;
- FT_Int num_linked;
-
- FT_Int score;
-
- AH_Segment first;
- AH_Segment last;
-
-
- } AH_EdgeRec;
-
-
- /* an outline as seen by the hinter */
- typedef struct AH_OutlineRec_
- {- FT_Memory memory;
-
- AH_Direction vert_major_dir; /* vertical major direction */
- AH_Direction horz_major_dir; /* horizontal major direction */
-
- FT_Fixed x_scale;
- FT_Fixed y_scale;
- FT_Pos edge_distance_threshold;
-
- FT_Int max_points;
- FT_Int num_points;
- AH_Point points;
-
- FT_Int max_contours;
- FT_Int num_contours;
- AH_Point* contours;
-
- FT_Int num_hedges;
- AH_Edge horz_edges;
-
- FT_Int num_vedges;
- AH_Edge vert_edges;
-
- FT_Int num_hsegments;
- AH_Segment horz_segments;
-
- FT_Int num_vsegments;
- AH_Segment vert_segments;
-
- } AH_OutlineRec, *AH_Outline;
-
-
-#ifdef FT_CONFIG_CHESTER_SMALL_F
-
-#define AH_BLUE_CAPITAL_TOP 0 /* THEZOCQS */
-#define AH_BLUE_CAPITAL_BOTTOM ( AH_BLUE_CAPITAL_TOP + 1 ) /* HEZLOCUS */
-#define AH_BLUE_SMALL_F_TOP ( AH_BLUE_CAPITAL_BOTTOM + 1 ) /* fijkdbh */
-#define AH_BLUE_SMALL_TOP ( AH_BLUE_SMALL_F_TOP + 1 ) /* xzroesc */
-#define AH_BLUE_SMALL_BOTTOM ( AH_BLUE_SMALL_TOP + 1 ) /* xzroesc */
-#define AH_BLUE_SMALL_MINOR ( AH_BLUE_SMALL_BOTTOM + 1 ) /* pqgjy */
-#define AH_BLUE_MAX ( AH_BLUE_SMALL_MINOR + 1 )
-
-#else /* !FT_CONFIG_CHESTER_SMALL_F */
-
-#define AH_BLUE_CAPITAL_TOP 0 /* THEZOCQS */
-#define AH_BLUE_CAPITAL_BOTTOM ( AH_BLUE_CAPITAL_TOP + 1 ) /* HEZLOCUS */
-#define AH_BLUE_SMALL_TOP ( AH_BLUE_CAPITAL_BOTTOM + 1 ) /* xzroesc */
-#define AH_BLUE_SMALL_BOTTOM ( AH_BLUE_SMALL_TOP + 1 ) /* xzroesc */
-#define AH_BLUE_SMALL_MINOR ( AH_BLUE_SMALL_BOTTOM + 1 ) /* pqgjy */
-#define AH_BLUE_MAX ( AH_BLUE_SMALL_MINOR + 1 )
-
-#endif /* !FT_CONFIG_CHESTER_SMALL_F */
-
- typedef FT_Int AH_Blue;
-
-
-#define AH_HINTER_MONOCHROME 1
-#define AH_HINTER_OPTIMIZE 2
-
- typedef FT_Int AH_Hinter_Flags;
-
-
- /*************************************************************************/
- /* */
- /* <Struct> */
- /* AH_GlobalsRec */
- /* */
- /* <Description> */
- /* Holds the global metrics for a given font face (be it in design */
- /* units or scaled pixel values). */
- /* */
- /* <Fields> */
- /* num_widths :: The number of widths. */
- /* */
- /* num_heights :: The number of heights. */
- /* */
- /* stds :: A two-element array giving the default stem width */
- /* and height. */
- /* */
- /* widths :: Snap widths, including standard one. */
- /* */
- /* heights :: Snap height, including standard one. */
- /* */
- /* blue_refs :: The reference positions of blue zones. */
- /* */
- /* blue_shoots :: The overshoot positions of blue zones. */
- /* */
- typedef struct AH_GlobalsRec_
- {- FT_Int num_widths;
- FT_Int num_heights;
-
- FT_Pos stds[2];
-
- FT_Pos widths [AH_MAX_WIDTHS];
- FT_Pos heights[AH_MAX_HEIGHTS];
-
- FT_Pos blue_refs [AH_BLUE_MAX];
- FT_Pos blue_shoots[AH_BLUE_MAX];
-
- } AH_GlobalsRec, *AH_Globals;
-
-
- /*************************************************************************/
- /* */
- /* <Struct> */
- /* AH_Face_GlobalsRec */
- /* */
- /* <Description> */
- /* Holds the complete global metrics for a given font face (i.e., the */
- /* design units version + a scaled version + the current scales */
- /* used). */
- /* */
- /* <Fields> */
- /* face :: A handle to the source face object */
- /* */
- /* design :: The globals in font design units. */
- /* */
- /* scaled :: Scaled globals in sub-pixel values. */
- /* */
- /* x_scale :: The current horizontal scale. */
- /* */
- /* y_scale :: The current vertical scale. */
- /* */
- /* control_overshoot :: */
- /* Currently unused. */
- /* */
- typedef struct AH_Face_GlobalsRec_
- {- FT_Face face;
- AH_GlobalsRec design;
- AH_GlobalsRec scaled;
- FT_Fixed x_scale;
- FT_Fixed y_scale;
- FT_Bool control_overshoot;
-
- } AH_Face_GlobalsRec, *AH_Face_Globals;
-
-
- typedef struct AH_HinterRec_
- {- FT_Memory memory;
- AH_Hinter_Flags flags;
-
- FT_Int algorithm;
- FT_Face face;
-
- AH_Face_Globals globals;
-
- AH_Outline glyph;
-
- AH_Loader loader;
- FT_Vector pp1; /* horizontal phantom points */
- FT_Vector pp2;
- /* we ignore vertical phantom points */
-
- FT_Bool transformed;
- FT_Vector trans_delta;
- FT_Matrix trans_matrix;
-
- FT_Bool do_horz_hints; /* disable X hinting */
- FT_Bool do_vert_hints; /* disable Y hinting */
- FT_Bool do_horz_snapping; /* disable X stem size snapping */
- FT_Bool do_vert_snapping; /* disable Y stem size snapping */
- FT_Bool do_stem_adjust; /* disable light stem snapping */
-
- } AH_HinterRec, *AH_Hinter;
-
-
-#ifdef DEBUG_HINTER
- extern AH_Hinter ah_debug_hinter;
- extern FT_Bool ah_debug_disable_horz;
- extern FT_Bool ah_debug_disable_vert;
-#else
-#define ah_debug_disable_horz 0
-#define ah_debug_disable_vert 0
-#endif /* DEBUG_HINTER */
-
-
-FT_END_HEADER
-
-#endif /* __AHTYPES_H__ */
-
-
-/* END */
--- a/src/autohint/autohint.c
+++ /dev/null
@@ -1,32 +1,0 @@
-/***************************************************************************/
-/* */
-/* autohint.c */
-/* */
-/* Automatic Hinting wrapper (body only). */
-/* */
-/* Copyright 2000-2001 Catharon Productions Inc. */
-/* Author: David Turner */
-/* */
-/* This file is part of the Catharon Typography Project and shall only */
-/* be used, modified, and distributed under the terms of the Catharon */
-/* Open Source License that should come with this file under the name */
-/* `CatharonLicense.txt'. By continuing to use, modify, or distribute */
-/* this file you indicate that you have read the license and */
-/* understand and accept it fully. */
-/* */
-/* Note that this license is compatible with the FreeType license. */
-/* */
-/***************************************************************************/
-
-
-#define FT_MAKE_OPTION_SINGLE_OBJECT
-
-#include <ft2build.h>
-#include "ahangles.c"
-#include "ahglyph.c"
-#include "ahglobal.c"
-#include "ahhint.c"
-#include "ahmodule.c"
-
-
-/* END */
--- a/src/autohint/mather.py
+++ /dev/null
@@ -1,78 +1,0 @@
-#!/usr/bin/env python
-#
-
-#
-# autohint math table builder
-#
-
-
-# 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 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.
-
-
-import math
-
-ag_pi = 256
-
-def print_arctan( atan_bits ):
- atan_base = 1 << atan_bits
-
- print " static AH_Angle ag_arctan[1L << AG_ATAN_BITS] ="
- print " {"-
- count = 0
- line = " "
-
- for n in range( atan_base ):
- comma = ","
- if ( n == atan_base - 1 ):
- comma = ""
-
- angle = math.atan( n * 1.0 / atan_base ) / math.pi * ag_pi
- line = line + " " + repr( int( angle + 0.5 ) ) + comma
- count = count + 1;
- if ( count == 8 ):
- count = 0
- print line
- line = " "
-
- if ( count > 0 ):
- print line
- print " };"
-
-
-# This routine is not used currently.
-#
-def print_sines():
- print " static FT_Fixed ah_sines[AG_HALF_PI + 1] ="
- print " {"-
- count = 0
- line = " "
-
- for n in range( ag_pi / 2 ):
- sinus = math.sin( n * math.pi / ag_pi )
- line = line + " " + repr( int( 65536.0 * sinus ) ) + ","
- count = count + 1
- if ( count == 8 ):
- count = 0
- print line
- line = " "
-
- if ( count > 0 ):
- print line
- print " 65536"
- print " };"
-
-
-print_arctan( 8 )
-
-
-# END
--- a/src/autohint/module.mk
+++ /dev/null
@@ -1,25 +1,0 @@
-#
-# FreeType 2 auto-hinter module definition
-#
-
-
-# Copyright 2000 Catharon Productions Inc.
-# Author: David Turner
-#
-# This file is part of the Catharon Typography Project and shall only
-# be used, modified, and distributed under the terms of the Catharon
-# Open Source License that should come with this file under the name
-# `CatharonLicense.txt'. By continuing to use, modify, or distribute
-# this file you indicate that you have read the license and
-# understand and accept it fully.
-#
-# Note that this license is compatible with the FreeType license.
-
-
-make_module_list: add_autohint_module
-
-add_autohint_module:
- $(OPEN_DRIVER)autohint_module_class$(CLOSE_DRIVER)
- $(ECHO_DRIVER)autohint $(ECHO_DRIVER_DESC)automatic hinting module$(ECHO_DRIVER_DONE)
-
-# EOF
--- a/src/autohint/rules.mk
+++ /dev/null
@@ -1,77 +1,0 @@
-#
-# FreeType 2 auto-hinter module configuration rules
-#
-
-
-# Copyright 2000, 2001, 2002, 2003 Catharon Productions Inc.
-# Author: David Turner
-#
-# This file is part of the Catharon Typography Project and shall only
-# be used, modified, and distributed under the terms of the Catharon
-# Open Source License that should come with this file under the name
-# `CatharonLicense.txt'. By continuing to use, modify, or distribute
-# this file you indicate that you have read the license and
-# understand and accept it fully.
-#
-# Note that this license is compatible with the FreeType license.
-
-
-# AUTO driver directory
-#
-AUTO_DIR := $(SRC_DIR)/autohint
-
-
-# compilation flags for the driver
-#
-AUTO_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(AUTO_DIR))
-
-
-# AUTO driver sources (i.e., C files)
-#
-AUTO_DRV_SRC := $(AUTO_DIR)/ahangles.c \
- $(AUTO_DIR)/ahglobal.c \
- $(AUTO_DIR)/ahglyph.c \
- $(AUTO_DIR)/ahhint.c \
- $(AUTO_DIR)/ahmodule.c
-
-# AUTO driver headers
-#
-AUTO_DRV_H := $(AUTO_DRV_SRC:%c=%h) \
- $(AUTO_DIR)/ahloader.h \
- $(AUTO_DIR)/ahtypes.h \
- $(AUTO_DIR)/aherrors.h
-
-
-# AUTO driver object(s)
-#
-# AUTO_DRV_OBJ_M is used during `multi' builds.
-# AUTO_DRV_OBJ_S is used during `single' builds.
-#
-AUTO_DRV_OBJ_M := $(AUTO_DRV_SRC:$(AUTO_DIR)/%.c=$(OBJ_DIR)/%.$O)
-AUTO_DRV_OBJ_S := $(OBJ_DIR)/autohint.$O
-
-# AUTO driver source file for single build
-#
-AUTO_DRV_SRC_S := $(AUTO_DIR)/autohint.c
-
-
-# AUTO driver - single object
-#
-$(AUTO_DRV_OBJ_S): $(AUTO_DRV_SRC_S) $(AUTO_DRV_SRC) \
- $(FREETYPE_H) $(AUTO_DRV_H)
- $(AUTO_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(AUTO_DRV_SRC_S))
-
-
-# AUTO driver - multiple objects
-#
-$(OBJ_DIR)/%.$O: $(AUTO_DIR)/%.c $(FREETYPE_H) $(AUTO_DRV_H)
- $(AUTO_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
-
-
-# update main driver object lists
-#
-DRV_OBJS_S += $(AUTO_DRV_OBJ_S)
-DRV_OBJS_M += $(AUTO_DRV_OBJ_M)
-
-
-# EOF