Commit 0456354658b844ec9f0a23cce83735a0d0cf21f8
2000-07-24T06:01:34
`make install' is available now. Formatting.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443
diff --git a/builds/unix/unix.in b/builds/unix/unix.in
index a35153e..9aeea24 100644
--- a/builds/unix/unix.in
+++ b/builds/unix/unix.in
@@ -17,26 +17,41 @@ ifndef TOP
TOP := .
endif
-DELETE := @RMF@
-DELDIR := @RMDIR@
-SEP := /
-HOSTSEP := $(SEP)
-BUILD := $(TOP)/builds/unix
-PLATFORM := unix
+DELETE := @RMF@
+DELDIR := @RMDIR@
+SEP := /
+HOSTSEP := $(SEP)
+BUILD := $(TOP)/builds/unix
+PLATFORM := unix
+CC := @CC@
-FTSYS_SRC := @FTSYS_SRC@
+INSTALL := @INSTALL@
+INSTALL_DATA := @INSTALL_DATA@
+MKINSTALLDIRS := $(BUILD)/mkinstalldirs
+
+LIBTOOL := $(BUILD)/libtool
+
+
+# don't use `:=' here since the path stuff will be included after this file
+#
+FTSYS_SRC = @FTSYS_SRC@
DISTCLEAN += $(BUILD)/config.cache \
$(BUILD)/config.log \
$(BUILD)/config.status \
$(BUILD)/unix.mk \
$(BUILD)/ftconfig.h \
- $(BUILD)/libtool
+ $(LIBTOOL)
+# Standard installation variables.
+#
prefix := @prefix@
exec_prefix := @exec_prefix@
libdir := @libdir@
+bindir := @bindir@
+includedir := @includedir@
+
version_info := @version_info@
@@ -120,9 +135,9 @@ ANSIFLAGS := @XX_ANSIFLAGS@
#
#
CCraw := $(CC)
-CC := $(BUILD)/libtool --mode=compile $(CCraw)
+CC := $(LIBTOOL) --mode=compile $(CCraw)
-# linker flags
+# Linker flags.
#
LDFLAGS := @LDFLAGS@
@@ -134,17 +149,45 @@ ifdef BUILD_FREETYPE
#
include $(TOP)/builds/freetype.mk
+
# The cleanup targets.
#
clean_freetype: clean_freetype_unix
distclean_freetype: distclean_freetype_unix
+
+ # Unix installation and deinstallation targets.
+ install: $(FT_LIBRARY)
+ $(MKINSTALLDIRS) $(libdir) \
+ $(includedir)/freetype/config \
+ $(includedir)/freetype/internal
+ $(LIBTOOL) --mode=install $(INSTALL) $(FT_LIBRARY) $(libdir)
+ -for P in $(PUBLIC_H) ; do \
+ $(INSTALL_DATA) $$P $(includedir)/freetype ; \
+ done
+ -for P in $(BASE_H) ; do \
+ $(INSTALL_DATA) $$P $(includedir)/freetype/internal ; \
+ done
+ -for P in $(CONFIG_H) ; do \
+ $(INSTALL_DATA) $$P $(includedir)/freetype/config ; \
+ done
+
+ uninstall:
+ -$(LIBTOOL) --mode=uninstall $(RM) $(libdir)/$(LIBRARY).$A
+ -$(DELETE) $(includedir)/freetype/config/*
+ -$(DELDIR) $(includedir)/freetype/config
+ -$(DELETE) $(includedir)/freetype/internal/*
+ -$(DELDIR) $(includedir)/freetype/internal
+ -$(DELETE) $(includedir)/freetype/*
+ -$(DELDIR) $(includedir)/freetype
+
+
# Unix cleaning and distclean rules.
#
clean_freetype_unix:
-$(DELETE) $(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)
- -$(DELETE) $(subst $O,$(SO),$(BASE_OBJECTS) $(OBJ_M) $(OBJ_S))
- -$(DELETE) $(CLEAN)
+ -$(DELETE) $(subst $O,$(SO),$(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)) \
+ $(CLEAN)
distclean_freetype_unix: clean_freetype_unix
-$(DELETE) $(FT_LIBRARY)
@@ -152,9 +195,10 @@ ifdef BUILD_FREETYPE
-$(DELDIR) $(OBJ_DIR)/.libs
-$(DELETE) *.orig *~ core *.core $(DISTCLEAN)
+
# Librarian to use to build the library
#
- FT_LIBRARIAN := $(BUILD)/libtool --mode=link $(CCraw)
+ FT_LIBRARIAN := $(LIBTOOL) --mode=link $(CCraw)
# This final rule is used to link all object files into a single library.
diff --git a/builds/unix/unix.mk b/builds/unix/unix.mk
index 792a9d7..d5b07ed 100644
--- a/builds/unix/unix.mk
+++ b/builds/unix/unix.mk
@@ -17,26 +17,41 @@ ifndef TOP
TOP := .
endif
-DELETE := rm -f
-DELDIR := rmdir
-SEP := /
-HOSTSEP := $(SEP)
-BUILD := $(TOP)/builds/unix
-PLATFORM := unix
+DELETE := rm -f
+DELDIR := rmdir
+SEP := /
+HOSTSEP := $(SEP)
+BUILD := $(TOP)/builds/unix
+PLATFORM := unix
+CC := gcc
-FTSYS_SRC := $(BUILD)/ftsystem.c
+INSTALL := /usr/bin/ginstall -c
+INSTALL_DATA := ${INSTALL} -m 644
+MKINSTALLDIRS := $(BUILD)/mkinstalldirs
+
+LIBTOOL := $(BUILD)/libtool
+
+
+# don't use `:=' here since the path stuff will be included after this file
+#
+FTSYS_SRC = $(BUILD)/ftsystem.c
DISTCLEAN += $(BUILD)/config.cache \
$(BUILD)/config.log \
$(BUILD)/config.status \
$(BUILD)/unix.mk \
$(BUILD)/ftconfig.h \
- $(BUILD)/libtool
+ $(LIBTOOL)
+# Standard installation variables.
+#
prefix := /usr/local
exec_prefix := ${prefix}
libdir := ${exec_prefix}/lib
+bindir := ${exec_prefix}/bin
+includedir := ${prefix}/include
+
version_info := 6:0:0
@@ -120,9 +135,9 @@ ANSIFLAGS := -pedantic -ansi
#
#
CCraw := $(CC)
-CC := $(BUILD)/libtool --mode=compile $(CCraw)
+CC := $(LIBTOOL) --mode=compile $(CCraw)
-# linker flags
+# Linker flags.
#
LDFLAGS :=
@@ -134,17 +149,45 @@ ifdef BUILD_FREETYPE
#
include $(TOP)/builds/freetype.mk
+
# The cleanup targets.
#
clean_freetype: clean_freetype_unix
distclean_freetype: distclean_freetype_unix
+
+ # Unix installation and deinstallation targets.
+ install: $(FT_LIBRARY)
+ $(MKINSTALLDIRS) $(libdir) \
+ $(includedir)/freetype/config \
+ $(includedir)/freetype/internal
+ $(LIBTOOL) --mode=install $(INSTALL) $(FT_LIBRARY) $(libdir)
+ -for P in $(PUBLIC_H) ; do \
+ $(INSTALL_DATA) $$P $(includedir)/freetype ; \
+ done
+ -for P in $(BASE_H) ; do \
+ $(INSTALL_DATA) $$P $(includedir)/freetype/internal ; \
+ done
+ -for P in $(CONFIG_H) ; do \
+ $(INSTALL_DATA) $$P $(includedir)/freetype/config ; \
+ done
+
+ uninstall:
+ -$(LIBTOOL) --mode=uninstall $(RM) $(libdir)/$(LIBRARY).$A
+ -$(DELETE) $(includedir)/freetype/config/*
+ -$(DELDIR) $(includedir)/freetype/config
+ -$(DELETE) $(includedir)/freetype/internal/*
+ -$(DELDIR) $(includedir)/freetype/internal
+ -$(DELETE) $(includedir)/freetype/*
+ -$(DELDIR) $(includedir)/freetype
+
+
# Unix cleaning and distclean rules.
#
clean_freetype_unix:
-$(DELETE) $(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)
- -$(DELETE) $(subst $O,$(SO),$(BASE_OBJECTS) $(OBJ_M) $(OBJ_S))
- -$(DELETE) $(CLEAN)
+ -$(DELETE) $(subst $O,$(SO),$(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)) \
+ $(CLEAN)
distclean_freetype_unix: clean_freetype_unix
-$(DELETE) $(FT_LIBRARY)
@@ -152,9 +195,10 @@ ifdef BUILD_FREETYPE
-$(DELDIR) $(OBJ_DIR)/.libs
-$(DELETE) *.orig *~ core *.core $(DISTCLEAN)
+
# Librarian to use to build the library
#
- FT_LIBRARIAN := $(BUILD)/libtool --mode=link $(CCraw)
+ FT_LIBRARIAN := $(LIBTOOL) --mode=link $(CCraw)
# This final rule is used to link all object files into a single library.
diff --git a/include/freetype/ftimage.h b/include/freetype/ftimage.h
index 71d6ca8..4dd1c3d 100644
--- a/include/freetype/ftimage.h
+++ b/include/freetype/ftimage.h
@@ -588,8 +588,8 @@
/* a a bitmap. This section contains the public API for rasters. */
/* */
/* Note that in FreeType 2, all rasters are now encapsulated within */
- /* specific modules called "renderers". See */
- /* <freetype/internal/ftrender.h> for more details on renderers. */
+ /* specific modules called `renderers'. See `freetype/ftrender.h' for */
+ /* more details on renderers. */
/* */
/*************************************************************************/
diff --git a/src/autohint/ahangles.h b/src/autohint/ahangles.h
index d88d02a..4eb36bf 100644
--- a/src/autohint/ahangles.h
+++ b/src/autohint/ahangles.h
@@ -20,8 +20,8 @@
/***************************************************************************/
-#ifndef AGANGLES_H
-#define AGANGLES_H
+#ifndef AHANGLES_H
+#define AHANGLES_H
#ifdef FT_FLAT_COMPILE
@@ -57,7 +57,7 @@
AH_Angle ah_angle( FT_Vector* v );
-#endif /* AGANGLES_H */
+#endif /* AHANGLES_H */
/* END */
diff --git a/src/autohint/ahglobal.h b/src/autohint/ahglobal.h
index 43e3c01..79e7358 100644
--- a/src/autohint/ahglobal.h
+++ b/src/autohint/ahglobal.h
@@ -20,8 +20,8 @@
/***************************************************************************/
-#ifndef AGGLOBAL_H
-#define AGGLOBAL_H
+#ifndef AHGLOBAL_H
+#define AHGLOBAL_H
#ifdef FT_FLAT_COMPILE
@@ -46,7 +46,7 @@
FT_Error ah_hinter_compute_globals( AH_Hinter* hinter );
-#endif /* AGGLOBAL_H */
+#endif /* AHGLOBAL_H */
/* END */
diff --git a/src/autohint/ahglyph.h b/src/autohint/ahglyph.h
index 801d9b6..66fd5e3 100644
--- a/src/autohint/ahglyph.h
+++ b/src/autohint/ahglyph.h
@@ -2,31 +2,39 @@
/* */
/* ahglyph.h */
/* */
-/* routines used to load and analyze a given glyph before hinting */
+/* Routines used to load and analyze a given glyph before hinting */
+/* (specification). */
/* */
-/* Copyright 2000: Catharon Productions Inc. */
+/* 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 */
+/* `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 */
+/* Note that this license is compatible with the FreeType license. */
/* */
/***************************************************************************/
-#ifndef AGGLYPH_H
-#define AGGLYPH_H
+
+
+#ifndef AHGLYPH_H
+#define AHGLYPH_H
#ifdef FT_FLAT_COMPILE
+
#include "ahtypes.h"
+
#else
+
#include <autohint/ahtypes.h>
+
#endif
- typedef enum AH_UV_
+
+ typedef enum AH_UV_
{
ah_uv_fxy,
ah_uv_fyx,
@@ -35,10 +43,11 @@
ah_uv_ox,
ah_uv_oy,
ah_uv_yx,
- ah_uv_xy /* should always be last !! */
+ ah_uv_xy /* should always be last! */
} AH_UV;
+
LOCAL_DEF
void ah_setup_uv( AH_Outline* outline,
AH_UV source );
@@ -47,33 +56,38 @@
/* AH_Outline functions - they should be typically called in this order */
LOCAL_DEF
- FT_Error ah_outline_new( FT_Memory memory, AH_Outline* *aoutline );
+ FT_Error ah_outline_new( FT_Memory memory,
+ AH_Outline** aoutline );
LOCAL_DEF
- FT_Error ah_outline_load( AH_Outline* outline, FT_Face face );
+ FT_Error ah_outline_load( AH_Outline* outline,
+ FT_Face face );
LOCAL_DEF
- void ah_outline_compute_segments( AH_Outline* outline );
+ void ah_outline_compute_segments( AH_Outline* outline );
LOCAL_DEF
- void ah_outline_link_segments( AH_Outline* outline );
+ void ah_outline_link_segments( AH_Outline* outline );
LOCAL_DEF
- void ah_outline_detect_features( AH_Outline* outline );
+ void ah_outline_detect_features( AH_Outline* outline );
LOCAL_DEF
- void ah_outline_compute_blue_edges( AH_Outline* outline,
- AH_Face_Globals* globals );
+ void ah_outline_compute_blue_edges( AH_Outline* outline,
+ AH_Face_Globals* globals );
LOCAL_DEF
- void ah_outline_scale_blue_edges( AH_Outline* outline,
- AH_Face_Globals* globals );
+ void ah_outline_scale_blue_edges( AH_Outline* outline,
+ AH_Face_Globals* globals );
LOCAL_DEF
- void ah_outline_save( AH_Outline* outline, AH_Loader* loader );
+ void ah_outline_save( AH_Outline* outline, AH_Loader* loader );
LOCAL_DEF
- void ah_outline_done( AH_Outline* outline );
+ void ah_outline_done( AH_Outline* outline );
+
+
+#endif /* AHGLYPH_H */
-#endif /* AGGLYPH_H */
+/* END */
diff --git a/src/autohint/ahtypes.h b/src/autohint/ahtypes.h
index 6fe6ba8..e73b55c 100644
--- a/src/autohint/ahtypes.h
+++ b/src/autohint/ahtypes.h
@@ -137,6 +137,8 @@
ah_dir_none = 4,
ah_dir_right = 1,
ah_dir_left = -1,
+ ah_dir_up_and_down = 0,
+ ah_dir_left_and_right = 0,
ah_dir_up = 2,
ah_dir_down = -2