Index: freetype/FILES =================================================================== RCS file: /cvs/freetype/freetype/FILES,v retrieving revision 1.4 retrieving revision 1.6 diff -r1.4 -r1.6 4,6c4,5 < < docs/ Documentation. < docs/image GIF images for documentation. --- > howto/ Various system-specific HOWTOs, explaining how > to compile the library on different platforms. 12,13c11,12 < howto/ Various system-specific HOWTOs, explaining how < to compile the library on different platforms. --- > docs/ Documentation. > docs/image GIF images for documentation. 33a33,35 > pascal/ Used to hold a Pascal version of the engine, > which is now available separately. > 38a41,43 > readme.1st A notice about the possible interaction of patents > PATENTS owned by Apple on TrueType, with respect to FreeType. > 46c51,53 < license.txt The FreeType license. --- > license.txt The FreeType licensing conditions. > docs/FTL.txt > docs/GPL.txt 67c74 < a4local.m4, --- > aclocal.m4, Index: freetype/INSTALL =================================================================== RCS file: /cvs/freetype/freetype/INSTALL,v retrieving revision 1.23 retrieving revision 1.28 diff -r1.23 -r1.28 17c17 < 6. Building a dynamic library (`DLL' or `so') --- > 6. Building a dynamic library (`so' or `DLL') 53c53 < This package, known as the FreeType 1.4 Public Release, contains --- > This package, known as the FreeType 1.5 Public Release, contains 59c59 < Contains the 1.4 release of the FreeType library. It is written --- > Contains the 1.5 release of the FreeType library. It is written 81c81 < the original english text into language-specific one. --- > the original English text into language-specific one. 175c175 < gcc -c -Iarch/ansi tt*.c # compile base engine sources --- > gcc -c -I arch/ansi tt*.c # compile base engine sources 217c217 < gcc -c -Iarch/ansi -I. arch/ansi/freetype.c --- > gcc -c -I arch/ansi -I . arch/ansi/freetype.c 240c240 < standard doesn't know threads at all). --- > C standard doesn't know about threads at all). 292,293c292 < * some OpenType layout tables (GDEF, GSUB; GPOS is not < finished yet) --- > * the OpenType layout tables (GDEF, GPOS, GSUB) 303,304c302,303 < The idea is to keep the base engine small (under 50kByte), while < providing optional enhancements for specific uses. --- > The idea is to keep the base engine small (under 60 kByte), > while providing optional enhancements for specific uses. 314,315c313,315 < cd lib ; go to `lib' < gcc -c -Iarch/ansi -I. extend/ftx*.c ; compile all extensions --- > cd lib # go to `lib' > gcc -c -I arch/ansi -I . -I extend extend/ftx*.c > # compile all extensions 323,324c323,324 < -- compile the engine, then the extensions < ar libfreetype.a *.o ; create static library --- > # .. compile the engine, then the extensions > ar libfreetype.a *.o # create static library 343c343 < make tool. Or: --- > Borland make tool. Or: 354,356d353 < We welcome new Makefile submissions for platforms not currently < listed in the `lib/arch' hierarchy. < 362c359 < 6. Building a dynamic library (`DLL' or `so') --- > 6. Building a dynamic library (`so' or `DLL') 389,392c386,390 < cd lib ; go to `lib' < gcc -c -fPIC -Iarch/ansi -I. \ < arch/ansi/freetype.c ; compile engine < gcc -c -fPIC -Iarch/ansi -I. extend/ftx*.c ; & extensions --- > cd lib # go to `lib' > gcc -c -fPIC -I arch/ansi -I . \ > arch/ansi/freetype.c # compile engine > gcc -c -fPIC -I arch/ansi -I . -I extend > extend/ftx*.c # & extensions 414c412 < special macro named EXPORT_DEF. For example, here is the --- > special macro named FT_EXPORT_DEF. For example, here is the 418,419c416,417 < EXPORT_DEF < TT_Error TT_Init_FreeType( TT_Engine* engine ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Init_FreeType( TT_Engine* engine ); 422c420 < EXPORT_DEF, it is automatically set to `extern' by default. --- > FT_EXPORT_DEF, it is automatically set to `extern' by default. 425c423 < EXPORT_DEF in its `ft_conf.h' to a keyword tagging the --- > FT_EXPORT_DEF in its `ft_conf.h' to the keywords tagging the 428c426,428 < `__dllentry', etc. --- > `__dllentry', `_FAR _PASCAL _export' after the type name, etc. > Note that FT_EXPORT_DEF is a (macro) function, taking the type > name as argument, in order to allow the last example. 432,436c432,436 < You can also `grep' for EXPORT_DEF in the `freetype.h' source < file to obtain the list of exported functions of the FreeType < API, which could then be used to write a `def' file for the < DLL. We provide a sample .def file (built with an Unix script) < for Windows. --- > You can also `grep' for FT_EXPORT_DEF in the `freetype.h' > source file to obtain the list of exported functions of the > FreeType API, which could then be used to write a `def' file > for the DLL. We provide a sample .def file (built with an Unix > script) for Windows. 439,440c439,440 < each exported function is preceded with the EXPORT_FUNC macro, < as in --- > each exported function is preceded with the FT_EXPORT_FUNC > macro, as in 442,443c442,443 < EXPORT_FUNC < TT_Error TT_Init_FreeType( TT_Engine* engine ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Init_FreeType( TT_Engine* engine ) 451c451 < By default, EXPORT_FUNC converts to an empty string, but it --- > By default, FT_EXPORT_FUNC converts to an empty string, but it 454,459d453 < Note that the EXPORT_DEF/EXPORT_FUNC mechanism does not work < for 16-bit Windows (in this environment, the special keyword < for declaring entry points, (the `__export' keyword), must be < after the type name). We suggest you to use the makefiles we < provide for both Microsoft and Borland compilers. < 513c507 < illegal in the US, Japan, and possibly other countries. --- > illegal in the US, UK, France, and possibly other countries. 519,523c513,516 < This section will now explain how to build a `patent-free' < engine, at the cost of rendering quality. This is done simply < by de-activating the compilation of the TrueType bytecode < interpreter (which is the only part of FreeType that might < violate an Apple patent). This has two effects: --- > To avoid problems, we have decided to turn off by default the > compilation of the TrueType bytecode interpreter (which is the > only part of FreeType that might violate an Apple patent). This > has two effects: 525c518 < - saving about 18kByte of code in the engine --- > - saving about 18 kbyte of code in the engine 529,530c522,523 < Such an engine can be used by font converters and/or graphics < libraries to display glyphs at high pixel sizes. --- > Nevertheless, such an engine can be used by font converters > and/or graphics libraries to display glyphs at high pixel sizes. 532,533c525,531 < In order to do so, simply look for the following line in your < configuration file `ft_conf.h': --- > If you believe you can go ahead, this section will now explain > how to build a `complete' engine, at the cost of possible patent > violation. This is done simply by activating the compilation of > the TrueType bytecode interpreter. In order to do so, simply > recompile the library (more exactly, it affects only ttinterp.c) > while #defin'ing TT_CONFIG_OPTION_BYTECODE_INTERPRETER. Look > for the following line in your configuration file `ft_conf.h': 535c533 < #undef FT_CONFIG_OPTION_NO_INTERPRETER --- > #undef FT_CONFIG_OPTION_BYTECODE_INTERPRETER 539c537 < #define FT_CONFIG_OPTION_NO_INTERPRETER --- > #define FT_CONFIG_OPTION_BYTECODE_INTERPRETER 685c683,691 < 1. Compile the library for the `debugger' system, i.e. --- > 1. Ensure the bytecode interpreter is not turned off (using > the debugger with the default build which is patents-compliant > is not really useful). How to process is explained in part 8 > of chapter II above (but of course you should modify the > `ft_conf.h' file which is specific to the debugger). This > implies that you must first be sure that you are really > allowed to use such a version of FreeType. > > 2. Compile the library for the `debugger' system, i.e. 694c700 < 2. Compile the debugger: --- > 3. Compile the debugger: Index: freetype/Makefile.in =================================================================== RCS file: /cvs/freetype/freetype/Makefile.in,v retrieving revision 1.15 retrieving revision 1.17 diff -r1.15 -r1.17 1c1,8 < # This file is part of the FreeType project. --- > # Copyright 1996-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. 58a66,68 > > .PHONY: all debug ttlib ttlibdebug tttest ttpo install uninstall \ > clean distclean depend Index: freetype/PATENTS =================================================================== RCS file: /cvs/freetype/freetype/PATENTS,v retrieving revision 1.3 retrieving revision 1.5 diff -r1.3 -r1.5 9,10c9,11 < FREETYPE MIGHT BE ILLEGAL IN THE USA, JAPAN, AND POSSIBLY OTHER < COUNTRIES, BE IT IN COMMERCIAL OR OPEN SOURCE PRODUCTS. --- > THE FREETYPE LIBRARY MIGHT BE ILLEGAL IN FRANCE, UK, USA, AND > POSSIBLY OTHER COUNTRIES, BE IT IN COMMERCIAL OR OPEN SOURCE > PRODUCTS. 15c16 < http://www.freetype.org/patents.htm --- > http://www.freetype.org/patents.html Index: freetype/README =================================================================== RCS file: /cvs/freetype/freetype/README,v retrieving revision 1.29 retrieving revision 1.34 diff -r1.29 -r1.34 9c9 < Release 1.4 --- > Release 1.5 14c14 < - 2000 Robert Wilhelm --- > - 2001 Robert Wilhelm 70c70 < The library itself takes about 55kByte of Intel code, complete --- > The library itself takes about 53 kByte of Intel code, complete 135c135 < This feature is already used in xtt, a TrueType font server --- > This feature is already used in x-tt, a TrueType font server 152,157d151 < - FreeType 1.4 is binary compatible with 1.3.1, which means that < you won't need to recompile your programs if they used the < engine as a shared library (libttf.so on Linux, or FreeType.dll < on Windows). See the file `freetype/docs/changes.txt' for more < information about (minimal) API changes. < 196c190 < * for DOS and OS/2: `ft-14.zip' --- > * for DOS and OS/2: `ft-15.zip' 200,201c194,195 < Hobbes: ftp://ftp.cdrom.com/pub/os2/fonts < SimTel: ftp://oak.oakland.edu/pub/simtel.net/msdos/graphics --- > Hobbes: ftp://ftp.cdrom.com/pub/os2/misc > SimTel: ftp://ftp.simtel.net/pub/msdos/graphics 203c197 < * for UNIX and Amiga: `freetype-1.4.tar.gz' --- > * for UNIX and Amiga: `freetype-1.5.tar.gz' 209,212c203,206 < * As uploading can take several days before the package becomes < available to the public, we advise you to download it from < our own ftp site if you read this message few days after the < announcement at: --- > As uploading can take several days before the package becomes > available to the public, we advise you to download it from our > own ftp site if you read this message few days after the > announcement at: 214c208 < ftp://ftp.freetype.org/pub/ --- > ftp://ftp.freetype.org/freetype/ 216c210 < Our home page is at: --- > Our home page is at: 218c212 < http://www.freetype.org --- > http://www.freetype.org 220c214 < Screen shots are available! --- > Screen shots are available! 222c216 < There are also three mailing lists: --- > There are also three mailing lists: 224c218 < o freetype-announce@freetype.org --- > o announce@freetype.org 230c224 < o freetype@freetype.org --- > o freetype@freetype.org 237c231 < o devel@freetype.org --- > o devel@freetype.org 242c236 < To subscribe, send the usual subscription commands to: --- > To subscribe, send the usual "subscribe" command to: 244c238,240 < majordomo@freetype.org --- > announce-request@freetype.org > freetype-request@freetype.org > devel-request@freetype.org 246,249c242 < To report bugs please use send an email to the address < bugs@freetype.org -- if you want help fixing bugs, contact < robert.wilhelm@freetype.org to be manually subscribed to this < closed list. --- > To report bugs please use send an e-mail to devel@freetype.org. 272a266,272 > Since version 1.5, you can also optionally choose to use the > GNU Public Licence (GPL) instead. The GPL is used only to allow > GPL-ed applications to use FreeType (since the "disclaimer > clause" is considered an unacceptable "restriction" in GNU > speak); for a commercial product, you should avoid the GPL, and > then elect the FreeType licence. > 288c288 < you're really stuck, mail your question to: --- > you are really stuck, mail your question to: 292c292 < We'll try to help you. --- > We shall try to help you. 309c309 < You're welcome to volunteer for other platforms, like: --- > You are welcome to volunteer for other platforms, like: 327c327 < If you're compiling with another compiler, you may encounter --- > If you are compiling with another compiler, you may encounter 572c572 < locale. Currently French, Dutch, Spanish, German, and Czech --- > locale. Currently Czech, Dutch, French, German, and Spanish 579a580,585 > > fterror also gives you a textual interpretation of a particular > (numerical) error code, as returned by the Freetype library. > Example: > > LANG=fr fterror 0x40E Index: freetype/announce =================================================================== RCS file: /cvs/freetype/freetype/announce,v retrieving revision 1.14 retrieving revision 1.17 diff -r1.14 -r1.17 6c6 < F R E E T Y P E 1 . 4 --- > F R E E T Y P E 1 . 4 . 9 12c12 < Copyright (C) 1996-2000 The FreeType Development Team --- > Copyright (C) 1996-2001 The FreeType Development Team 34,35c34,35 < THE FREE USE OF THE FREETYPE LIBRARY MIGHT BE ILLEGAL IN THE USA, < JAPAN, AND POSSIBLY OTHER COUNTRIES. FOR MORE INFORMATION, WE --- > THE FREE USE OF THE FREETYPE LIBRARY MIGHT BE ILLEGAL IN FRANCE, > UK, USA, AND POSSIBLY OTHER COUNTRIES. FOR MORE INFORMATION, WE 53c53,54 < . version 1.4 fixes minor bugs found in 1.3.1. --- > . version 1.5 fixes minor bugs found in 1.3.1. > . version 1.4 were never released officially (by us). 68d68 < Index: freetype/config.guess =================================================================== RCS file: /cvs/freetype/freetype/config.guess,v retrieving revision 1.8 retrieving revision 1.11 diff -r1.8 -r1.11 3,4c3,4 < # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 < # Free Software Foundation, Inc. --- > # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, > # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. 6c6 < version='2000-07-27' --- > timestamp='2003-08-18' 27,28c27,29 < # Written by Per Bothner . < # Please send patches to . --- > # Originally written by Per Bothner . > # Please send patches to . Submit a context > # diff and a properly formatted ChangeLog entry. 35,39c36 < # don't specify an explicit system type (host/target name). < # < # Only a few systems have been added to this list; please add others < # (but try to keep the structure clean). < # --- > # don't specify an explicit build system type. 46c43 < Output the configuration name of this system. --- > Output the configuration name of the system \`$me' is run on. 49,50c46,60 < -h, --help print this help, then exit < -V, --version print version number, then exit" --- > -h, --help print this help, then exit > -t, --time-stamp print date of last modification, then exit > -v, --version print version number, then exit > > Report bugs and patches to ." > > version="\ > GNU config.guess ($timestamp) > > Originally written by Per Bothner. > Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 > Free Software Foundation, Inc. > > This is free software; see the source for copying conditions. There is NO > warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." 57,58c67,70 < case "$1" in < --version | --vers* | -V ) --- > case $1 in > --time-stamp | --time* | -t ) > echo "$timestamp" ; exit 0 ;; > --version | -v ) 67,69c79 < exec >&2 < echo "$me: invalid option $1" < echo "$help" --- > echo "$me: invalid option $1$help" >&2 81,92c91 < # Use $HOST_CC if defined. $CC may point to a cross-compiler < if test x"$CC_FOR_BUILD" = x; then < if test x"$HOST_CC" != x; then < CC_FOR_BUILD="$HOST_CC" < else < if test x"$CC" != x; then < CC_FOR_BUILD="$CC" < else < CC_FOR_BUILD=cc < fi < fi < fi --- > trap 'exit 1' 1 2 15 93a93,126 > # CC_FOR_BUILD -- compiler used by this script. Note that the use of a > # compiler to aid in system detection is discouraged as it requires > # temporary files to be created and, as you can see below, it is a > # headache to deal with in a portable fashion. > > # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still > # use `HOST_CC' if defined, but it is deprecated. > > # Portable tmp directory creation inspired by the Autoconf team. > > set_cc_for_build=' > trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; > trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; > : ${TMPDIR=/tmp} ; > { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || > { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || > { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || > { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; > dummy=$tmp/dummy ; > tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; > case $CC_FOR_BUILD,$HOST_CC,$CC in > ,,) echo "int x;" > $dummy.c ; > for c in cc gcc c89 c99 ; do > if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then > CC_FOR_BUILD="$c"; break ; > fi ; > done ; > if test x"$CC_FOR_BUILD" = x ; then > CC_FOR_BUILD=no_compiler_found ; > fi > ;; > ,,*) CC_FOR_BUILD=$CC ;; > ,*,*) CC_FOR_BUILD=$HOST_CC ;; > esac ;' 96c129 < # (ghazi@noc.rutgers.edu 8/24/94.) --- > # (ghazi@noc.rutgers.edu 1994-08-24) 103c136 < UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown --- > UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown 106,108d138 < dummy=dummy-$$ < trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15 < 113c143 < # Netbsd (nbsd) targets should (where applicable) match one or --- > # NetBSD (nbsd) targets should (where applicable) match one or 120,130c150,180 < # Determine the machine/vendor (is the vendor relevant). < case "${UNAME_MACHINE}" in < amiga) machine=m68k-unknown ;; < arm32) machine=arm-unknown ;; < atari*) machine=m68k-atari ;; < sun3*) machine=m68k-sun ;; < mac68k) machine=m68k-apple ;; < macppc) machine=powerpc-apple ;; < hp3[0-9][05]) machine=m68k-hp ;; < ibmrt|romp-ibm) machine=romp-ibm ;; < *) machine=${UNAME_MACHINE}-unknown ;; --- > # > # Note: NetBSD doesn't particularly care about the vendor > # portion of the name. We always set it to "unknown". > sysctl="sysctl -n hw.machine_arch" > UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ > /usr/sbin/$sysctl 2>/dev/null || echo unknown)` > case "${UNAME_MACHINE_ARCH}" in > armeb) machine=armeb-unknown ;; > arm*) machine=arm-unknown ;; > sh3el) machine=shl-unknown ;; > sh3eb) machine=sh-unknown ;; > *) machine=${UNAME_MACHINE_ARCH}-unknown ;; > esac > # The Operating System including object format, if it has switched > # to ELF recently, or will in the future. > case "${UNAME_MACHINE_ARCH}" in > arm*|i386|m68k|ns32k|sh3*|sparc|vax) > eval $set_cc_for_build > if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ > | grep __ELF__ >/dev/null > then > # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). > # Return netbsd for either. FIX? > os=netbsd > else > os=netbsdelf > fi > ;; > *) > os=netbsd > ;; 132,141d181 < # The Operating System including object format. < if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ < | grep __ELF__ >/dev/null < then < # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). < # Return netbsd for either. FIX? < os=netbsd < else < os=netbsdelf < fi 143c183,194 < release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` --- > # Debian GNU/NetBSD machines have a different userland, and > # thus, need a distinct triplet. However, they do not need > # kernel version information, so it can be replaced with a > # suitable tag, in the style of linux-gnu. > case "${UNAME_VERSION}" in > Debian*) > release='-gnu' > ;; > *) > release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` > ;; > esac 148a200,238 > amiga:OpenBSD:*:*) > echo m68k-unknown-openbsd${UNAME_RELEASE} > exit 0 ;; > arc:OpenBSD:*:*) > echo mipsel-unknown-openbsd${UNAME_RELEASE} > exit 0 ;; > hp300:OpenBSD:*:*) > echo m68k-unknown-openbsd${UNAME_RELEASE} > exit 0 ;; > mac68k:OpenBSD:*:*) > echo m68k-unknown-openbsd${UNAME_RELEASE} > exit 0 ;; > macppc:OpenBSD:*:*) > echo powerpc-unknown-openbsd${UNAME_RELEASE} > exit 0 ;; > mvme68k:OpenBSD:*:*) > echo m68k-unknown-openbsd${UNAME_RELEASE} > exit 0 ;; > mvme88k:OpenBSD:*:*) > echo m88k-unknown-openbsd${UNAME_RELEASE} > exit 0 ;; > mvmeppc:OpenBSD:*:*) > echo powerpc-unknown-openbsd${UNAME_RELEASE} > exit 0 ;; > pmax:OpenBSD:*:*) > echo mipsel-unknown-openbsd${UNAME_RELEASE} > exit 0 ;; > sgi:OpenBSD:*:*) > echo mipseb-unknown-openbsd${UNAME_RELEASE} > exit 0 ;; > sun3:OpenBSD:*:*) > echo m68k-unknown-openbsd${UNAME_RELEASE} > exit 0 ;; > wgrisc:OpenBSD:*:*) > echo mipsel-unknown-openbsd${UNAME_RELEASE} > exit 0 ;; > *:OpenBSD:*:*) > echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} > exit 0 ;; 152a243,279 > # According to Compaq, /usr/sbin/psrinfo has been available on > # OSF/1 and Tru64 systems produced since 1995. I hope that > # covers most systems running today. This code pipes the CPU > # types through head -n 1, so we only detect the type of CPU 0. > ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` > case "$ALPHA_CPU_TYPE" in > "EV4 (21064)") > UNAME_MACHINE="alpha" ;; > "EV4.5 (21064)") > UNAME_MACHINE="alpha" ;; > "LCA4 (21066/21068)") > UNAME_MACHINE="alpha" ;; > "EV5 (21164)") > UNAME_MACHINE="alphaev5" ;; > "EV5.6 (21164A)") > UNAME_MACHINE="alphaev56" ;; > "EV5.6 (21164PC)") > UNAME_MACHINE="alphapca56" ;; > "EV5.7 (21164PC)") > UNAME_MACHINE="alphapca57" ;; > "EV6 (21264)") > UNAME_MACHINE="alphaev6" ;; > "EV6.7 (21264A)") > UNAME_MACHINE="alphaev67" ;; > "EV6.8CB (21264C)") > UNAME_MACHINE="alphaev68" ;; > "EV6.8AL (21264B)") > UNAME_MACHINE="alphaev68" ;; > "EV6.8CX (21264D)") > UNAME_MACHINE="alphaev68" ;; > "EV6.9A (21264/EV69A)") > UNAME_MACHINE="alphaev69" ;; > "EV7 (21364)") > UNAME_MACHINE="alphaev7" ;; > "EV7.9 (21364A)") > UNAME_MACHINE="alphaev79" ;; > esac 157,205d283 < cat <$dummy.s < .data < \$Lformat: < .byte 37,100,45,37,120,10,0 # "%d-%x\n" < < .text < .globl main < .align 4 < .ent main < main: < .frame \$30,16,\$26,0 < ldgp \$29,0(\$27) < .prologue 1 < .long 0x47e03d80 # implver \$0 < lda \$2,-1 < .long 0x47e20c21 # amask \$2,\$1 < lda \$16,\$Lformat < mov \$0,\$17 < not \$1,\$18 < jsr \$26,printf < ldgp \$29,0(\$26) < mov 0,\$16 < jsr \$26,exit < .end main < EOF < $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null < if test "$?" = 0 ; then < case `./$dummy` in < 0-0) < UNAME_MACHINE="alpha" < ;; < 1-0) < UNAME_MACHINE="alphaev5" < ;; < 1-1) < UNAME_MACHINE="alphaev56" < ;; < 1-101) < UNAME_MACHINE="alphapca56" < ;; < 2-303) < UNAME_MACHINE="alphaev6" < ;; < 2-307) < UNAME_MACHINE="alphaev67" < ;; < esac < fi < rm -f $dummy.s $dummy 207a286,288 > Alpha*:OpenVMS:*:*) > echo alpha-hp-vms > exit 0 ;; 220,222d300 < amiga:OpenBSD:*:*) < echo m68k-unknown-openbsd${UNAME_RELEASE} < exit 0 ;; 226,242c304,305 < arc64:OpenBSD:*:*) < echo mips64el-unknown-openbsd${UNAME_RELEASE} < exit 0 ;; < arc:OpenBSD:*:*) < echo mipsel-unknown-openbsd${UNAME_RELEASE} < exit 0 ;; < hkmips:OpenBSD:*:*) < echo mips-unknown-openbsd${UNAME_RELEASE} < exit 0 ;; < pmax:OpenBSD:*:*) < echo mipsel-unknown-openbsd${UNAME_RELEASE} < exit 0 ;; < sgi:OpenBSD:*:*) < echo mips-unknown-openbsd${UNAME_RELEASE} < exit 0 ;; < wgrisc:OpenBSD:*:*) < echo mipsel-unknown-openbsd${UNAME_RELEASE} --- > *:[Mm]orph[Oo][Ss]:*:*) > echo ${UNAME_MACHINE}-unknown-morphos 250c313 < SR2?01:HI-UX/MPP:*:*) --- > SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) 263a327,333 > DRS?6000:unix:4.0:6*) > echo sparc-icl-nx6 > exit 0 ;; > DRS?6000:UNIX_SV:4.2*:7*) > case `/usr/bin/uname -p` in > sparc) echo sparc-icl-nx7 && exit 0 ;; > esac ;; 292c362 < UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` --- > UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` 306,308d375 < atari*:OpenBSD:*:*) < echo m68k-unknown-openbsd${UNAME_RELEASE} < exit 0 ;; 335,346d401 < sun3*:OpenBSD:*:*) < echo m68k-unknown-openbsd${UNAME_RELEASE} < exit 0 ;; < mac68k:OpenBSD:*:*) < echo m68k-unknown-openbsd${UNAME_RELEASE} < exit 0 ;; < mvme68k:OpenBSD:*:*) < echo m68k-unknown-openbsd${UNAME_RELEASE} < exit 0 ;; < mvme88k:OpenBSD:*:*) < echo m88k-unknown-openbsd${UNAME_RELEASE} < exit 0 ;; 362a418 > eval $set_cc_for_build 384,387c440,442 < $CC_FOR_BUILD $dummy.c -o $dummy \ < && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ < && rm $dummy.c $dummy && exit 0 < rm -f $dummy.c $dummy --- > $CC_FOR_BUILD -o $dummy $dummy.c \ > && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ > && exit 0 389a445,453 > Motorola:PowerMAX_OS:*:*) > echo powerpc-motorola-powermax > exit 0 ;; > Motorola:*:4.3:PL8-*) > echo powerpc-harris-powermax > exit 0 ;; > Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) > echo powerpc-harris-powermax > exit 0 ;; 437c501 < i?86:AIX:*:*) --- > i*86:AIX:*:*) 439a504,511 > ia64:AIX:*:*) > if [ -x /usr/bin/oslevel ] ; then > IBM_REV=`/usr/bin/oslevel` > else > IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} > fi > echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} > exit 0 ;; 441a514 > eval $set_cc_for_build 453,454c526 < $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0 < rm -f $dummy.c $dummy --- > $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 462,464c534,536 < *:AIX:*:4) < IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` < if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then --- > *:AIX:*:[45]) > IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` > if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then 472c544 < IBM_REV=4.${UNAME_RELEASE} --- > IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} 497a570 > HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` 502c575,591 < sed 's/^ //' << EOF >$dummy.c --- > if [ -x /usr/bin/getconf ]; then > sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` > sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` > case "${sc_cpu_version}" in > 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 > 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 > 532) # CPU_PA_RISC2_0 > case "${sc_kernel_bits}" in > 32) HP_ARCH="hppa2.0n" ;; > 64) HP_ARCH="hppa2.0w" ;; > '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 > esac ;; > esac > fi > if [ "${HP_ARCH}" = "" ]; then > eval $set_cc_for_build > sed 's/^ //' << EOF >$dummy.c 535,536c624,626 < (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` < rm -f $dummy.c $dummy --- > (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` > test -z "$HP_ARCH" && HP_ARCH=hppa > fi ;; 538c628,638 < HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` --- > if [ ${HP_ARCH} = "hppa2.0w" ] > then > # avoid double evaluation of $set_cc_for_build > test -n "$CC_FOR_BUILD" || eval $set_cc_for_build > if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null > then > HP_ARCH="hppa2.0w" > else > HP_ARCH="hppa64" > fi > fi 540a641,644 > ia64:HP-UX:*:*) > HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` > echo ia64-hp-hpux${HPUX_REV} > exit 0 ;; 541a646 > eval $set_cc_for_build 567,568c672 < $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0 < rm -f $dummy.c $dummy --- > $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 577c681 < *9??*:MPE/iX:*:*) --- > *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) 586c690 < i?86:OSF1:*:*) --- > i*86:OSF1:*:*) 596,598d699 < hppa*:OpenBSD:*:*) < echo hppa-unknown-openbsd < exit 0 ;; 617,619d717 < CRAY*X-MP:*:*:*) < echo xmp-cray-unicos < exit 0 ;; 621c719 < echo ymp-cray-unicos${UNAME_RELEASE} --- > echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 626c724,725 < -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ --- > -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ > -e 's/\.[^.]*$/.X/' 632c731 < echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' --- > echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 637,640c736,740 < CRAY-2:*:*:*) < echo cray2-cray-unicos < exit 0 ;; < F300:UNIX_System_V:*:*) --- > *:UNICOS/mp:*:*) > echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' > exit 0 ;; > F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) > FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 643c743 < echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" --- > echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" 645,651c745 < F301:UNIX_System_V:*:*) < echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'` < exit 0 ;; < hp300:OpenBSD:*:*) < echo m68k-unknown-openbsd${UNAME_RELEASE} < exit 0 ;; < i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) --- > i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) 660,664c754,769 < *:FreeBSD:*:*) < echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` < exit 0 ;; < *:OpenBSD:*:*) < echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` --- > *:FreeBSD:*:*|*:GNU/FreeBSD:*:*) > # Determine whether the default compiler uses glibc. > eval $set_cc_for_build > sed 's/^ //' << EOF >$dummy.c > #include > #if __GLIBC__ >= 2 > LIBC=gnu > #else > LIBC= > #endif > EOF > eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` > # GNU/FreeBSD systems have a "k" prefix to indicate we are using > # FreeBSD's kernel, but not the complete OS. > case ${LIBC} in gnu) kernel_only='k' ;; esac > echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} 671a777,785 > i*:PW*:*) > echo ${UNAME_MACHINE}-pc-pw32 > exit 0 ;; > x86:Interix*:[34]*) > echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' > exit 0 ;; > [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) > echo i${UNAME_MACHINE}-pc-mks > exit 0 ;; 676c790 < echo i386-pc-interix --- > echo i586-pc-interix 693,694c807,903 < *:Linux:*:*) < --- > arm*:Linux:*:*) > echo ${UNAME_MACHINE}-unknown-linux-gnu > exit 0 ;; > cris:Linux:*:*) > echo cris-axis-linux-gnu > exit 0 ;; > ia64:Linux:*:*) > echo ${UNAME_MACHINE}-unknown-linux-gnu > exit 0 ;; > m68*:Linux:*:*) > echo ${UNAME_MACHINE}-unknown-linux-gnu > exit 0 ;; > mips:Linux:*:*) > eval $set_cc_for_build > sed 's/^ //' << EOF >$dummy.c > #undef CPU > #undef mips > #undef mipsel > #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) > CPU=mipsel > #else > #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) > CPU=mips > #else > CPU= > #endif > #endif > EOF > eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` > test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 > ;; > mips64:Linux:*:*) > eval $set_cc_for_build > sed 's/^ //' << EOF >$dummy.c > #undef CPU > #undef mips64 > #undef mips64el > #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) > CPU=mips64el > #else > #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) > CPU=mips64 > #else > CPU= > #endif > #endif > EOF > eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` > test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 > ;; > ppc:Linux:*:*) > echo powerpc-unknown-linux-gnu > exit 0 ;; > ppc64:Linux:*:*) > echo powerpc64-unknown-linux-gnu > exit 0 ;; > alpha:Linux:*:*) > case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in > EV5) UNAME_MACHINE=alphaev5 ;; > EV56) UNAME_MACHINE=alphaev56 ;; > PCA56) UNAME_MACHINE=alphapca56 ;; > PCA57) UNAME_MACHINE=alphapca56 ;; > EV6) UNAME_MACHINE=alphaev6 ;; > EV67) UNAME_MACHINE=alphaev67 ;; > EV68*) UNAME_MACHINE=alphaev68 ;; > esac > objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null > if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi > echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} > exit 0 ;; > parisc:Linux:*:* | hppa:Linux:*:*) > # Look for CPU level > case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in > PA7*) echo hppa1.1-unknown-linux-gnu ;; > PA8*) echo hppa2.0-unknown-linux-gnu ;; > *) echo hppa-unknown-linux-gnu ;; > esac > exit 0 ;; > parisc64:Linux:*:* | hppa64:Linux:*:*) > echo hppa64-unknown-linux-gnu > exit 0 ;; > s390:Linux:*:* | s390x:Linux:*:*) > echo ${UNAME_MACHINE}-ibm-linux > exit 0 ;; > sh64*:Linux:*:*) > echo ${UNAME_MACHINE}-unknown-linux-gnu > exit 0 ;; > sh*:Linux:*:*) > echo ${UNAME_MACHINE}-unknown-linux-gnu > exit 0 ;; > sparc:Linux:*:* | sparc64:Linux:*:*) > echo ${UNAME_MACHINE}-unknown-linux-gnu > exit 0 ;; > x86_64:Linux:*:*) > echo x86_64-unknown-linux-gnu > exit 0 ;; > i*86:Linux:*:*) 698,700c907,909 < ld_help_string=`cd /; ld --help 2>&1` < ld_supported_emulations=`echo $ld_help_string \ < | sed -ne '/supported emulations:/!d --- > # Set LC_ALL=C to ensure ld outputs messages in English. > ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ > | sed -ne '/supported targets:/!d 702c911 < s/.*supported emulations: *// --- > s/.*supported targets: *// 705,708c914,916 < case "$ld_supported_emulations" in < *ia64) < echo "${UNAME_MACHINE}-unknown-linux" < exit 0 --- > case "$ld_supported_targets" in > elf32-i386) > TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" 710c918 < i?86linux) --- > a.out-i386-linux) 712,718c920,921 < exit 0 < ;; < elf_i?86) < echo "${UNAME_MACHINE}-pc-linux" < exit 0 < ;; < i?86coff) --- > exit 0 ;; > coff-i386) 720,777c923,928 < exit 0 < ;; < sparclinux) < echo "${UNAME_MACHINE}-unknown-linux-gnuaout" < exit 0 < ;; < armlinux) < echo "${UNAME_MACHINE}-unknown-linux-gnuaout" < exit 0 < ;; < elf32arm*) < echo "${UNAME_MACHINE}-unknown-linux-gnuoldld" < exit 0 < ;; < armelf_linux*) < echo "${UNAME_MACHINE}-unknown-linux-gnu" < exit 0 < ;; < m68klinux) < echo "${UNAME_MACHINE}-unknown-linux-gnuaout" < exit 0 < ;; < elf32ppc | elf32ppclinux) < # Determine Lib Version < cat >$dummy.c < < #if defined(__GLIBC__) < extern char __libc_version[]; < extern char __libc_release[]; < #endif < main(argc, argv) < int argc; < char *argv[]; < { < #if defined(__GLIBC__) < printf("%s %s\n", __libc_version, __libc_release); < #else < printf("unkown\n"); < #endif < return 0; < } < EOF < LIBC="" < $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null < if test "$?" = 0 ; then < ./$dummy | grep 1\.99 > /dev/null < if test "$?" = 0 ; then < LIBC="libc1" < fi < fi < rm -f $dummy.c $dummy < echo powerpc-unknown-linux-gnu${LIBC} < exit 0 < ;; < shelf_linux) < echo "${UNAME_MACHINE}-unknown-linux-gnu" < exit 0 < ;; --- > exit 0 ;; > "") > # Either a pre-BFD a.out linker (linux-gnuoldld) or > # one that does not give us useful --help. > echo "${UNAME_MACHINE}-pc-linux-gnuoldld" > exit 0 ;; 779,899c930,953 < < if test "${UNAME_MACHINE}" = "alpha" ; then < cat <$dummy.s < .data < \$Lformat: < .byte 37,100,45,37,120,10,0 # "%d-%x\n" < < .text < .globl main < .align 4 < .ent main < main: < .frame \$30,16,\$26,0 < ldgp \$29,0(\$27) < .prologue 1 < .long 0x47e03d80 # implver \$0 < lda \$2,-1 < .long 0x47e20c21 # amask \$2,\$1 < lda \$16,\$Lformat < mov \$0,\$17 < not \$1,\$18 < jsr \$26,printf < ldgp \$29,0(\$26) < mov 0,\$16 < jsr \$26,exit < .end main < EOF < LIBC="" < $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null < if test "$?" = 0 ; then < case `./$dummy` in < 0-0) < UNAME_MACHINE="alpha" < ;; < 1-0) < UNAME_MACHINE="alphaev5" < ;; < 1-1) < UNAME_MACHINE="alphaev56" < ;; < 1-101) < UNAME_MACHINE="alphapca56" < ;; < 2-303) < UNAME_MACHINE="alphaev6" < ;; < 2-307) < UNAME_MACHINE="alphaev67" < ;; < esac < < objdump --private-headers $dummy | \ < grep ld.so.1 > /dev/null < if test "$?" = 0 ; then < LIBC="libc1" < fi < fi < rm -f $dummy.s $dummy < echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0 < elif test "${UNAME_MACHINE}" = "mips" ; then < cat >$dummy.c < /* for printf() prototype */ < int main (int argc, char *argv[]) { < #else < int main (argc, argv) int argc; char *argv[]; { < #endif < #ifdef __MIPSEB__ < printf ("%s-unknown-linux-gnu\n", argv[1]); < #endif < #ifdef __MIPSEL__ < printf ("%sel-unknown-linux-gnu\n", argv[1]); < #endif < return 0; < } < EOF < $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0 < rm -f $dummy.c $dummy < elif test "${UNAME_MACHINE}" = "s390"; then < echo s390-ibm-linux && exit 0 < else < # Either a pre-BFD a.out linker (linux-gnuoldld) < # or one that does not give us useful --help. < # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout. < # If ld does not provide *any* "supported emulations:" < # that means it is gnuoldld. < echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:" < test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0 < < case "${UNAME_MACHINE}" in < i?86) < VENDOR=pc; < ;; < *) < VENDOR=unknown; < ;; < esac < # Determine whether the default compiler is a.out or elf < cat >$dummy.c < < #ifdef __cplusplus < #include /* for printf() prototype */ < int main (int argc, char *argv[]) { < #else < int main (argc, argv) int argc; char *argv[]; { < #endif < #ifdef __ELF__ < # ifdef __GLIBC__ < # if __GLIBC__ >= 2 < printf ("%s-${VENDOR}-linux-gnu\n", argv[1]); < # else < printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]); < # endif < # else < printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]); < # endif < #else < printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]); < #endif < return 0; < } --- > # Determine whether the default compiler is a.out or elf > eval $set_cc_for_build > sed 's/^ //' << EOF >$dummy.c > #include > #ifdef __ELF__ > # ifdef __GLIBC__ > # if __GLIBC__ >= 2 > LIBC=gnu > # else > LIBC=gnulibc1 > # endif > # else > LIBC=gnulibc1 > # endif > #else > #ifdef __INTEL_COMPILER > LIBC=gnu > #else > LIBC=gnuaout > #endif > #endif > #ifdef __dietlibc__ > LIBC=dietlibc > #endif 901,906c955,962 < $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0 < rm -f $dummy.c $dummy < fi ;; < # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions < # are messed up and put the nodename in both sysname and nodename. < i?86:DYNIX/ptx:4*:*) --- > eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` > test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 > test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 > ;; > i*86:DYNIX/ptx:4*:*) > # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. > # earlier versions are messed up and put the nodename in both > # sysname and nodename. 909c965 < i?86:UNIX_SV:4.2MP:2.*) --- > i*86:UNIX_SV:4.2MP:2.*) 917c973,990 < i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*) --- > i*86:OS/2:*:*) > # If we were able to find `uname', then EMX Unix compatibility > # is probably installed. > echo ${UNAME_MACHINE}-pc-os2-emx > exit 0 ;; > i*86:XTS-300:*:STOP) > echo ${UNAME_MACHINE}-unknown-stop > exit 0 ;; > i*86:atheos:*:*) > echo ${UNAME_MACHINE}-unknown-atheos > exit 0 ;; > i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) > echo i386-unknown-lynxos${UNAME_RELEASE} > exit 0 ;; > i*86:*DOS:*:*) > echo ${UNAME_MACHINE}-pc-msdosdjgpp > exit 0 ;; > i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) 925,932c998,1004 < i?86:*:5:7*) < # Fixed at (any) Pentium or better < UNAME_MACHINE=i586 < if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then < echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION} < else < echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} < fi --- > i*86:*:5:[78]*) > case `/bin/uname -X | grep "^Machine"` in > *486*) UNAME_MACHINE=i486 ;; > *Pentium) UNAME_MACHINE=i586 ;; > *Pent*|*Celeron) UNAME_MACHINE=i686 ;; > esac > echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} 934c1006 < i?86:*:3.2:*) --- > i*86:*:3.2:*) 939,941c1011,1013 < UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` < (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 < (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ --- > UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` > (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 > (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ 943c1015 < (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ --- > (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ 945c1017 < (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ --- > (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ 952,954d1023 < i?86:*DOS:*:*) < echo ${UNAME_MACHINE}-pc-msdosdjgpp < exit 0 ;; 977a1047,1052 > mc68k:UNIX:SYSTEM5:3.51m) > echo m68k-convergent-sysv > exit 0 ;; > M680?0:D-NIX:5.3:*) > echo m68k-diab-dnix > exit 0 ;; 980c1055 < 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) --- > 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) 991c1066 < m68*:LynxOS:2.*:*) --- > m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) 997,999d1071 < i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*) < echo i386-unknown-lynxos${UNAME_RELEASE} < exit 0 ;; 1003c1075 < rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*) --- > rs6000:LynxOS:2.*:*) 1005a1078,1080 > PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) > echo powerpc-unknown-lynxos${UNAME_RELEASE} > exit 0 ;; 1023,1024c1098,1099 < PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort < # says --- > PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort > # says 1035a1111,1114 > *:VOS:*:*) > # From Paul.Green@stratus.com. > echo hppa1.1-stratus-vos > exit 0 ;; 1039c1118 < news*:NEWS-OS:*:6*) --- > news*:NEWS-OS:6*:*) 1063a1143,1145 > SX-6:SUPER-UX:*:*) > echo sx6-nec-superux${UNAME_RELEASE} > exit 0 ;; 1071c1153,1157 < echo `uname -p`-apple-darwin${UNAME_RELEASE} --- > case `uname -p` in > *86) UNAME_PROCESSOR=i686 ;; > powerpc) UNAME_PROCESSOR=powerpc ;; > esac > echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} 1074c1160,1162 < if test "${UNAME_MACHINE}" = "x86pc"; then --- > UNAME_PROCESSOR=`uname -p` > if test "$UNAME_PROCESSOR" = "x86"; then > UNAME_PROCESSOR=i386 1077c1165 < echo `uname -p`-${UNAME_MACHINE}-nto-qnx --- > echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} 1082c1170 < NSR-W:NONSTOP_KERNEL:*:*) --- > NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) 1084a1173,1175 > *:NonStop-UX:*:*) > echo mips-compaq-nonstopux > exit 0 ;; 1101a1193,1213 > *:TOPS-10:*:*) > echo pdp10-unknown-tops10 > exit 0 ;; > *:TENEX:*:*) > echo pdp10-unknown-tenex > exit 0 ;; > KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) > echo pdp10-dec-tops20 > exit 0 ;; > XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) > echo pdp10-xkl-tops20 > exit 0 ;; > *:TOPS-20:*:*) > echo pdp10-unknown-tops20 > exit 0 ;; > *:ITS:*:*) > echo pdp10-unknown-its > exit 0 ;; > SEI:*:*:SEIUX) > echo mips-sei-seiux${UNAME_RELEASE} > exit 0 ;; 1106a1219 > eval $set_cc_for_build 1193,1197c1306,1323 < #if !defined (ultrix) < printf ("vax-dec-bsd\n"); exit (0); < #else < printf ("vax-dec-ultrix\n"); exit (0); < #endif --- > # if !defined (ultrix) > # include > # if defined (BSD) > # if BSD == 43 > printf ("vax-dec-bsd4.3\n"); exit (0); > # else > # if BSD == 199006 > printf ("vax-dec-bsd4.3reno\n"); exit (0); > # else > printf ("vax-dec-bsd\n"); exit (0); > # endif > # endif > # else > printf ("vax-dec-bsd\n"); exit (0); > # endif > # else > printf ("vax-dec-ultrix\n"); exit (0); > # endif 1208,1209c1334 < $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0 < rm -f $dummy.c $dummy --- > $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 1244,1245c1369,1371 < The $version version of this script cannot recognize your system type. < Please download the most up to date version of the config scripts: --- > This script, last modified $timestamp, has failed to recognize > the operating system you are using. It is advised that you > download the most up to date version of the config scripts from 1254c1380 < config.guess version = $version --- > config.guess timestamp = $timestamp 1281c1407 < # time-stamp-start: "version='" --- > # time-stamp-start: "timestamp='" Index: freetype/config.sub =================================================================== RCS file: /cvs/freetype/freetype/config.sub,v retrieving revision 1.8 retrieving revision 1.11 diff -r1.8 -r1.11 2,4c2,4 < # Configuration validation subroutine script, version 1.1. < # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 < # Free Software Foundation, Inc. --- > # Configuration validation subroutine script. > # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, > # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. 6c6 < version='2000-07-27' --- > timestamp='2003-08-18' 32c32,33 < # Please send patches to . --- > # Please send patches to . Submit a context > # diff and a properly formatted ChangeLog entry. 63,64c64,77 < -h, --help print this help, then exit < -V, --version print version number, then exit" --- > -h, --help print this help, then exit > -t, --time-stamp print date of last modification, then exit > -v, --version print version number, then exit > > Report bugs and patches to ." > > version="\ > GNU config.sub ($timestamp) > > Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 > Free Software Foundation, Inc. > > This is free software; see the source for copying conditions. There is NO > warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." 71,72c84,87 < case "$1" in < --version | --vers* | -V ) --- > case $1 in > --time-stamp | --time* | -t ) > echo "$timestamp" ; exit 0 ;; > --version | -v ) 81,83c96 < exec >&2 < echo "$me: invalid option $1" < echo "$help" --- > echo "$me: invalid option $1$help" 108c121 < nto-qnx* | linux-gnu*) --- > nto-qnx* | linux-gnu* | linux-dietlibc | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) 147a161,168 > -chorusos*) > os=-chorusos > basic_machine=$1 > ;; > -chorusrdb) > os=-chorusrdb > basic_machine=$1 > ;; 206,221c227,269 < tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \ < | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \ < | 580 | i960 | h8300 \ < | x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \ < | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ < | hppa64 \ < | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \ < | alphaev6[78] \ < | we32k | ns16k | clipper | i370 | sh | sh[34] \ < | powerpc | powerpcle \ < | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \ < | mips64orion | mips64orionel | mipstx39 | mipstx39el \ < | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ < | mips64vr5000 | miprs64vr5000el | mcore \ < | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \ < | thumb | d10v | d30v | fr30 | avr) --- > 1750a | 580 \ > | a29k \ > | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ > | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ > | am33_2.0 \ > | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ > | c4x | clipper \ > | d10v | d30v | dlx | dsp16xx \ > | fr30 | frv \ > | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ > | i370 | i860 | i960 | ia64 \ > | ip2k | iq2000 \ > | m32r | m68000 | m68k | m88k | mcore \ > | mips | mipsbe | mipseb | mipsel | mipsle \ > | mips16 \ > | mips64 | mips64el \ > | mips64vr | mips64vrel \ > | mips64orion | mips64orionel \ > | mips64vr4100 | mips64vr4100el \ > | mips64vr4300 | mips64vr4300el \ > | mips64vr5000 | mips64vr5000el \ > | mipsisa32 | mipsisa32el \ > | mipsisa32r2 | mipsisa32r2el \ > | mipsisa64 | mipsisa64el \ > | mipsisa64sb1 | mipsisa64sb1el \ > | mipsisa64sr71k | mipsisa64sr71kel \ > | mipstx39 | mipstx39el \ > | mn10200 | mn10300 \ > | msp430 \ > | ns16k | ns32k \ > | openrisc | or32 \ > | pdp10 | pdp11 | pj | pjl \ > | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ > | pyramid \ > | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ > | sh64 | sh64le \ > | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ > | strongarm \ > | tahoe | thumb | tic4x | tic80 | tron \ > | v850 | v850e \ > | we32k \ > | x86 | xscale | xstormy16 | xtensa \ > | z8k) 229c277 < m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl) --- > m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) 235c283 < i[234567]86) --- > i*86 | x86_64) 244,265c292,345 < # FIXME: clean up the formatting here. < vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \ < | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \ < | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ < | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ < | xmp-* | ymp-* \ < | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \ < | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \ < | hppa2.0n-* | hppa64-* \ < | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \ < | alphaev6[78]-* \ < | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ < | clipper-* | orion-* \ < | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ < | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \ < | mips64el-* | mips64orion-* | mips64orionel-* \ < | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ < | mipstx39-* | mipstx39el-* | mcore-* \ < | f301-* | armv*-* | s390-* | sv1-* | t3e-* \ < | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ < | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \ < | bs2000-* | tic54x-* | c54x-*) --- > 580-* \ > | a29k-* \ > | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ > | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ > | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ > | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ > | avr-* \ > | bs2000-* \ > | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ > | clipper-* | cydra-* \ > | d10v-* | d30v-* | dlx-* \ > | elxsi-* \ > | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ > | h8300-* | h8500-* \ > | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ > | i*86-* | i860-* | i960-* | ia64-* \ > | ip2k-* | iq2000-* \ > | m32r-* \ > | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ > | m88110-* | m88k-* | mcore-* \ > | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ > | mips16-* \ > | mips64-* | mips64el-* \ > | mips64vr-* | mips64vrel-* \ > | mips64orion-* | mips64orionel-* \ > | mips64vr4100-* | mips64vr4100el-* \ > | mips64vr4300-* | mips64vr4300el-* \ > | mips64vr5000-* | mips64vr5000el-* \ > | mipsisa32-* | mipsisa32el-* \ > | mipsisa32r2-* | mipsisa32r2el-* \ > | mipsisa64-* | mipsisa64el-* \ > | mipsisa64sb1-* | mipsisa64sb1el-* \ > | mipsisa64sr71k-* | mipsisa64sr71kel-* \ > | mipstx39-* | mipstx39el-* \ > | msp430-* \ > | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ > | orion-* \ > | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ > | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ > | pyramid-* \ > | romp-* | rs6000-* \ > | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ > | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ > | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ > | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ > | tahoe-* | thumb-* \ > | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ > | tron-* \ > | v850-* | v850e-* | vax-* \ > | we32k-* \ > | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ > | xtensa-* \ > | ymp-* \ > | z8k-*) 296a377,379 > amd64) > basic_machine=x86_64-pc > ;; 327a411,414 > c90) > basic_machine=c90-cray > os=-unicos > ;; 348,357c435,436 < cray | ymp) < basic_machine=ymp-cray < os=-unicos < ;; < cray2) < basic_machine=cray2-cray < os=-unicos < ;; < [ctj]90-cray) < basic_machine=c90-cray --- > cray | j90) > basic_machine=j90-cray 371a451,458 > decsystem10* | dec10*) > basic_machine=pdp10-dec > os=-tops10 > ;; > decsystem20* | dec20*) > basic_machine=pdp10-dec > os=-tops20 > ;; 412a500,503 > go32) > basic_machine=i386-pc > os=-go32 > ;; 488c579 < i[34567]86v32) --- > i*86v32) 492c583 < i[34567]86v4*) --- > i*86v4*) 496c587 < i[34567]86v) --- > i*86v) 500c591 < i[34567]86sol2) --- > i*86sol2) 512,519d602 < i386-go32 | go32) < basic_machine=i386-unknown < os=-go32 < ;; < i386-mingw32 | mingw32) < basic_machine=i386-unknown < os=-mingw32 < ;; 544a628,631 > mingw32) > basic_machine=i386-pc > os=-mingw32 > ;; 552,559d638 < mipsel*-linux*) < basic_machine=mipsel-unknown < os=-linux-gnu < ;; < mips*-linux*) < basic_machine=mips-unknown < os=-linux-gnu < ;; 573a653,656 > morphos) > basic_machine=powerpc-unknown > os=-morphos > ;; 575c658 < basic_machine=i386-unknown --- > basic_machine=i386-pc 638a722,725 > nonstopux) > basic_machine=mips-compaq > os=-nonstopux > ;; 641a729,732 > nv1) > basic_machine=nv1-cray > os=-unicosmp > ;; 648a740,743 > or32 | or32-*) > basic_machine=or32-unknown > os=-coff > ;; 671c766 < pc532 | pc532-*) --- > pc532 | pc532-*) 674c769 < pentium | p5 | k5 | k6 | nexen) --- > pentium | p5 | k5 | k6 | nexgen | viac3) 677c772,775 < pentiumpro | p6 | 6x86 | athlon) --- > pentiumpro | p6 | 6x86 | athlon | athlon_*) > basic_machine=i686-pc > ;; > pentiumii | pentium2 | pentiumiii | pentium3) 680c778 < pentiumii | pentium2) --- > pentium4) 683c781 < pentium-* | p5-* | k5-* | k6-* | nexen-*) --- > pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) 689c787,790 < pentiumii-* | pentium2-*) --- > pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) > basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` > ;; > pentium4-*) 695c796 < power) basic_machine=rs6000-ibm --- > power) basic_machine=power-ibm 698c799 < ;; --- > ;; 703c804 < ;; --- > ;; 706a808,817 > ppc64) basic_machine=powerpc64-unknown > ;; > ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` > ;; > ppc64le | powerpc64little | ppc64-le | powerpc64-little) > basic_machine=powerpc64le-unknown > ;; > ppc64le-* | powerpc64little-*) > basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` > ;; 709a821,824 > pw32) > basic_machine=i586-unknown > os=-pw32 > ;; 719a835,840 > s390 | s390-*) > basic_machine=s390-ibm > ;; > s390x | s390x-*) > basic_machine=s390x-ibm > ;; 723a845,854 > sb1) > basic_machine=mipsisa64sb1-unknown > ;; > sb1el) > basic_machine=mipsisa64sb1el-unknown > ;; > sei) > basic_machine=mips-sei > os=-seiux > ;; 731c862,865 < sparclite-wrs) --- > sh64) > basic_machine=sh64-unknown > ;; > sparclite-wrs | simso-wrs) 798c932,936 < basic_machine=t3e-cray --- > basic_machine=alphaev5-cray > os=-unicos > ;; > t90) > basic_machine=t90-cray 804a943,950 > tic55x | c55x*) > basic_machine=tic55x-unknown > os=-coff > ;; > tic6x | c6x*) > basic_machine=tic6x-unknown > os=-coff > ;; 810a957,960 > toad1) > basic_machine=pdp10-xkl > os=-tops20 > ;; 835,836c985,986 < basic_machine=f301-fujitsu < ;; --- > basic_machine=f301-fujitsu > ;; 857,861c1007 < xmp) < basic_machine=xmp-cray < os=-unicos < ;; < xps | xps100) --- > xps | xps100) 863a1010,1013 > ymp) > basic_machine=ymp-cray > os=-unicos > ;; 884,890d1033 < mips) < if [ x$os = x-linux-gnu ]; then < basic_machine=mips-unknown < else < basic_machine=mips-mips < fi < ;; 899a1043,1046 > pdp10) > # there are many clones, so DEC is not a safe bet > basic_machine=pdp10-unknown > ;; 906,907c1053,1057 < sh3 | sh4) < base_machine=sh-unknown --- > sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) > basic_machine=sh-unknown > ;; > sh64) > basic_machine=sh64-unknown 909c1059 < sparc | sparcv9) --- > sparc | sparcv9 | sparcv9b) 912c1062 < cydra) --- > cydra) 927,929c1077,1078 < c4x*) < basic_machine=c4x-none < os=-coff --- > *-unknown) > # Make sure to match an already-canonicalized machine name. 983c1132 < | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ --- > | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \ 986a1136 > | -chorusos* | -chorusrdb* \ 989,990c1139,1144 < | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ < | -openstep* | -oskit*) --- > | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ > | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ > | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ > | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ > | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ > | -powermax* | -dnix* | -nx6 | -nx7 | -sei*) 995c1149 < x86-* | i[34567]86-*) --- > x86-* | i*86-*) 1001a1156,1157 > -nto-qnx*) > ;; 1003c1159 < os=-nto-qnx --- > os=`echo $os | sed -e 's|nto|nto-qnx|'` 1011a1168,1170 > -linux-dietlibc) > os=-linux-dietlibc > ;; 1041a1201,1203 > -atheos*) > os=-atheos > ;; 1047a1210,1212 > -nova*) > os=-rtmk-nova > ;; 1049c1214 < os=-nextstep2 --- > os=-nextstep2 1051c1216 < -nsk) --- > -nsk*) 1088,1089c1253,1260 < -*mint | -*MiNT) < os=-mint --- > -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) > os=-mint > ;; > -aros*) > os=-aros > ;; > -kaos*) > os=-kaos 1122c1293,1300 < pdp11-*) --- > c4x-* | tic4x-*) > os=-coff > ;; > # This must come before the *-dec entry. > pdp10-*) > os=-tops20 > ;; > pdp11-*) 1148a1327,1329 > or32-*) > os=-coff > ;; 1212c1393 < *-gould) --- > *-gould) 1215c1396 < *-highlevel) --- > *-highlevel) 1221c1402 < *-sgi) --- > *-sgi) 1224c1405 < *-siemens) --- > *-siemens) 1230c1411 < f301-fujitsu) --- > f30[01]-fujitsu | f700-fujitsu) 1296c1477 < -vxsim* | -vxworks*) --- > -vxsim* | -vxworks* | -windiss*) 1308c1489 < -*mint | -*MiNT) --- > -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) 1310a1492,1494 > -vos*) > vendor=stratus > ;; 1321c1505 < # time-stamp-start: "version='" --- > # time-stamp-start: "timestamp='" Index: freetype/configure =================================================================== RCS file: /cvs/freetype/freetype/configure,v retrieving revision 1.49 retrieving revision 1.54 diff -r1.49 -r1.54 566a567 > 639c640 < echo "configure:640: checking host system type" >&5 --- > echo "configure:641: checking host system type" >&5 660c661 < echo "configure:661: checking build system type" >&5 --- > echo "configure:662: checking build system type" >&5 680c681 < echo "configure:681: checking for $ac_word" >&5 --- > echo "configure:682: checking for $ac_word" >&5 688a690,694 > ac_test_flag="-f" > if ! test -z "$COMSPEC$ComSpec"; then > ac_test_flag="-x" > IFS="${PATH_SEPARATOR-;}" > fi 691c697 < if test -f $ac_dir/$ac_word; then --- > if test $ac_test_flag $ac_dir/$ac_word; then 710c716 < echo "configure:711: checking for $ac_word" >&5 --- > echo "configure:717: checking for $ac_word" >&5 718a725,729 > ac_test_flag="-f" > if ! test -z "$COMSPEC$ComSpec"; then > ac_test_flag="-x" > IFS="${PATH_SEPARATOR-;}" > fi 721c732 < if test -f $ac_dir/$ac_word; then --- > if test $ac_test_flag $ac_dir/$ac_word; then 740c751 < echo "configure:741: checking for $ac_word" >&5 --- > echo "configure:752: checking for $ac_word" >&5 749a761,765 > ac_test_flag="-f" > if ! test -z "$COMSPEC$ComSpec"; then > ac_test_flag="-x" > IFS="${PATH_SEPARATOR-;}" > fi 752c768 < if test -f $ac_dir/$ac_word; then --- > if test $ac_test_flag $ac_dir/$ac_word; then 791c807 < echo "configure:792: checking for $ac_word" >&5 --- > echo "configure:808: checking for $ac_word" >&5 799a816,820 > ac_test_flag="-f" > if ! test -z "$COMSPEC$ComSpec"; then > ac_test_flag="-x" > IFS="${PATH_SEPARATOR-;}" > fi 802c823 < if test -f $ac_dir/$ac_word; then --- > if test $ac_test_flag $ac_dir/$ac_word; then 823c844 < echo "configure:824: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 --- > echo "configure:845: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 834c855 < #line 835 "configure" --- > #line 856 "configure" 839c860 < if { (eval echo configure:840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 865c886 < echo "configure:866: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 --- > echo "configure:887: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 870c891 < echo "configure:871: checking whether we are using GNU C" >&5 --- > echo "configure:892: checking whether we are using GNU C" >&5 879c900 < if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:880: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then --- > if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:901: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then 898c919 < echo "configure:899: checking whether ${CC-cc} accepts -g" >&5 --- > echo "configure:920: checking whether ${CC-cc} accepts -g" >&5 941c962 < echo "configure:942: checking for ld used by GCC" >&5 --- > echo "configure:963: checking for ld used by GCC" >&5 965c986 < echo "configure:966: checking for GNU ld" >&5 --- > echo "configure:987: checking for GNU ld" >&5 968c989 < echo "configure:969: checking for non-GNU ld" >&5 --- > echo "configure:990: checking for non-GNU ld" >&5 1003c1024 < echo "configure:1004: checking if the linker ($LD) is GNU ld" >&5 --- > echo "configure:1025: checking if the linker ($LD) is GNU ld" >&5 1019c1040 < echo "configure:1020: checking for BSD-compatible nm" >&5 --- > echo "configure:1041: checking for BSD-compatible nm" >&5 1055c1076 < echo "configure:1056: checking whether ln -s works" >&5 --- > echo "configure:1077: checking whether ln -s works" >&5 1074a1096,1101 > if test $host != $build; then > ac_tool_prefix=${host_alias}- > else > ac_tool_prefix= > fi > 1089c1116 < --- > libtool_flags="$libtool_flags --enable-win32-dll" 1104,1105c1131,1132 < echo '#line 1105 "configure"' > conftest.$ac_ext < if { (eval echo configure:1106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then --- > echo '#line 1132 "configure"' > conftest.$ac_ext > if { (eval echo configure:1133: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 1126c1153 < echo "configure:1127: checking whether the C compiler needs -belf" >&5 --- > echo "configure:1154: checking whether the C compiler needs -belf" >&5 1131c1158 < #line 1132 "configure" --- > #line 1159 "configure" 1138c1165 < if { (eval echo configure:1139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:1166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 1156a1184,1416 > *-*-cygwin* | *-*-mingw*) > # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. > set dummy ${ac_tool_prefix}dlltool; ac_word=$2 > echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 > echo "configure:1189: checking for $ac_word" >&5 > if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then > echo $ac_n "(cached) $ac_c" 1>&6 > else > if test -n "$DLLTOOL"; then > ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. > else > IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" > ac_dummy="$PATH" > ac_test_flag="-f" > if ! test -z "$COMSPEC$ComSpec"; then > ac_test_flag="-x" > IFS="${PATH_SEPARATOR-;}" > fi > for ac_dir in $ac_dummy; do > test -z "$ac_dir" && ac_dir=. > if test $ac_test_flag $ac_dir/$ac_word; then > ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" > break > fi > done > IFS="$ac_save_ifs" > fi > fi > DLLTOOL="$ac_cv_prog_DLLTOOL" > if test -n "$DLLTOOL"; then > echo "$ac_t""$DLLTOOL" 1>&6 > else > echo "$ac_t""no" 1>&6 > fi > > > if test -z "$ac_cv_prog_DLLTOOL"; then > if test -n "$ac_tool_prefix"; then > # Extract the first word of "dlltool", so it can be a program name with args. > set dummy dlltool; ac_word=$2 > echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 > echo "configure:1226: checking for $ac_word" >&5 > if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then > echo $ac_n "(cached) $ac_c" 1>&6 > else > if test -n "$DLLTOOL"; then > ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. > else > IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" > ac_dummy="$PATH" > ac_test_flag="-f" > if ! test -z "$COMSPEC$ComSpec"; then > ac_test_flag="-x" > IFS="${PATH_SEPARATOR-;}" > fi > for ac_dir in $ac_dummy; do > test -z "$ac_dir" && ac_dir=. > if test $ac_test_flag $ac_dir/$ac_word; then > ac_cv_prog_DLLTOOL="dlltool" > break > fi > done > IFS="$ac_save_ifs" > test -z "$ac_cv_prog_DLLTOOL" && ac_cv_prog_DLLTOOL="false" > fi > fi > DLLTOOL="$ac_cv_prog_DLLTOOL" > if test -n "$DLLTOOL"; then > echo "$ac_t""$DLLTOOL" 1>&6 > else > echo "$ac_t""no" 1>&6 > fi > > else > DLLTOOL="false" > fi > fi > > # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. > set dummy ${ac_tool_prefix}as; ac_word=$2 > echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 > echo "configure:1266: checking for $ac_word" >&5 > if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then > echo $ac_n "(cached) $ac_c" 1>&6 > else > if test -n "$AS"; then > ac_cv_prog_AS="$AS" # Let the user override the test. > else > IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" > ac_dummy="$PATH" > ac_test_flag="-f" > if ! test -z "$COMSPEC$ComSpec"; then > ac_test_flag="-x" > IFS="${PATH_SEPARATOR-;}" > fi > for ac_dir in $ac_dummy; do > test -z "$ac_dir" && ac_dir=. > if test $ac_test_flag $ac_dir/$ac_word; then > ac_cv_prog_AS="${ac_tool_prefix}as" > break > fi > done > IFS="$ac_save_ifs" > fi > fi > AS="$ac_cv_prog_AS" > if test -n "$AS"; then > echo "$ac_t""$AS" 1>&6 > else > echo "$ac_t""no" 1>&6 > fi > > > if test -z "$ac_cv_prog_AS"; then > if test -n "$ac_tool_prefix"; then > # Extract the first word of "as", so it can be a program name with args. > set dummy as; ac_word=$2 > echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 > echo "configure:1303: checking for $ac_word" >&5 > if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then > echo $ac_n "(cached) $ac_c" 1>&6 > else > if test -n "$AS"; then > ac_cv_prog_AS="$AS" # Let the user override the test. > else > IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" > ac_dummy="$PATH" > ac_test_flag="-f" > if ! test -z "$COMSPEC$ComSpec"; then > ac_test_flag="-x" > IFS="${PATH_SEPARATOR-;}" > fi > for ac_dir in $ac_dummy; do > test -z "$ac_dir" && ac_dir=. > if test $ac_test_flag $ac_dir/$ac_word; then > ac_cv_prog_AS="as" > break > fi > done > IFS="$ac_save_ifs" > test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="false" > fi > fi > AS="$ac_cv_prog_AS" > if test -n "$AS"; then > echo "$ac_t""$AS" 1>&6 > else > echo "$ac_t""no" 1>&6 > fi > > else > AS="false" > fi > fi > > # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. > set dummy ${ac_tool_prefix}objdump; ac_word=$2 > echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 > echo "configure:1343: checking for $ac_word" >&5 > if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then > echo $ac_n "(cached) $ac_c" 1>&6 > else > if test -n "$OBJDUMP"; then > ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. > else > IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" > ac_dummy="$PATH" > ac_test_flag="-f" > if ! test -z "$COMSPEC$ComSpec"; then > ac_test_flag="-x" > IFS="${PATH_SEPARATOR-;}" > fi > for ac_dir in $ac_dummy; do > test -z "$ac_dir" && ac_dir=. > if test $ac_test_flag $ac_dir/$ac_word; then > ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" > break > fi > done > IFS="$ac_save_ifs" > fi > fi > OBJDUMP="$ac_cv_prog_OBJDUMP" > if test -n "$OBJDUMP"; then > echo "$ac_t""$OBJDUMP" 1>&6 > else > echo "$ac_t""no" 1>&6 > fi > > > if test -z "$ac_cv_prog_OBJDUMP"; then > if test -n "$ac_tool_prefix"; then > # Extract the first word of "objdump", so it can be a program name with args. > set dummy objdump; ac_word=$2 > echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 > echo "configure:1380: checking for $ac_word" >&5 > if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then > echo $ac_n "(cached) $ac_c" 1>&6 > else > if test -n "$OBJDUMP"; then > ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. > else > IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" > ac_dummy="$PATH" > ac_test_flag="-f" > if ! test -z "$COMSPEC$ComSpec"; then > ac_test_flag="-x" > IFS="${PATH_SEPARATOR-;}" > fi > for ac_dir in $ac_dummy; do > test -z "$ac_dir" && ac_dir=. > if test $ac_test_flag $ac_dir/$ac_word; then > ac_cv_prog_OBJDUMP="objdump" > break > fi > done > IFS="$ac_save_ifs" > test -z "$ac_cv_prog_OBJDUMP" && ac_cv_prog_OBJDUMP="false" > fi > fi > OBJDUMP="$ac_cv_prog_OBJDUMP" > if test -n "$OBJDUMP"; then > echo "$ac_t""$OBJDUMP" 1>&6 > else > echo "$ac_t""no" 1>&6 > fi > > else > OBJDUMP="false" > fi > fi > > ;; 1240c1500 < freetype_version='1.4' --- > freetype_version='1.5' 1242c1502 < version_info='5:0:3' --- > version_info='6:0:4' 1282c1542 < echo "configure:1283: checking host system type" >&5 --- > echo "configure:1543: checking host system type" >&5 1303c1563 < echo "configure:1304: checking target system type" >&5 --- > echo "configure:1564: checking target system type" >&5 1321c1581 < echo "configure:1322: checking build system type" >&5 --- > echo "configure:1582: checking build system type" >&5 1347c1607 < echo "configure:1348: checking for $ac_word" >&5 --- > echo "configure:1608: checking for $ac_word" >&5 1355a1616,1620 > ac_test_flag="-f" > if ! test -z "$COMSPEC$ComSpec"; then > ac_test_flag="-x" > IFS="${PATH_SEPARATOR-;}" > fi 1358c1623 < if test -f $ac_dir/$ac_word; then --- > if test $ac_test_flag $ac_dir/$ac_word; then 1377c1642 < echo "configure:1378: checking for $ac_word" >&5 --- > echo "configure:1643: checking for $ac_word" >&5 1386a1652,1656 > ac_test_flag="-f" > if ! test -z "$COMSPEC$ComSpec"; then > ac_test_flag="-x" > IFS="${PATH_SEPARATOR-;}" > fi 1389c1659 < if test -f $ac_dir/$ac_word; then --- > if test $ac_test_flag $ac_dir/$ac_word; then 1428c1698 < echo "configure:1429: checking for $ac_word" >&5 --- > echo "configure:1699: checking for $ac_word" >&5 1436a1707,1711 > ac_test_flag="-f" > if ! test -z "$COMSPEC$ComSpec"; then > ac_test_flag="-x" > IFS="${PATH_SEPARATOR-;}" > fi 1439c1714 < if test -f $ac_dir/$ac_word; then --- > if test $ac_test_flag $ac_dir/$ac_word; then 1460c1735 < echo "configure:1461: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 --- > echo "configure:1736: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 1471c1746 < #line 1472 "configure" --- > #line 1747 "configure" 1476c1751 < if { (eval echo configure:1477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:1752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 1502c1777 < echo "configure:1503: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 --- > echo "configure:1778: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 1507c1782 < echo "configure:1508: checking whether we are using GNU C" >&5 --- > echo "configure:1783: checking whether we are using GNU C" >&5 1516c1791 < if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then --- > if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1792: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then 1535c1810 < echo "configure:1536: checking whether ${CC-cc} accepts -g" >&5 --- > echo "configure:1811: checking whether ${CC-cc} accepts -g" >&5 1567c1842 < echo "configure:1568: checking how to run the C preprocessor" >&5 --- > echo "configure:1843: checking how to run the C preprocessor" >&5 1582c1857 < #line 1583 "configure" --- > #line 1858 "configure" 1588c1863 < { (eval echo configure:1589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --- > { (eval echo configure:1864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 1599c1874 < #line 1600 "configure" --- > #line 1875 "configure" 1605c1880 < { (eval echo configure:1606: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --- > { (eval echo configure:1881: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 1616c1891 < #line 1617 "configure" --- > #line 1892 "configure" 1622c1897 < { (eval echo configure:1623: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --- > { (eval echo configure:1898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 1649c1924 < XX_CFLAGS="-Wall -pedantic -ansi" --- > XX_CFLAGS="-Wall -pedantic -ansi -D_REENTRANT" 1672a1948,1949 > > 1676c1953 < echo "configure:1677: checking whether ${MAKE-make} sets \${MAKE}" >&5 --- > echo "configure:1954: checking whether ${MAKE-make} sets \${MAKE}" >&5 1706c1983 < echo "configure:1707: checking for $ac_hdr" >&5 --- > echo "configure:1984: checking for $ac_hdr" >&5 1711c1988 < #line 1712 "configure" --- > #line 1989 "configure" 1716c1993 < { (eval echo configure:1717: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --- > { (eval echo configure:1994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 1745c2022 < echo "configure:1746: checking for $ac_func" >&5 --- > echo "configure:2023: checking for $ac_func" >&5 1750c2027 < #line 1751 "configure" --- > #line 2028 "configure" 1773c2050 < if { (eval echo configure:1774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:2051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 1799d2075 < ALL_LINGUAS="de fr cs nl es" 1804c2080 < echo "configure:1805: checking for $ac_hdr" >&5 --- > echo "configure:2081: checking for $ac_hdr" >&5 1809c2085 < #line 1810 "configure" --- > #line 2086 "configure" 1814c2090 < { (eval echo configure:1815: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --- > { (eval echo configure:2091: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 1840,1841c2116,2159 < echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 < echo "configure:1842: checking for gettext in -lintl" >&5 --- > > > ALL_LINGUAS="de fr cs nl es" > > LIBINTL= > LTLIBINTL= > > echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6 > echo "configure:2125: checking for GNU gettext in libc" >&5 > if eval "test \"`echo '$''{'ftgt_cv_func_gnugettext_libc'+set}'`\" = set"; then > echo $ac_n "(cached) $ac_c" 1>&6 > else > cat > conftest.$ac_ext < #line 2130 "configure" > #include "confdefs.h" > > #include > extern int _nl_msg_cat_cntr; > extern int *_nl_domain_bindings; > > int main() { > > bindtextdomain ("", ""); > return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings > > ; return 0; } > EOF > if { (eval echo configure:2144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then > rm -rf conftest* > ftgt_cv_func_gnugettext_libc=yes > else > echo "configure: failed program was:" >&5 > cat conftest.$ac_ext >&5 > rm -rf conftest* > ftgt_cv_func_gnugettext_libc=no > fi > rm -f conftest* > fi > > echo "$ac_t""$ftgt_cv_func_gnugettext_libc" 1>&6 > > if test "$ftgt_cv_func_gnugettext_libc" != "yes"; then > echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 > echo "configure:2160: checking for gettext in -lintl" >&5 1849c2167 < #line 1850 "configure" --- > #line 2168 "configure" 1860c2178 < if { (eval echo configure:1861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:2179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 1887,1888d2204 < < 1889a2206,2261 > if test "$ac_cv_lib_intl_gettext" != "yes"; then > echo $ac_n "checking for GNU gettext in libintl, using libiconv""... $ac_c" 1>&6 > echo "configure:2209: checking for GNU gettext in libintl, using libiconv" >&5 > if eval "test \"`echo '$''{'ftgt_cv_func_gnugettext_libintliconv'+set}'`\" = set"; then > echo $ac_n "(cached) $ac_c" 1>&6 > else > echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 > echo "configure:2214: checking for bindtextdomain in -lintl" >&5 > ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` > if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then > echo $ac_n "(cached) $ac_c" 1>&6 > else > ac_save_LIBS="$LIBS" > LIBS="-lintl -liconv $LIBS" > cat > conftest.$ac_ext < #line 2222 "configure" > #include "confdefs.h" > /* Override any gcc2 internal prototype to avoid an error. */ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char bindtextdomain(); > > int main() { > bindtextdomain() > ; return 0; } > EOF > if { (eval echo configure:2233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then > rm -rf conftest* > eval "ac_cv_lib_$ac_lib_var=yes" > else > echo "configure: failed program was:" >&5 > cat conftest.$ac_ext >&5 > rm -rf conftest* > eval "ac_cv_lib_$ac_lib_var=no" > fi > rm -f conftest* > LIBS="$ac_save_LIBS" > > fi > if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then > echo "$ac_t""yes" 1>&6 > ftgt_cv_func_gnugettext_libintliconv=yes LIBS="$LIBS -lintl -liconv" > else > echo "$ac_t""no" 1>&6 > ftgt_cv_func_gnugettext_libintliconv=no > USE_NLS=no > fi > > fi > > echo "$ac_t""$ftgt_cv_func_gnugettext_libintliconv" 1>&6 > fi > fi > fi > > if test "$USE_NLS" = "yes"; then 1912c2284 < echo "configure:1913: checking for $ac_word" >&5 --- > echo "configure:2285: checking for $ac_word" >&5 1925a2298,2302 > ac_test_flag="-f" > if ! test -z "$COMSPEC$ComSpec"; then > ac_test_flag="-x" > IFS="${PATH_SEPARATOR-;}" > fi; 1928c2305 < if test -f $ac_dir/$ac_word; then --- > if test $ac_test_flag $ac_dir/$ac_word; then 1949c2326 < echo "configure:1950: checking for $ac_func" >&5 --- > echo "configure:2327: checking for $ac_func" >&5 1954c2331 < #line 1955 "configure" --- > #line 2332 "configure" 1977c2354 < if { (eval echo configure:1978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:2355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 2004c2381 < echo "configure:2005: checking for $ac_word" >&5 --- > echo "configure:2382: checking for $ac_word" >&5 2017a2395,2399 > ac_test_flag="-f" > if ! test -z "$COMSPEC$ComSpec"; then > ac_test_flag="-x" > IFS="${PATH_SEPARATOR-;}" > fi; 2020c2402 < if test -f $ac_dir/$ac_word; then --- > if test $ac_test_flag $ac_dir/$ac_word; then 2040c2422 < echo "configure:2041: checking for $ac_word" >&5 --- > echo "configure:2423: checking for $ac_word" >&5 2053a2436,2440 > ac_test_flag="-f" > if ! test -z "$COMSPEC$ComSpec"; then > ac_test_flag="-x" > IFS="${PATH_SEPARATOR-;}" > fi; 2056c2443 < if test -f $ac_dir/$ac_word; then --- > if test $ac_test_flag $ac_dir/$ac_word; then 2076c2463 < echo "configure:2077: checking for $ac_word" >&5 --- > echo "configure:2464: checking for $ac_word" >&5 2089a2477,2481 > ac_test_flag="-f" > if ! test -z "$COMSPEC$ComSpec"; then > ac_test_flag="-x" > IFS="${PATH_SEPARATOR-;}" > fi; 2092c2484 < if test -f $ac_dir/$ac_word; then --- > if test $ac_test_flag $ac_dir/$ac_word; then 2136c2528 < #line 2137 "configure" --- > #line 2529 "configure" 2144c2536 < if { (eval echo configure:2145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:2537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 2178c2570 < echo "configure:2179: checking for $ac_word" >&5 --- > echo "configure:2571: checking for $ac_word" >&5 2186a2579,2583 > ac_test_flag="-f" > if ! test -z "$COMSPEC$ComSpec"; then > ac_test_flag="-x" > IFS="${PATH_SEPARATOR-;}" > fi 2189c2586 < if test -f $ac_dir/$ac_word; then --- > if test $ac_test_flag $ac_dir/$ac_word; then 2207c2604 < echo "configure:2208: checking for $ac_word" >&5 --- > echo "configure:2605: checking for $ac_word" >&5 2215a2613,2617 > ac_test_flag="-f" > if ! test -z "$COMSPEC$ComSpec"; then > ac_test_flag="-x" > IFS="${PATH_SEPARATOR-;}" > fi 2218c2620 < if test -f $ac_dir/$ac_word; then --- > if test $ac_test_flag $ac_dir/$ac_word; then 2245c2647 < echo "configure:2246: checking for a BSD compatible install" >&5 --- > echo "configure:2648: checking for a BSD compatible install" >&5 2250a2653,2657 > ac_test_flag="-f" > if ! test -z "$COMSPEC$ComSpec"; then > ac_test_flag="-x" > IFS="${PATH_SEPARATOR-;}" > fi 2260c2667 < if test -f $ac_dir/$ac_prog; then --- > if test $ac_test_flag $ac_dir/$ac_prog; then 2298c2705 < echo "configure:2299: checking whether ln -s works" >&5 --- > echo "configure:2706: checking whether ln -s works" >&5 2325c2732 < echo "configure:2326: checking for gethostbyname" >&5 --- > echo "configure:2733: checking for gethostbyname" >&5 2330c2737 < #line 2331 "configure" --- > #line 2738 "configure" 2353c2760 < if { (eval echo configure:2354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:2761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 2372c2779 < echo "configure:2373: checking for gethostbyname in -lnsl" >&5 --- > echo "configure:2780: checking for gethostbyname in -lnsl" >&5 2380c2787 < #line 2381 "configure" --- > #line 2788 "configure" 2391c2798 < if { (eval echo configure:2392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:2799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 2418c2825 < echo "configure:2419: checking for gethostbyname in -lsocket" >&5 --- > echo "configure:2826: checking for gethostbyname in -lsocket" >&5 2426c2833 < #line 2427 "configure" --- > #line 2834 "configure" 2437c2844 < if { (eval echo configure:2438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:2845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 2466c2873 < echo "configure:2467: checking for gethostbyname in -lsocket" >&5 --- > echo "configure:2874: checking for gethostbyname in -lsocket" >&5 2474c2881 < #line 2475 "configure" --- > #line 2882 "configure" 2485c2892 < if { (eval echo configure:2486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:2893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 2504c2911 < echo "configure:2505: checking for gethostbyname in -lresolv" >&5 --- > echo "configure:2912: checking for gethostbyname in -lresolv" >&5 2512c2919 < #line 2513 "configure" --- > #line 2920 "configure" 2523c2930 < if { (eval echo configure:2524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:2931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 2562c2969 < echo "configure:2563: checking for socket" >&5 --- > echo "configure:2970: checking for socket" >&5 2567c2974 < #line 2568 "configure" --- > #line 2975 "configure" 2590c2997 < if { (eval echo configure:2591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:2998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 2608c3015 < echo "configure:2609: checking for socket in -lsocket" >&5 --- > echo "configure:3016: checking for socket in -lsocket" >&5 2616c3023 < #line 2617 "configure" --- > #line 3024 "configure" 2627c3034 < if { (eval echo configure:2628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:3035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 2653c3060 < echo "configure:2654: checking for socket in -lsocket" >&5 --- > echo "configure:3061: checking for socket in -lsocket" >&5 2661c3068 < #line 2662 "configure" --- > #line 3069 "configure" 2672c3079 < if { (eval echo configure:2673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:3080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 2698c3105 < echo "configure:2699: checking for cos in -lm" >&5 --- > echo "configure:3106: checking for cos in -lm" >&5 2706c3113 < #line 2707 "configure" --- > #line 3114 "configure" 2717c3124 < if { (eval echo configure:2718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:3125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 2750c3157 < echo "configure:2751: checking for X" >&5 --- > echo "configure:3158: checking for X" >&5 2812c3219 < #line 2813 "configure" --- > #line 3220 "configure" 2817c3224 < { (eval echo configure:2818: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --- > { (eval echo configure:3225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 2886c3293 < #line 2887 "configure" --- > #line 3294 "configure" 2893c3300 < if { (eval echo configure:2894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:3301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 2999c3406 < echo "configure:3000: checking whether -R must be followed by a space" >&5 --- > echo "configure:3407: checking whether -R must be followed by a space" >&5 3002c3409 < #line 3003 "configure" --- > #line 3410 "configure" 3009c3416 < if { (eval echo configure:3010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:3417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 3025c3432 < #line 3026 "configure" --- > #line 3433 "configure" 3032c3439 < if { (eval echo configure:3033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:3440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 3064c3471 < echo "configure:3065: checking for dnet_ntoa in -ldnet" >&5 --- > echo "configure:3472: checking for dnet_ntoa in -ldnet" >&5 3072c3479 < #line 3073 "configure" --- > #line 3480 "configure" 3083c3490 < if { (eval echo configure:3084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:3491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 3105c3512 < echo "configure:3106: checking for dnet_ntoa in -ldnet_stub" >&5 --- > echo "configure:3513: checking for dnet_ntoa in -ldnet_stub" >&5 3113c3520 < #line 3114 "configure" --- > #line 3521 "configure" 3124c3531 < if { (eval echo configure:3125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:3532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 3153c3560 < echo "configure:3154: checking for gethostbyname" >&5 --- > echo "configure:3561: checking for gethostbyname" >&5 3158c3565 < #line 3159 "configure" --- > #line 3566 "configure" 3181c3588 < if { (eval echo configure:3182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:3589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 3202c3609 < echo "configure:3203: checking for gethostbyname in -lnsl" >&5 --- > echo "configure:3610: checking for gethostbyname in -lnsl" >&5 3210c3617 < #line 3211 "configure" --- > #line 3618 "configure" 3221c3628 < if { (eval echo configure:3222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:3629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 3251c3658 < echo "configure:3252: checking for connect" >&5 --- > echo "configure:3659: checking for connect" >&5 3256c3663 < #line 3257 "configure" --- > #line 3664 "configure" 3279c3686 < if { (eval echo configure:3280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:3687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 3300c3707 < echo "configure:3301: checking for connect in -lsocket" >&5 --- > echo "configure:3708: checking for connect in -lsocket" >&5 3308c3715 < #line 3309 "configure" --- > #line 3716 "configure" 3319c3726 < if { (eval echo configure:3320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:3727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 3343c3750 < echo "configure:3344: checking for remove" >&5 --- > echo "configure:3751: checking for remove" >&5 3348c3755 < #line 3349 "configure" --- > #line 3756 "configure" 3371c3778 < if { (eval echo configure:3372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:3779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 3392c3799 < echo "configure:3393: checking for remove in -lposix" >&5 --- > echo "configure:3800: checking for remove in -lposix" >&5 3400c3807 < #line 3401 "configure" --- > #line 3808 "configure" 3411c3818 < if { (eval echo configure:3412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:3819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 3435c3842 < echo "configure:3436: checking for shmat" >&5 --- > echo "configure:3843: checking for shmat" >&5 3440c3847 < #line 3441 "configure" --- > #line 3848 "configure" 3463c3870 < if { (eval echo configure:3464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:3871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 3484c3891 < echo "configure:3485: checking for shmat in -lipc" >&5 --- > echo "configure:3892: checking for shmat in -lipc" >&5 3492c3899 < #line 3493 "configure" --- > #line 3900 "configure" 3503c3910 < if { (eval echo configure:3504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:3911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 3536c3943 < echo "configure:3537: checking for IceConnectionNumber in -lICE" >&5 --- > echo "configure:3944: checking for IceConnectionNumber in -lICE" >&5 3544c3951 < #line 3545 "configure" --- > #line 3952 "configure" 3555c3962 < if { (eval echo configure:3556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:3963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 3590c3997 < echo "configure:3591: checking for $ac_hdr" >&5 --- > echo "configure:3998: checking for $ac_hdr" >&5 3595c4002 < #line 3596 "configure" --- > #line 4003 "configure" 3600c4007 < { (eval echo configure:3601: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --- > { (eval echo configure:4008: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 3628c4035 < echo "configure:3629: checking for working const" >&5 --- > echo "configure:4036: checking for working const" >&5 3633c4040 < #line 3634 "configure" --- > #line 4041 "configure" 3682c4089 < if { (eval echo configure:3683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then --- > if { (eval echo configure:4090: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 3703c4110 < echo "configure:3704: checking size of int" >&5 --- > echo "configure:4111: checking size of int" >&5 3711c4118 < #line 3712 "configure" --- > #line 4119 "configure" 3722c4129 < if { (eval echo configure:3723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --- > if { (eval echo configure:4130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 3742c4149 < echo "configure:3743: checking size of long" >&5 --- > echo "configure:4150: checking size of long" >&5 3750c4157 < #line 3751 "configure" --- > #line 4158 "configure" 3761c4168 < if { (eval echo configure:3762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --- > if { (eval echo configure:4169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 3786c4193 < echo "configure:3787: checking for $ac_hdr" >&5 --- > echo "configure:4194: checking for $ac_hdr" >&5 3791c4198 < #line 3792 "configure" --- > #line 4199 "configure" 3796c4203 < { (eval echo configure:3797: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --- > { (eval echo configure:4204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 3825c4232 < echo "configure:3826: checking for $ac_func" >&5 --- > echo "configure:4233: checking for $ac_func" >&5 3830c4237 < #line 3831 "configure" --- > #line 4238 "configure" 3853c4260 < if { (eval echo configure:3854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:4261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 3878c4285 < echo "configure:3879: checking for working mmap" >&5 --- > echo "configure:4286: checking for working mmap" >&5 3886c4293 < #line 3887 "configure" --- > #line 4294 "configure" 4026c4433 < if { (eval echo configure:4027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --- > if { (eval echo configure:4434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 4058c4465 < echo "configure:4059: checking for $ac_func" >&5 --- > echo "configure:4466: checking for $ac_func" >&5 4063c4470 < #line 4064 "configure" --- > #line 4471 "configure" 4086c4493 < if { (eval echo configure:4087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- > if { (eval echo configure:4494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 4264a4672,4674 > s%@DLLTOOL@%$DLLTOOL%g > s%@AS@%$AS%g > s%@OBJDUMP@%$OBJDUMP%g 4279d4688 < s%@HAVE_LIBINTL@%$HAVE_LIBINTL%g Index: freetype/configure.in =================================================================== RCS file: /cvs/freetype/freetype/configure.in,v retrieving revision 1.51 retrieving revision 1.57 diff -r1.51 -r1.57 1c1,5 < dnl This file is part of the FreeType project. --- > dnl This file is part of the FreeType project, and may only be used, > dnl modified, and distributed under the terms of the FreeType project > dnl license, LICENSE.TXT. By continuing to use, modify, or distribute > dnl this file you indicate that you have read the license and understand > dnl and accept it fully. 11a16 > AC_LIBTOOL_WIN32_DLL 15c20 < freetype_version='1.4' --- > freetype_version='1.5' 18c23 < version_info='5:0:3' --- > version_info='6:0:4' 35c40 < XX_CFLAGS="-Wall -pedantic -ansi" --- > XX_CFLAGS="-Wall -pedantic -ansi -D_REENTRANT" 60c65,67 < dnl gettext support --- > > dnl NLS/gettext nightmare^H^H^H^H^H^H^H^H^H^H support... > 67d73 < ALL_LINGUAS="de fr cs nl es" 69d74 < AC_CHECK_LIB(intl,gettext) 71d75 < AC_SUBST(HAVE_LIBINTL) 72a77,123 > ALL_LINGUAS="de fr cs nl es" > > dnl We now need to check whether the "intl" library is available. > dnl The bad news is that a number of possibilities can happen: > dnl a) GNU gettext support is already available from the (modern) libc > dnl b) some version of gettext is available as standalone "intl" lib > dnl No real problem (this was the only case previously detected) > dnl c) a recent version of gettext is used, and it needs the > dnl (separate) "iconv" library to work > dnl > dnl This test has been adapted from gettext.m4, written by Bruno Haible > LIBINTL= > LTLIBINTL= > > dnl First, test case a) > AC_CACHE_CHECK([for GNU gettext in libc], ftgt_cv_func_gnugettext_libc, > [AC_TRY_LINK([ > #include > extern int _nl_msg_cat_cntr; > extern int *_nl_domain_bindings; > ],[ > bindtextdomain ("", ""); > return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings > ], ftgt_cv_func_gnugettext_libc=yes, > ftgt_cv_func_gnugettext_libc=no)]) > > if test "$ftgt_cv_func_gnugettext_libc" != "yes"; then > dnl It does not come for free. Let's check case b), > dnl id est see whether libintl exists and does not depend on libiconv. > AC_CHECK_LIB(intl, gettext) > > if test "$ac_cv_lib_intl_gettext" != "yes"; then > dnl Does not work; so let's check case c), > dnl id est see whether libintl exists and depends on libiconv. > AC_CACHE_CHECK([for GNU gettext in libintl, using libiconv], > ftgt_cv_func_gnugettext_libintliconv, > [AC_CHECK_LIB(intl, bindtextdomain, > ftgt_cv_func_gnugettext_libintliconv=yes LIBS="$LIBS -lintl -liconv", > [ftgt_cv_func_gnugettext_libintliconv=no > dnl No NLS support then! > USE_NLS=no], > -liconv)]) > fi > fi > fi > > if test "$USE_NLS" = "yes"; then Index: freetype/freetype.spec =================================================================== RCS file: /cvs/freetype/freetype/freetype.spec,v retrieving revision 1.19 retrieving revision 1.23 diff -r1.19 -r1.23 3c3 < Version: 1.4 --- > Version: 1.5 5c5 < Source: ftp://ftp.freetype.org/pub/freetype-%{version}.tar.gz --- > Source: ftp://ftp.freetype.org/freetype/freetype1-%{version}-%{release}.tar.gz 7c7 < Copyright: BSD-Like --- > Copyright: BSD-Like + GPL 71a72,77 > * Tue Jan 08 2002 Werner Lemberg > - Updated to version 1.5. > > * Mon Oct 29 2001 Antoine Leca > - Updated to version 1.4.9 (pre 1.5); NOTE: 1.4 was never released officially. > 139c145 < %doc announce license.txt --- > %doc announce license.txt docs/FTL.txt docs/GPL.txt Index: freetype/ft_conf.h.in =================================================================== RCS file: /cvs/freetype/freetype/ft_conf.h.in,v retrieving revision 1.15 retrieving revision 1.17 diff -r1.15 -r1.17 1,4c1,17 < /* ft_conf.h.in. */ < < /* This file is part of the FreeType project. */ < --- > /******************************************************************* > * > * ft_conf.h.in > * > * Template ft_conf.h for Unix systems > * > * > * Copyright 1996-2002 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. > * > ******************************************************************/ 50,52d62 < /* Define if you have the libintl library. */ < #undef HAVE_LIBINTL < 88,90c98,100 < /* Define this if you want to completely disable the use of the bytecode */ < /* interpreter. Doing so will produce a much smaller library, but the */ < /* quality of the rendered glyphs will enormously suffer from this. */ --- > /* Define this if you want to compile a bytecode interpreter in the */ > /* TrueType driver. Note that there are important patent issues related */ > /* to the use of the interpreter. */ 92,94c102,103 < /* This switch was introduced due to the Apple patents issue which */ < /* emerged recently on the FreeType lists. We still do not have Apple's */ < /* opinion on the subject and will change this as soon as we have. */ --- > /* By undefining this, you will only compile the code necessary to load */ > /* TrueType glyphs without hinting. */ 96c105 < #undef TT_CONFIG_OPTION_NO_INTERPRETER --- > #undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER Index: freetype/license.txt =================================================================== RCS file: /cvs/freetype/freetype/license.txt,v retrieving revision 1.15 retrieving revision 1.16 diff -r1.15 -r1.16 1,2d0 < The FreeType Project LICENSE < ---------------------------- 4c2,3 < 2000-Feb-08 --- > FreeType comes with two licenses from which you can choose the one which > fits your needs best: 6,7c5 < Copyright 1996-2000 by < David Turner, Robert Wilhelm, and Werner Lemberg --- > . The FreeType License, in file `docs/FTL.txt'; 9,164c7 < < < Introduction < ============ < < The FreeType Project is distributed in several archive packages; < some of them may contain, in addition to the FreeType font engine, < various tools and contributions which rely on, or relate to, the < FreeType Project. < < This license applies to all files found in such packages, and < which do not fall under their own explicit license. The license < affects thus the FreeType font engine, the test programs, < documentation and makefiles, at the very least. < < 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 be < 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 < FreeType 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 FreeType Project and < assume no liability related to The FreeType Project. < < < Legal Terms < =========== < < 0. Definitions < -------------- < < Throughout this license, the terms `package', `FreeType Project', < and `FreeType archive' refer to the set of files originally < distributed by the authors (David Turner, Robert Wilhelm, and < Werner Lemberg) as the `FreeType Project', be they named as alpha, < beta or final release. < < `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 the FreeType < engine'. < < This license applies to all files distributed in the original < FreeType Project, 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 FreeType Project is copyright (C) 1996-2000 by David Turner, < Robert Wilhelm, and Werner Lemberg. All rights reserved except as < specified below. < < 1. No Warranty < -------------- < < THE FREETYPE PROJECT IS 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 OR THE INABILITY TO < USE, OF THE FREETYPE PROJECT. < < 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 FreeType Project (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 of the work of the < FreeType Team, in the distribution documentation. We also < encourage you to put an URL to the FreeType web page in your < documentation, though this isn't mandatory. < < These conditions apply to any software derived from or based on < the FreeType Project, 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 the FreeType authors 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 one or more of the < following phrases to refer to this software in your documentation < or advertising materials: `FreeType Project', `FreeType Engine', < `FreeType library', or `FreeType Distribution'. < < As you have not signed this license, you are not required to < accept it. However, as the FreeType Project is 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 FreeType < Project, you indicate that you understand and accept all the terms < of this license. < < 4. Contacts < ----------- < < There are two mailing lists related to FreeType: < < o freetype@freetype.org < < Discusses general use and applications of FreeType, as well as < future and wanted additions to the library and distribution. < If you are looking for support, start in this list if you < haven't found anything to help you in the documentation. < < o devel@freetype.org < < Discusses bugs, as well as engine internals, design issues, < specific licenses, porting, etc. < < o http://www.freetype.org < < Holds the current FreeType web page, which will allow you to < download our latest development version and read online < documentation. < < You can also contact us individually at: < < David Turner < Robert Wilhelm < Werner Lemberg < < < --- end of license.txt --- --- > . The GNU Public License, in file `docs/GPL.txt'. Index: freetype/docs/FAQ =================================================================== RCS file: /cvs/freetype/freetype/docs/FAQ,v retrieving revision 1.14 retrieving revision 1.20 diff -r1.14 -r1.20 1c1 < FreeType User FAQ --- > FreeType 1 User FAQ 17c17 < 5. The library compiles fine on my system, unfortunately it seems --- > 5. The library compiles fine on my system, unfortunately it seems 20c20,21 < 6. What is FreeType, and what is it not? --- > 6. I did compile the test programs `out of the box' without > problems, but the results are ugly. What did I have wrong? 22c23 < 7. Can FreeType be ported to other platforms? --- > 7. What is FreeType, and what is it not? 24c25,27 < 8. My TrueType font only works on a Mac/in Windows. Will I be able --- > 8. Can FreeType be ported to other platforms? > > 9. My TrueType font only works on a Mac/in Windows. Will I be able 27c30 < 9. What are the most common character mappings? --- > 10. What are the most common character mappings? 29c32 < 10. How do I render text with FreeType? --- > 11. How do I render text with FreeType? 31c34 < 11. How do I render rotated/slanted text with FreeType? --- > 12. How do I render rotated/slanted text with FreeType? 33c36 < 12. How do I compute a glyph bitmap's dimensions? --- > 13. How do I compute a glyph bitmap's dimensions? 35c38 < 13. Why is text rendering so slow? Does FreeType cache glyphs? --- > 14. Why is text rendering so slow? Does FreeType cache glyphs? 37c40 < 14. Do you always render the same glyphs as Windows or the Mac? --- > 15. Do you always render the same glyphs as Windows or the Mac? 39c42 < 15. The program `ftlint' reports errors with one of my fonts, though --- > 16. The program `ftlint' reports errors with one of my fonts, though 42c45 < 16. What does the `fttimer' test program benchmarks? --- > 17. What does the `fttimer' test program benchmarks? 44c47 < 17. Is it possible to perform styling (like oblique, italic, bold, --- > 18. Is it possible to perform styling (like oblique, italic, bold, 47c50 < 18. When does glyph hinting takes place? Is it when the glyph is --- > 19. When does glyph hinting takes place? Is it when the glyph is 50c53 < 19. Which is the best, caching outlines or bitmaps? --- > 20. Which is the best, caching outlines or bitmaps? 52c55 < 20. Can I open OpenType and/or TrueType GX fonts with FreeType? --- > 21. Can I open OpenType and/or TrueType GX fonts with FreeType? 54c57 < 21. How can I access additional TrueType tables that FreeType --- > 22. How can I access additional TrueType tables that FreeType 57c60 < 22. When will I be able to use FreeType to display TrueType fonts in --- > 23. When will I be able to use FreeType to display TrueType fonts in 60c63 < 23. What does the `free' in FreeType really means? --- > 24. What does the `free' in FreeType really means? 62c65 < 24. Does FreeType support threads? Is it re-entrant? --- > 25. Does FreeType support threads? Is it re-entrant? 64c67 < 25. Does FreeType support `foreign languages'? --- > 26. Does FreeType support `foreign languages'? 66c69 < 26. I'm using fractional char sizes, but the glyphs stay at the same --- > 27. I'm using fractional char sizes, but the glyphs stay at the same 69c72 < 27. Hinting doesn't work at very small sizes. Why? --- > 28. Hinting doesn't work at very small sizes. Why? 217c220 < system-specific package. You need not gcc to compile it. --- > system-specific package. You do not need gcc to compile it. 225c228 < As said before, the test programs rely on a small graphics --- > As said before, some test programs rely on a small graphics 229,236c232,238 < DOS Full-Screen < Amiga Full-Screen Note that the windowed graphics < Amiga Windowed driver are very 'basic', they do < OS/2 Full-Screen not provide menus, dialog boxes, < OS/2 Windowed etc. Rather, they provide one < X11 Windowed windowed bitmap/pixmap and translate < Win32 Windowed events to the ones defined in < `test/gevents'. --- > DOS Full-Screen Note that the windowed graphics > Amiga Full-Screen driver are very 'basic', they do > Amiga Windowed not provide menus, dialog boxes, > OS/2 Full-Screen etc. Rather, they provide one > OS/2 Windowed windowed bitmap/pixmap and translate > X11 Windowed events to the ones defined in > Win32 Windowed `test/gevents'. 255c257,288 < 6. What is FreeType, and what is it not? --- > 6. I did compile the test programs `out of the box' without > problems, but the results are ugly. What did I have wrong? > > Well, chances are you built the `patents-free' version of the > Freetype library, which does not enable the bytecode interpreter, > which means that at small to normal point sizes, the glyphs are > distorded, hence ugly. > > Apple Computer owns three patents that are related to the > processing of glyph outlines within TrueType fonts. This process > if also called hinting or grid-fitting and is used to enhance the > quality of glyphs at small bitmap sizes. > > When the work with Freetype began, we were not aware of these > patents. Since version 1.3, however, we have provided a way to > build a patent-compliant version of the library, which completely > disables the TrueType interpreter (quite a rude way). If the > result is usable with big point sizes, or for special tasks such > as font converting, it results about useless for normal screen > reading. Beginning with version 1.5, this behaviour is even by > default, so this is what you get if you compile `out of the box'. > > However, the source code for the bytecode interpreter is still > available and can be activated at compile time, for those who > want to use it anyway (because they purchased a license from > Apple, or because they are in a country where the patents do not > apply, etc.). For details, check the `freetype/INSTALL' file. > > > -------------------------------------------------------------------- > > 7. What is FreeType, and what is it not? 311c344 < 7. Can FreeType be ported to other platforms? --- > 8. Can FreeType be ported to other platforms? 314,318c347,352 < 16, 32, and 64 bits processors. Note, however, that the 16-bit < port requires a large memory model, as some tables found in < TrueType programs could exceed 64kByte (this is really true for < CJK and Unicode fonts. Nearly all others should work fine with < it). --- > 16, 32, and 64 bit processors. Note, however, that the 16-bit > port requires a large memory model. Furthermore, some tables > found in TrueType programs may exceed 64 kBytes, which calls for > the so-called huge memory model. This is really true for CJK and > Unicode fonts. Nearly all others should work fine with the large > model. 320c354 < It doesn't support some very exotic platforms though, like a --- > It does not support some very exotic platforms though, like a 344c378 < 8. My TrueType font only works on a Mac/in Windows. Will I be able --- > 9. My TrueType font only works on a Mac/in Windows. Will I be able 375a410,411 > http://sourceforge.net/projects/fonttools/ > 379c415 < 9. What are the most common character mappings? --- > 10. What are the most common character mappings? 400c436 < 10. How do I render text with FreeType? --- > 11. How do I render text with FreeType? 412c448 < 11. How do I render rotated/slanted text with FreeType? --- > 12. How do I render rotated/slanted text with FreeType? 422c458 < 12. How do I compute a glyph bitmap's dimensions? --- > 13. How do I compute a glyph bitmap's dimensions? 431c467 < 13. Why is text rendering so slow? --- > 14. Why is text rendering so slow? 434c470 < The FreeType engine doesn't cache anything, be it outlines or --- > The FreeType 1 engine doesn't cache anything, be it outlines or 451c487 < 14. Do you always render the same glyphs as Windows or the Mac? --- > 15. Do you always render the same glyphs as Windows or the Mac? 479c515 < 15. The program `ftlint' reports errors with one of my fonts, though --- > 16. The program `ftlint' reports errors with one of my fonts, though 512c548 < NT 4 :-) --- > Windows NT :-) 526c562 < 16. What does the `fttimer' test program benchmarks? --- > 17. What does the `fttimer' test program benchmarks? 538c574 < (this is about 500 pixels high!). As you'll see by running --- > (this is about 500 pixels high). As you'll see by running 544c580 < 17. Is it possible to perform styling (like oblique, italic, bold, --- > 18. Is it possible to perform styling (like oblique, italic, bold, 592c628 < 18. When does glyph hinting takes place? Is it when the glyph is --- > 19. When does glyph hinting takes place? Is it when the glyph is 606c642 < 19. Which is the best, caching outlines or bitmaps? --- > 20. Which is the best, caching outlines or bitmaps? 624c660 < 20. Can I open OpenType and/or TrueType GX fonts with FreeType? --- > 21. Can I open OpenType and/or TrueType GX fonts with FreeType? 635c671 < the ones promised in NT 5 and Java 2D). --- > the ones promised in NT 5 and Java 2D... or with Freetype 2). 637c673 < FreeType is a TrueType glyph engine and doesn't support Type 2 --- > FreeType 1 is a TrueType glyph engine and doesn't support Type 2 644,645c680,681 < Note that FreeType version 2 (which is in alpha stage currently) < already includes a PostScript Type 1 interpreter... --- > Note that FreeType version 2 (which is now widely available) > includes a PostScript Type 1 / Type 2 interpreter... 650c686 < 21. How can I access additional TrueType tables that FreeType --- > 22. How can I access additional TrueType tables that FreeType 668c704 < 22. When will I be able to use FreeType to display TrueType fonts in --- > 23. When will I be able to use FreeType to display TrueType fonts in 673c709 < to Michal Mecasek (mike@mendelu.cz) for his excellent work! --- > to Michal Necasek (mike@mendelu.cz) for his excellent work! 688c724 < 23. What does the `free' in FreeType really means? --- > 24. What does the `free' in FreeType really means? 708c744,752 < The exact and legal terms are in the file `license.txt'. --- > From version 1.5 and later releases, we added the choice for the > user of the library to use the GNU General Public License instead. > As a result, you can link the Freetype library with any GPL-ed > software, without any inconvenience; however, you then have the > obligation to publish all of the source code of the products you > release. > > The exact and legal terms are in the files `docs/FTL.txt' and > `docs/GPL.txt', respectively. 715c759 < 24. Does FreeType support threads? Is it re-entrant? --- > 25. Does FreeType support threads? Is it re-entrant? 733c777 < 25. Does FreeType support `foreign languages'? --- > 26. Does FreeType support `foreign languages'? 763c807 < 26. I'm using fractional char sizes, but the glyphs stay at the same --- > 27. I'm using fractional char sizes, but the glyphs stay at the same 791c835 < 27. Hinting doesn't work at very small sizes. Why? --- > 28. Hinting doesn't work at very small sizes. Why? Index: freetype/docs/apiref.txt =================================================================== RCS file: /cvs/freetype/freetype/docs/apiref.txt,v retrieving revision 1.46 retrieving revision 1.47 diff -r1.46 -r1.47 1541,1542c1541,1542 < Note: since FT 1.4, the `charCode' is an unsigned long, < instead of an unsigned short.. --- > Note: Since FT 1.5, the `charCode' is an unsigned long instead > of an unsigned short. Index: freetype/docs/apirefx.txt =================================================================== RCS file: /cvs/freetype/freetype/docs/apirefx.txt,v retrieving revision 1.18 retrieving revision 1.21 diff -r1.18 -r1.21 151c151 < NOTE: --- > NOTE 1: 155a156,171 > NOTE 2: > > Some standard names sometimes present some variations, as: > > Omega vs. Ohm > Delta vs. increment > macron vs. overscore > mu vs. mu1 > periodcentered vs. middot > > We always return the first listed name, which correspond to > the last version of the TrueType specifications (which did > vary in the past on this respect). You may have to adjust the > source (in lib/extend/ftxpost.c) in order to interface with > some old applications. > 1007d1022 < 1016c1031 < ^^^^^^^ TT_UShort last_char, --- > ^^^^^^^ TT_ULong last_char, 1029d1043 < 1046,1047c1060,1062 < systems like Linux; this means that for other platforms only < English error strings are returned. --- > systems like Linux (and on similarly inspired systems, like DJGPP > or MinGW); this means that for other platforms only English error > strings are returned. 1068c1083 < gettext interface) is given e.g. in test/ftdump.c. --- > gettext interface) is given in test/ftdump.c or test/fterror.c. Index: freetype/docs/changes.txt =================================================================== RCS file: /cvs/freetype/freetype/docs/changes.txt,v retrieving revision 1.19 retrieving revision 1.28 diff -r1.19 -r1.28 1c1 < Changes between FreeType version 1.3.1 and version 1.4 --- > Changes between FreeType version 1.3.1 and version 1.5 2a3,10 > ** > ** WARNING: Because of the Apple patents problem, the TrueType > ** bytecode interpreter is now turned *OFF* by default. Edit > ** ft_conf.h if you want to (and can) use grid-fitting. > ** > > Note: Version 1.4 has never been released officially. > 12a21,24 > TODO has been dropped (since we consider there will be no > further development). > > 16c28,29 < TT_Char_Index() now uses a TT_ULong for character codes. --- > TT_Char_Index() now uses TT_ULong for character codes. It now > supports cmap tables in format 8 and 12. 19,20c32,33 < TT_GSUB_Add_String() has two additional parameters needed for < GPOS support. --- > New error code (TT_Err_Too_Many_FDefs) when a font defines too > many functions. 29a43,51 > The EXPORT_DEF/EXPORT_FUNC/etc. stuff has been replaced with a > more elaborate scheme (coming from the Freetype 2 experience) > that allows more complex cases of interface to be handled. See > ttconfig.h for details. > > > Cleaning up of the ft_conf.h files to remove obsolete stuff. > > 37a60,73 > TT_GSUB_Add_String() has two additional parameters needed for > GPOS support. > > > TT_CharMap_Next() of the ftxcmap extension now uses `TT_ULong' > as the second parameter. > > > A long-lived bug in ftxpost.c (with 2.0 format, when the > additional names were out of order, the names were incorrectly > assigned) has been extermined. Thanks to Jean-Christophe Dubacq > . > > 42c78,79 < GSUB. `P' will toggle GPOS activation (this is new). --- > GSUB. `P' will toggle GPOS activation (this is new). UTF-8 > values greater than U+FFFF are supported. 52a90,95 > ** > ** You can now at your option use either the FreeType license > ** (usable in commercial products) or the GPL license (usable with > ** other free software, but this requires any further development > ** to be released to the public). > ** 82a126,131 > has been updated. > > > OS/2 table version 2 is now recognized. > > 97a147,167 > > > ttf2pk: > Added support for multiple SFD files. > > New option `-L' to provide a ligature mapping file (patch from > CHO Jin-Hwan ). > > New option `-w' to emit PostScript encoding vectors for > subfont files to be used with pdfLaTeX (patch from CHO > Jin-Hwan ). > > Add support for a configuration file (ttf2pk.cfg) which can > read more than a single map file, similar to pdfTeX (patch > from CHO Jin-Hwan ). > > Support for character codes greater than 0xFFFF (patch from > Dominique Unruh ). > > ttf2tfm no longer assumes that the x-height is always 400 PS > units. Index: freetype/docs/credits =================================================================== RCS file: /cvs/freetype/freetype/docs/credits,v retrieving revision 1.14 retrieving revision 1.17 diff -r1.14 -r1.17 22c22 < Antoine LECA (antoine.leca@renault.fr) --- > Antoine LECA (Antoine-Freetype@Leca-Marti.org) 61c61 < Yamano-uchi, Hidetoshi --- > YAMANO-UCHI, Hidetoshi 63c63 < embedded bitmap support. --- > Embedded bitmap support. 71a72 > Cho, Jin-Hwan: Contributed extensions to the ttf2pk package. 77a79 > Dubacq, Jean-Christophe Index: freetype/docs/freetype.lsm =================================================================== RCS file: /cvs/freetype/freetype/docs/freetype.lsm,v retrieving revision 1.10 retrieving revision 1.12 diff -r1.10 -r1.12 3,4c3,4 < Version: 1.4 < Entered-date: 01SEP99 --- > Version: 1.5 > Entered-date: 18JAN02 6,15c6,16 < Keywords: font truetype rasterizer < Author: David Turner , < Werner Lemberg < Robert Wilhelm < Maintained-by: Robert Wilhelm < Primary-site: ftp://sunsite.unc.edu/pub/Linux/X11/fonts/ < Alternate-site: < Original-site: ftp://ftp.freetype.org/pub/ < Platforms: Linux, OS/2, MSDOS, Amiga OS, Unix, Mac, Windows < Copying-policy: BSD-like --- > Keywords: font truetype rasterizer freetype > Author: david.turner@freetype.org (David Turner) > werner.lemberg@freetype.org (Werner Lemberg) > robert.wilhelm@freetype.org (Robert Wilhelm) > Maintained-by: robert.wilhelm@freetype.org (Robert Wilhelm) > werner.lemberg@freetype.org (Werner Lemberg) > Antoine-Freetype@Leca-Marti.org (Antoine Leca) > Primary-site: ftp.freetype.org /freetype > 1400 KB freetype-1.5.tar.gz > Alternate-site: sunsite.unc.edu /pub/Linux/X11/fonts/ > Copying-policy: BSD-like or GPL Index: freetype/docs/optimize.txt =================================================================== RCS file: /cvs/freetype/freetype/docs/optimize.txt,v retrieving revision 1.2 retrieving revision 1.4 diff -r1.2 -r1.4 55,56c55,56 < Note that this macro is ignored if < TT_CONFIG_OPTION_NO_INTERPRETER is set. --- > Note that this macro is ignored until > TT_CONFIG_OPTION_BYTECODE_INTERPRETER is set. 84a85,107 > > > 4. TT_USE_LONG_LONG > ------------------- > > Define TT_USE_LONG_LONG if you want to enable the use of the > 'long long' 64-bit type provided by gcc and other compilers. > Note that: > > 1. The type wasn't ANSI C in 1989 (but is now OK with the new > C99), and thus will produce many warnings during library > compilation with many compilers, including gcc 2.8.x. > > 2. Though the generated object files are slightly smaller, the > resulting executables are bigger of about 4kB! gcc must be > linking some extra code in there! > > 3. There is really no speed gain in doing so (but it may help > debug the ttcalc component). > > IMPORTANT NOTE: You don't need to define it on 64-bits machines! > > NOTE 2 : This flag used to be _GNUC_LONG64_ Index: freetype/docs/porting.txt =================================================================== RCS file: /cvs/freetype/freetype/docs/porting.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -r1.5 -r1.6 109c109 < Because the ANSI libc doesn't provide synchronisation --- > Because the ANSI libc does not provide synchronisation 218c218 < implementation of TT_Alloc() doesn't respect it, you're pretty --- > implementation of TT_Alloc() does not respect it, you are pretty 321c321 < - The failure code, which releases the buffers, doesn't need to --- > - The failure code, which releases the buffers, does not need to 557c557 < things simple, NESTING FRAME ACCESSES aren't allowed. For --- > things simple, NESTING FRAME ACCESSES are not allowed. For 655,657c655,657 < What follows is that some ttfile functions won't take the same < number of arguments depending on the thread-support mode. Let < uss take the example of frame access and parsing: --- > What follows is that some `ttfile' functions will not take the > same number of arguments depending on the thread-support mode. > Let us take the example of frame access and parsing: 716c716 < wasn't thought as a good idea to complexify _source_ code in --- > was not thought as a good idea to complexify _source_ code in 973,974c973,974 < use directly your system's API. The TT_Mutex_xxxx() won't be < necessary then. --- > use directly your system's API. The TT_Mutex_xxxx() will not > be necessary then. 1011c1011 < - Define the macro TT_HAVE_TT_TEXT. --- > - Define the macro HAVE_TT_TEXT. 1020,1021c1020,1021 < If the configuration macro TT_HAVE_TT_TEXT is not defined, the < file `freetype.h' defines TT_Text as `char*'. You can read its --- > If the configuration macro HAVE_TT_TEXT is not defined, the file > `freetype.h' defines TT_Text as `char*'. You can read its 1046c1046 < We're sorry for the current design and state, but TT_Stream --- > We are sorry for the current design and state, but TT_Stream 1056,1057c1056,1057 < However, all of this doesn't mean than the current design < doesn't work. It does, so don't hesitate to use it :-) --- > However, all of this does not mean than the current design > does not work. It does, so do not hesitate to use it :-) Index: freetype/docs/readme.txt =================================================================== RCS file: /cvs/freetype/freetype/docs/readme.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -r1.5 -r1.6 85c85 < These documents will probably come later. --- > These documents were scheduled, but will probably never come... Index: freetype/howto/msdos.txt =================================================================== RCS file: /cvs/freetype/freetype/howto/msdos.txt,v retrieving revision 1.4 retrieving revision 1.7 diff -r1.4 -r1.7 13c13 < III. Specificities by compiler --- > III. Compiler Issues 15c15 < . Borland Turbo C v.1.5 --- > 2. Borland Turbo C v.2.0x 58c58 < cl: nmake /f arch\msdos\Makefile.MS (for version 7) --- > cl: nmake /f arch\msdos\Makefile.MS (for versions 6-7) 67a68,70 > depend - (for gcc with emx or DJGPP only) Creates a file that > lists the dependancies. Useful for the developper. > 133c136 < gcc -c -I. -Iarch/msdos arch/msdos/freetype.c --- > cl -c -I. -Iarch/msdos arch/msdos/freetype.c 140c143 < gcc -c -I. -Iarch/msdos -Iextend extend/*.c --- > bcc -c -I. -Iarch/msdos -Iextend extend/*.c 207,208c210,215 < III. Specificities < ================== --- > III. Compiler Issues > ==================== > > Many comments specific to a given compiler are now stored in its > relevant Makefile's, in the arch/msdos subdirectories. > 251,356c258 < 2. gcc in the DJGPP environment < ------------------------------- < < < 3. gcc in the EMX environment < ----------------------------- < < < 4. Watcom < --------- < < This compiler did compile early versions of the FreeType package. < While we tried our best to maintain the makefiles, the development < team does not have < access to a copy of this compiler, and we did not receive notices < of successfull builts since many months. So be prepared to some < problems; and if it works for you, or if you can upgrade the < package in any way, please notify us! < < < 5. Microsoft Visual C++ 1.x (16-bit) < ------------------------------------ < < < 6. Microsoft C/C++ 7.0 < ---------------------- < < 7. Borland C++ compilers < ------------------------ < < a. Borland C++ v. 3.1, 4.0, 5.0 (16-bit) < ---------------------------------------- < < b. Borland C++ v. 2.0, 3.0 < -------------------------- < < We did not test either of these versions recently, so please be < careful here, unexpected pitfalls may arise. In the other hand, < we will appreciate enhancements, or even notifications of < successful builts! < < However, there is something that may fail as it stands: the < -i40 option passed to CFLAGS was not recognized until v.3.1, so < the compiler will complain. Makefile.BC takes care of this by < testing the version of make, but if you use a version more < recent than the one which ships with the compiler, you may < experience problems. < < < 8. Turbo C++ compilers < ---------------------- < < Use < make -farch/msdos/Makefile.TC < < in either the lib (library only) or test directory (for the < library and the demo programs). < < Due to lack of place in the command line, we are not able to < switch off all the irrelevant warnings for the demo program. < Under the default settings, only one warning should be shown. < If more of the ``verbose'' warnings are enabled, much more can < appear. However, rest assured that any of them have been dealt < with, and they are just that, warnings, not indicies of real < problems. < < a. Turbo C++ v. 3.0 < ------------------- < < The Makefile.TC for this version is common with the older < versions (discussed below). Alternatively, you can consider using < the Makefile.BC instead, applying any remarks noted above for < v.3.0 of BCC, and also changing the name of the compiler < from BCC to TCC! < < b. Turbo C++ 2nd edition < ------------------------ < < Not tried (we appreciate insights). Should work as v. 1.0 (see < below). < < c. Turbo C++ v. 1.0 < ------------------- < < Unlike v.3.0, the version of make shipped with this version is < not able to cater with some of the possibilities used in < Makefile.BC, for example the inline construction of the `option' < file, with the && command. < < 12. Turbo C v. 2.0 < ------------------ < < Unlike version 1.5, Turbo C v.2.0 is not able to compile C sources < when they use the Unix convention for end-of-line. So make sure < either you use the .zip archive (where files are stored with CR-LF), < or if you use the .tar.gz version, the program that do the < transformation (WinZip can when instructed, look after "CR/LF < conversion for TAR"). < < This version lacks an ANSI compliant header, so it causes < problems when compiling the demo program fttimer. We worked around < this difficulty in a very hacky way (refer to the test Makefile.TC) < The detection is based on the version of make used, so if you use < a more recent version, please take a look at Makefile.TC. < < 13. Turbo C v. 1.5 --- > 2. Turbo C v. 2.0x 359,365c261,266 < Yes, this old compiler is able to compile the FreeType library, even < if it predates the ANSI standard by months! However, this is a < huge piece for such a small compiler, and several things are not < possible. First, as always with real-mode compilers, you need a lot < of available memory, probably more than 512KB at the C> prompt. < Also, compiling for debug is ardeous: both Makefile.TC assume the < -v option, which was not available in this version. --- > Unlike the precedent version 1.5 (!), Turbo C v.2.0 is not able to > compile C sources if they use the Unix convention for end-of- > line. So make sure either you use the .zip archive (where files > are stored with CR-LF), or if you use the .tar.gz version, the > program that does the transformation (WinZip can do it if > instructed, look after "CR/LF conversion for TAR"). 367d267 < The hack for is used there too, as with v.2.0. Index: freetype/howto/unix.txt =================================================================== RCS file: /cvs/freetype/freetype/howto/unix.txt,v retrieving revision 1.8 retrieving revision 1.9 diff -r1.8 -r1.9 70a71,73 > > Note that the Makefile uses nested variables which causes problems > with BSD make. Use GNU make instead. Index: freetype/howto/windows.txt =================================================================== RCS file: /cvs/freetype/freetype/howto/windows.txt,v retrieving revision 1.3 retrieving revision 1.7 diff -r1.3 -r1.7 9c9,10 < 3. Notes --- > 3. Building a DLL > 4. Notes 65a67,69 > depend - (for gcc only) Creates a file that lists the > dependancies. Useful for the developper. > 92,93c96,97 < the following compilers: Borland C++ 5.0, Visual C++ 4.0, and < Visual C++ 5.0. The project/workspace files can be found in the --- > the following compilers: Borland C++ 4.x/5.0, Visual C++ 4.0, and > Visual Studio. The project/workspace files can be found in the 96c100 < freetype.ide for Borland C++ 4.0 and 5.0 (and perhaps 4.5) --- > freetype.ide for Borland C++ 4.0, 4.5, and 5.0 99c103,104 < freetype.dsw Visual C++ 5.0 --- > freetype.dsw Visual Studio > ft_dll.dsp (a.k.a. Visual C++ 5, 6, and 7) 111c116 < "c:\Program Files\Borland\BC 5.0\Include" for include files. --- > "C:\Program Files\Borland\BC 5.0\Include" for include files. 115c120 < `freetype.mdp' file, which isn't a Visual C++ project during --- > `freetype.dsw' file, which isn't a Visual C++ project during 182,183c187,188 < cl: nmake /f arch\win16\Makefile.VC DLL=1 dll (16bit) < cl: nmake /f arch\win32\Makefile.CL DLL=1 dll (32bit) --- > cl: nmake /f arch\win16\Makefile.VC DLL=1 dll (16bit) > cl: nmake /f arch\win32\Makefile.CL DLL=1 dll (32bit) 188c193 < This should build `ft14_XX.dll' (`14' for version 1.4, `XX' is --- > This should build `ft15_XX.dll' (`15' for versions 1.5.*, `XX' is 193c198 < install - Install the DLL `ft14_XX.dll' to your system directory --- > install - Install the DLL `ft15_XX.dll' to your system directory 334,335c339,340 < using any clone of the Bourne shell and gcc, the GNU compiler, < with --- > using any clone of the Bourne shell, sed, and gcc, the GNU > compiler, with Index: freetype/lib/freetype.h =================================================================== RCS file: /cvs/freetype/freetype/lib/freetype.h,v retrieving revision 1.69 retrieving revision 1.72 diff -r1.69 -r1.72 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2001, 2002, 2003 by 24a25,32 > > #ifdef FT_FREETYPE_H > #error "This is freetype.h of FreeType 1!" > #error "Please fix the directory search order for header files" > #error "so that freetype.h of FreeType 2 is found first." > #endif > > 30c38 < #define TT_FREETYPE_MINOR 4 --- > #define TT_FREETYPE_MINOR 5 36,37c44,55 < /* To make freetype.h independent from configuration files we check */ < /* whether EXPORT_DEF has been defined already. */ --- > /*************************************************************************/ > /* Define FT_EXPORT_DEF as needed to use e.g. a DLL. */ > /* All variables and functions visible from outside have these prefixes. */ > /* */ > /* To make freetype.h independent from configuration files we check */ > /* whether FT_EXPORT_DEF has been defined already. */ > > /* Backward compatibility only. Don't use for new code. */ > #ifdef EXPORT_DEF > #define FT_EXPORT_DEF( type ) EXPORT_DEF type > #endif > /* End of backward compatibility section. */ 39,40c57,58 < #ifndef EXPORT_DEF < #define EXPORT_DEF extern --- > #ifndef FT_EXPORT_DEF > #define FT_EXPORT_DEF( type ) extern type 43,45c61,68 < /* The same for TT_Text. If you define the HAVE_TT_TEXT macro, you */ < /* have to provide a typedef declaration for TT_Text before */ < /* including this file. */ --- > /* This is for variables; default is using the same as functions. */ > #ifndef FT_EXPORT_DECL > #define FT_EXPORT_DECL( type ) FT_EXPORT_DEF( type ) > #endif > > /* The same for TT_Text. If you define the HAVE_TT_TEXT macro, you have */ > /* to provide a typedef declaration for TT_Text before including this */ > /* file. */ 507a531,538 > > /* only version 2 tables: */ > > TT_Short sxHeight; > TT_Short sCapHeight; > TT_UShort usDefaultChar; > TT_UShort usBreakChar; > TT_UShort usMaxContext; 642,644c673,675 < EXPORT_DEF < TT_Error TT_FreeType_Version( int *major, < int *minor ); --- > FT_EXPORT_DEF( TT_Error ) > TT_FreeType_Version( int *major, > int *minor ); 649,650c680,681 < EXPORT_DEF < TT_Error TT_Init_FreeType( TT_Engine* engine ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Init_FreeType( TT_Engine* engine ); 655,656c686,687 < EXPORT_DEF < TT_Error TT_Done_FreeType( TT_Engine engine ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Done_FreeType( TT_Engine engine ); 669,671c700,702 < EXPORT_DEF < TT_Error TT_Set_Raster_Gray_Palette( TT_Engine engine, < TT_Byte* palette ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Set_Raster_Gray_Palette( TT_Engine engine, > TT_Byte* palette ); 686,689c717,720 < EXPORT_DEF < TT_Error TT_Open_Face( TT_Engine engine, < const TT_Text* fontPathName, < TT_Face* face ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Open_Face( TT_Engine engine, > const TT_Text* fontPathName, > TT_Face* face ); 695,699c726,730 < EXPORT_DEF < TT_Error TT_Open_Collection( TT_Engine engine, < const TT_Text* collectionPathName, < TT_ULong fontIndex, < TT_Face* face ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Open_Collection( TT_Engine engine, > const TT_Text* collectionPathName, > TT_ULong fontIndex, > TT_Face* face ); 709,711c740,742 < EXPORT_DEF < TT_Error TT_Get_Face_Properties( TT_Face face, < TT_Face_Properties* properties ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Get_Face_Properties( TT_Face face, > TT_Face_Properties* properties ); 716,718c747,749 < EXPORT_DEF < TT_Error TT_Set_Face_Pointer( TT_Face face, < void* data ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Set_Face_Pointer( TT_Face face, > void* data ); 723,724c754,755 < EXPORT_DEF < void* TT_Get_Face_Pointer( TT_Face face ); --- > FT_EXPORT_DEF( void* ) > TT_Get_Face_Pointer( TT_Face face ); 730,731c761,762 < EXPORT_DEF < TT_Error TT_Flush_Face( TT_Face face ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Flush_Face( TT_Face face ); 737,744c768,775 < EXPORT_DEF < TT_Error TT_Get_Face_Metrics( TT_Face face, < TT_UShort firstGlyph, < TT_UShort lastGlyph, < TT_Short* leftBearings, < TT_UShort* widths, < TT_Short* topBearings, < TT_UShort* heights ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Get_Face_Metrics( TT_Face face, > TT_UShort firstGlyph, > TT_UShort lastGlyph, > TT_Short* leftBearings, > TT_UShort* widths, > TT_Short* topBearings, > TT_UShort* heights ); 750,751c781,782 < EXPORT_DEF < TT_Error TT_Close_Face( TT_Face face ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Close_Face( TT_Face face ); 756,761c787,792 < EXPORT_DEF < TT_Error TT_Get_Font_Data( TT_Face face, < TT_ULong tag, < TT_Long offset, < void* buffer, < TT_Long* length ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Get_Font_Data( TT_Face face, > TT_ULong tag, > TT_Long offset, > void* buffer, > TT_Long* length ); 779,781c810,812 < EXPORT_DEF < TT_Error TT_New_Instance( TT_Face face, < TT_Instance* instance ); --- > FT_EXPORT_DEF( TT_Error ) > TT_New_Instance( TT_Face face, > TT_Instance* instance ); 787,790c818,821 < EXPORT_DEF < TT_Error TT_Set_Instance_Resolutions( TT_Instance instance, < TT_UShort xResolution, < TT_UShort yResolution ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Set_Instance_Resolutions( TT_Instance instance, > TT_UShort xResolution, > TT_UShort yResolution ); 795,802c826,833 < EXPORT_DEF < TT_Error TT_Set_Instance_CharSize( TT_Instance instance, < TT_F26Dot6 charSize ); < < EXPORT_DEF < TT_Error TT_Set_Instance_CharSizes( TT_Instance instance, < TT_F26Dot6 charWidth, < TT_F26Dot6 charHeight ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Set_Instance_CharSize( TT_Instance instance, > TT_F26Dot6 charSize ); > > FT_EXPORT_DEF( TT_Error ) > TT_Set_Instance_CharSizes( TT_Instance instance, > TT_F26Dot6 charWidth, > TT_F26Dot6 charHeight ); 807,811c838,842 < EXPORT_DEF < TT_Error TT_Set_Instance_PixelSizes( TT_Instance instance, < TT_UShort pixelWidth, < TT_UShort pixelHeight, < TT_F26Dot6 pointSize ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Set_Instance_PixelSizes( TT_Instance instance, > TT_UShort pixelWidth, > TT_UShort pixelHeight, > TT_F26Dot6 pointSize ); 818,821c849,852 < EXPORT_DEF < TT_Error TT_Set_Instance_Transform_Flags( TT_Instance instance, < TT_Bool rotated, < TT_Bool stretched ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Set_Instance_Transform_Flags( TT_Instance instance, > TT_Bool rotated, > TT_Bool stretched ); 826,828c857,859 < EXPORT_DEF < TT_Error TT_Get_Instance_Metrics( TT_Instance instance, < TT_Instance_Metrics* metrics ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Get_Instance_Metrics( TT_Instance instance, > TT_Instance_Metrics* metrics ); 833,835c864,866 < EXPORT_DEF < TT_Error TT_Set_Instance_Pointer( TT_Instance instance, < void* data ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Set_Instance_Pointer( TT_Instance instance, > void* data ); 840,841c871,872 < EXPORT_DEF < void* TT_Get_Instance_Pointer( TT_Instance instance ); --- > FT_EXPORT_DEF( void* ) > TT_Get_Instance_Pointer( TT_Instance instance ); 846,847c877,878 < EXPORT_DEF < TT_Error TT_Done_Instance( TT_Instance instance ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Done_Instance( TT_Instance instance ); 855,857c886,888 < EXPORT_DEF < TT_Error TT_New_Glyph( TT_Face face, < TT_Glyph* glyph ); --- > FT_EXPORT_DEF( TT_Error ) > TT_New_Glyph( TT_Face face, > TT_Glyph* glyph ); 862,863c893,894 < EXPORT_DEF < TT_Error TT_Done_Glyph( TT_Glyph glyph ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Done_Glyph( TT_Glyph glyph ); 895,899c926,930 < EXPORT_DEF < TT_Error TT_Load_Glyph( TT_Instance instance, < TT_Glyph glyph, < TT_UShort glyphIndex, < TT_UShort loadFlags ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Load_Glyph( TT_Instance instance, > TT_Glyph glyph, > TT_UShort glyphIndex, > TT_UShort loadFlags ); 906,908c937,939 < EXPORT_DEF < TT_Error TT_Get_Glyph_Outline( TT_Glyph glyph, < TT_Outline* outline ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Get_Glyph_Outline( TT_Glyph glyph, > TT_Outline* outline ); 913,915c944,946 < EXPORT_DEF < TT_Error TT_Get_Glyph_Metrics( TT_Glyph glyph, < TT_Glyph_Metrics* metrics ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Get_Glyph_Metrics( TT_Glyph glyph, > TT_Glyph_Metrics* metrics ); 921,923c952,954 < EXPORT_DEF < TT_Error TT_Get_Glyph_Big_Metrics( TT_Glyph glyph, < TT_Big_Glyph_Metrics* metrics ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Get_Glyph_Big_Metrics( TT_Glyph glyph, > TT_Big_Glyph_Metrics* metrics ); 934,938c965,969 < EXPORT_DEF < TT_Error TT_Get_Glyph_Bitmap( TT_Glyph glyph, < TT_Raster_Map* bitmap, < TT_F26Dot6 xOffset, < TT_F26Dot6 yOffset ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Get_Glyph_Bitmap( TT_Glyph glyph, > TT_Raster_Map* bitmap, > TT_F26Dot6 xOffset, > TT_F26Dot6 yOffset ); 949,953c980,984 < EXPORT_DEF < TT_Error TT_Get_Glyph_Pixmap( TT_Glyph glyph, < TT_Raster_Map* pixmap, < TT_F26Dot6 xOffset, < TT_F26Dot6 yOffset ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Get_Glyph_Pixmap( TT_Glyph glyph, > TT_Raster_Map* pixmap, > TT_F26Dot6 xOffset, > TT_F26Dot6 yOffset ); 962,965c993,996 < EXPORT_DEF < TT_Error TT_New_Outline( TT_UShort numPoints, < TT_Short numContours, < TT_Outline* outline ); --- > FT_EXPORT_DEF( TT_Error ) > TT_New_Outline( TT_UShort numPoints, > TT_Short numContours, > TT_Outline* outline ); 970,971c1001,1002 < EXPORT_DEF < TT_Error TT_Done_Outline( TT_Outline* outline ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Done_Outline( TT_Outline* outline ); 976,978c1007,1009 < EXPORT_DEF < TT_Error TT_Copy_Outline( TT_Outline* source, < TT_Outline* target ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Copy_Outline( TT_Outline* source, > TT_Outline* target ); 983,986c1014,1017 < EXPORT_DEF < TT_Error TT_Get_Outline_Bitmap( TT_Engine engine, < TT_Outline* outline, < TT_Raster_Map* bitmap ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Get_Outline_Bitmap( TT_Engine engine, > TT_Outline* outline, > TT_Raster_Map* bitmap ); 991,994c1022,1025 < EXPORT_DEF < TT_Error TT_Get_Outline_Pixmap( TT_Engine engine, < TT_Outline* outline, < TT_Raster_Map* pixmap ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Get_Outline_Pixmap( TT_Engine engine, > TT_Outline* outline, > TT_Raster_Map* pixmap ); 1001,1003c1032,1034 < EXPORT_DEF < TT_Error TT_Get_Outline_BBox( TT_Outline* outline, < TT_BBox* bbox ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Get_Outline_BBox( TT_Outline* outline, > TT_BBox* bbox ); 1008,1010c1039,1041 < EXPORT_DEF < void TT_Transform_Outline( TT_Outline* outline, < TT_Matrix* matrix ); --- > FT_EXPORT_DEF( void ) > TT_Transform_Outline( TT_Outline* outline, > TT_Matrix* matrix ); 1015,1018c1046,1049 < EXPORT_DEF < void TT_Translate_Outline( TT_Outline* outline, < TT_F26Dot6 xOffset, < TT_F26Dot6 yOffset ); --- > FT_EXPORT_DEF( void ) > TT_Translate_Outline( TT_Outline* outline, > TT_F26Dot6 xOffset, > TT_F26Dot6 yOffset ); 1023,1026c1054,1057 < EXPORT_DEF < void TT_Transform_Vector( TT_F26Dot6* x, < TT_F26Dot6* y, < TT_Matrix* matrix ); --- > FT_EXPORT_DEF( void ) > TT_Transform_Vector( TT_F26Dot6* x, > TT_F26Dot6* y, > TT_Matrix* matrix ); 1031,1034c1062,1065 < EXPORT_DEF < TT_Long TT_MulDiv( TT_Long A, < TT_Long B, < TT_Long C ); --- > FT_EXPORT_DEF( TT_Long ) > TT_MulDiv( TT_Long A, > TT_Long B, > TT_Long C ); 1040,1042c1071,1073 < EXPORT_DEF < TT_Long TT_MulFix( TT_Long A, < TT_Long B ); --- > FT_EXPORT_DEF( TT_Long ) > TT_MulFix( TT_Long A, > TT_Long B ); 1059,1060c1090,1091 < EXPORT_DEF < int TT_Get_CharMap_Count( TT_Face face ); --- > FT_EXPORT_DEF( int ) > TT_Get_CharMap_Count( TT_Face face ); 1066,1070c1097,1101 < EXPORT_DEF < TT_Error TT_Get_CharMap_ID( TT_Face face, < TT_UShort charmapIndex, < TT_UShort* platformID, < TT_UShort* encodingID ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Get_CharMap_ID( TT_Face face, > TT_UShort charmapIndex, > TT_UShort* platformID, > TT_UShort* encodingID ); 1079,1082c1110,1113 < EXPORT_DEF < TT_Error TT_Get_CharMap( TT_Face face, < TT_UShort charmapIndex, < TT_CharMap* charMap ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Get_CharMap( TT_Face face, > TT_UShort charmapIndex, > TT_CharMap* charMap ); 1090,1092c1121,1123 < EXPORT_DEF < TT_UShort TT_Char_Index( TT_CharMap charMap, < TT_ULong charCode ); --- > FT_EXPORT_DEF( TT_UShort ) > TT_Char_Index( TT_CharMap charMap, > TT_ULong charCode ); 1109,1110c1140,1141 < EXPORT_DEF < int TT_Get_Name_Count( TT_Face face ); --- > FT_EXPORT_DEF( int ) > TT_Get_Name_Count( TT_Face face ); 1116,1122c1147,1153 < EXPORT_DEF < TT_Error TT_Get_Name_ID( TT_Face face, < TT_UShort nameIndex, < TT_UShort* platformID, < TT_UShort* encodingID, < TT_UShort* languageID, < TT_UShort* nameID ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Get_Name_ID( TT_Face face, > TT_UShort nameIndex, > TT_UShort* platformID, > TT_UShort* encodingID, > TT_UShort* languageID, > TT_UShort* nameID ); 1133,1137c1164,1168 < EXPORT_DEF < TT_Error TT_Get_Name_String( TT_Face face, < TT_UShort nameIndex, < TT_String** stringPtr, < TT_UShort* length ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Get_Name_String( TT_Face face, > TT_UShort nameIndex, > TT_String** stringPtr, > TT_UShort* length ); Index: freetype/lib/fterrid.h =================================================================== RCS file: /cvs/freetype/freetype/lib/fterrid.h,v retrieving revision 1.5 retrieving revision 1.7 diff -r1.5 -r1.7 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2001 by 103a104 > #define TT_Err_Too_Many_FDefs 0x304 Index: freetype/lib/ftnameid.h =================================================================== RCS file: /cvs/freetype/freetype/lib/ftnameid.h,v retrieving revision 1.9 retrieving revision 1.14 diff -r1.9 -r1.14 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2001 by 33a34 > #define TT_PLATFORM_CUSTOM 4 45c46,47 < #define TT_APPLE_ID_UNICODE_2_0 3 /* or later */ --- > #define TT_APPLE_ID_UNICODE_2_0 3 /* or later, BMP characters */ > #define TT_APPLE_ID_UNICODE_32 4 /* 3.1 or later, full repertoire */ 115a118 > #define TT_MS_ID_UCS_4 10 /* full repertoire, UTF-32 */ 262c265 < * the canonical source for the MS assigned LCID's is at --- > * the canonical source for the MS assigned LCID's used to be at 263a267,269 > * now (2002-11-15), the Microsoft site directs to > * http://www.microsoft.com/globaldev/reference/loclanghome.asp > * http://support.microsoft.com/support/kb/articles/Q224/8/04.ASP 266,416c272,387 < #define TT_MS_LANGID_ARABIC_SAUDI_ARABIA 0x0401 < #define TT_MS_LANGID_ARABIC_IRAQ 0x0801 < #define TT_MS_LANGID_ARABIC_EGYPT 0x0c01 < #define TT_MS_LANGID_ARABIC_LIBYA 0x1001 < #define TT_MS_LANGID_ARABIC_ALGERIA 0x1401 < #define TT_MS_LANGID_ARABIC_MOROCCO 0x1801 < #define TT_MS_LANGID_ARABIC_TUNISIA 0x1c01 < #define TT_MS_LANGID_ARABIC_OMAN 0x2001 < #define TT_MS_LANGID_ARABIC_YEMEN 0x2401 < #define TT_MS_LANGID_ARABIC_SYRIA 0x2801 < #define TT_MS_LANGID_ARABIC_JORDAN 0x2c01 < #define TT_MS_LANGID_ARABIC_LEBANON 0x3001 < #define TT_MS_LANGID_ARABIC_KUWAIT 0x3401 < #define TT_MS_LANGID_ARABIC_UAE 0x3801 < #define TT_MS_LANGID_ARABIC_BAHRAIN 0x3c01 < #define TT_MS_LANGID_ARABIC_QATAR 0x4001 < #define TT_MS_LANGID_BULGARIAN_BULGARIA 0x0402 < #define TT_MS_LANGID_CATALAN_SPAIN 0x0403 < #define TT_MS_LANGID_CHINESE_TAIWAN 0x0404 < #define TT_MS_LANGID_CHINESE_PRC 0x0804 < #define TT_MS_LANGID_CHINESE_HONG_KONG 0x0c04 < #define TT_MS_LANGID_CHINESE_SINGAPORE 0x1004 < #define TT_MS_LANGID_CHINESE_MACAU 0x1404 < #define TT_MS_LANGID_CZECH_CZECH_REPUBLIC 0x0405 < #define TT_MS_LANGID_DANISH_DENMARK 0x0406 < #define TT_MS_LANGID_GERMAN_GERMANY 0x0407 < #define TT_MS_LANGID_GERMAN_SWITZERLAND 0x0807 < #define TT_MS_LANGID_GERMAN_AUSTRIA 0x0c07 < #define TT_MS_LANGID_GERMAN_LUXEMBOURG 0x1007 < #define TT_MS_LANGID_GERMAN_LIECHTENSTEI 0x1407 < #define TT_MS_LANGID_GREEK_GREECE 0x0408 < #define TT_MS_LANGID_ENGLISH_UNITED_STATES 0x0409 < #define TT_MS_LANGID_ENGLISH_UNITED_KINGDOM 0x0809 < #define TT_MS_LANGID_ENGLISH_AUSTRALIA 0x0c09 < #define TT_MS_LANGID_ENGLISH_CANADA 0x1009 < #define TT_MS_LANGID_ENGLISH_NEW_ZEALAND 0x1409 < #define TT_MS_LANGID_ENGLISH_IRELAND 0x1809 < #define TT_MS_LANGID_ENGLISH_SOUTH_AFRICA 0x1c09 < #define TT_MS_LANGID_ENGLISH_JAMAICA 0x2009 < #define TT_MS_LANGID_ENGLISH_CARIBBEAN 0x2409 < #define TT_MS_LANGID_ENGLISH_BELIZE 0x2809 < #define TT_MS_LANGID_ENGLISH_TRINIDAD 0x2c09 < #define TT_MS_LANGID_ENGLISH_ZIMBABWE 0x3009 < #define TT_MS_LANGID_ENGLISH_PHILIPPINES 0x3409 < #define TT_MS_LANGID_SPANISH_SPAIN_TRADITIONAL_SORT 0x040a < #define TT_MS_LANGID_SPANISH_MEXICO 0x080a < #define TT_MS_LANGID_SPANISH_SPAIN_INTERNATIONAL_SORT 0x0c0a < #define TT_MS_LANGID_SPANISH_GUATEMALA 0x100a < #define TT_MS_LANGID_SPANISH_COSTA_RICA 0x140a < #define TT_MS_LANGID_SPANISH_PANAMA 0x180a < #define TT_MS_LANGID_SPANISH_DOMINICAN_REPUBLIC 0x1c0a < #define TT_MS_LANGID_SPANISH_VENEZUELA 0x200a < #define TT_MS_LANGID_SPANISH_COLOMBIA 0x240a < #define TT_MS_LANGID_SPANISH_PERU 0x280a < #define TT_MS_LANGID_SPANISH_ARGENTINA 0x2c0a < #define TT_MS_LANGID_SPANISH_ECUADOR 0x300a < #define TT_MS_LANGID_SPANISH_CHILE 0x340a < #define TT_MS_LANGID_SPANISH_URUGUAY 0x380a < #define TT_MS_LANGID_SPANISH_PARAGUAY 0x3c0a < #define TT_MS_LANGID_SPANISH_BOLIVIA 0x400a < #define TT_MS_LANGID_SPANISH_EL_SALVADOR 0x440a < #define TT_MS_LANGID_SPANISH_HONDURAS 0x480a < #define TT_MS_LANGID_SPANISH_NICARAGUA 0x4c0a < #define TT_MS_LANGID_SPANISH_PUERTO_RICO 0x500a < #define TT_MS_LANGID_FINNISH_FINLAND 0x040b < #define TT_MS_LANGID_FRENCH_FRANCE 0x040c < #define TT_MS_LANGID_FRENCH_BELGIUM 0x080c < #define TT_MS_LANGID_FRENCH_CANADA 0x0c0c < #define TT_MS_LANGID_FRENCH_SWITZERLAND 0x100c < #define TT_MS_LANGID_FRENCH_LUXEMBOURG 0x140c < #define TT_MS_LANGID_FRENCH_MONACO 0x180c < #define TT_MS_LANGID_HEBREW_ISRAEL 0x040d < #define TT_MS_LANGID_HUNGARIAN_HUNGARY 0x040e < #define TT_MS_LANGID_ICELANDIC_ICELAND 0x040f < #define TT_MS_LANGID_ITALIAN_ITALY 0x0410 < #define TT_MS_LANGID_ITALIAN_SWITZERLAND 0x0810 < #define TT_MS_LANGID_JAPANESE_JAPAN 0x0411 < #define TT_MS_LANGID_KOREAN_EXTENDED_WANSUNG_KOREA 0x0412 < #define TT_MS_LANGID_KOREAN_JOHAB_KOREA 0x0812 < #define TT_MS_LANGID_DUTCH_NETHERLANDS 0x0413 < #define TT_MS_LANGID_DUTCH_BELGIUM 0x0813 < #define TT_MS_LANGID_NORWEGIAN_NORWAY_BOKMAL 0x0414 < #define TT_MS_LANGID_NORWEGIAN_NORWAY_NYNORSK 0x0814 < #define TT_MS_LANGID_POLISH_POLAND 0x0415 < #define TT_MS_LANGID_PORTUGUESE_BRAZIL 0x0416 < #define TT_MS_LANGID_PORTUGUESE_PORTUGAL 0x0816 < #define TT_MS_LANGID_RHAETO_ROMANIC_SWITZERLAND 0x0417 < #define TT_MS_LANGID_ROMANIAN_ROMANIA 0x0418 < #define TT_MS_LANGID_MOLDAVIAN_MOLDAVIA 0x0818 < #define TT_MS_LANGID_RUSSIAN_RUSSIA 0x0419 < #define TT_MS_LANGID_RUSSIAN_MOLDAVIA 0x0819 < #define TT_MS_LANGID_CROATIAN_CROATIA 0x041a < #define TT_MS_LANGID_SERBIAN_SERBIA_LATIN 0x081a < #define TT_MS_LANGID_SERBIAN_SERBIA_CYRILLIC 0x0c1a < #define TT_MS_LANGID_SLOVAK_SLOVAKIA 0x041b < #define TT_MS_LANGID_ALBANIAN_ALBANIA 0x041c < #define TT_MS_LANGID_SWEDISH_SWEDEN 0x041d < #define TT_MS_LANGID_SWEDISH_FINLAND 0x081d < #define TT_MS_LANGID_THAI_THAILAND 0x041e < #define TT_MS_LANGID_TURKISH_TURKEY 0x041f < #define TT_MS_LANGID_URDU_PAKISTAN 0x0420 < #define TT_MS_LANGID_INDONESIAN_INDONESIA 0x0421 < #define TT_MS_LANGID_UKRAINIAN_UKRAINE 0x0422 < #define TT_MS_LANGID_BELARUSIAN_BELARUS 0x0423 < #define TT_MS_LANGID_SLOVENE_SLOVENIA 0x0424 < #define TT_MS_LANGID_ESTONIAN_ESTONIA 0x0425 < #define TT_MS_LANGID_LATVIAN_LATVIA 0x0426 < #define TT_MS_LANGID_LITHUANIAN_LITHUANIA 0x0427 < #define TT_MS_LANGID_CLASSIC_LITHUANIAN_LITHUANIA 0x0827 < #define TT_MS_LANGID_MAORI_NEW_ZEALAND 0x0428 < #define TT_MS_LANGID_FARSI_IRAN 0x0429 < #define TT_MS_LANGID_VIETNAMESE_VIET_NAM 0x042a < #define TT_MS_LANGID_ARMENIAN_ARMENIA 0x042b < #define TT_MS_LANGID_AZERI_AZERBAIJAN_LATIN 0x042c < #define TT_MS_LANGID_AZERI_AZERBAIJAN_CYRILLIC 0x082c < #define TT_MS_LANGID_BASQUE_SPAIN 0x042d < #define TT_MS_LANGID_SORBIAN_GERMANY 0x042e < #define TT_MS_LANGID_MACEDONIAN_MACEDONIA 0x042f < #define TT_MS_LANGID_SUTU_SOUTH_AFRICA 0x0430 < #define TT_MS_LANGID_TSONGA_SOUTH_AFRICA 0x0431 < #define TT_MS_LANGID_TSWANA_SOUTH_AFRICA 0x0432 < #define TT_MS_LANGID_VENDA_SOUTH_AFRICA 0x0433 < #define TT_MS_LANGID_XHOSA_SOUTH_AFRICA 0x0434 < #define TT_MS_LANGID_ZULU_SOUTH_AFRICA 0x0435 < #define TT_MS_LANGID_AFRIKAANS_SOUTH_AFRICA 0x0436 < #define TT_MS_LANGID_GEORGIAN_GEORGIA 0x0437 < #define TT_MS_LANGID_FAEROESE_FAEROE_ISLANDS 0x0438 < #define TT_MS_LANGID_HINDI_INDIA 0x0439 < #define TT_MS_LANGID_MALTESE_MALTA 0x043a < #define TT_MS_LANGID_SAAMI_LAPONIA 0x043b < #define TT_MS_LANGID_IRISH_GAELIC_IRELAND 0x043c < #define TT_MS_LANGID_SCOTTISH_GAELIC_UNITED_KINGDOM 0x083c < #define TT_MS_LANGID_MALAY_MALAYSIA 0x043e < #define TT_MS_LANGID_MALAY_BRUNEI_DARUSSALAM 0x083e < #define TT_MS_LANGID_KAZAK_KAZAKSTAN 0x043f < #define TT_MS_LANGID_SWAHILI_KENYA 0x0441 < #define TT_MS_LANGID_UZBEK_UZBEKISTAN_LATIN 0x0443 < #define TT_MS_LANGID_UZBEK_UZBEKISTAN_CYRILLIC 0x0843 < #define TT_MS_LANGID_TATAR_TATARSTAN 0x0444 < #define TT_MS_LANGID_BENGALI_INDIA 0x0445 < #define TT_MS_LANGID_PUNJABI_INDIA 0x0446 < #define TT_MS_LANGID_GUJARATI_INDIA 0x0447 < #define TT_MS_LANGID_ORIYA_INDIA 0x0448 < #define TT_MS_LANGID_TAMIL_INDIA 0x0449 < #define TT_MS_LANGID_TELUGU_INDIA 0x044a < #define TT_MS_LANGID_KANNADA_INDIA 0x044b < #define TT_MS_LANGID_MALAYALAM_INDIA 0x044c < #define TT_MS_LANGID_ASSAMESE_INDIA 0x044d < #define TT_MS_LANGID_MARATHI_INDIA 0x044e < #define TT_MS_LANGID_SANSKRIT_INDIA 0x044f < #define TT_MS_LANGID_KONKANI_INDIA 0x0457 --- > #define TT_MS_LANGID_ARABIC_SAUDI_ARABIA 0x0401 > #define TT_MS_LANGID_ARABIC_IRAQ 0x0801 > #define TT_MS_LANGID_ARABIC_EGYPT 0x0c01 > #define TT_MS_LANGID_ARABIC_LIBYA 0x1001 > #define TT_MS_LANGID_ARABIC_ALGERIA 0x1401 > #define TT_MS_LANGID_ARABIC_MOROCCO 0x1801 > #define TT_MS_LANGID_ARABIC_TUNISIA 0x1c01 > #define TT_MS_LANGID_ARABIC_OMAN 0x2001 > #define TT_MS_LANGID_ARABIC_YEMEN 0x2401 > #define TT_MS_LANGID_ARABIC_SYRIA 0x2801 > #define TT_MS_LANGID_ARABIC_JORDAN 0x2c01 > #define TT_MS_LANGID_ARABIC_LEBANON 0x3001 > #define TT_MS_LANGID_ARABIC_KUWAIT 0x3401 > #define TT_MS_LANGID_ARABIC_UAE 0x3801 > #define TT_MS_LANGID_ARABIC_BAHRAIN 0x3c01 > #define TT_MS_LANGID_ARABIC_QATAR 0x4001 > #define TT_MS_LANGID_BULGARIAN_BULGARIA 0x0402 > #define TT_MS_LANGID_CATALAN_SPAIN 0x0403 > #define TT_MS_LANGID_CHINESE_TAIWAN 0x0404 > #define TT_MS_LANGID_CHINESE_PRC 0x0804 > #define TT_MS_LANGID_CHINESE_HONG_KONG 0x0c04 > #define TT_MS_LANGID_CHINESE_SINGAPORE 0x1004 > > #if 1 /* this used to be this value (and it still is in many places) */ > #define TT_MS_LANGID_CHINESE_MACAU 0x1404 > #else /* but beware, Microsoft may change its mind... > the most recent Word reference has the following: :-( */ > #define TT_MS_LANGID_CHINESE_MACAU TT_MS_LANGID_CHINESE_HONG_KONG > #endif > > #define TT_MS_LANGID_CZECH_CZECH_REPUBLIC 0x0405 > #define TT_MS_LANGID_DANISH_DENMARK 0x0406 > #define TT_MS_LANGID_GERMAN_GERMANY 0x0407 > #define TT_MS_LANGID_GERMAN_SWITZERLAND 0x0807 > #define TT_MS_LANGID_GERMAN_AUSTRIA 0x0c07 > #define TT_MS_LANGID_GERMAN_LUXEMBOURG 0x1007 > #define TT_MS_LANGID_GERMAN_LIECHTENSTEI 0x1407 > #define TT_MS_LANGID_GREEK_GREECE 0x0408 > #define TT_MS_LANGID_ENGLISH_UNITED_STATES 0x0409 > #define TT_MS_LANGID_ENGLISH_UNITED_KINGDOM 0x0809 > #define TT_MS_LANGID_ENGLISH_AUSTRALIA 0x0c09 > #define TT_MS_LANGID_ENGLISH_CANADA 0x1009 > #define TT_MS_LANGID_ENGLISH_NEW_ZEALAND 0x1409 > #define TT_MS_LANGID_ENGLISH_IRELAND 0x1809 > #define TT_MS_LANGID_ENGLISH_SOUTH_AFRICA 0x1c09 > #define TT_MS_LANGID_ENGLISH_JAMAICA 0x2009 > #define TT_MS_LANGID_ENGLISH_CARIBBEAN 0x2409 > #define TT_MS_LANGID_ENGLISH_BELIZE 0x2809 > #define TT_MS_LANGID_ENGLISH_TRINIDAD 0x2c09 > #define TT_MS_LANGID_ENGLISH_ZIMBABWE 0x3009 > #define TT_MS_LANGID_ENGLISH_PHILIPPINES 0x3409 > #define TT_MS_LANGID_SPANISH_SPAIN_TRADITIONAL_SORT 0x040a > #define TT_MS_LANGID_SPANISH_MEXICO 0x080a > #define TT_MS_LANGID_SPANISH_SPAIN_INTERNATIONAL_SORT 0x0c0a > #define TT_MS_LANGID_SPANISH_GUATEMALA 0x100a > #define TT_MS_LANGID_SPANISH_COSTA_RICA 0x140a > #define TT_MS_LANGID_SPANISH_PANAMA 0x180a > #define TT_MS_LANGID_SPANISH_DOMINICAN_REPUBLIC 0x1c0a > #define TT_MS_LANGID_SPANISH_VENEZUELA 0x200a > #define TT_MS_LANGID_SPANISH_COLOMBIA 0x240a > #define TT_MS_LANGID_SPANISH_PERU 0x280a > #define TT_MS_LANGID_SPANISH_ARGENTINA 0x2c0a > #define TT_MS_LANGID_SPANISH_ECUADOR 0x300a > #define TT_MS_LANGID_SPANISH_CHILE 0x340a > #define TT_MS_LANGID_SPANISH_URUGUAY 0x380a > #define TT_MS_LANGID_SPANISH_PARAGUAY 0x3c0a > #define TT_MS_LANGID_SPANISH_BOLIVIA 0x400a > #define TT_MS_LANGID_SPANISH_EL_SALVADOR 0x440a > #define TT_MS_LANGID_SPANISH_HONDURAS 0x480a > #define TT_MS_LANGID_SPANISH_NICARAGUA 0x4c0a > #define TT_MS_LANGID_SPANISH_PUERTO_RICO 0x500a > #define TT_MS_LANGID_FINNISH_FINLAND 0x040b > #define TT_MS_LANGID_FRENCH_FRANCE 0x040c > #define TT_MS_LANGID_FRENCH_BELGIUM 0x080c > #define TT_MS_LANGID_FRENCH_CANADA 0x0c0c > #define TT_MS_LANGID_FRENCH_SWITZERLAND 0x100c > #define TT_MS_LANGID_FRENCH_LUXEMBOURG 0x140c > #define TT_MS_LANGID_FRENCH_MONACO 0x180c > #define TT_MS_LANGID_HEBREW_ISRAEL 0x040d > #define TT_MS_LANGID_HUNGARIAN_HUNGARY 0x040e > #define TT_MS_LANGID_ICELANDIC_ICELAND 0x040f > #define TT_MS_LANGID_ITALIAN_ITALY 0x0410 > #define TT_MS_LANGID_ITALIAN_SWITZERLAND 0x0810 > #define TT_MS_LANGID_JAPANESE_JAPAN 0x0411 > #define TT_MS_LANGID_KOREAN_EXTENDED_WANSUNG_KOREA 0x0412 > #define TT_MS_LANGID_KOREAN_JOHAB_KOREA 0x0812 > #define TT_MS_LANGID_DUTCH_NETHERLANDS 0x0413 > #define TT_MS_LANGID_DUTCH_BELGIUM 0x0813 > #define TT_MS_LANGID_NORWEGIAN_NORWAY_BOKMAL 0x0414 > #define TT_MS_LANGID_NORWEGIAN_NORWAY_NYNORSK 0x0814 > #define TT_MS_LANGID_POLISH_POLAND 0x0415 > #define TT_MS_LANGID_PORTUGUESE_BRAZIL 0x0416 > #define TT_MS_LANGID_PORTUGUESE_PORTUGAL 0x0816 > #define TT_MS_LANGID_RHAETO_ROMANIC_SWITZERLAND 0x0417 > #define TT_MS_LANGID_ROMANIAN_ROMANIA 0x0418 > #define TT_MS_LANGID_MOLDAVIAN_MOLDAVIA 0x0818 > #define TT_MS_LANGID_RUSSIAN_RUSSIA 0x0419 > #define TT_MS_LANGID_RUSSIAN_MOLDAVIA 0x0819 > #define TT_MS_LANGID_CROATIAN_CROATIA 0x041a > #define TT_MS_LANGID_SERBIAN_SERBIA_LATIN 0x081a > #define TT_MS_LANGID_SERBIAN_SERBIA_CYRILLIC 0x0c1a > #define TT_MS_LANGID_SLOVAK_SLOVAKIA 0x041b > #define TT_MS_LANGID_ALBANIAN_ALBANIA 0x041c > #define TT_MS_LANGID_SWEDISH_SWEDEN 0x041d > #define TT_MS_LANGID_SWEDISH_FINLAND 0x081d > #define TT_MS_LANGID_THAI_THAILAND 0x041e > #define TT_MS_LANGID_TURKISH_TURKEY 0x041f > #define TT_MS_LANGID_URDU_PAKISTAN 0x0420 > #define TT_MS_LANGID_INDONESIAN_INDONESIA 0x0421 > #define TT_MS_LANGID_UKRAINIAN_UKRAINE 0x0422 > #define TT_MS_LANGID_BELARUSIAN_BELARUS 0x0423 > #define TT_MS_LANGID_SLOVENE_SLOVENIA 0x0424 > #define TT_MS_LANGID_ESTONIAN_ESTONIA 0x0425 > #define TT_MS_LANGID_LATVIAN_LATVIA 0x0426 > #define TT_MS_LANGID_LITHUANIAN_LITHUANIA 0x0427 > #define TT_MS_LANGID_CLASSIC_LITHUANIAN_LITHUANIA 0x0827 417a389,548 > #if 0 /* this seems to be an error that have been dropped */ > #define TT_MS_LANGID_MAORI_NEW_ZEALAND 0x0428 > #endif > > #define TT_MS_LANGID_FARSI_IRAN 0x0429 > #define TT_MS_LANGID_VIETNAMESE_VIET_NAM 0x042a > #define TT_MS_LANGID_ARMENIAN_ARMENIA 0x042b > #define TT_MS_LANGID_AZERI_AZERBAIJAN_LATIN 0x042c > #define TT_MS_LANGID_AZERI_AZERBAIJAN_CYRILLIC 0x082c > #define TT_MS_LANGID_BASQUE_SPAIN 0x042d > #define TT_MS_LANGID_SORBIAN_GERMANY 0x042e > #define TT_MS_LANGID_MACEDONIAN_MACEDONIA 0x042f > #define TT_MS_LANGID_SUTU_SOUTH_AFRICA 0x0430 > #define TT_MS_LANGID_TSONGA_SOUTH_AFRICA 0x0431 > #define TT_MS_LANGID_TSWANA_SOUTH_AFRICA 0x0432 > #define TT_MS_LANGID_VENDA_SOUTH_AFRICA 0x0433 > #define TT_MS_LANGID_XHOSA_SOUTH_AFRICA 0x0434 > #define TT_MS_LANGID_ZULU_SOUTH_AFRICA 0x0435 > #define TT_MS_LANGID_AFRIKAANS_SOUTH_AFRICA 0x0436 > #define TT_MS_LANGID_GEORGIAN_GEORGIA 0x0437 > #define TT_MS_LANGID_FAEROESE_FAEROE_ISLANDS 0x0438 > #define TT_MS_LANGID_HINDI_INDIA 0x0439 > #define TT_MS_LANGID_MALTESE_MALTA 0x043a > #define TT_MS_LANGID_SAAMI_LAPONIA 0x043b > > #if 0 /* this seems to be a previous invertion */ > #define TT_MS_LANGID_IRISH_GAELIC_IRELAND 0x043c > #define TT_MS_LANGID_SCOTTISH_GAELIC_UNITED_KINGDOM 0x083c > #else > #define TT_MS_LANGID_SCOTTISH_GAELIC_UNITED_KINGDOM 0x083c > #define TT_MS_LANGID_IRISH_GAELIC_IRELAND 0x043c > #endif > > #define TT_MS_LANGID_MALAY_MALAYSIA 0x043e > #define TT_MS_LANGID_MALAY_BRUNEI_DARUSSALAM 0x083e > #define TT_MS_LANGID_KAZAK_KAZAKSTAN 0x043f > #define TT_MS_LANGID_SWAHILI_KENYA 0x0441 > #define TT_MS_LANGID_UZBEK_UZBEKISTAN_LATIN 0x0443 > #define TT_MS_LANGID_UZBEK_UZBEKISTAN_CYRILLIC 0x0843 > #define TT_MS_LANGID_TATAR_TATARSTAN 0x0444 > #define TT_MS_LANGID_BENGALI_INDIA 0x0445 > #define TT_MS_LANGID_PUNJABI_INDIA 0x0446 > #define TT_MS_LANGID_GUJARATI_INDIA 0x0447 > #define TT_MS_LANGID_ORIYA_INDIA 0x0448 > #define TT_MS_LANGID_TAMIL_INDIA 0x0449 > #define TT_MS_LANGID_TELUGU_INDIA 0x044a > #define TT_MS_LANGID_KANNADA_INDIA 0x044b > #define TT_MS_LANGID_MALAYALAM_INDIA 0x044c > #define TT_MS_LANGID_ASSAMESE_INDIA 0x044d > #define TT_MS_LANGID_MARATHI_INDIA 0x044e > #define TT_MS_LANGID_SANSKRIT_INDIA 0x044f > #define TT_MS_LANGID_KONKANI_INDIA 0x0457 > > /* new as of 2001-01-01 */ > #define TT_MS_LANGID_ARABIC_GENERAL 0x0001 > #define TT_MS_LANGID_CHINESE_GENERAL 0x0004 > #define TT_MS_LANGID_ENGLISH_GENERAL 0x0009 > #define TT_MS_LANGID_FRENCH_WEST_INDIES 0x1c0c > #define TT_MS_LANGID_FRENCH_REUNION 0x200c > #define TT_MS_LANGID_FRENCH_CONGO 0x240c > /* which was formerly: */ > #define TT_MS_LANGID_FRENCH_ZAIRE TT_MS_LANGID_FRENCH_CONGO > > #define TT_MS_LANGID_FRENCH_SENEGAL 0x280c > #define TT_MS_LANGID_FRENCH_CAMEROON 0x2c0c > #define TT_MS_LANGID_FRENCH_COTE_D_IVOIRE 0x300c > #define TT_MS_LANGID_FRENCH_MALI 0x340c > #define TT_MS_LANGID_BOSNIAN_BOSNIA_HERZEGOVINA 0x101a > #define TT_MS_LANGID_URDU_INDIA 0x0820 > #define TT_MS_LANGID_TAJIK_TAJIKISTAN 0x0428 > #define TT_MS_LANGID_YIDDISH_GERMANY 0x043d > #define TT_MS_LANGID_KIRGHIZ_KIRGHIZSTAN 0x0440 > /* alias declared in Windows 2000 */ > #define TT_MS_LANGID_KIRGHIZ_KIRGHIZ_REPUBLIC \ > TT_MS_LANGID_KIRGHIZ_KIRGHIZSTAN > > #define TT_MS_LANGID_TURKMEN_TURKMENISTAN 0x0442 > #define TT_MS_LANGID_MONGOLIAN_MONGOLIA /* Cyrillic */ 0x0450 > > /* this seems to be inconsistant... :-( > * here is the current "official" way: */ > #define TT_MS_LANGID_TIBETAN_BHUTAN 0x0451 > /* and now here is what is used by Passport SDK */ > #define TT_MS_LANGID_TIBETAN_CHINA 0x0451 > #define TT_MS_LANGID_DZONGHKA_BHUTAN 0x0851 > /* end of inconsistency */ > > #define TT_MS_LANGID_WELSH_WALES 0x0452 > #define TT_MS_LANGID_KHMER_CAMBODIA 0x0453 > #define TT_MS_LANGID_LAO_LAOS 0x0454 > #define TT_MS_LANGID_BURMESE_MYANMAR 0x0455 > #define TT_MS_LANGID_GALICIAN_SPAIN 0x0456 > #define TT_MS_LANGID_MANIPURI_INDIA 0x0458 > #define TT_MS_LANGID_SINDHI_INDIA 0x0459 > /* the following one is only encountered in Microsoft RTF specification */ > #define TT_MS_LANGID_KASHMIRI_PAKISTAN 0x0460 > /* the following one is not in the Passport list, looks like an omission */ > #define TT_MS_LANGID_KASHMIRI_INDIA 0x0860 > #define TT_MS_LANGID_NEPALI_NEPAL 0x0461 > #define TT_MS_LANGID_NEPALI_INDIA 0x0861 > #define TT_MS_LANGID_FRISIAN_NETHERLANDS 0x0462 > > > /* new as of 2001-03-01 (from Office Xp) */ > #define TT_MS_LANGID_ENGLISH_HONG_KONG 0x3c09 > #define TT_MS_LANGID_ENGLISH_INDIA 0x4009 > #define TT_MS_LANGID_ENGLISH_MALAYSIA 0x4409 > #define TT_MS_LANGID_ENGLISH_SINGAPORE 0x4809 > #define TT_MS_LANGID_SYRIAC_SYRIA 0x045a > #define TT_MS_LANGID_SINHALESE_SRI_LANKA 0x045b > #define TT_MS_LANGID_CHEROKEE_UNITED_STATES 0x045c > #define TT_MS_LANGID_INUKTITUT_CANADA 0x045d > #define TT_MS_LANGID_AMHARIC_ETHIOPIA 0x045e > #define TT_MS_LANGID_TAMAZIGHT_MOROCCO 0x045f > #define TT_MS_LANGID_TAMAZIGHT_MOROCCO_LATIN 0x085f > #define TT_MS_LANGID_PASHTO_AFGHANISTAN 0x0463 > #define TT_MS_LANGID_FILIPINO_PHILIPPINES 0x0464 > #define TT_MS_LANGID_DHIVEHI_MALDIVES 0x0465 > /* alias declared in Windows 2000 */ > #define TT_MS_LANGID_DIVEHI_MALDIVES TT_MS_LANGID_DHIVEHI_MALDIVES > /* for language codes from 0x0466 to 0x0471, see below */ > #define TT_MS_LANGID_OROMO_ETHIOPIA 0x0472 > #define TT_MS_LANGID_TIGRIGNA_ETHIOPIA 0x0473 > #define TT_MS_LANGID_TIGRIGNA_ERYTHREA 0x0873 > /* also spelled in the `Passport SDK' list as: */ > #define TT_MS_LANGID_TIGRIGNA_ERYTREA TT_MS_LANGID_TIGRIGNA_ERYTHREA > > /* New additions from Windows Xp/Passport SDK. AL 2001-11-10. */ > > /* don't ask me what this one means... :-( > * note it is currently commented out > #define TT_MS_LANGID_GREEK_GREECE2 0x2008 > * end of comment to avoid strange code */ > > #define TT_MS_LANGID_SPANISH_UNITED_STATES 0x540a > /* these following two blatently violate MS specs, by using a sublang>0x1F */ > #define TT_MS_LANGID_SPANISH_LATIN_AMERICA 0xE40a > #define TT_MS_LANGID_FRENCH_NORTH_AFRICA 0xE40c > > #define TT_MS_LANGID_FRENCH_MOROCCO 0x380c > #define TT_MS_LANGID_FRENCH_HAITI 0x3c0c > #define TT_MS_LANGID_BENGALI_BANGLADESH 0x0845 > #define TT_MS_LANGID_PUNJABI_ARABIC_PAKISTAN 0x0846 > #define TT_MS_LANGID_MONGOLIAN_MONGOLIA_MONGOLIAN 0x0850 > #define TT_MS_LANGID_EDO_NIGERIA 0x0466 > #define TT_MS_LANGID_FULFULDE_NIGERIA 0x0467 > #define TT_MS_LANGID_HAUSA_NIGERIA 0x0468 > #define TT_MS_LANGID_IBIBIO_NIGERIA 0x0469 > #define TT_MS_LANGID_YORUBA_NIGERIA 0x046a > /* language codes from 0x046b to 0x046f are (still) unknown. */ > #define TT_MS_LANGID_IGBO_NIGERIA 0x0470 > #define TT_MS_LANGID_KANURI_NIGERIA 0x0471 > #define TT_MS_LANGID_GUARANI_PARAGUAY 0x0474 > #define TT_MS_LANGID_HAWAIIAN_UNITED_STATES 0x0475 > #define TT_MS_LANGID_LATIN 0x0476 > #define TT_MS_LANGID_SOMALI_SOMALIA 0x0477 > /* Note Yi does not have a (proper) ISO639-2 code, since it is mostly not > * written (but OTOH the peculiar writing system is worth studying). */ > #define TT_MS_LANGID_YI_CHINA 0x0478 > #define TT_MS_LANGID_PAPIAMENTU_NETHERLANDS_ANTILLES 0x0479 445a577,578 > /* This is new in OpenType 1.3 */ > #define TT_NAME_ID_CID_FINDFONT_NAME 20 454,455c587,588 < /* Bit 0 C0 Controls and Basic Latin */ < #define TT_UCR_BASIC_LATIN (1L << 0) /* U+0000-U+007F */ --- > /* Bit 0 Basic Latin */ > #define TT_UCR_BASIC_LATIN (1L << 0) /* U+0020-U+007E */ 468c601 < /* Bit 7 Greek */ --- > /* Bit 7 Greek and Coptic */ 471c604,605 < /* Bit 9 Cyrillic */ --- > /* Bit 9 Cyrillic + */ > /* Cyrillic Supplementary */ 472a607 > /* U+0500-U+052F */ 527c662,664 < /* Bit 37 Arrows */ --- > /* Bit 37 Arrows + */ > /* Supplemental Arrows-A + */ > /* Supplemental Arrows-B */ 529c666,671 < /* Bit 38 Mathematical Operators */ --- > /* U+27F0-U+27FF */ > /* U+2900-U+297F */ > /* Bit 38 Mathematical Operators + */ > /* Supplemental Mathematical Operators + */ > /* Miscellaneous Mathematical Symbols-A + */ > /* Miscellaneous Mathematical Symbols-B */ 530a673,675 > /* U+2A00-U+2AFF */ > /* U+27C0-U+27EF */ > /* U+2980-U+29FF */ 556c701,702 < /* Bit 50 Katakana */ --- > /* Bit 50 Katakana + */ > /* Katakana Phonetic Extensions */ 558c704,706 < /* Bit 51 Bopomofo */ --- > /* U+31F0-U+31FF */ > /* Bit 51 Bopomofo + */ > /* Bopomofo Extended */ 559a708 > /* U+31A0-U+31BF */ 562c711 < /* Bit 53 CJK Miscellaneous */ --- > /* Bit 53 Kanbun (also named `CJK Miscellaneous') */ 563a713 > #define TT_UCR_KANBUN TT_UCR_CJK_MISC 576,577c726,735 < /* Bit 57 Surrogates */ < #define TT_UCR_SURROGATES (1L << 25) /* U+D800-U+DFFF */ --- > /* Bit 57 High Surrogates + */ > /* High Private Use Surrogates + */ > /* Low Surrogates */ > #define TT_UCR_SURROGATES (1L << 25) /* U+D800-U+DB7F */ > /* U+DB80-U+DBFF */ > /* U+DC00-U+DFFF */ > /* According to OpenType specs v.1.3+, setting bit 57 implies that there */ > /* is at least one codepoint beyond the Basic Multilingual Plane that is */ > /* supported by this font. So really means: U+10000-U+10FFFD */ > 582c740,746 < /* Bit 59 CJK Unified Ideographs */ --- > /* Bit 59 CJK Unified Ideographs + */ > /* CJK Radicals Supplement + */ > /* Kangxi Radicals + */ > /* Ideographic Description Characters + */ > /* CJK Unified Ideographs Extension A + */ > /* CJK Unified Ideographs Extension B + */ > /* Kanbun */ 583a748,753 > /* U+2E80-U+2EFF */ > /* U+2F00-U+2FDF */ > /* U+2FF0-U+2FFF */ > /* U+3400-U+4DB5 */ > /*U+20000-U+2A6DF*/ > /* U+3190-U+319F */ 592c762,763 < /* Bit 61 CJK Compatibility Ideographs */ --- > /* Bit 61 CJK Compatibility Ideographs + */ > /* CJK Compatibility Ideographs Supplement */ 593a765 > /*U+2F800-U+2FA1F*/ 597c769 < #define TT_UCR_ARABIC_PRESENTATIONS_A (1L << 31) /* U+FB50-U+FSFF */ --- > #define TT_UCR_ARABIC_PRESENTATIONS_A (1L << 31) /* U+FB50-U+FDFF */ 605c777 < #define TT_UCR_ARABIC_PRESENTATIONS_B (1L << 3) /* U+FE70-U+FEFF */ --- > #define TT_UCR_ARABIC_PRESENTATIONS_B (1L << 3) /* U+FE70-U+FEFE */ 612c784 < #define TT_UCR_TIBETAN (1L << 6) /* U+0F00-U+0FBF */ --- > #define TT_UCR_TIBETAN (1L << 6) /* U+0F00-U+0FFF */ 622c794 < #define TT_UCR_ETHIOPIC (1L << 11) /* U+1200-U+12BF */ --- > #define TT_UCR_ETHIOPIC (1L << 11) /* U+1200-U+137F */ 625,626c797,798 < /* Bit 77 Canadian Aboriginal Syllabics */ < #define TT_UCR_CANADIAN_ABORIGINAL_SYLLABICS (1L << 13) /* U+1400-U+14DF */ --- > /* Bit 77 Unified Canadian Aboriginal Syllabics */ > #define TT_UCR_CANADIAN_ABORIGINAL_SYLLABICS (1L << 13) /* U+1400-U+167F */ 635c807 < /* Bit 82 Braille */ --- > /* Bit 82 Braille Patterns */ 637,638c809,840 < /* Bit 83 Yi */ < #define TT_UCR_YI (1L << 19) /* U+A000-U+A4CF */ --- > /* Bit 83 Yi Syllables + */ > /* Yi Radicals */ > #define TT_UCR_YI (1L << 19) /* U+A000-U+A48F */ > /* U+A490-U+A4CF */ > /* Bit 84 Tagalog + */ > /* Hanunoo + */ > /* Buhid + */ > /* Tagbanwa */ > #define TT_UCR_PHILIPPINE (1L << 20) /* U+1700-U+171F */ > /* U+1720-U+173F */ > /* U+1740-U+175F */ > /* U+1760-U+177F */ > /* Bit 85 Old Italic */ > #define TT_UCR_OLD_ITALIC (1L << 21) /*U+10300-U+1032F*/ > /* Bit 86 Gothic */ > #define TT_UCR_GOTHIC (1L << 22) /*U+10330-U+1034F*/ > /* Bit 87 Deseret */ > #define TT_UCR_DESERET (1L << 23) /*U+10400-U+1044F*/ > /* Bit 88 Byzantine Musical Symbols + */ > /* Musical Symbols */ > #define TT_UCR_MUSICAL_SYMBOLS (1L << 24) /*U+1D000-U+1D0FF*/ > /*U+1D100-U+1D1FF*/ > /* Bit 89 Mathematical Alphanumeric Symbols */ > #define TT_UCR_MATH_ALPHANUMERIC_SYMBOLS (1L << 25) /*U+1D400-U+1D7FF*/ > /* Bit 90 Private Use (plane 15) + */ > /* Private Use (plane 16) */ > #define TT_UCR_PRIVATE_USE_SUPPLEMENTARY (1L << 26) /*U+F0000-U+FFFFD*/ > /*U+100000-U+10FFFD*/ > /* Bit 91 Variation Selectors */ > #define TT_UCR_VARIATION_SELECTORS (1L << 27) /* U+FE00-U+FE0F */ > /* Bit 92 Tags */ > #define TT_UCR_TAGS (1L << 28) /*U+E0000-U+E007F*/ 642c844,845 < #if defined( __TURBOC__ ) && __TURBOC__ < 0x0410 || defined( __PACIFIC__ ) --- > #if defined( __TURBOC__ ) && __TURBOC__ < 0x0410 || defined( __PACIFIC__ ) \ > || defined( M_I86 ) && !defined( _M_I86 ) Index: freetype/lib/ttapi.c =================================================================== RCS file: /cvs/freetype/freetype/lib/ttapi.c,v retrieving revision 1.50 retrieving revision 1.55 diff -r1.50 -r1.55 77,78c77,79 < EXPORT_FUNC < TT_Error TT_FreeType_Version( int *major, int *minor ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_FreeType_Version( int *major, > int *minor ) 109,110c110,111 < EXPORT_FUNC < TT_Error TT_Init_FreeType( TT_Engine* engine ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Init_FreeType( TT_Engine* engine ) 178,179c179,180 < EXPORT_FUNC < TT_Error TT_Done_FreeType( TT_Engine engine ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Done_FreeType( TT_Engine engine ) 222,224c223,225 < EXPORT_FUNC < TT_Error TT_Set_Raster_Gray_Palette( TT_Engine engine, < Byte* palette ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Set_Raster_Gray_Palette( TT_Engine engine, > Byte* palette ) 259,262c260,263 < EXPORT_FUNC < TT_Error TT_Open_Face( TT_Engine engine, < const TT_Text* fontPathName, < TT_Face* face ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Open_Face( TT_Engine engine, > const TT_Text* fontPathName, > TT_Face* face ) 322,326c323,327 < EXPORT_FUNC < TT_Error TT_Open_Collection( TT_Engine engine, < const TT_Text* collectionPathName, < TT_ULong fontIndex, < TT_Face* face ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Open_Collection( TT_Engine engine, > const TT_Text* collectionPathName, > TT_ULong fontIndex, > TT_Face* face ) 385,387c386,388 < EXPORT_FUNC < TT_Error TT_Get_Face_Properties( TT_Face face, < TT_Face_Properties* properties ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Get_Face_Properties( TT_Face face, > TT_Face_Properties* properties ) 442,444c443,445 < EXPORT_FUNC < TT_Error TT_Set_Face_Pointer( TT_Face face, < void* data ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Set_Face_Pointer( TT_Face face, > void* data ) 478,479c479,480 < EXPORT_FUNC < void* TT_Get_Face_Pointer( TT_Face face ) --- > FT_EXPORT_FUNC( void* ) > TT_Get_Face_Pointer( TT_Face face ) 546,553c547,554 < EXPORT_FUNC < TT_Error TT_Get_Face_Metrics( TT_Face face, < TT_UShort firstGlyph, < TT_UShort lastGlyph, < TT_Short* leftBearings, < TT_UShort* widths, < TT_Short* topBearings, < TT_UShort* heights ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Get_Face_Metrics( TT_Face face, > TT_UShort firstGlyph, > TT_UShort lastGlyph, > TT_Short* leftBearings, > TT_UShort* widths, > TT_Short* topBearings, > TT_UShort* heights ) 555,556c556,557 < PFace _face = HANDLE_Face( face ); < UShort num; --- > PFace _face = HANDLE_Face( face ); > UInt num; 629,630c630,631 < EXPORT_FUNC < TT_Error TT_Flush_Face( TT_Face face ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Flush_Face( TT_Face face ) 660,661c661,662 < EXPORT_FUNC < TT_Error TT_Close_Face( TT_Face face ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Close_Face( TT_Face face ) 693,695c694,696 < EXPORT_FUNC < TT_Error TT_New_Instance( TT_Face face, < TT_Instance* instance ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_New_Instance( TT_Face face, > TT_Instance* instance ) 750,753c751,754 < EXPORT_FUNC < TT_Error TT_Set_Instance_Resolutions( TT_Instance instance, < TT_UShort xResolution, < TT_UShort yResolution ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Set_Instance_Resolutions( TT_Instance instance, > TT_UShort xResolution, > TT_UShort yResolution ) 797,800c798,801 < EXPORT_FUNC < TT_Error TT_Set_Instance_CharSizes( TT_Instance instance, < TT_F26Dot6 charWidth, < TT_F26Dot6 charHeight ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Set_Instance_CharSizes( TT_Instance instance, > TT_F26Dot6 charWidth, > TT_F26Dot6 charHeight ) 860,862c861,863 < EXPORT_FUNC < TT_Error TT_Set_Instance_CharSize( TT_Instance instance, < TT_F26Dot6 charSize ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Set_Instance_CharSize( TT_Instance instance, > TT_F26Dot6 charSize ) 889,893c890,894 < EXPORT_FUNC < TT_Error TT_Set_Instance_PixelSizes( TT_Instance instance, < TT_UShort pixelWidth, < TT_UShort pixelHeight, < TT_F26Dot6 pointSize ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Set_Instance_PixelSizes( TT_Instance instance, > TT_UShort pixelWidth, > TT_UShort pixelHeight, > TT_F26Dot6 pointSize ) 942,945c943,946 < EXPORT_FUNC < TT_Error TT_Set_Instance_Transform_Flags( TT_Instance instance, < TT_Bool rotated, < TT_Bool stretched ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Set_Instance_Transform_Flags( TT_Instance instance, > TT_Bool rotated, > TT_Bool stretched ) 976,978c977,979 < EXPORT_FUNC < TT_Error TT_Get_Instance_Metrics( TT_Instance instance, < TT_Instance_Metrics* metrics ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Get_Instance_Metrics( TT_Instance instance, > TT_Instance_Metrics* metrics ) 1027,1029c1028,1030 < EXPORT_FUNC < TT_Error TT_Set_Instance_Pointer( TT_Instance instance, < void* data ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Set_Instance_Pointer( TT_Instance instance, > void* data ) 1062,1063c1063,1064 < EXPORT_FUNC < void* TT_Get_Instance_Pointer( TT_Instance instance ) --- > FT_EXPORT_FUNC( void* ) > TT_Get_Instance_Pointer( TT_Instance instance ) 1089,1090c1090,1091 < EXPORT_FUNC < TT_Error TT_Done_Instance( TT_Instance instance ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Done_Instance( TT_Instance instance ) 1119,1121c1120,1122 < EXPORT_FUNC < TT_Error TT_New_Glyph( TT_Face face, < TT_Glyph* glyph ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_New_Glyph( TT_Face face, > TT_Glyph* glyph ) 1154,1155c1155,1156 < EXPORT_FUNC < TT_Error TT_Done_Glyph( TT_Glyph glyph ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Done_Glyph( TT_Glyph glyph ) 1186,1190c1187,1191 < EXPORT_FUNC < TT_Error TT_Load_Glyph( TT_Instance instance, < TT_Glyph glyph, < TT_UShort glyphIndex, < TT_UShort loadFlags ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Load_Glyph( TT_Instance instance, > TT_Glyph glyph, > TT_UShort glyphIndex, > TT_UShort loadFlags ) 1242,1244c1243,1245 < EXPORT_FUNC < TT_Error TT_Get_Glyph_Outline( TT_Glyph glyph, < TT_Outline* outline ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Get_Glyph_Outline( TT_Glyph glyph, > TT_Outline* outline ) 1274,1276c1275,1277 < EXPORT_FUNC < TT_Error TT_Get_Glyph_Metrics( TT_Glyph glyph, < TT_Glyph_Metrics* metrics ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Get_Glyph_Metrics( TT_Glyph glyph, > TT_Glyph_Metrics* metrics ) 1308,1310c1309,1311 < EXPORT_FUNC < TT_Error TT_Get_Glyph_Big_Metrics( TT_Glyph glyph, < TT_Big_Glyph_Metrics* metrics ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Get_Glyph_Big_Metrics( TT_Glyph glyph, > TT_Big_Glyph_Metrics* metrics ) 1345,1349c1346,1350 < EXPORT_FUNC < TT_Error TT_Get_Glyph_Bitmap( TT_Glyph glyph, < TT_Raster_Map* bitmap, < TT_F26Dot6 xOffset, < TT_F26Dot6 yOffset ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Get_Glyph_Bitmap( TT_Glyph glyph, > TT_Raster_Map* bitmap, > TT_F26Dot6 xOffset, > TT_F26Dot6 yOffset ) 1408,1412c1409,1413 < EXPORT_FUNC < TT_Error TT_Get_Glyph_Pixmap( TT_Glyph glyph, < TT_Raster_Map* pixmap, < TT_F26Dot6 xOffset, < TT_F26Dot6 yOffset ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Get_Glyph_Pixmap( TT_Glyph glyph, > TT_Raster_Map* pixmap, > TT_F26Dot6 xOffset, > TT_F26Dot6 yOffset ) 1465,1468c1466,1469 < EXPORT_FUNC < TT_Error TT_New_Outline( TT_UShort numPoints, < TT_Short numContours, < TT_Outline* outline ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_New_Outline( TT_UShort numPoints, > TT_Short numContours, > TT_Outline* outline ) 1511,1512c1512,1513 < EXPORT_FUNC < TT_Error TT_Done_Outline( TT_Outline* outline ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Done_Outline( TT_Outline* outline ) 1546,1549c1547,1550 < EXPORT_FUNC < TT_Error TT_Get_Outline_Bitmap( TT_Engine engine, < TT_Outline* outline, < TT_Raster_Map* bitmap ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Get_Outline_Bitmap( TT_Engine engine, > TT_Outline* outline, > TT_Raster_Map* bitmap ) 1587,1590c1588,1591 < EXPORT_FUNC < TT_Error TT_Get_Outline_Pixmap( TT_Engine engine, < TT_Outline* outline, < TT_Raster_Map* pixmap ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Get_Outline_Pixmap( TT_Engine engine, > TT_Outline* outline, > TT_Raster_Map* pixmap ) 1631,1633c1632,1634 < EXPORT_FUNC < TT_Error TT_Copy_Outline( TT_Outline* source, < TT_Outline* target ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Copy_Outline( TT_Outline* source, > TT_Outline* target ) 1675,1677c1676,1678 < EXPORT_FUNC < void TT_Transform_Outline( TT_Outline* outline, < TT_Matrix* matrix ) --- > FT_EXPORT_FUNC( void ) > TT_Transform_Outline( TT_Outline* outline, > TT_Matrix* matrix ) 1716,1719c1717,1720 < EXPORT_FUNC < void TT_Transform_Vector( TT_F26Dot6* x, < TT_F26Dot6* y, < TT_Matrix* matrix ) --- > FT_EXPORT_FUNC( void ) > TT_Transform_Vector( TT_F26Dot6* x, > TT_F26Dot6* y, > TT_Matrix* matrix ) 1751,1754c1752,1755 < EXPORT_FUNC < void TT_Translate_Outline( TT_Outline* outline, < TT_F26Dot6 xOffset, < TT_F26Dot6 yOffset ) --- > FT_EXPORT_FUNC( void ) > TT_Translate_Outline( TT_Outline* outline, > TT_F26Dot6 xOffset, > TT_F26Dot6 yOffset ) 1784,1786c1785,1787 < EXPORT_FUNC < TT_Error TT_Get_Outline_BBox( TT_Outline* outline, < TT_BBox* bbox ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Get_Outline_BBox( TT_Outline* outline, > TT_BBox* bbox ) 1849,1850c1850,1851 < EXPORT_FUNC < int TT_Get_CharMap_Count( TT_Face face ) --- > FT_EXPORT_FUNC( int ) > TT_Get_CharMap_Count( TT_Face face ) 1875,1879c1876,1880 < EXPORT_FUNC < TT_Error TT_Get_CharMap_ID( TT_Face face, < TT_UShort charmapIndex, < TT_UShort* platformID, < TT_UShort* encodingID ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Get_CharMap_ID( TT_Face face, > TT_UShort charmapIndex, > TT_UShort* platformID, > TT_UShort* encodingID ) 1916,1919c1917,1920 < EXPORT_FUNC < TT_Error TT_Get_CharMap( TT_Face face, < TT_UShort charmapIndex, < TT_CharMap* charMap ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Get_CharMap( TT_Face face, > TT_UShort charmapIndex, > TT_CharMap* charMap ) 1982,1984c1983,1985 < EXPORT_FUNC < TT_UShort TT_Char_Index( TT_CharMap charMap, < TT_ULong charCode ) --- > FT_EXPORT_FUNC( TT_UShort ) > TT_Char_Index( TT_CharMap charMap, > TT_ULong charCode ) 2018,2019c2019,2020 < EXPORT_FUNC < int TT_Get_Name_Count( TT_Face face ) --- > FT_EXPORT_FUNC( int ) > TT_Get_Name_Count( TT_Face face ) 2055,2061c2056,2062 < EXPORT_FUNC < TT_Error TT_Get_Name_ID( TT_Face face, < TT_UShort nameIndex, < TT_UShort* platformID, < TT_UShort* encodingID, < TT_UShort* languageID, < TT_UShort* nameID ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Get_Name_ID( TT_Face face, > TT_UShort nameIndex, > TT_UShort* platformID, > TT_UShort* encodingID, > TT_UShort* languageID, > TT_UShort* nameID ) 2105,2109c2106,2110 < EXPORT_FUNC < TT_Error TT_Get_Name_String( TT_Face face, < TT_UShort nameIndex, < TT_String** stringPtr, < TT_UShort* length ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Get_Name_String( TT_Face face, > TT_UShort nameIndex, > TT_String** stringPtr, > TT_UShort* length ) 2172,2177c2173,2178 < EXPORT_FUNC < TT_Error TT_Get_Font_Data( TT_Face face, < TT_ULong tag, < TT_Long offset, < void* buffer, < TT_Long* length ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Get_Font_Data( TT_Face face, > TT_ULong tag, > TT_Long offset, > void* buffer, > TT_Long* length ) 2198,2201c2199,2202 < EXPORT_FUNC < TT_Error TT_Register_Callback( TT_Engine engine, < int callback_id, < void* callback_ptr ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Register_Callback( TT_Engine engine, > int callback_id, > void* callback_ptr ) Index: freetype/lib/ttcache.c =================================================================== RCS file: /cvs/freetype/freetype/lib/ttcache.c,v retrieving revision 1.19 retrieving revision 1.21 diff -r1.19 -r1.21 148,152c148,152 < LOCAL_FUNC < TT_Error Cache_Create( PEngine_Instance engine, < PCache_Class clazz, < TCache* cache, < TMutex* lock ) --- > FT_INTERNAL_FUNC( TT_Error ) > Cache_Create( PEngine_Instance engine, > PCache_Class clazz, > TCache* cache, > TMutex* lock ) 183,184c183,184 < LOCAL_FUNC < TT_Error Cache_Destroy( TCache* cache ) --- > FT_INTERNAL_FUNC( TT_Error ) > Cache_Destroy( TCache* cache ) 254,257c254,257 < LOCAL_FUNC < TT_Error Cache_New( TCache* cache, < void** new_object, < void* parent_object ) --- > FT_INTERNAL_FUNC( TT_Error ) > Cache_New( TCache* cache, > void** new_object, > void* parent_object ) 355,356c355,357 < LOCAL_FUNC < TT_Error Cache_Done( TCache* cache, void* data ) --- > FT_INTERNAL_FUNC( TT_Error ) > Cache_Done( TCache* cache, > void* data ) 434,435c435,436 < LOCAL_FUNC < TT_Error TTCache_Init( PEngine_Instance engine ) --- > FT_INTERNAL_FUNC( TT_Error ) > TTCache_Init( PEngine_Instance engine ) 443,444c444,445 < LOCAL_FUNC < TT_Error TTCache_Done( PEngine_Instance engine ) --- > FT_INTERNAL_FUNC( TT_Error ) > TTCache_Done( PEngine_Instance engine ) Index: freetype/lib/ttcache.h =================================================================== RCS file: /cvs/freetype/freetype/lib/ttcache.h,v retrieving revision 1.16 retrieving revision 1.18 diff -r1.16 -r1.18 168,172c168,172 < LOCAL_DEF < TT_Error Cache_Create( PEngine_Instance engine, < PCache_Class clazz, < TCache* cache, < TMutex* lock ); --- > FT_INTERNAL_DEF( TT_Error ) > Cache_Create( PEngine_Instance engine, > PCache_Class clazz, > TCache* cache, > TMutex* lock ); 176,177c176,177 < LOCAL_DEF < TT_Error Cache_Destroy( TCache* cache ); --- > FT_INTERNAL_DEF( TT_Error ) > Cache_Destroy( TCache* cache ); 182,185c182,185 < LOCAL_DEF < TT_Error Cache_New( TCache* cache, < void** new_object, < void* parent_object ); --- > FT_INTERNAL_DEF( TT_Error ) > Cache_New( TCache* cache, > void** new_object, > void* parent_object ); 191,192c191,192 < LOCAL_DEF < TT_Error Cache_Done( TCache* cache, void* data ); --- > FT_INTERNAL_DEF( TT_Error ) > Cache_Done( TCache* cache, void* data ); 202,203c202,203 < LOCAL_DEF < TT_Error TTCache_Init( PEngine_Instance engine ); --- > FT_INTERNAL_DEF( TT_Error ) > TTCache_Init( PEngine_Instance engine ); 205,206c205,206 < LOCAL_DEF < TT_Error TTCache_Done( PEngine_Instance engine ); --- > FT_INTERNAL_DEF( TT_Error ) > TTCache_Done( PEngine_Instance engine ); Index: freetype/lib/ttcalc.c =================================================================== RCS file: /cvs/freetype/freetype/lib/ttcalc.c,v retrieving revision 1.20 retrieving revision 1.22 diff -r1.20 -r1.22 50,51c50,53 < EXPORT_FUNC < TT_Long TT_MulDiv( TT_Long a, TT_Long b, TT_Long c ) --- > FT_EXPORT_FUNC( TT_Long ) > TT_MulDiv( TT_Long a, > TT_Long b, > TT_Long c ) 69,70c71,73 < EXPORT_FUNC < TT_Long TT_MulFix( TT_Long a, TT_Long b ) --- > FT_EXPORT_FUNC( TT_Long ) > TT_MulFix( TT_Long a, > TT_Long b ) 83,84c86,87 < LOCAL_FUNC < Int Order64( TT_Int64 z ) --- > FT_INTERNAL_FUNC( Int ) > Order64( TT_Int64 z ) 98,99c101,102 < LOCAL_FUNC < TT_Int32 Sqrt64( TT_Int64 l ) --- > FT_INTERNAL_FUNC( TT_Int32 ) > Sqrt64( TT_Int64 l ) 139,140c142,145 < EXPORT_FUNC < TT_Long TT_MulDiv( TT_Long a, TT_Long b, TT_Long c ) --- > FT_EXPORT_FUNC( TT_Long ) > TT_MulDiv( TT_Long a, > TT_Long b, > TT_Long c ) 185,186c190,192 < EXPORT_FUNC < TT_Long TT_MulFix( TT_Long a, TT_Long b ) --- > FT_EXPORT_FUNC( TT_Long ) > TT_MulFix( TT_Long a, > TT_Long b ) 215,216c221,222 < LOCAL_FUNC < void Neg64( TT_Int64* x ) --- > FT_INTERNAL_FUNC( void ) > Neg64( TT_Int64* x ) 237,238c243,246 < LOCAL_FUNC < void Add64( TT_Int64* x, TT_Int64* y, TT_Int64* z ) --- > FT_INTERNAL_FUNC( void ) > Add64( TT_Int64* x, > TT_Int64* y, > TT_Int64* z ) 251,252c259,262 < LOCAL_FUNC < void Sub64( TT_Int64* x, TT_Int64* y, TT_Int64* z ) --- > FT_INTERNAL_FUNC( void ) > Sub64( TT_Int64* x, > TT_Int64* y, > TT_Int64* z ) 265,266c275,278 < LOCAL_FUNC < void MulTo64( TT_Int32 x, TT_Int32 y, TT_Int64* z ) --- > FT_INTERNAL_FUNC( void ) > MulTo64( TT_Int32 x, > TT_Int32 y, > TT_Int64* z ) 310,311c322,324 < LOCAL_FUNC < TT_Int32 Div64by32( TT_Int64* x, TT_Int32 y ) --- > FT_INTERNAL_FUNC( TT_Int32 ) > Div64by32( TT_Int64* x, > TT_Int32 y ) 357,358c370,371 < LOCAL_FUNC < Int Order64( TT_Int64* z ) --- > FT_INTERNAL_FUNC( Int ) > Order64( TT_Int64* z ) 384,385c397,398 < LOCAL_FUNC < TT_Int32 Sqrt64( TT_Int64* l ) --- > FT_INTERNAL_FUNC( TT_Int32 ) > Sqrt64( TT_Int64* l ) Index: freetype/lib/ttcalc.h =================================================================== RCS file: /cvs/freetype/freetype/lib/ttcalc.h,v retrieving revision 1.15 retrieving revision 1.18 diff -r1.15 -r1.18 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2002 by 42c42,47 < LOCAL_DEF TT_Int32 Sqrt64( TT_Int64 l ); --- > FT_INTERNAL_DEF( TT_Int32 ) > Sqrt64( TT_Int64 l ) > #if defined __GCC__ && defined TT_MAKE_OPTION_SINGLE_OBJECT > __attribute__ (( unused )) /* keep the compiler mute */ > #endif > ; 63,72c68,94 < LOCAL_DEF void Add64( TT_Int64* x, TT_Int64* y, TT_Int64* z ); < LOCAL_DEF void Sub64( TT_Int64* x, TT_Int64* y, TT_Int64* z ); < < LOCAL_DEF void MulTo64( TT_Int32 x, TT_Int32 y, TT_Int64* z ); < < LOCAL_DEF TT_Int32 Div64by32( TT_Int64* x, TT_Int32 y ); < < LOCAL_DEF int Order64( TT_Int64* z ); < < LOCAL_DEF TT_Int32 Sqrt64( TT_Int64* l ); --- > FT_INTERNAL_DEF( void ) > Add64( TT_Int64* x, > TT_Int64* y, > TT_Int64* z ); > FT_INTERNAL_DEF( void ) > Sub64( TT_Int64* x, > TT_Int64* y, > TT_Int64* z ); > > FT_INTERNAL_DEF( void ) > MulTo64( TT_Int32 x, > TT_Int32 y, > TT_Int64* z ); > > FT_INTERNAL_DEF( TT_Int32 ) > Div64by32( TT_Int64* x, > TT_Int32 y ); > > FT_INTERNAL_DEF( int ) > Order64( TT_Int64* z ); > > FT_INTERNAL_DEF( TT_Int32 ) > Sqrt64( TT_Int64* l ) > #if defined __GCC__ && defined TT_MAKE_OPTION_SINGLE_OBJECT > __attribute__ (( unused )) /* keep the compiler mute */ > #endif > ; Index: freetype/lib/ttcmap.c =================================================================== RCS file: /cvs/freetype/freetype/lib/ttcmap.c,v retrieving revision 1.23 retrieving revision 1.30 diff -r1.23 -r1.30 3c3 < * ttcmap.c 1.0 --- > * ttcmap.c 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2002, 2003 by 47,49c47,49 < LOCAL_FUNC < TT_Error CharMap_Load( PCMapTable cmap, < TT_Stream input ) --- > FT_INTERNAL_FUNC( TT_Error ) > CharMap_Load( PCMapTable cmap, > TT_Stream input ) 55c55,56 < UShort u, l; --- > UShort u, l, num_Groups, j; > ULong length; 57,63c58,66 < PCMap0 cmap0; < PCMap2 cmap2; < PCMap4 cmap4; < PCMap6 cmap6; < < PCMap2SubHeader cmap2sub; < PCMap4Segment segments; --- > PCMap0 cmap0; > PCMap2 cmap2; > PCMap4 cmap4; > PCMap6 cmap6; > PCMap8_12 cmap8_12; > > PCMap2SubHeader cmap2sub; > PCMap4Segment segments; > PCMapGroup groups; 224a228,279 > case 8: > case 12: > if ( FILE_Seek( cmap->offset - 2 ) ) > return error; > > cmap8_12 = &cmap->c.cmap8_12; > > if ( ACCESS_Frame( 8L ) ) > goto Fail; > > length = GET_ULong(); > cmap->length = (UShort)(length & 0xFFFFU); > > if ( length!=cmap->length ) > goto Fail; > > GET_ULong(); /* language */ > > FORGET_Frame(); > > if ( cmap->format == 8 ) > if ( FILE_Skip( 8192L ) ) > goto Fail; > > if ( ACCESS_Frame( 4L ) ) > goto Fail; > cmap8_12->nGroups = GET_ULong(); > FORGET_Frame(); > > if ( cmap8_12->nGroups > 0xFFFF ) > goto Fail; > num_Groups = cmap8_12->nGroups; > > if ( ALLOC_ARRAY( cmap8_12->groups, num_Groups, TCMapGroup ) ) > goto Fail; > if ( ACCESS_Frame( num_Groups * 3 * 4L ) ) > goto Fail; > > groups = cmap8_12->groups; > > for ( j = 0; j < num_Groups; j++ ) > { > groups[j].startCharCode = GET_ULong(); > groups[j].endCharCode = GET_ULong(); > groups[j].startGlyphID = GET_ULong(); > } > > FORGET_Frame(); > > cmap8_12->last_group = cmap8_12->groups; > break; > 249,250c304,305 < LOCAL_FUNC < TT_Error CharMap_Free( PCMapTable cmap ) --- > FT_INTERNAL_FUNC( TT_Error ) > CharMap_Free( PCMapTable cmap ) 277a333,338 > case 8: > case 12: > FREE( cmap->c.cmap8_12.groups ); > cmap->c.cmap8_12.nGroups = 0; > break; > 300,303c361,365 < static UShort code_to_index0( ULong charCode, PCMap0 cmap0 ); < static UShort code_to_index2( ULong charCode, PCMap2 cmap2 ); < static UShort code_to_index4( ULong charCode, PCMap4 cmap4 ); < static UShort code_to_index6( ULong charCode, PCMap6 cmap6 ); --- > static UShort code_to_index0 ( ULong charCode, PCMap0 cmap0 ); > static UShort code_to_index2 ( ULong charCode, PCMap2 cmap2 ); > static UShort code_to_index4 ( ULong charCode, PCMap4 cmap4 ); > static UShort code_to_index6 ( ULong charCode, PCMap6 cmap6 ); > static UShort code_to_index8_12( ULong charCode, PCMap8_12 cmap8_12 ); 306,308c368,370 < LOCAL_FUNC < UShort CharMap_Index( PCMapTable cmap, < ULong charcode ) --- > FT_INTERNAL_FUNC( UShort ) > CharMap_Index( PCMapTable cmap, > ULong charcode ) 319a382,384 > case 8: > case 12: > return code_to_index8_12( charcode, &cmap->c.cmap8_12 ); 371c436,437 < UShort index1, idx, offset; --- > UShort index1, idx; > UInt offset; 374a441,443 > if ( charCode >= 0x10000L ) > return 0; > 392c461 < if ( (charCode & 0xFF) < sh2.firstCode ) --- > if ( (charCode & 0xFF) < (TT_UInt)sh2.firstCode ) 395c464 < if ( (charCode & 0xFF) >= (sh2.firstCode + sh2.entryCount) ) --- > if ( (charCode & 0xFF) >= (TT_UInt)( sh2.firstCode + sh2.entryCount ) ) 405c474 < return (idx + sh2.idDelta) & 0xFFFF; --- > return ( idx + sh2.idDelta ) & 0xFFFF; 430,431c499,500 < UShort index1, segCount; < UShort i; --- > UInt index1; > UShort segCount, i; 438c507 < if ( charCode <= cmap4->segments[i].endCount ) --- > if ( charCode <= (TT_UInt)cmap4->segments[i].endCount ) 447c516 < if ( charCode < seg4.startCount ) --- > if ( charCode < (TT_UInt)seg4.startCount ) 488c557 < UShort firstCode; --- > TT_UInt firstCode; 499a569,634 > } > > > /*************************************************************************/ > /* */ > /* */ > /* code_to_index8_12 */ > /* */ > /* */ > /* Converts the (possibly 32bit) character code into a glyph index. */ > /* Uses format 8 or 12. */ > /* */ > /* */ > /* charCode :: The wanted character code. */ > /* cmap8_12 :: A pointer to a cmap table in format 8 or 12. */ > /* */ > /* */ > /* Glyph index into the glyphs array. 0 if the glyph does not exist. */ > /* */ > static UShort code_to_index8_12( ULong charCode, > PCMap8_12 cmap8_12 ) > { > PCMapGroup group, limit; > > > limit = cmap8_12->groups + cmap8_12->nGroups; > > /* first, check against the last used group */ > > group = cmap8_12->last_group; > > /* the following is equivalent to performing two tests, as in */ > /* */ > /* if ( charCode >= group->startCharCode && */ > /* charCode <= group->endCharCode ) */ > /* */ > /* This is a bit strange, but it is faster, and the idea behind the */ > /* cache is to significantly speed up charcode to glyph index */ > /* conversion. */ > > if ( (ULong)( charCode - group->startCharCode ) < > (ULong)( group->endCharCode - group->startCharCode ) ) > goto Found1; > > for ( group = cmap8_12->groups; group < limit; group++ ) > { > /* the ranges are sorted in increasing order. If we are out of */ > /* the range here, the char code isn't in the charmap, so exit. */ > > if ( charCode > group->endCharCode ) > continue; > > if ( charCode >= group->startCharCode ) > goto Found; > } > return 0; > > Found: > cmap8_12->last_group = group; > > Found1: > /* Theoretically, glyph indices > 0xFFFF are possible with this format, > but since all other TrueType tables expect 16bit glyph indices only > it doesn't make sense to support this. */ > return (UShort)( group->startGlyphID + > ( charCode - group->startCharCode ) ); Index: freetype/lib/ttcmap.h =================================================================== RCS file: /cvs/freetype/freetype/lib/ttcmap.h,v retrieving revision 1.14 retrieving revision 1.16 diff -r1.14 -r1.16 3c3 < * ttcmap.h 1.0 --- > * ttcmap.h 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2002 by 112a113,144 > /* formats 8 & 12 */ > > /* auxiliary table for format 8 and 12 */ > > struct TCMapGroup_ > { > ULong startCharCode; > ULong endCharCode; > ULong startGlyphID; > }; > > typedef struct TCMapGroup_ TCMapGroup; > typedef TCMapGroup* PCMapGroup; > > /* FreeType handles format 8 and 12 identically. It is not necessary to > cover mixed 16bit and 32bit codes since FreeType always uses ULong > for input character codes -- converting Unicode surrogates to 32bit > character codes must be done by the application. */ > > struct TCMap8_12_ > { > ULong nGroups; > PCMapGroup groups; > > PCMapGroup last_group; /* last used group; this is a small */ > /* cache to potentially increase speed */ > }; > > typedef struct TCMap8_12_ TCMap8_12; > typedef TCMap8_12* PCMap8_12; > > 128,131c160,164 < TCMap0 cmap0; < TCMap2 cmap2; < TCMap4 cmap4; < TCMap6 cmap6; --- > TCMap0 cmap0; > TCMap2 cmap2; > TCMap4 cmap4; > TCMap6 cmap6; > TCMap8_12 cmap8_12; 143,145c176,178 < LOCAL_DEF < TT_Error CharMap_Load( PCMapTable table, < TT_Stream input ); --- > FT_INTERNAL_DEF( TT_Error ) > CharMap_Load( PCMapTable table, > TT_Stream input ); 150,151c183,184 < LOCAL_DEF < TT_Error CharMap_Free( PCMapTable table ); --- > FT_INTERNAL_DEF( TT_Error ) > CharMap_Free( PCMapTable table ); 156,158c189,191 < LOCAL_DEF < UShort CharMap_Index( PCMapTable cmap, < ULong charCode ); --- > FT_INTERNAL_DEF( UShort ) > CharMap_Index( PCMapTable cmap, > ULong charCode ); Index: freetype/lib/ttconfig.h =================================================================== RCS file: /cvs/freetype/freetype/lib/ttconfig.h,v retrieving revision 1.21 retrieving revision 1.24 diff -r1.21 -r1.24 1c1 < /******************************************************************* --- > /************************************************************************** 3c3 < * ttconfig.h 1.0 --- > * ttconfig.h 1.2 5c5 < * Configuration settings header file (spec only). --- > * Configuration settings header file. 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2002 by 21c21,30 < ******************************************************************/ --- > * The platform specificities are gathered in arch//ft_conf.h > * which is included by this file. > * > * Changes between 1.2 and 1.1 : > * > * - the EXPORT_DEF/EXPORT_FUNC/LOCAL_DEF/LOCAL_FUNC mechanism have > * replaced with a more elaborate one (with FT_ before) that allows > * addition of qualifiers _after_ the type, which is needed for DLLs. > * > *************************************************************************/ 28,29c37 < /* ------------ auto configuration ------------------------------------- */ < --- > /* --------------- auto configuration ---------------------------------- */ 39,78c47,50 < /**************************************************************************/ < /* Define TT_CONFIG_THREAD_SAFE if you want to build a thread-safe */ < /* version of the library. */ < < /* #define TT_CONFIG_OPTION_THREAD_SAFE */ < < < < /* ------------ general debugging -------------------------------------- */ < < < /************************************************************************* < * < * There are now three debugging modes: < * < * - trace mode: < * < * Error and trace messages are sent to the log file < * (which can be the standard error output). Define < * DEBUG_LEVEL_TRACE to enable this mode. < * < * - error mode: < * < * Only error messages are generated. Define < * DEBUG_LEVEL_ERROR to enable this mode. < * < * - release mode: < * < * Error messages are neither sent nor generated. The code is < * free from any debugging parts. < * < * < * Note that you should link the engine with the 'ttdebug' component. < * in case either DEBUG_LEVEL_TRACE or DEBUG_LEVEL_ERROR is defined. < * < * Please consult ttdebug.h for more details. */ < < /* #define DEBUG_LEVEL_TRACE */ < /* #define DEBUG_LEVEL_ERROR */ < --- > /*************************************************************************/ > /* */ > /* Some more settings used to be here, but they are now chosen */ > /* in the system-dependent file arch//ft_conf.h */ 81d52 < /* ------------ special debugging -------------------------------------- */ 82a54 > /* --------------- special debugging ----------------------------------- */ 126c98,109 < /* ------------ arithmetic and processor support ----------------------- */ --- > /* --------------- arithmetic and processor support -------------------- */ > > /*************************************************************************/ > /* define ALIGNMENT to your processor/environment preferred alignment */ > /* size. A value of 8 should work on all current processors, even */ > /* 64-bits ones. */ > > #ifndef ALIGNMENT > #define ALIGNMENT 8 > #endif > > 127a111 > /* --------------- compilation model and naughty processors support ---- */ 130,132c114,120 < /* Define TT_USE_LONG_LONG if you want to enable the use of the */ < /* 'long long' 64-bit type provided by gcc and other compilers. Note */ < /* that : */ --- > /* Under normal operation, the library is compiled into a single object */ > /* file. This gets rids of all the external symbols defined in each */ > /* component interface, and de-pollutes the name-space. */ > /* */ > /* However, you can still compile components into separate object files, */ > /* and gather all of them into the library. But you should then declare */ > /* some functions as externally visible. */ 134,135c122,124 < /* 1. The type isn't ANSI, and thus will produce many warnings */ < /* during library compilation. */ --- > /* We use two macros, namely FT_INTERNAL_FUNC and FT_INTERNAL_DEF, which */ > /* apply to functions that are internal to the engine, and should never */ > /* be seen or linked by a client application. */ 137,139c126,129 < /* 2. Though the generated object files are slightly smaller, the */ < /* resulting executables are bigger of about 4Kb! gcc must be */ < /* linking some extra code in there! */ --- > /* FT_INTERNAL_DEF used in header (.h) files, to define a function */ > /* that will be seen by other components. This */ > /* translates to "extern" in normal mode, and to */ > /* "static" in single-object mode. */ 141,142c131,134 < /* 3. There is really no speed gain in doing so (but it may help */ < /* debug the ttcalc component). */ --- > /* FT_INTERNAL_FUNC used in implementation (.c) files, just before */ > /* the function body. This translates to nothing */ > /* in normal mode, and to "static" in single-object */ > /* mode. */ 144c136,139 < /* IMPORTANT NOTE: You don't need to define it on 64-bits machines! */ --- > /* It is called a "MAKE_OPTION" because the macro must be defined in the */ > /* Makefile, rather than this one. It allows any developer to quickly */ > /* switch from one mode to the other without messing with "ttconfig.h" */ > /* each time. */ 146c141,154 < /* NOTE 2 : This flag used to be _GNUC_LONG64_ */ --- > /* The following macros are needed to compile the library with some */ > /* 16-bit (the infamous `_cdecl', `__loadds', `_export', `FAR', etc. */ > /* stuff) or perhaps C++ compilers (extern "C"). The typename is passed */ > /* as an argument, which allows the macro to add stuff _after_ the */ > /* typename, which is required by 16-bit msdos compiler syntax. */ > > #ifndef TT_MAKE_OPTION_SINGLE_OBJECT > > #ifndef FT_INTERNAL_FUNC > #define FT_INTERNAL_FUNC( type ) type > #endif > #ifndef FT_INTERNAL_DEF > #define FT_INTERNAL_DEF( type ) extern type > #endif 148c156,173 < /* #define TT_USE_LONG_LONG */ --- > #else /* ! TT_MAKE_OPTION_SINGLE_OBJECT */ > > #ifndef FT_INTERNAL_FUNC > #define FT_INTERNAL_FUNC( type ) static type > #endif > #ifndef FT_INTERNAL_DEF > #define FT_INTERNAL_DEF( type ) static type > #endif > > #endif /* TT_MAKE_OPTION_SINGLE_OBJECT */ > > /* This is for variables; default is using the same as functions. */ > #ifndef FT_INTERNAL_DECL > #define FT_INTERNAL_DECL( type ) FT_INTERNAL_DEF( type ) > #endif > #ifndef FT_INTERNAL_VAR > #define FT_INTERNAL_VAR( type ) FT_INTERNAL_DECL( type ) > #endif 152,154c177,178 < /* define ALIGNMENT to your processor/environment preferred alignment */ < /* size. A value of 8 should work on all current processors, even */ < /* 64-bits ones. */ --- > /* Define FT_EXPORT_DEF and FT_EXPORT_FUNC as needed to build e.g. a DLL.*/ > /* All variables and functions visible from outside have these prefixes. */ 156c180,191 < #define ALIGNMENT 8 --- > /* Backward compatibility only. Don't use for new code. */ > #ifdef EXPORT_DEF > #define FT_EXPORT_DEF( type ) EXPORT_DEF type > #endif > #ifdef EXPORT_FUNC > #define FT_EXPORT_FUNC( type ) EXPORT_FUNC type > #endif > /* End of backward compatibility section. */ > > #ifndef FT_EXPORT_DEF > #define FT_EXPORT_DEF( type ) extern type > #endif 157a193,195 > #ifndef FT_EXPORT_FUNC > #define FT_EXPORT_FUNC( type ) type > #endif 158a197,203 > /* This is for variables; default is using the same as functions. */ > #ifndef FT_EXPORT_DECL > #define FT_EXPORT_DECL( type ) FT_EXPORT_DEF( type ) > #endif > #ifndef FT_EXPORT_VAR > #define FT_EXPORT_VAR( type ) FT_EXPORT_DECL( type ) > #endif 160d204 < /* --------------- miscellaneous ----------------------------------- */ 163,165c207 < /*********************************************************************/ < /* The number of extensions available. Don't change this value */ < /* except if you add new extensions to the engine. */ --- > /* --------------- miscellaneous --------------------------------------- */ 167c209,211 < #define TT_MAX_EXTENSIONS 8 --- > /*************************************************************************/ > /* The number of extensions available. Don't change this value */ > /* except if you add new extensions to the engine. */ 168a213 > #define TT_MAX_EXTENSIONS 8 171d215 < /* --------------- automatic setup -- don't touch ------------------ */ 172a217 > /* --------------- automatic setup -- don't touch ---------------------- */ 174,176c219,221 < /*********************************************************************/ < /* If HAVE_TT_TEXT is defined we don't provide a default typedef for */ < /* defining TT_Text. */ --- > /*************************************************************************/ > /* If HAVE_TT_TEXT is defined we don't provide a default typedef for */ > /* defining TT_Text. */ 184,186c229,231 < /*********************************************************************/ < /* We define NULL in case it's not defined yet. The default */ < /* location is stdlib.h. */ --- > /*************************************************************************/ > /* We define NULL in case it's not defined yet. The default */ > /* location is stdlib.h. */ 193,199c238,244 < /*********************************************************************/ < /* Some systems can't use vfprintf for error messages on stderr; if */ < /* HAVE_PRINT_FUNCTION is defined, the Print macro must be supplied */ < /* externally (having the same parameters). */ < /* */ < /* This is only used by the "ttdebug" component, which should be */ < /* linked to the engine only in debug mode. */ --- > /*************************************************************************/ > /* Some systems can't use vfprintf for error messages on stderr; if */ > /* HAVE_PRINT_FUNCTION is defined, the Print macro must be supplied */ > /* externally (having the same parameters). */ > /* */ > /* This is only used by the "ttdebug" component, which should be linked */ > /* to the engine only in debug mode. */ 208,246c253 < /********************************************************************/ < /* */ < /* I have added the ability to compile the library into a single */ < /* object file. This gets rids of all the external symbols defined */ < /* in each component interface, and de-pollutes the name-space. */ < /* */ < /* I use two macros, namely LOCAL_FUNC and LOCAL_DEF, which only */ < /* apply to functions that are internal to the engine, and */ < /* should never be seen or linked by a client application. */ < /* */ < /* LOCAL_DEF used in header (.h) files, to define a function */ < /* that will be seen by other components. This */ < /* translates to "extern" in normal mode, and to */ < /* "static" in single-object mode. */ < /* */ < /* LOCAL_FUNC used in implementation (.c) files, just before */ < /* the function body. This translates to nothing */ < /* in normal mode, and to "static" in single-object */ < /* mode. */ < /* */ < /* Getting rid of un-necessary symbols makes the "ttcommon" */ < /* renaming macros hack unnecessary. Moreover, the stripped */ < /* single object file (freetype.o) is 52 Kb, instead of the */ < /* previous 57 Kb (size of all combined .o files), and gives */ < /* a better idea of the engine's real code size. */ < /* */ < /* It is called a "MAKE_OPTION" because the macro must be */ < /* defined in the Makefile, rather than this one. It allows */ < /* any developer to quickly switch from one mode to the other */ < /* without messing with "ttconfig.h" each time. */ < /* */ < #ifndef TT_MAKE_OPTION_SINGLE_OBJECT < #define LOCAL_FUNC /* void */ < #define LOCAL_DEF extern < #else < #define LOCAL_FUNC static < #define LOCAL_DEF static < #endif < --- > /* --------------- internal (developer) configuration toggles ---------- */ 249,264c256,257 < /* Define EXPORT_DEF and EXPORT_FUNC as needed to build e.g. a DLL. All */ < /* variables and functions visible from outside have these prefixes. */ < < #ifndef EXPORT_DEF < #define EXPORT_DEF extern < #endif < < #ifndef EXPORT_FUNC < #define EXPORT_FUNC /* void */ < #endif < < < < /* -------------- internal (developer) configuration toggles ------------ */ < < --- > /* Do not undefine this configuration macro. It is now a default that */ > /* must be kept in all release builds. */ 266,267d258 < /* Do not undefine this configuration macro. It is now a default that */ < /* must be kept in all release builds. */ 269a261,267 > /*************************************************************************/ > /* Define this if you want to generate a static raster. This makes a */ > /* non re-entrant version of the scan-line converter, which is about */ > /* 10% faster and 50% bigger than an indirect one! */ > /* */ > /* NOTE : this is different from TT_CONFIG_OPTION_STATIC_RASTER. */ > /* This one only affects the calling convention. */ 271,273d268 < /* Define this if you want to generate a static raster. This makes */ < /* a non re-entrant version of the scan-line converter, which is */ < /* about 10% faster and 50% bigger than an indirect one! */ 277d271 < Index: freetype/lib/ttdebug.h =================================================================== RCS file: /cvs/freetype/freetype/lib/ttdebug.h,v retrieving revision 1.14 retrieving revision 1.15 diff -r1.14 -r1.15 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2001 by Index: freetype/lib/ttengine.h =================================================================== RCS file: /cvs/freetype/freetype/lib/ttengine.h,v retrieving revision 1.14 retrieving revision 1.16 diff -r1.14 -r1.16 1c1 < /******************************************************************* --- > /************************************************************************* 3c3 < * ttengine.h 1.1 --- > * ttengine.h 1.1 5c5,6 < * Engine instance structure definition. --- > * Engine instance structure definition > * (this spec has no associated body). 7c8 < * Copyright 1996-2000 by --- > * Copyright 1996-2001 by 21c22 < ******************************************************************/ --- > *************************************************************************/ 35,48c36,49 < /********************************************************************/ < /* */ < /* The freetype engine instance structure. */ < /* */ < /* This structure holds all the data that is necessary to run */ < /* one instance of the freetype engine. It is needed to get a */ < /* completely re-entrant version of the library. */ < /* */ < /* The goal is to move _all_ component-specific variables, either */ < /* static or global in the structure; the component initializers */ < /* and finalizers will all be called with the address of a valid */ < /* TEngine_Instance. */ < /* */ < /********************************************************************/ --- > /***********************************************************************/ > /* */ > /* The freetype engine instance structure. */ > /* */ > /* This structure holds all the data that is necessary to run one */ > /* instance of the freetype engine. It is needed to get a completely */ > /* completely re-entrant version of the library. */ > /* */ > /* The goal is to move _all_ component-specific variables, either */ > /* static or global in the structure; the component initializers and */ > /* finalizers will all be called with the address of a valid */ > /* TEngine_Instance. */ > /* */ > /***********************************************************************/ 56,63c57,64 < void* objs_face_class; /* the face cache class */ < void* objs_instance_class; /* the instance cache class */ < void* objs_execution_class; /* the context cache class */ < void* objs_glyph_class; /* the glyph cache class */ < < void* objs_face_cache; /* these caches are used to track */ < void* objs_exec_cache; /* the current face and execution */ < /* context objects */ --- > void* objs_face_class; /* the face cache class */ > void* objs_instance_class; /* the instance cache class */ > void* objs_execution_class; /* the context cache class */ > void* objs_glyph_class; /* the glyph cache class */ > > void* objs_face_cache; /* these caches are used to track */ > void* objs_exec_cache; /* the current face and execution */ > /* context objects */ 65c66 < void* file_component; /* ttfile implementation dependent */ --- > void* file_component; /* ttfile implementation dependent */ 67,68c68,69 < TMutex raster_lock; /* mutex for this engine's render pool */ < void* raster_component; /* ttraster implementation depedent */ --- > TMutex raster_lock; /* mutex for this engine render pool */ > void* raster_component; /* ttraster implementation depedent */ 71c72 < void* extension_component; /* extensions dependent */ --- > void* extension_component; /* extensions dependent */ 78,82c79,83 < /* NOTE : The raster's lock is only acquired by the Render_Glyph and */ < /* Render_Gray_Glyph functions, which always release it on exit */ < /* They do not lock the engine mutex. This means you shouldn't */ < /* be concerned about deadlocks between the two mutexes, as these */ < /* should never appear.. */ --- > /* NOTE : The raster's lock is only acquired by the Render_Glyph and */ > /* Render_Gray_Glyph functions, which always release it on exit */ > /* They do not lock the engine mutex. This means you shouldn't */ > /* be concerned about deadlocks between the two mutexes, as */ > /* these should never appear.. */ 98c99 < #else /* for thread-safe builds */ --- > #else /* for thread-unsafe builds */ 100,101c101,102 < #define ENGINE_ARG /* void */ < #define ENGINE_ARGS --- > #define ENGINE_ARG /* none */ > #define ENGINE_ARGS /* none */ 103,104c104,105 < #define ENGINE_VAR < #define ENGINE_VARS --- > #define ENGINE_VAR /* nothing */ > #define ENGINE_VARS /* nothing */ Index: freetype/lib/ttextend.c =================================================================== RCS file: /cvs/freetype/freetype/lib/ttextend.c,v retrieving revision 1.18 retrieving revision 1.21 diff -r1.18 -r1.21 3c3 < * ttextend.h 2.0 --- > * ttextend.c 2.0 46,47c46,47 < LOCAL_FUNC < TT_Error TTExtend_Init( PEngine_Instance engine ) --- > FT_INTERNAL_FUNC( TT_Error ) > TTExtend_Init( PEngine_Instance engine ) 66,67c66,67 < LOCAL_FUNC < TT_Error TTExtend_Done( PEngine_Instance engine ) --- > FT_INTERNAL_FUNC( TT_Error ) > TTExtend_Done( PEngine_Instance engine ) 76,81c76,81 < EXPORT_FUNC < TT_Error TT_Register_Extension( PEngine_Instance engine, < Long id, < Long size, < PExt_Constructor create, < PExt_Destructor destroy ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Register_Extension( PEngine_Instance engine, > Long id, > Long size, > PExt_Constructor create, > PExt_Destructor destroy ) 114,117c114,117 < EXPORT_FUNC < TT_Error TT_Extension_Get( PFace face, < Long extension_id, < void** extension_block ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Extension_Get( PFace face, > Long extension_id, > void** extension_block ) 146,147c146,147 < LOCAL_FUNC < TT_Error Extension_Destroy( PFace face ) --- > FT_INTERNAL_FUNC( TT_Error ) > Extension_Destroy( PFace face ) 179,180c179,180 < LOCAL_FUNC < TT_Error Extension_Create( PFace face ) --- > FT_INTERNAL_FUNC( TT_Error ) > Extension_Create( PFace face ) Index: freetype/lib/ttextend.h =================================================================== RCS file: /cvs/freetype/freetype/lib/ttextend.h,v retrieving revision 1.18 retrieving revision 1.19 diff -r1.18 -r1.19 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2001 by 105c105 < /* except replacing the LOCAL_DEF keyword with EXPORT_DEF */ --- > /* except replacing the FT_INTERNAL_DEF macro with FT_EXPORT_DEF. */ 125,130c125,130 < EXPORT_DEF < TT_Error TT_Register_Extension( PEngine_Instance engine, < Long id, < Long size, < PExt_Constructor create, < PExt_Destructor destroy ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Register_Extension( PEngine_Instance engine, > Long id, > Long size, > PExt_Constructor create, > PExt_Destructor destroy ); 135,136c135,136 < LOCAL_DEF < TT_Error TTExtend_Init( PEngine_Instance engine ); --- > FT_INTERNAL_DEF( TT_Error ) > TTExtend_Init( PEngine_Instance engine ); 139,140c139,140 < LOCAL_DEF < TT_Error TTExtend_Done( PEngine_Instance engine ); --- > FT_INTERNAL_DEF( TT_Error ) > TTExtend_Done( PEngine_Instance engine ); 144,145c144,145 < LOCAL_DEF < TT_Error Extension_Create( PFace face ); --- > FT_INTERNAL_DEF( TT_Error ) > Extension_Create( PFace face ); 149,150c149,150 < LOCAL_DEF < TT_Error Extension_Destroy( PFace face ); --- > FT_INTERNAL_DEF( TT_Error ) > Extension_Destroy( PFace face ); 155,158c155,158 < EXPORT_DEF < TT_Error TT_Extension_Get( PFace face, < Long extension_id, < void** extension_block ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Extension_Get( PFace face, > Long extension_id, > void** extension_block ); 166d165 < Index: freetype/lib/ttfile.c =================================================================== RCS file: /cvs/freetype/freetype/lib/ttfile.c,v retrieving revision 1.28 retrieving revision 1.30 diff -r1.28 -r1.30 71,72c71,72 < EXPORT_FUNC < const TFileFrame TT_Null_FileFrame = { NULL, 0, 0 }; --- > FT_EXPORT_FUNC( const ) > TFileFrame TT_Null_FileFrame = { NULL, 0, 0 }; 185,186c185,186 < LOCAL_FUNC < TT_Error TTFile_Init( PEngine_Instance engine ) --- > FT_INTERNAL_FUNC( TT_Error ) > TTFile_Init( PEngine_Instance engine ) 210,211c210,211 < LOCAL_FUNC < TT_Error TTFile_Done( PEngine_Instance engine ) --- > FT_INTERNAL_FUNC( TT_Error ) > TTFile_Done( PEngine_Instance engine ) 233,235c233,235 < EXPORT_FUNC < TT_Error TT_Use_Stream( TT_Stream org_stream, < TT_Stream* stream ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Use_Stream( TT_Stream org_stream, > TT_Stream* stream ) 260,261c260,261 < EXPORT_FUNC < TT_Error TT_Done_Stream( TT_Stream* stream ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Done_Stream( TT_Stream* stream ) 291,292c291,292 < EXPORT_FUNC < TT_Error TT_Access_Frame( STREAM_ARGS FRAME_ARGS Long size ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Access_Frame( STREAM_ARGS FRAME_ARGS Long size ) 358,359c358,359 < EXPORT_FUNC < TT_Error TT_Check_And_Access_Frame( STREAM_ARGS FRAME_ARGS Long size ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Check_And_Access_Frame( STREAM_ARGS FRAME_ARGS Long size ) 412,413c412,413 < EXPORT_FUNC < TT_Error TT_Forget_Frame( FRAME_ARG ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Forget_Frame( FRAME_ARG ) 457,458c457,458 < LOCAL_FUNC < TT_Error TTFile_Init( PEngine_Instance engine ) --- > FT_INTERNAL_FUNC( TT_Error ) > TTFile_Init( PEngine_Instance engine ) 472,473c472,473 < LOCAL_FUNC < TT_Error TTFile_Done( PEngine_Instance engine ) --- > FT_INTERNAL_FUNC( TT_Error ) > TTFile_Done( PEngine_Instance engine ) 493,495c493,495 < EXPORT_FUNC < TT_Error TT_Use_Stream( TT_Stream input_stream, < TT_Stream* copy ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Use_Stream( TT_Stream input_stream, > TT_Stream* copy ) 515,516c515,516 < EXPORT_FUNC < TT_Error TT_Done_Stream( TT_Stream* stream ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Done_Stream( TT_Stream* stream ) 543,544c543,544 < EXPORT_FUNC < TT_Error TT_Access_Frame( STREAM_ARGS FRAME_ARGS Long size ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Access_Frame( STREAM_ARGS FRAME_ARGS Long size ) 599,600c599,600 < EXPORT_FUNC < TT_Error TT_Check_And_Access_Frame( STREAM_ARGS FRAME_ARGS Long size ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Check_And_Access_Frame( STREAM_ARGS FRAME_ARGS Long size ) 641,642c641,642 < EXPORT_FUNC < TT_Error TT_Forget_Frame( STREAM_ARGS FRAME_ARG ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Forget_Frame( STREAM_ARGS FRAME_ARG ) 764,765c764,765 < EXPORT_FUNC < Long TT_Stream_Size( TT_Stream stream ) --- > FT_EXPORT_FUNC( Long ) > TT_Stream_Size( TT_Stream stream ) 793,795c793,795 < LOCAL_FUNC < TT_Error TT_Open_Stream( const TT_Text* filepathname, < TT_Stream* stream ) --- > FT_INTERNAL_FUNC( TT_Error ) > TT_Open_Stream( const TT_Text* filepathname, > TT_Stream* stream ) 848,849c848,849 < LOCAL_FUNC < TT_Error TT_Close_Stream( TT_Stream* stream ) --- > FT_INTERNAL_FUNC( TT_Error ) > TT_Close_Stream( TT_Stream* stream ) 879,880c879,880 < EXPORT_FUNC < TT_Error TT_Flush_Stream( TT_Stream* stream ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Flush_Stream( TT_Stream* stream ) 907,908c907,908 < EXPORT_FUNC < TT_Error TT_Seek_File( STREAM_ARGS Long position ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Seek_File( STREAM_ARGS Long position ) 931,932c931,932 < EXPORT_FUNC < TT_Error TT_Skip_File( STREAM_ARGS Long distance ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Skip_File( STREAM_ARGS Long distance ) 952,953c952,953 < EXPORT_FUNC < TT_Error TT_Read_File( STREAM_ARGS void* buffer, Long count ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Read_File( STREAM_ARGS void* buffer, Long count ) 976,979c976,979 < EXPORT_FUNC < TT_Error TT_Read_At_File( STREAM_ARGS Long position, < void* buffer, < Long count ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Read_At_File( STREAM_ARGS Long position, > void* buffer, > Long count ) 1004,1005c1004,1005 < EXPORT_FUNC < Long TT_File_Pos( STREAM_ARG ) --- > FT_EXPORT_FUNC( Long ) > TT_File_Pos( STREAM_ARG ) 1023,1024c1023,1024 < EXPORT_FUNC < Byte TT_Get_Byte( FRAME_ARG ) --- > FT_EXPORT_FUNC( Byte ) > TT_Get_Byte( FRAME_ARG ) 1044,1045c1044,1046 < EXPORT_FUNC < Char TT_Get_Char( FRAME_ARG ) --- > > FT_EXPORT_FUNC( Char ) > TT_Get_Char( FRAME_ARG ) 1065,1066c1066,1067 < EXPORT_FUNC < Short TT_Get_Short( FRAME_ARG ) --- > FT_EXPORT_FUNC( Short ) > TT_Get_Short( FRAME_ARG ) 1094,1095c1095,1096 < EXPORT_FUNC < UShort TT_Get_UShort( FRAME_ARG ) --- > FT_EXPORT_FUNC( UShort ) > TT_Get_UShort( FRAME_ARG ) 1124,1125c1125,1126 < EXPORT_FUNC < Long TT_Get_Long( FRAME_ARG ) --- > FT_EXPORT_FUNC( Long ) > TT_Get_Long( FRAME_ARG ) 1155,1156c1156,1157 < EXPORT_FUNC < ULong TT_Get_ULong( FRAME_ARG ) --- > FT_EXPORT_FUNC( ULong ) > TT_Get_ULong( FRAME_ARG ) Index: freetype/lib/ttfile.h =================================================================== RCS file: /cvs/freetype/freetype/lib/ttfile.h,v retrieving revision 1.27 retrieving revision 1.30 diff -r1.27 -r1.30 3c3 < * ttfile.h 1.3 --- > * ttfile.h 1.4 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2002 by 15a16,20 > * Changes between 1.4 and 1.2 : > * > * - the macros which used to be in ttload.h are now here > * (with their underlying functions) > * 44,45c49,50 < LOCAL_DEF < TT_Error TTFile_Init( PEngine_Instance engine ); --- > FT_INTERNAL_DEF( TT_Error ) > TTFile_Init( PEngine_Instance engine ); 48,49c53,54 < LOCAL_DEF < TT_Error TTFile_Done( PEngine_Instance engine ); --- > FT_INTERNAL_DEF( TT_Error ) > TTFile_Done( PEngine_Instance engine ); 52,56c57,213 < /**********************************************************************/ < /* */ < /* Stream functions. */ < /* */ < /**********************************************************************/ --- > /****************************************************************/ > /* */ > /* Macros. */ > /* */ > /****************************************************************/ > > /* The following macros are defined to simplify the writing of */ > /* the various table and glyph loaders. */ > > /* For examples see the code in ttload.c, ttgload.c etc. */ > > #define USE_Stream( original, duplicate ) \ > ( (error = TT_Use_Stream( original, &duplicate )) != TT_Err_Ok ) > > #define DONE_Stream( _stream ) \ > TT_Done_Stream( &_stream ) > > /* Define a file frame -- use it only when needed */ > #define DEFINE_A_FRAME TFileFrame frame = TT_Null_FileFrame > > /* Define a stream -- use it only when needed */ > #define DEFINE_A_STREAM TT_Stream stream > > > #ifdef TT_CONFIG_OPTION_THREAD_SAFE /* re-entrant implementation */ > > /* The following macros define the necessary local */ > /* variables used to access streams and frames. */ > > /* Define stream locals with frame */ > #define DEFINE_STREAM_LOCALS \ > TT_Error error; \ > DEFINE_A_STREAM; \ > DEFINE_A_FRAME > > /* Define stream locals without frame */ > #define DEFINE_STREAM_LOCALS_WO_FRAME \ > TT_Error error; \ > DEFINE_A_STREAM > > /* Define locals with a predefined stream in reentrant mode -- see ttload.c */ > #define DEFINE_LOAD_LOCALS( STREAM ) \ > TT_Error error; \ > DEFINE_A_STREAM = (STREAM); \ > DEFINE_A_FRAME > > /* Define locals without frame with a predefined stream - see ttload.c */ > #define DEFINE_LOAD_LOCALS_WO_FRAME( STREAM ) \ > TT_Error error; \ > DEFINE_A_STREAM = (STREAM) > > /* Define all locals necessary to access a font file */ > #define DEFINE_ALL_LOCALS \ > TT_Error error; \ > DEFINE_A_STREAM; \ > DEFINE_A_FRAME > > > #define ACCESS_Frame( _size_ ) \ > ( (error = TT_Access_Frame( stream, \ > &frame, \ > (Long)(_size_) )) != TT_Err_Ok ) > #define CHECK_AND_ACCESS_Frame( _size_ ) \ > ( (error = TT_Check_And_Access_Frame( stream, \ > &frame, \ > (Long)(_size_) )) != TT_Err_Ok ) > #define FORGET_Frame() \ > ( (void)TT_Forget_Frame( stream, &frame ) ) > > #define GET_Byte() TT_Get_Byte ( &frame ) > #define GET_Char() TT_Get_Char ( &frame ) > #define GET_UShort() TT_Get_UShort( &frame ) > #define GET_Short() TT_Get_Short ( &frame ) > #define GET_Long() TT_Get_Long ( &frame ) > #define GET_ULong() TT_Get_ULong ( &frame ) > #define GET_Tag4() TT_Get_ULong ( &frame ) > > #define FILE_Pos() TT_File_Pos ( stream ) > > #define FILE_Seek( _position_ ) \ > ( (error = TT_Seek_File( stream, \ > (Long)(_position_) )) != TT_Err_Ok ) > #define FILE_Skip( _distance_ ) \ > ( (error = TT_Skip_File( stream, \ > (Long)(_distance_) )) != TT_Err_Ok ) > #define FILE_Read( buffer, count ) \ > ( (error = TT_Read_File ( stream, \ > buffer, \ > (Long)(count) )) != TT_Err_Ok ) > #define FILE_Read_At( pos, buffer, count ) \ > ( (error = TT_Read_At_File( stream, \ > (Long)(pos), \ > buffer, \ > (Long)(count) )) != TT_Err_Ok ) > > #else /* thread-safe implementation */ > > /* Define stream locals with frame -- nothing in thread-safe mode */ > #define DEFINE_STREAM_LOCALS \ > TT_Error error > > /* Define stream locals without frame -- nothing in thread-safe mode */ > #define DEFINE_STREAM_LOCALS_WO_FRAME \ > TT_Error error > > /* Define locals with a predefined stream in reentrant mode -- see ttload.c */ > #define DEFINE_LOAD_LOCALS( STREAM ) \ > TT_Error error > > > /* Define locals without frame with a predefined stream - see ttload.c */ > #define DEFINE_LOAD_LOCALS_WO_FRAME( STREAM ) \ > TT_Error error > > /* Define all locals necessary to access a font file */ > #define DEFINE_ALL_LOCALS \ > TT_Error error; \ > DEFINE_A_STREAM > > > #define ACCESS_Frame( _size_ ) \ > ( (error = TT_Access_Frame( (Long)(_size_) )) != TT_Err_Ok ) > #define CHECK_AND_ACCESS_Frame( _size_ ) \ > ( (error = TT_Check_And_Access_Frame( (Long)(_size_) )) != TT_Err_Ok ) > #define FORGET_Frame() \ > ( (void)TT_Forget_Frame() ) > > #define GET_Byte() TT_Get_Byte () > #define GET_Char() TT_Get_Char () > #define GET_UShort() TT_Get_UShort() > #define GET_Short() TT_Get_Short () > #define GET_Long() TT_Get_Long () > #define GET_ULong() TT_Get_ULong () > #define GET_Tag4() TT_Get_ULong () > > #define FILE_Pos() TT_File_Pos() > > #define FILE_Seek( _position_ ) \ > ( (error = TT_Seek_File( (Long)(_position_) )) != TT_Err_Ok ) > #define FILE_Skip( _distance_ ) \ > ( (error = TT_Skip_File( (Long)(_distance_) )) != TT_Err_Ok ) > #define FILE_Read( buffer, count ) \ > ( (error = TT_Read_File ( buffer, \ > (Long)(count) )) != TT_Err_Ok ) > #define FILE_Read_At( pos, buffer, count ) \ > ( (error = TT_Read_At_File( (Long)(pos), \ > buffer, \ > (Long)(count) )) != TT_Err_Ok ) > > #endif /* TT_CONFIG_OPTION_THREAD_SAFE */ > > > /****************************************************************/ > /* */ > /* Stream functions. */ > /* */ > /****************************************************************/ 61,63c218,220 < LOCAL_DEF < TT_Error TT_Open_Stream( const TT_Text* name, < TT_Stream* stream ); --- > FT_INTERNAL_DEF( TT_Error ) > TT_Open_Stream( const TT_Text* name, > TT_Stream* stream ); 69,70c226,227 < LOCAL_DEF < TT_Error TT_Close_Stream( TT_Stream* stream ); --- > FT_INTERNAL_DEF( TT_Error ) > TT_Close_Stream( TT_Stream* stream ); 81,83c238,240 < EXPORT_DEF < TT_Error TT_Use_Stream( TT_Stream org_stream, < TT_Stream* stream ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Use_Stream( TT_Stream org_stream, > TT_Stream* stream ); 91,92c248,249 < EXPORT_DEF < TT_Error TT_Done_Stream( TT_Stream* stream ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Done_Stream( TT_Stream* stream ); 98,99c255,256 < EXPORT_DEF < TT_Error TT_Flush_Stream( TT_Stream* stream ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Flush_Stream( TT_Stream* stream ); 131,133c288,290 < EXPORT_DEF < TT_Error TT_Read_File( STREAM_ARGS void* buffer, < Long count ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Read_File( STREAM_ARGS void* buffer, > Long count ); 138,139c295,296 < EXPORT_DEF < TT_Error TT_Seek_File( STREAM_ARGS Long position ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Seek_File( STREAM_ARGS Long position ); 144,145c301,302 < EXPORT_DEF < TT_Error TT_Skip_File( STREAM_ARGS Long distance ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Skip_File( STREAM_ARGS Long distance ); 150,153c307,310 < EXPORT_DEF < TT_Error TT_Read_At_File( STREAM_ARGS Long position, < void* buffer, < Long count ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Read_At_File( STREAM_ARGS Long position, > void* buffer, > Long count ); 157,158c314,315 < EXPORT_DEF < Long TT_File_Pos( STREAM_ARG ); --- > FT_EXPORT_DEF( Long ) > TT_File_Pos( STREAM_ARG ); 162,163c319,320 < EXPORT_DEF < Long TT_Stream_Size( TT_Stream stream ); --- > FT_EXPORT_DEF( Long ) > TT_Stream_Size( TT_Stream stream ); 166,173c323,330 < /********************************************************************/ < /* */ < /* Frame operations. */ < /* */ < /* For a comprehensive explanation of frames, please refer to the */ < /* documentation files. */ < /* */ < /********************************************************************/ --- > /****************************************************************/ > /* */ > /* Frame operations. */ > /* */ > /* For a comprehensive explanation of frames, please refer to */ > /* the documentation files. */ > /* */ > /****************************************************************/ 186,187c343,344 < EXPORT_DEF < const TFileFrame TT_Null_FileFrame; --- > FT_EXPORT_DECL( const TFileFrame ) > TT_Null_FileFrame; 223,224c380,381 < EXPORT_DEF < TT_Error TT_Access_Frame( STREAM_ARGS FRAME_ARGS Long size ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Access_Frame( STREAM_ARGS FRAME_ARGS Long size ); 231,232c388,389 < EXPORT_DEF < TT_Error TT_Check_And_Access_Frame( STREAM_ARGS FRAME_ARGS Long size ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Check_And_Access_Frame( STREAM_ARGS FRAME_ARGS Long size ); 236,237c393,394 < EXPORT_DEF < TT_Error TT_Forget_Frame( STREAM_ARGS FRAME_ARG ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Forget_Frame( STREAM_ARGS FRAME_ARG ); 242,247c399,406 < EXPORT_DEF < Char TT_Get_Char ( FRAME_ARG ); < EXPORT_DEF < Short TT_Get_Short( FRAME_ARG ); < EXPORT_DEF < Long TT_Get_Long ( FRAME_ARG ); --- > FT_EXPORT_DEF( Char ) > TT_Get_Char( FRAME_ARG ); > > FT_EXPORT_DEF( Short ) > TT_Get_Short( FRAME_ARG ); > > FT_EXPORT_DEF( Long ) > TT_Get_Long( FRAME_ARG ); Index: freetype/lib/ttgload.c =================================================================== RCS file: /cvs/freetype/freetype/lib/ttgload.c,v retrieving revision 1.45 retrieving revision 1.50 diff -r1.45 -r1.50 60,64c60,64 < LOCAL_FUNC < void TT_Get_Metrics( TT_Horizontal_Header* header, < UShort index, < Short* bearing, < UShort* advance ) --- > FT_INTERNAL_FUNC( void ) > TT_Get_Metrics( TT_Horizontal_Header* header, > UShort index, > Short* bearing, > UShort* advance ) 267c267 < if ( CHECK_ACCESS_Frame( n_points * 5L ) ) --- > if ( CHECK_AND_ACCESS_Frame( n_points * 5L ) ) 561,566c561,565 < < LOCAL_FUNC < TT_Error Load_TrueType_Glyph( PInstance instance, < PGlyph glyph, < UShort glyph_index, < UShort load_flags ) --- > FT_INTERNAL_FUNC( TT_Error ) > Load_TrueType_Glyph( PInstance instance, > PGlyph glyph, > UShort glyph_index, > UShort load_flags ) 783c782 < if ( index + 1 < face->numLocations && --- > if ( (TT_UInt)( index + 1 ) < (TT_UInt)face->numLocations && Index: freetype/lib/ttgload.h =================================================================== RCS file: /cvs/freetype/freetype/lib/ttgload.h,v retrieving revision 1.11 retrieving revision 1.13 diff -r1.11 -r1.13 30,34c30,34 < LOCAL_DEF < void TT_Get_Metrics( TT_Horizontal_Header* header, < UShort index, < Short* bearing, < UShort* advance ); --- > FT_INTERNAL_DEF( void ) > TT_Get_Metrics( TT_Horizontal_Header* header, > UShort index, > Short* bearing, > UShort* advance ); 37,41c37,41 < LOCAL_DEF < TT_Error Load_TrueType_Glyph( PInstance instance, < PGlyph glyph, < UShort glyph_index, < UShort load_flags ); --- > FT_INTERNAL_DEF( TT_Error ) > Load_TrueType_Glyph( PInstance instance, > PGlyph glyph, > UShort glyph_index, > UShort load_flags ); Index: freetype/lib/ttinterp.c =================================================================== RCS file: /cvs/freetype/freetype/lib/ttinterp.c,v retrieving revision 1.61 retrieving revision 1.65 diff -r1.61 -r1.65 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2002 by 20,22c20,22 < * ignore errors like out-of-bound array access and writes in order < * to silently support broken glyphs (even if the results are not < * always pretty). --- > * ignore errors like out-of-bound array access and writes in > * order to silently support broken glyphs (even if the results > * are not always pretty). 28c28 < * is due to the Apple patents issues which emerged recently. --- > * is due to the Apple patents issue. 40c40 < #ifdef TT_CONFIG_OPTION_NO_INTERPRETER --- > #ifndef TT_CONFIG_OPTION_BYTECODE_INTERPRETER 42,43c42,43 < LOCAL_FUNC < TT_Error RunIns( PExecution_Context exc ) --- > FT_INTERNAL_FUNC( TT_Error ) > RunIns( EXEC_OP ) 45a46,48 > > #ifndef TT_CONFIG_OPTION_STATIC_INTERPRETER > /* make picky compilers happy */ 46a50 > #endif 50c54 < #else --- > #else /* ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER */ 54c58,60 < #include --- > /* The debugger uses a special version of the TrueType */ > /* interpreter, with some hooks and a simple user interface. */ > /* Here we declare the needed additions. */ 57,60c63,71 < /* Define the `getch()' function. On Unix systems, it is an alias */ < /* for `getchar()', and the debugger front end must ensure that the */ < /* `stdin' file descriptor is not in line-by-line input mode. */ < #ifdef OS2 --- > /* Define the `getch()' function, used for get user inputs. */ > > #ifndef UNIX > > /* Outside Unix, we rely on getch() being defined by . */ > /* This has become a standard, coming from MS-DOS libraries, and */ > /* has been ported to OS/2, Win32, and perhaps others. */ > /* If it does not work for you, investigate the code for Unix */ > /* (here, and in test/fdebug.c). */ 62c73,82 < #else --- > #if defined( _M_I86 ) > /* a recent compiler, which do not pollute name spaces... */ > #define getch(x) _getch(x) > #endif /* modern compiler */ > > #else /* !defined( UNIX ) */ > > /* On Unix systems, it is an alias for `getchar()', and the */ > /* debugger front end must ensure that the `stdin' file */ > /* descriptor is not in line-by-line input mode. */ 63a84 > 74,77c95,98 < /* In order to detect infinite loops in the code, we set-up */ < /* a counter within the run loop. a singly stroke of interpretation */ < /* is now limited to a maximum number of opcodes defined below.. */ < /* */ --- > /* In order to detect infinite loops in the code, we set-up a */ > /* counter within the run loop. a singly stroke of interpretation */ > /* is now limited to a maximum number of opcodes defined below. */ > /* */ 81,136c102,158 < /* There are two kinds of implementations there: */ < /* */ < /* a. static implementation: */ < /* */ < /* The current execution context is a static variable, */ < /* which fields are accessed directly by the interpreter */ < /* during execution. The context is named 'cur'. */ < /* */ < /* This version is non-reentrant, of course. */ < /* */ < /* */ < /* b. indirect implementation: */ < /* */ < /* The current execution context is passed to _each_ */ < /* function as its first argument, and each field is */ < /* thus accessed indirectly. */ < /* */ < /* This version is, however, fully re-entrant. */ < /* */ < /* */ < /* The idea is that an indirect implementation may be */ < /* slower to execute on the low-end processors that are */ < /* used in some systems (like 386s or even 486s). */ < /* */ < /* When the interpreter started, we had no idea of the */ < /* time that glyph hinting (i.e. executing instructions) */ < /* could take in the whole process of rendering a glyph, */ < /* and a 10 to 30% performance penalty on low-end systems */ < /* didn't seem much of a good idea. This question led us */ < /* to provide two distinct builds of the C version from */ < /* a single source, with the use of macros (again). */ < /* */ < /* Now that the engine is working (and working really */ < /* well!), it seems that the greatest time-consuming */ < /* factors are: file i/o, glyph loading, rasterizing and */ < /* _then_ glyph hinting! */ < /* */ < /* Tests performed with two versions of the 'fttimer' */ < /* program seem to indicate that hinting takes less than 5% */ < /* of the rendering process, which is dominated by glyph */ < /* loading and scan-line conversion by an high order of */ < /* magnitude. */ < /* */ < /* As a consequence, the indirect implementation is now the */ < /* default, as its performance costs can be considered */ < /* negligible in our context. Note, however, that we */ < /* kept the same source with macros because: */ < /* */ < /* - the code is kept very close in design to the */ < /* Pascal one used for development. */ < /* */ < /* - it's much more readable that way! */ < /* */ < /* - it's still open to later experimentation and tuning */ < < --- > /******************************************************************/ > /* */ > /* There are two kinds of implementations there: */ > /* */ > /* a. static implementation: */ > /* */ > /* The current execution context is a static variable, which */ > /* fields are accessed directly by the interpreter during */ > /* execution. The context is named 'cur'. */ > /* */ > /* This version is non-reentrant, of course. */ > /* */ > /* */ > /* b. indirect implementation: */ > /* */ > /* The current execution context is passed to _each_ function */ > /* as its first argument, and each field is thus accessed */ > /* indirectly. */ > /* */ > /* This version is, however, fully re-entrant. */ > /* */ > /* */ > /* The idea is that an indirect implementation may be slower to */ > /* execute on the low-end processors that are used in some */ > /* systems (like 386's or even 486's). */ > /* */ > /* When the interpreter started, we had no idea of the time that */ > /* glyph hinting (i.e. executing instructions) could take in the */ > /* whole process of rendering a glyph, and a 10 to 30% */ > /* performance penalty on low-end systems didn't seem much of a */ > /* good idea. This question led us to provide two distinct */ > /* builds from a single source, with the use of macros (again). */ > /* */ > /* Now that the engine is working (and working really well!), it */ > /* seems that the greatest time-consuming factors are: file i/o, */ > /* glyph loading, rasterizing and _then_ glyph hinting! */ > /* */ > /* Tests performed with two versions of the 'fttimer' program */ > /* seem to indicate that hinting takes less than 5% of the */ > /* rendering process, which is dominated by glyph loading and */ > /* scan-line conversion by an high order of magnitude. */ > /* */ > /* As a consequence, the indirect implementation is now the */ > /* default, as its performance costs can be considered */ > /* negligible in our context. Note, however, that we kept the */ > /* same source with macros because: */ > /* */ > /* - the code is kept very close in design to the Pascal one */ > /* used for development. */ > /* */ > /* - it's much more readable that way! */ > /* */ > /* - it's still open to later experimentation and tuning. */ > /* */ > /* TT_CONFIG_OPTION_STATIC_INTERPRETER (in ft_conf.h) toggles */ > /* the use of the static interpreter. */ > /* */ 138c160 < #ifndef TT_CONFIG_OPTION_STATIC_INTERPRETER /* indirect implementation */ --- > #ifndef TT_CONFIG_OPTION_STATIC_INTERPRETER /* indirect implementation */ 140c162 < #define CUR (*exc) /* see ttobjs.h */ --- > #define CUR (*exc) 148,150c170,172 < /* apparently, we have a _lot_ of direct indexing when accessing */ < /* the static 'cur', which makes the code bigger (due to all the */ < /* four bytes addresses). */ --- > /* Apparently, we have a _lot_ of direct indexing when accessing */ > /* the static `cur', which makes the code bigger (due to all the */ > /* four byte addresses). */ 154a177,178 > /* A bunch of macros to save typing (and ease reading). */ > 203c227 < #define BOUNDS( x, n ) ( (x) >= (n) ) --- > #define BOUNDS( x, n ) ( (TT_UInt)(x) >= (TT_UInt)(n) ) 227d250 < /*********************************************************************/ 514a538 > 715c739 < * Notes : This one could become a Macro in the C version. --- > * Notes : Called through the GET_ShortIns() macro. 734d757 < * 1526,1527c1549,1550 < /* XXX : UNDOCUMENTED! It seems that it's possible to try */ < /* to normalize the vector (0,0). Return immediately */ --- > /* UNDOCUMENTED! It seems that it's possible to try to */ > /* normalize the vector (0,0). Return immediately. */ 3137,3139c3160 < /* We could introduce a new error message, but we're too close */ < /* from the release to change all the 'po' files again.. */ < CUR.error = TT_Err_Too_Many_Ins; --- > CUR.error = TT_Err_Too_Many_FDefs; 3144c3165 < if ( n < 0 || (ULong)n != args[0] ) --- > if ( n < 0 || n != (int)args[0] ) 3345c3366 < --- > 3351c3372,3374 < /* XXX Bad error code. See FDEF[]. */ --- > /* We could introduce a new error message (the same as for FDEF), */ > /* but we're too close from the release to change all the 'po' */ > /* files again... */ 3823c3846 < CUR.GS.instruct_control = --- > CUR.GS.instruct_control = 5270c5293 < --- > 5289c5312 < --- > 5294c5317 < --- > 5296c5319 < --- > 5299c5322 < --- > 5621c5644 < LOCAL_FUNC --- > FT_INTERNAL_FUNC( TT_Error ) 5623c5646 < TT_Error RunIns( PExecution_Context exc ) --- > RunIns( PExecution_Context exc ) 5625c5648 < TT_Error RunIns2( PExecution_Context exc ) --- > RunIns2( PExecution_Context exc ) 5656c5679 < Compute_Round( EXEC_ARGS (Byte)exc->GS.round_state ); --- > Compute_Round( EXEC_ARGS (Byte)( CUR.GS.round_state ) ); 6322c6345 < --- > 6326c6349 < --- > 6328,6329c6351,6352 < < --- > > 6332a6356 > 6340,6342c6364,6365 < < LOCAL_FUNC < TT_Error RunIns( PExecution_Context exc ) --- > FT_INTERNAL_FUNC( TT_Error ) > RunIns( PExecution_Context exc ) 6378,6379c6401,6402 < if ( exc->curRange != debug_coderange ) < return RunIns2( exc ); --- > if ( CUR.curRange != debug_coderange ) > return RunIns2( &CUR ); 6381c6404 < pts = exc->pts; --- > pts = CUR.pts; 6390c6413 < exc->instruction_trap = 1; --- > CUR.instruction_trap = 1; 6396c6419 < if ( exc->IP < exc->codeSize ) --- > if ( CUR.IP < CUR.codeSize ) 6403c6426 < exc->args = exc->top - (Pop_Push_Count[exc->opcode] >> 4); --- > CUR.args = CUR.top - (Pop_Push_Count[CUR.opcode] >> 4); 6470c6493 < exc->error = TT_Err_Too_Few_Arguments; --- > CUR.error = TT_Err_Too_Few_Arguments; 6482c6505 < exc->error = TT_Err_Stack_Overflow; --- > CUR.error = TT_Err_Stack_Overflow; 6484a6508,6511 > > #ifdef TT_CONFIG_OPTION_STATIC_INTERPRETER > *exc = cur; > #endif 6512,6517c6539,6544 < PTRACE0(( "freedom (%04hx,%04hx)\n", exc->GS.freeVector.x, < exc->GS.freeVector.y )); < PTRACE0(( "projection (%04hx,%04hx)\n", exc->GS.projVector.x, < exc->GS.projVector.y )); < PTRACE0(( "dual (%04hx,%04hx)\n\n", exc->GS.dualVector.x, < exc->GS.dualVector.y )); --- > PTRACE0(( "freedom (%04hx,%04hx)\n", CUR.GS.freeVector.x, > CUR.GS.freeVector.y )); > PTRACE0(( "projection (%04hx,%04hx)\n", CUR.GS.projVector.x, > CUR.GS.projVector.y )); > PTRACE0(( "dual (%04hx,%04hx)\n\n", CUR.GS.dualVector.x, > CUR.GS.dualVector.y )); 6522,6524c6549,6551 < PTRACE0(( "rounding %s\n", round_str[exc->GS.round_state] )); < PTRACE0(( "min dist %04lx\n", exc->GS.minimum_distance )); < PTRACE0(( "cvt_cutin %04lx\n", exc->GS.control_value_cutin )); --- > PTRACE0(( "rounding %s\n", round_str[CUR.GS.round_state] )); > PTRACE0(( "min dist %04lx\n", CUR.GS.minimum_distance )); > PTRACE0(( "cvt_cutin %04lx\n", CUR.GS.control_value_cutin )); 6529c6556 < for ( A = 0; A < exc->pts.n_points; A++ ) --- > for ( A = 0; A < CUR.pts.n_points; A++ ) 6559c6586 < if ( exc->IP < exc->codeSize ) --- > if ( CUR.IP < CUR.codeSize ) 6568c6595 < while ( exc->IP != next_IP ) --- > while ( CUR.IP != next_IP ) 6570c6597 < if ( ( error = RunIns2( exc ) ) ) --- > if ( ( error = RunIns2( &CUR ) ) != 0 ) 6579c6606 < if ( exc->IP < exc->codeSize ) --- > if ( CUR.IP < CUR.codeSize ) 6582,6583c6609,6610 < if ( ( error = RunIns2( exc ) ) ) < goto LErrorLabel_; --- > if ( ( error = RunIns2( &CUR ) ) != 0 ) > goto LErrorLabel_; 6652c6679 < #endif /* TT_CONFIG_OPTION_NO_INTERPRETER */ --- > #endif /* TT_CONFIG_OPTION_BYTECODE_INTERPRETER */ Index: freetype/lib/ttinterp.h =================================================================== RCS file: /cvs/freetype/freetype/lib/ttinterp.h,v retrieving revision 1.10 retrieving revision 1.13 diff -r1.10 -r1.13 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2001 by 45c45,46 < LOCAL_DEF TT_Error RunIns( PExecution_Context exc ); --- > FT_INTERNAL_DEF( TT_Error ) > RunIns( PExecution_Context exc ); Index: freetype/lib/ttload.c =================================================================== RCS file: /cvs/freetype/freetype/lib/ttload.c,v retrieving revision 1.43 retrieving revision 1.49 diff -r1.43 -r1.49 8c8 < * Copyright 1996-2000 by --- > * Copyright 1996-2001, 2002, 2003 by 53,55c53,55 < EXPORT_FUNC < Long TT_LookUp_Table( PFace face, < ULong tag ) --- > FT_EXPORT_FUNC( Long ) > TT_LookUp_Table( PFace face, > ULong tag ) 115c115 < PTRACE3(("skipped.\n")); --- > PTRACE3(( "skipped.\n" )); 151,152c151,153 < LOCAL_FUNC < TT_Error Load_TrueType_Directory( PFace face, ULong faceIndex ) --- > FT_INTERNAL_FUNC( TT_Error ) > Load_TrueType_Directory( PFace face, > ULong faceIndex ) 162c163 < PTRACE2(("Load_TT_Directory( %08lx, %ld )\n", (long)face, faceIndex)); --- > PTRACE2(( "Load_TT_Directory( %08lx, %ld )\n", (long)face, faceIndex )); 265,266c266,267 < LOCAL_FUNC < TT_Error Load_TrueType_MaxProfile( PFace face ) --- > FT_INTERNAL_FUNC( TT_Error ) > Load_TrueType_MaxProfile( PFace face ) 314c315 < if (maxProfile->maxFunctionDefs == 0) --- > if ( maxProfile->maxFunctionDefs == 0 ) 354,355c355,356 < LOCAL_FUNC < TT_Error Load_TrueType_Gasp( PFace face ) --- > FT_INTERNAL_FUNC( TT_Error ) > Load_TrueType_Gasp( PFace face ) 398c399 < PTRACE3(("\n")); --- > PTRACE3(( "\n" )); 425,426c426,427 < LOCAL_FUNC < TT_Error Load_TrueType_Header( PFace face ) --- > FT_INTERNAL_FUNC( TT_Error ) > Load_TrueType_Header( PFace face ) 626,628c627,629 < LOCAL_FUNC < TT_Error Load_TrueType_Metrics_Header( PFace face, < Bool vertical ) --- > FT_INTERNAL_FUNC( TT_Error ) > Load_TrueType_Metrics_Header( PFace face, > Bool vertical ) 717,718c718,719 < LOCAL_FUNC < TT_Error Load_TrueType_Locations( PFace face ) --- > FT_INTERNAL_FUNC( TT_Error ) > Load_TrueType_Locations( PFace face ) 783a785,795 > /* maxp->numGlyphs + 1 must be identical to numLocations; since */ > /* the latter is used for allocation, we change numGlyphs if */ > /* necessary. */ > if ( face->maxProfile.numGlyphs + 1 != face->numLocations ) > { > PTRACE2(( > "maxProfile.numGlyphs + 1 (%d) is different from numLocations (%d)!\n" > face->maxProfile.numGlyphs + 1, face->numLocations )); > face->numGlyphs = face->maxProfile.numGlyphs = face->numLocations - 1; > } > 800,801c812,813 < LOCAL_FUNC < TT_Error Load_TrueType_Names( PFace face ) --- > FT_INTERNAL_FUNC( TT_Error ) > Load_TrueType_Names( PFace face ) 969,970c981,982 < LOCAL_FUNC < TT_Error Free_TrueType_Names( PFace face ) --- > FT_INTERNAL_FUNC( TT_Error ) > Free_TrueType_Names( PFace face ) 1001,1002c1013,1014 < LOCAL_FUNC < TT_Error Load_TrueType_CVT( PFace face ) --- > FT_INTERNAL_FUNC( TT_Error ) > Load_TrueType_CVT( PFace face ) 1057,1058c1069,1070 < LOCAL_FUNC < TT_Error Load_TrueType_CMap( PFace face ) --- > FT_INTERNAL_FUNC( TT_Error ) > Load_TrueType_CMap( PFace face ) 1150,1151c1162,1163 < LOCAL_FUNC < TT_Error Load_TrueType_Programs( PFace face ) --- > FT_INTERNAL_FUNC( TT_Error ) > Load_TrueType_Programs( PFace face ) 1211c1223 < * Function : Load_TrueType_OS2 --- > * Function : Load_TrueType_OS_2 1218a1231,1234 > * NOTE : This function used to be named Load_TrueType_OS2. > * We changed its name to avoid a name clash (OS2 happens > * to be a reserved name on some OS/2 compilers...) > * 1221,1222c1237,1238 < LOCAL_FUNC < TT_Error Load_TrueType_OS2( PFace face ) --- > FT_INTERNAL_FUNC( TT_Error ) > Load_TrueType_OS_2( PFace face ) 1287a1304,1311 > os2->ulCodePageRange1 = 0; > os2->ulCodePageRange2 = 0; > os2->sxHeight = 0; > os2->sCapHeight = 0; > os2->usDefaultChar = 0; > os2->usBreakChar = 0; > os2->usMaxContext = 0; > 1299,1303c1323,1338 < } < else < { < os2->ulCodePageRange1 = 0; < os2->ulCodePageRange2 = 0; --- > > if ( os2->version >= 0x0002 ) > { > /* only version 2 tables */ > > if ( ACCESS_Frame( 10L ) ) > return error; > > os2->sxHeight = GET_Short(); > os2->sCapHeight = GET_Short(); > os2->usDefaultChar = GET_UShort(); > os2->usBreakChar = GET_UShort(); > os2->usMaxContext = GET_UShort(); > > FORGET_Frame(); > } 1324,1325c1359,1360 < LOCAL_FUNC < TT_Error Load_TrueType_PostScript( PFace face ) --- > FT_INTERNAL_FUNC( TT_Error ) > Load_TrueType_PostScript( PFace face ) 1378,1379c1413,1414 < LOCAL_FUNC < TT_Error Load_TrueType_Hdmx( PFace face ) --- > FT_INTERNAL_FUNC( TT_Error ) > Load_TrueType_Hdmx( PFace face ) 1470,1471c1505,1506 < LOCAL_FUNC < TT_Error Free_TrueType_Hdmx( PFace face ) --- > FT_INTERNAL_FUNC( TT_Error ) > Free_TrueType_Hdmx( PFace face ) 1530,1535c1565,1570 < LOCAL_FUNC < TT_Error Load_TrueType_Any( PFace face, < ULong tag, < Long offset, < void* buffer, < Long* length ) --- > FT_INTERNAL_FUNC( TT_Error ) > Load_TrueType_Any( PFace face, > ULong tag, > Long offset, > void* buffer, > Long* length ) Index: freetype/lib/ttload.h =================================================================== RCS file: /cvs/freetype/freetype/lib/ttload.h,v retrieving revision 1.25 retrieving revision 1.29 diff -r1.25 -r1.29 3c3 < * ttload.h 1.1 --- > * ttload.h 1.2 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2002 by 16a17,20 > * Changes between 1.2 and 1.1 : > * > * - the macros are now in ttfile.h (with their underlying functions) > * 34,62c38,83 < EXPORT_DEF < Long TT_LookUp_Table( PFace face, ULong tag ); < < LOCAL_DEF TT_Error Load_TrueType_Directory ( PFace face, < ULong faceIndex ); < < LOCAL_DEF TT_Error Load_TrueType_MaxProfile ( PFace face ); < LOCAL_DEF TT_Error Load_TrueType_Gasp ( PFace face ); < LOCAL_DEF TT_Error Load_TrueType_Header ( PFace face ); < LOCAL_DEF TT_Error Load_TrueType_Locations ( PFace face ); < LOCAL_DEF TT_Error Load_TrueType_Names ( PFace face ); < LOCAL_DEF TT_Error Load_TrueType_CVT ( PFace face ); < LOCAL_DEF TT_Error Load_TrueType_CMap ( PFace face ); < LOCAL_DEF TT_Error Load_TrueType_Programs ( PFace face ); < LOCAL_DEF TT_Error Load_TrueType_OS2 ( PFace face ); < LOCAL_DEF TT_Error Load_TrueType_PostScript ( PFace face ); < LOCAL_DEF TT_Error Load_TrueType_Hdmx ( PFace face ); < < LOCAL_DEF TT_Error Load_TrueType_Metrics_Header( PFace face, < Bool vertical ); < < LOCAL_DEF TT_Error Load_TrueType_Any( PFace face, < ULong tag, < Long offset, < void* buffer, < Long* length ); < < LOCAL_DEF TT_Error Free_TrueType_Names( PFace face ); < LOCAL_DEF TT_Error Free_TrueType_Hdmx ( PFace face ); --- > FT_EXPORT_DEF( Long ) > TT_LookUp_Table( PFace face, > ULong tag ); > > FT_INTERNAL_DEF( TT_Error ) > Load_TrueType_Directory( PFace face, > ULong faceIndex ); > > FT_INTERNAL_DEF( TT_Error ) > Load_TrueType_MaxProfile( PFace face ); > FT_INTERNAL_DEF( TT_Error ) > Load_TrueType_Gasp( PFace face ); > FT_INTERNAL_DEF( TT_Error ) > Load_TrueType_Header( PFace face ); > FT_INTERNAL_DEF( TT_Error ) > Load_TrueType_Locations( PFace face ); > FT_INTERNAL_DEF( TT_Error ) > Load_TrueType_Names( PFace face ); > FT_INTERNAL_DEF( TT_Error ) > Load_TrueType_CVT( PFace face ); > FT_INTERNAL_DEF( TT_Error ) > Load_TrueType_CMap( PFace face ); > FT_INTERNAL_DEF( TT_Error ) > Load_TrueType_Programs( PFace face ); > FT_INTERNAL_DEF( TT_Error ) > Load_TrueType_OS_2( PFace face ); > FT_INTERNAL_DEF( TT_Error ) > Load_TrueType_PostScript( PFace face ); > FT_INTERNAL_DEF( TT_Error ) > Load_TrueType_Hdmx( PFace face ); > > FT_INTERNAL_DEF( TT_Error ) > Load_TrueType_Metrics_Header( PFace face, > Bool vertical ); > > FT_INTERNAL_DEF( TT_Error ) > Load_TrueType_Any( PFace face, > ULong tag, > Long offset, > void* buffer, > Long* length ); > > FT_INTERNAL_DEF( TT_Error ) > Free_TrueType_Names( PFace face ); > FT_INTERNAL_DEF( TT_Error ) > Free_TrueType_Hdmx ( PFace face ); Index: freetype/lib/ttmemory.c =================================================================== RCS file: /cvs/freetype/freetype/lib/ttmemory.c,v retrieving revision 1.23 retrieving revision 1.27 diff -r1.23 -r1.27 42c42 < #define MAX_TRACKED_BLOCKS 1024 --- > #define MAX_TRACKED_BLOCKS 4096 90,91c90,92 < EXPORT_FUNC < TT_Error TT_Alloc( ULong Size, void** P ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Alloc( ULong Size, > void** P ) 166,167c167,169 < EXPORT_FUNC < TT_Error TT_Realloc( ULong Size, void** P ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Realloc( ULong Size, > void** P ) 217c219 < pointers[i].size = size; --- > pointers[i].size = Size; 244,245c246,247 < EXPORT_FUNC < TT_Error TT_Free( void** P ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Free( void** P ) 294,295c296,297 < LOCAL_FUNC < TT_Error TTMemory_Init( void ) --- > FT_INTERNAL_FUNC( TT_Error ) > TTMemory_Init( void ) 336,337c338,339 < LOCAL_FUNC < TT_Error TTMemory_Done( void ) --- > FT_INTERNAL_FUNC( TT_Error ) > TTMemory_Done( void ) 366c368 < "%d memory frees, of which %d failed\n", --- > "%d memory deallocations, of which %d failed\n", 389c391 < fprintf( stderr, "No memory leaks !\n" ); --- > fprintf( stderr, "No memory leaks!\n" ); Index: freetype/lib/ttmemory.h =================================================================== RCS file: /cvs/freetype/freetype/lib/ttmemory.h,v retrieving revision 1.17 retrieving revision 1.19 diff -r1.17 -r1.19 84,85c84,86 < EXPORT_DEF < TT_Error TT_Alloc( ULong Size, void** P ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Alloc( ULong Size, > void** P ); 94,95c95,97 < EXPORT_DEF < TT_Error TT_Realloc( ULong Size, void** P ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Realloc( ULong Size, > void** P ); 104,105c106,107 < EXPORT_DEF < TT_Error TT_Free( void** P ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Free( void** P ); 114,115c116,119 < LOCAL_DEF TT_Error TTMemory_Init( void ); < LOCAL_DEF TT_Error TTMemory_Done( void ); --- > FT_INTERNAL_DEF( TT_Error ) > TTMemory_Init( void ); > FT_INTERNAL_DEF( TT_Error ) > TTMemory_Done( void ); Index: freetype/lib/ttmutex.c =================================================================== RCS file: /cvs/freetype/freetype/lib/ttmutex.c,v retrieving revision 1.15 retrieving revision 1.17 diff -r1.15 -r1.17 43,44c43,44 < LOCAL_FUNC < void TT_Mutex_Create ( TMutex* mutex ) --- > FT_INTERNAL_FUNC( void ) > TT_Mutex_Create( TMutex* mutex ) 51,52c51,52 < LOCAL_FUNC < void TT_Mutex_Delete ( TMutex* mutex ) --- > FT_INTERNAL_FUNC( void ) > TT_Mutex_Delete( TMutex* mutex ) 59,60c59,60 < LOCAL_FUNC < void TT_Mutex_Lock ( TMutex* mutex ) --- > FT_INTERNAL_FUNC( void ) > TT_Mutex_Lock( TMutex* mutex ) 71,72c71,72 < LOCAL_FUNC < void TT_Mutex_Release( TMutex* mutex ) --- > FT_INTERNAL_FUNC( void ) > TT_Mutex_Release( TMutex* mutex ) Index: freetype/lib/ttmutex.h =================================================================== RCS file: /cvs/freetype/freetype/lib/ttmutex.h,v retrieving revision 1.12 retrieving revision 1.14 diff -r1.12 -r1.14 40,43c40,47 < LOCAL_DEF void TT_Mutex_Create ( TMutex* mutex ); /* Create a new mutex */ < LOCAL_DEF void TT_Mutex_Delete ( TMutex* mutex ); /* Delete a mutex */ < LOCAL_DEF void TT_Mutex_Lock ( TMutex* mutex ); /* Lock a mutex. */ < LOCAL_DEF void TT_Mutex_Release( TMutex* mutex ); /* Release a mutex */ --- > FT_INTERNAL_DEF( void ) > TT_Mutex_Create( TMutex* mutex ); /* Create a new mutex */ > FT_INTERNAL_DEF( void ) > TT_Mutex_Delete( TMutex* mutex ); /* Delete a mutex */ > FT_INTERNAL_DEF( void ) > TT_Mutex_Lock( TMutex* mutex ); /* Lock a mutex */ > FT_INTERNAL_DEF( void ) > TT_Mutex_Release( TMutex* mutex ); /* Release a mutex */ Index: freetype/lib/ttobjs.c =================================================================== RCS file: /cvs/freetype/freetype/lib/ttobjs.c,v retrieving revision 1.35 retrieving revision 1.38 diff -r1.35 -r1.38 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2001 by 45,46c45,46 < LOCAL_FUNC < PExecution_Context New_Context( PFace face ) --- > FT_INTERNAL_FUNC( PExecution_Context ) > New_Context( PFace face ) 69,70c69,70 < LOCAL_FUNC < TT_Error Done_Context( PExecution_Context exec ) --- > FT_INTERNAL_FUNC( TT_Error ) > Done_Context( PExecution_Context exec ) 93,94c93,94 < LOCAL_FUNC < PInstance New_Instance( PFace face ) --- > FT_INTERNAL_FUNC( PInstance ) > New_Instance( PFace face ) 116,117c116,117 < LOCAL_FUNC < TT_Error Done_Instance( PInstance instance ) --- > FT_INTERNAL_FUNC( TT_Error ) > Done_Instance( PInstance instance ) 209,212c209,212 < LOCAL_FUNC < TT_Error Goto_CodeRange( PExecution_Context exec, < Int range, < ULong IP ) --- > FT_INTERNAL_FUNC( TT_Error ) > Goto_CodeRange( PExecution_Context exec, > Int range, > ULong IP ) 258,259c258,260 < LOCAL_FUNC < PCodeRange Get_CodeRange( PExecution_Context exec, Int range ) --- > FT_INTERNAL_FUNC( PCodeRange ) > Get_CodeRange( PExecution_Context exec, > Int range ) 285,289c286,290 < LOCAL_FUNC < TT_Error Set_CodeRange( PExecution_Context exec, < Int range, < void* base, < ULong length ) --- > FT_INTERNAL_FUNC( TT_Error ) > Set_CodeRange( PExecution_Context exec, > Int range, > void* base, > ULong length ) 316,317c317,319 < LOCAL_FUNC < TT_Error Clear_CodeRange( PExecution_Context exec, Int range ) --- > FT_INTERNAL_FUNC( TT_Error ) > Clear_CodeRange( PExecution_Context exec, > Int range ) 342,343c344,345 < LOCAL_FUNC < TT_Error Context_Destroy( void* _context ) --- > FT_INTERNAL_FUNC( TT_Error ) > Context_Destroy( void* _context ) 385,386c387,389 < LOCAL_FUNC < TT_Error Context_Create( void* _context, void* _face ) --- > FT_INTERNAL_FUNC( TT_Error ) > Context_Create( void* _context, > void* _face ) 506,509c509,512 < LOCAL_FUNC < TT_Error Context_Load( PExecution_Context exec, < PFace face, < PInstance ins ) --- > FT_INTERNAL_FUNC( TT_Error ) > Context_Load( PExecution_Context exec, > PFace face, > PInstance ins ) 595,597c598,600 < LOCAL_FUNC < TT_Error Context_Save( PExecution_Context exec, < PInstance ins ) --- > FT_INTERNAL_FUNC( TT_Error ) > Context_Save( PExecution_Context exec, > PInstance ins ) 622,624c625,627 < LOCAL_FUNC < TT_Error Context_Run( PExecution_Context exec, < Bool debug ) --- > FT_INTERNAL_FUNC( TT_Error ) > Context_Run( PExecution_Context exec, > Bool debug ) 662,663c665,666 < LOCAL_FUNC < const TGraphicsState Default_GraphicsState = --- > FT_INTERNAL_VAR( const TGraphicsState ) > Default_GraphicsState = 695,696c698,699 < LOCAL_FUNC < TT_Error Instance_Destroy( void* _instance ) --- > FT_INTERNAL_FUNC( TT_Error ) > Instance_Destroy( void* _instance ) 751,753c754,756 < LOCAL_FUNC < TT_Error Instance_Create( void* _instance, < void* _face ) --- > FT_INTERNAL_FUNC( TT_Error ) > Instance_Create( void* _instance, > void* _face ) 829,830c832,833 < LOCAL_FUNC < TT_Error Instance_Init( PInstance ins ) --- > FT_INTERNAL_FUNC( TT_Error ) > Instance_Init( PInstance ins ) 935,936c938,939 < LOCAL_FUNC < TT_Error Instance_Reset( PInstance ins ) --- > FT_INTERNAL_FUNC( TT_Error ) > Instance_Reset( PInstance ins ) 1077,1078c1080,1081 < LOCAL_FUNC < TT_Error Face_Destroy( void* _face ) --- > FT_INTERNAL_FUNC( TT_Error ) > Face_Destroy( void* _face ) 1181,1183c1184,1186 < LOCAL_FUNC < TT_Error Face_Create( void* _face, < void* _input ) --- > FT_INTERNAL_FUNC( TT_Error ) > Face_Create( void* _face, > void* _input ) 1229c1232 < LOAD_( OS2 ) || --- > LOAD_( OS_2 ) || 1266,1267c1269,1270 < LOCAL_FUNC < TT_Error Glyph_Destroy( void* _glyph ) --- > FT_INTERNAL_FUNC( TT_Error ) > Glyph_Destroy( void* _glyph ) 1293,1295c1296,1298 < LOCAL_FUNC < TT_Error Glyph_Create( void* _glyph, < void* _face ) --- > FT_INTERNAL_FUNC( TT_Error ) > Glyph_Create( void* _glyph, > void* _face ) 1330,1331c1333,1335 < LOCAL_FUNC < TT_Pos Scale_X( PIns_Metrics metrics, TT_Pos x ) --- > FT_INTERNAL_FUNC( TT_Pos ) > Scale_X( PIns_Metrics metrics, > TT_Pos x ) 1351,1352c1355,1357 < LOCAL_FUNC < TT_Pos Scale_Y( PIns_Metrics metrics, TT_Pos y ) --- > FT_INTERNAL_FUNC( TT_Pos ) > Scale_Y( PIns_Metrics metrics, > TT_Pos y ) 1422,1423c1427,1428 < LOCAL_FUNC < TT_Error TTObjs_Init( PEngine_Instance engine ) --- > FT_INTERNAL_FUNC( TT_Error ) > TTObjs_Init( PEngine_Instance engine ) 1479,1480c1484,1485 < LOCAL_FUNC < TT_Error TTObjs_Done( PEngine_Instance engine ) --- > FT_INTERNAL_FUNC( TT_Error ) > TTObjs_Done( PEngine_Instance engine ) Index: freetype/lib/ttobjs.h =================================================================== RCS file: /cvs/freetype/freetype/lib/ttobjs.h,v retrieving revision 1.34 retrieving revision 1.37 diff -r1.34 -r1.37 210,211c210 < LOCAL_DEF < const TGraphicsState Default_GraphicsState; --- > FT_INTERNAL_DEF( const TGraphicsState ) Default_GraphicsState; 302c301,302 < #ifndef TT_STATIC_INTEPRETER /* indirect implementation */ --- > #ifndef TT_CONFIG_OPTION_STATIC_INTERPRETER > /* Normal (indexed) implementation */ 309c309,310 < #else /* static implementation */ --- > #else > /* Static implementation, with one shared execution context. */ 311c312 < #define EXEC_OPS /* void */ --- > #define EXEC_OPS /* [nothing] */ 313c314 < #define EXEC_ARGS /* void */ --- > #define EXEC_ARGS /* [nothing] */ 316c317,318 < #endif --- > #endif /* TT_CONFIG_OPTION_STATIC_INTERPRETER */ > 791,794c793,796 < LOCAL_DEF < TT_Error Goto_CodeRange( PExecution_Context exec, < Int range, < ULong IP ); --- > FT_INTERNAL_DEF( TT_Error ) > Goto_CodeRange( PExecution_Context exec, > Int range, > ULong IP ); 799,801c801,803 < LOCAL_DEF < PCodeRange Get_CodeRange( PExecution_Context exec, < Int range ); --- > FT_INTERNAL_DEF( PCodeRange ) > Get_CodeRange( PExecution_Context exec, > Int range ); 805,809c807,811 < LOCAL_DEF < TT_Error Set_CodeRange( PExecution_Context exec, < Int range, < void* base, < ULong length ); --- > FT_INTERNAL_DEF( TT_Error ) > Set_CodeRange( PExecution_Context exec, > Int range, > void* base, > ULong length ); 812,813c814,815 < LOCAL_DEF < TT_Error Clear_CodeRange( PExecution_Context exec, Int range ); --- > FT_INTERNAL_DEF( TT_Error ) > Clear_CodeRange( PExecution_Context exec, Int range ); 816,817c818,819 < LOCAL_DEF < PExecution_Context New_Context( PFace face ); --- > FT_INTERNAL_DEF( PExecution_Context ) > New_Context( PFace face ); 819,820c821,822 < LOCAL_DEF < TT_Error Done_Context( PExecution_Context exec ); --- > FT_INTERNAL_DEF( TT_Error ) > Done_Context( PExecution_Context exec ); 823,826c825,828 < LOCAL_DEF < TT_Error Context_Load( PExecution_Context exec, < PFace face, < PInstance ins ); --- > FT_INTERNAL_DEF( TT_Error ) > Context_Load( PExecution_Context exec, > PFace face, > PInstance ins ); 828,830c830,832 < LOCAL_DEF < TT_Error Context_Save( PExecution_Context exec, < PInstance ins ); --- > FT_INTERNAL_DEF( TT_Error ) > Context_Save( PExecution_Context exec, > PInstance ins ); 832,834c834,836 < LOCAL_DEF < TT_Error Context_Run( PExecution_Context exec, < Bool debug ); --- > FT_INTERNAL_DEF( TT_Error ) > Context_Run( PExecution_Context exec, > Bool debug ); 836,837c838,839 < LOCAL_DEF < TT_Error Instance_Init( PInstance ins ); --- > FT_INTERNAL_DEF( TT_Error ) > Instance_Init( PInstance ins ); 839,840c841,842 < LOCAL_DEF < TT_Error Instance_Reset( PInstance ins ); --- > FT_INTERNAL_DEF( TT_Error ) > Instance_Reset( PInstance ins ); 849,850c851,856 < LOCAL_DEF TT_Pos Scale_X( PIns_Metrics metrics, TT_Pos x ); < LOCAL_DEF TT_Pos Scale_Y( PIns_Metrics metrics, TT_Pos y ); --- > FT_INTERNAL_DEF( TT_Pos ) > Scale_X( PIns_Metrics metrics, > TT_Pos x ); > FT_INTERNAL_DEF( TT_Pos ) > Scale_Y( PIns_Metrics metrics, > TT_Pos y ); 863,864c869,872 < LOCAL_DEF TT_Error TTObjs_Init( PEngine_Instance engine ); < LOCAL_DEF TT_Error TTObjs_Done( PEngine_Instance engine ); --- > FT_INTERNAL_DEF( TT_Error ) > TTObjs_Init( PEngine_Instance engine ); > FT_INTERNAL_DEF( TT_Error ) > TTObjs_Done( PEngine_Instance engine ); Index: freetype/lib/ttraster.c =================================================================== RCS file: /cvs/freetype/freetype/lib/ttraster.c,v retrieving revision 1.37 retrieving revision 1.41 diff -r1.37 -r1.41 26,30c26 < * Changes between 1.5 and 1.4: < * < * Performance tuning. < * < * Changes between 1.4 and 1.3: --- > * Changes between 1.5 and 1.3: 616c612 < Int bottom, top; --- > Long bottom, top; 2462,2464c2458,2460 < LOCAL_FUNC < TT_Error Render_Glyph( RAS_ARGS TT_Outline* glyph, < TT_Raster_Map* target_map ) --- > FT_INTERNAL_FUNC( TT_Error ) > Render_Glyph( RAS_ARGS TT_Outline* glyph, > TT_Raster_Map* target_map ) 2551,2554c2547,2550 < LOCAL_FUNC < TT_Error Render_Gray_Glyph( RAS_ARGS TT_Outline* glyph, < TT_Raster_Map* target_map, < Byte* palette ) --- > FT_INTERNAL_FUNC( TT_Error ) > Render_Gray_Glyph( RAS_ARGS TT_Outline* glyph, > TT_Raster_Map* target_map, > Byte* palette ) 2654,2655c2650,2651 < LOCAL_FUNC < TT_Error TTRaster_Done( PEngine_Instance engine ) --- > FT_INTERNAL_FUNC( TT_Error ) > TTRaster_Done( PEngine_Instance engine ) 2674,2675c2670,2671 < LOCAL_FUNC < TT_Error TTRaster_Init( PEngine_Instance engine ) --- > FT_INTERNAL_FUNC( TT_Error ) > TTRaster_Init( PEngine_Instance engine ) Index: freetype/lib/ttraster.h =================================================================== RCS file: /cvs/freetype/freetype/lib/ttraster.h,v retrieving revision 1.16 retrieving revision 1.19 diff -r1.16 -r1.19 27c27 < * Changes between 1.4 and 1.3: --- > * Changes between 1.5 and 1.3: 97,99c97,99 < LOCAL_DEF < TT_Error Render_Glyph( RAS_ARGS TT_Outline* glyph, < TT_Raster_Map* target ); --- > FT_INTERNAL_DEF( TT_Error ) > Render_Glyph( RAS_ARGS TT_Outline* glyph, > TT_Raster_Map* target ); 105,108c105,108 < LOCAL_DEF < TT_Error Render_Gray_Glyph( RAS_ARGS TT_Outline* glyph, < TT_Raster_Map* target, < Byte* palette ); --- > FT_INTERNAL_DEF( TT_Error ) > Render_Gray_Glyph( RAS_ARGS TT_Outline* glyph, > TT_Raster_Map* target, > Byte* palette ); 112,113c112,113 < LOCAL_DEF < TT_Error TTRaster_Init( PEngine_Instance engine ); --- > FT_INTERNAL_DEF( TT_Error ) > TTRaster_Init( PEngine_Instance engine ); 116,117c116,117 < LOCAL_DEF < TT_Error TTRaster_Done( PEngine_Instance engine ); --- > FT_INTERNAL_DEF( TT_Error ) > TTRaster_Done( PEngine_Instance engine ); Index: freetype/lib/tttables.h =================================================================== RCS file: /cvs/freetype/freetype/lib/tttables.h,v retrieving revision 1.13 retrieving revision 1.14 diff -r1.13 -r1.14 5c5,6 < * TrueType Tables structures and handling (specification). --- > * TrueType Tables structures and handling (specification) > * (this spec has no associated body). 7c8 < * Copyright 1996-2000 by --- > * Copyright 1996-2001 by Index: freetype/lib/tttags.h =================================================================== RCS file: /cvs/freetype/freetype/lib/tttags.h,v retrieving revision 1.10 retrieving revision 1.11 diff -r1.10 -r1.11 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2001 by Index: freetype/lib/tttypes.h =================================================================== RCS file: /cvs/freetype/freetype/lib/tttypes.h,v retrieving revision 1.19 retrieving revision 1.21 diff -r1.19 -r1.21 8c8 < * Copyright 1996-2000 by --- > * Copyright 1996-2001 by 46a47 > typedef unsigned int UInt; Index: freetype/lib/arch/amigaos/Makefile.gcc =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/amigaos/Makefile.gcc,v retrieving revision 1.10 retrieving revision 1.13 diff -r1.10 -r1.13 1,3c1 < # This file is part of the FreeType project. < # < # It builds the library and test programs for amiga using ADE Enviroment. --- > # This file builds the library for Amiga using ADE environment. 9a8,17 > # > # > # Copyright 1996-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. 24c32 < extend/ftxopen.c --- > extend/ftxopen.c extend/ftxerr18.c 63c71 < $(CC) -E -M $^ > dep.end --- > $(CC) -E -MM -I$(ARCH) -I. -Iextend $^ > dep.end Index: freetype/lib/arch/amigaos/ft_conf.h =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/amigaos/ft_conf.h,v retrieving revision 1.18 retrieving revision 1.20 diff -r1.18 -r1.20 1,3c1,15 < /* This file is part of the FreeType project */ < < /* ft_conf.h for AmigaOS using ADE enviroment */ --- > /******************************************************************* > * > * ft_conf.h for AmigaOS using ADE environment > * > * > * Copyright 1996-2002 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. > * > ******************************************************************/ 15,18d26 < /* Define if you have a working `mmap' system call. */ < < /* #undef HAVE_MMAP */ < 20d27 < 23,26d29 < /* Define if the X Window System is missing or not being used. */ < < #define X_DISPLAY_MISSING < 28d30 < 32d33 < 35,38d35 < /* Define if you have the getpagesize function. */ < < #define HAVE_GETPAGESIZE < 40d36 < 44d39 < 47,54d41 < /* Define if you have the valloc function. */ < < #define HAVE_VALLOC < < /* Define if you have the header file. */ < < #define HAVE_FCNTL_H < 56d42 < 58a45,51 > /* Define if you have the header file. */ > /* #undef HAVE_LIBINTL_H */ > > /* Define if you have the header file. */ > /* Only meaningful if you have . */ > #define HAVE_LOCALE_H > 95,97c88,90 < /* Define this if you want to completely disable the use of the bytecode */ < /* interpreter. Doing so will produce a much smaller library, but the */ < /* quality of the rendered glyphs will enormously suffer from this. */ --- > /* Define this if you want to compile a bytecode interpreter in the */ > /* TrueType driver. Note that there are important patent issues related */ > /* to the use of the interpreter. */ 99,101c92,93 < /* This switch was introduced due to the Apple patents issue which */ < /* emerged recently on the FreeType lists. We still do not have Apple's */ < /* opinion on the subject and will change this as soon as we have. */ --- > /* By undefining this, you will only compile the code necessary to load */ > /* TrueType glyphs without hinting. */ 103c95 < #undef TT_CONFIG_OPTION_NO_INTERPRETER --- > #undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER 123c115 < /* */ --- > 134c126 < /* */ --- > Index: freetype/lib/arch/ansi/ft_conf.h =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/ansi/ft_conf.h,v retrieving revision 1.4 retrieving revision 1.7 diff -r1.4 -r1.7 1,3c1,15 < /* This file is part of the FreeType project */ < < /* ft_conf.h for the ANSI Build */ --- > /******************************************************************* > * > * ft_conf.h for the `bare ANSI' build > * > * > * Copyright 1996-2002 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. > * > ******************************************************************/ 14,16d25 < /* Define if you have a working `mmap' system call. */ < #undef HAVE_MMAP < 20,22d28 < /* Define if you have the getpagesize function. */ < #undef HAVE_GETPAGESIZE < 29,36c35,36 < /* Define if you have the valloc function. */ < #undef HAVE_VALLOC < < /* Define if you have the header file. Unix-specific */ < #undef HAVE_FCNTL_H < < /* command.com can't pipe stderr into a file; any message would be */ < /* written into the graphics screen. */ --- > /* Some systems (read: M$-DOS/Windows command.com) can't pipe stderr */ > /* into a file; so we redirect any message into stdout. */ 63a64,69 > /* Define if you have the header file. */ > #undef HAVE_LIBINTL_H > > /* Define if you have the header file. */ > /* Only meaningful if you have . */ > #define HAVE_LOCALE_H 69,70c75,76 < /* TrueType engine. This may be useful to tune it for specific */ < /* purposes.. */ --- > /* TrueType engine. This may be useful to tune it for specific */ > /* purposes. */ 101,103c107,109 < /* Define this if you want to completely disable the use of the bytecode */ < /* interpreter. Doing so will produce a much smaller library, but the */ < /* quality of the rendered glyphs will enormously suffer from this. */ --- > /* Define this if you want to compile a bytecode interpreter in the */ > /* TrueType driver. Note that there are important patent issues related */ > /* to the use of the interpreter. */ 105,107c111,112 < /* This switch was introduced due to the Apple patents issue which */ < /* emerged recently on the FreeType lists. We still do not have Apple's */ < /* opinion on the subject and will change this as soon as we have. */ --- > /* By undefining this, you will only compile the code necessary to load */ > /* TrueType glyphs without hinting. */ 109c114 < #undef TT_CONFIG_OPTION_NO_INTERPRETER --- > #undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER 118c123 < /* defined for better performance and code compactness.. */ --- > /* defined for better performance and code compactness. */ 126c131 < /* _may_ be faster on some architectures.. */ --- > /* _may_ be faster on some architectures. */ 129c134 < /* */ --- > 137c142 < /* which _may_ be faster on some architectures.. */ --- > /* which _may_ be faster on some architectures. */ 140c145 < /* */ --- > 188c193 < /* and ttinterp (for the 64-bit integers) only.. */ --- > /* and ttinterp (for the 64-bit integers) only. */ 206,207c211,212 < /* LONG64 must be defined when a 64-bit type is available */ < /* INT64 must then be defined to this type.. */ --- > /* LONG64 must be defined when a 64-bit type is available. */ > /* INT64 must then be defined to this type. */ 210a216,228 > #elif defined( __STDC_VERSION__ ) && ( __STDC_VERSION__ >= 199901L ) > > /* `long long' was officially introduced in the C99 standard. */ > /* Purists will note that the defined() test above is unnecessary */ > /* (according to the standard, undefined macros in #if expressions */ > /* default to 1), but we don't rely on this, and since it is easy */ > /* to avoid problems... */ > /* If your compiler complains a lot about possible ANSI violations */ > /* because of this setting, report this as a bug to the compiler */ > /* vendor. */ > #define LONG64 > #define INT64 long long > 213,215c231,233 < /* GCC provides the non-ANSI 'long long' 64-bit type. You can activate */ < /* by defining the TT_USE_LONG_LONG macro in 'ft_conf.h'. Note that this */ < /* will produce many -ansi warnings during library compilation. */ --- > /* GCC provides the non-ANSI89 'long long' 64-bit type. You can */ > /* activate it by defining the TT_USE_LONG_LONG macro. Note that */ > /* this will produce many -ansi warnings during library compilation. */ Index: freetype/lib/arch/beos/Makefile =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/beos/Makefile,v retrieving revision 1.2 retrieving revision 1.4 diff -r1.2 -r1.4 13a14,23 > # > # > # Copyright 1996-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. 85,86c95,96 < depend: $(SRS_S) $(SRC_M) $(SRC_X) < $(CC) -E -M $^ > dep.end --- > depend: $(SRC_S) $(SRC_M) $(SRC_X) > $(CC) -E -MM -I$(ARCH) -I. -Iextend $^ > dep.end Index: freetype/lib/arch/beos/ft_conf.h =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/beos/ft_conf.h,v retrieving revision 1.2 retrieving revision 1.4 diff -r1.2 -r1.4 1,2c1,15 < /* ft_conf.h for BeOS */ < /* This file is part of the FreeType project. */ --- > /******************************************************************* > * > * ft_conf.h for BeOS > * > * > * Copyright 1996-2002 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. > * > ******************************************************************/ 17,19d29 < /* Define if you have a working `mmap' system call. */ < #undef HAVE_MMAP < 23,25d32 < /* Define if the X Window System is missing or not being used. */ < #define X_DISPLAY_MISSING < 32,34d38 < /* Define if you have the getpagesize function. */ < #undef HAVE_GETPAGESIZE < 41,43d44 < /* Define if you have the header file. */ < #define HAVE_FCNTL_H < 47,49d47 < /* Define if you have the header file. */ < #define HAVE_LOCALE_H < 51c49 < #undef HAVE_LIBINTL_H --- > /* #undef HAVE_LIBINTL_H */ 53,54c51,53 < /* Define if you have the libintl library. */ < #undef HAVE_LIBINTL --- > /* Define if you have the header file. */ > /* Only meaningful if you have . */ > #define HAVE_LOCALE_H 70c69 < /* #undef HAVE_TT_TEXT */ --- > /* #define HAVE_TT_TEXT */ 91,93c90,92 < /* Define this if you want to completely disable the use of the bytecode */ < /* interpreter. Doing so will produce a much smaller library, but the */ < /* quality of the rendered glyphs will enormously suffer from this. */ --- > /* Define this if you want to compile a bytecode interpreter in the */ > /* TrueType driver. Note that there are important patent issues related */ > /* to the use of the interpreter. */ 95,97c94,95 < /* This switch was introduced due to the Apple patents issue which */ < /* emerged recently on the FreeType lists. We still do not have Apple's */ < /* opinion on the subject and will change this as soon as we have. */ --- > /* By undefining this, you will only compile the code necessary to load */ > /* TrueType glyphs without hinting. */ 99c97 < #undef TT_CONFIG_OPTION_NO_INTERPRETER --- > #undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER 120c118 < /* */ --- > 130c128 < /* */ --- > Index: freetype/lib/arch/beos/ttmutex.c =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/beos/ttmutex.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -r1.1.1.1 -r1.2 7c7 < * Copyright 1999-2000 by --- > * Copyright 1999-2001 by 46,47c46,47 < LOCAL_FUNC < void TT_Mutex_Create( TMutex* mutex ) --- > FT_INTERNAL_FUNC( void ) > TT_Mutex_Create( TMutex* mutex ) 79,80c79,80 < LOCAL_FUNC < void TT_Mutex_Delete( TMutex* mutex ) --- > FT_INTERNAL_FUNC( void ) > TT_Mutex_Delete( TMutex* mutex ) 104,105c104,105 < LOCAL_FUNC < void TT_Mutex_Lock( TMutex* mutex ) --- > FT_INTERNAL_FUNC( void ) > TT_Mutex_Lock( TMutex* mutex ) 128,129c128,129 < LOCAL_FUNC < void TT_Mutex_Release( TMutex* mutex ) --- > FT_INTERNAL_FUNC( void ) > TT_Mutex_Release( TMutex* mutex ) Index: freetype/lib/arch/debugger/Makefile =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/debugger/Makefile,v retrieving revision 1.4 retrieving revision 1.7 diff -r1.4 -r1.7 8c8 < # Use this file while in the lib directory with the following statement: --- > # Use this file while in the lib directory with the following statements: 9a10 > # make -f arch/debugger/Makefile depend 10a12,21 > # > # > # Copyright 1996-2002 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. 90c101 < $(CC) $(CFLAGS) -E -M $^ > dep.end --- > $(CC) $(CFLAGS) -E -MM -I$(ARCH) -I. -Iextend $^ > dep.end Index: freetype/lib/arch/debugger/ft_conf.h =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/debugger/ft_conf.h,v retrieving revision 1.3 retrieving revision 1.7 diff -r1.3 -r1.7 1,3c1,15 < /* This file is part of the FreeType project */ < < /* ft_conf.h for a debugging build */ --- > /******************************************************************* > * > * ft_conf.h for a debugging build > * > * > * Copyright 1996-2002 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. > * > ******************************************************************/ 14,16d25 < /* Define if you have a working `mmap' system call. */ < #undef HAVE_MMAP < 20,22d28 < /* Define if you have the getpagesize function. */ < #undef HAVE_GETPAGESIZE < 29,36c35,36 < /* Define if you have the valloc function. */ < #undef HAVE_VALLOC < < /* Define if you have the header file. Unix-specific */ < #undef HAVE_FCNTL_H < < /* command.com can't pipe stderr into a file; any message would be */ < /* written into the graphics screen. */ --- > /* command.com can't pipe stderr into a file; so any message will */ > /* be redirected into stdout (which is manageable). */ 64a65,71 > /* Define if you have the header file. */ > /* #undef HAVE_LIBINTL_H */ > > /* Define if you have the header file. */ > /* Only meaningful if you have . */ > #define HAVE_LOCALE_H > 101,107c108,117 < /* Define this if you want to completely disable the use of the bytecode */ < /* interpreter. Doing so will produce a much smaller library, but the */ < /* quality of the rendered glyphs will enormously suffer from this. */ < /* */ < /* This switch was introduced due to the Apple patents issue which */ < /* emerged recently on the FreeType lists. We still do not have Apple's */ < /* opinion on the subject and will change this as soon as we have. */ --- > /* Define this if you want to compile a bytecode interpreter in the */ > /* TrueType driver. Note that there are important patent issues related */ > /* to the use of the interpreter. */ > /* */ > /* By undefining this, you will only compile the code necessary to load */ > /* TrueType glyphs without hinting. */ > /* */ > /* The debugger is useless (and can't be compiled) without the bytecode */ > /* interpreter. But we require TT_CONFIG_OPTION_BYTECODE_INTERPRETER to */ > /* be passed explicitly to avoid disputes with the lawyers. */ 109c119 < #undef TT_CONFIG_OPTION_NO_INTERPRETER --- > /* #undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER */ 136c146 < #define TT_CONFIG_OPTION_STATIC_INTERPRETER --- > #undef TT_CONFIG_OPTION_STATIC_INTERPRETER 149c159 < #define TT_CONFIG_OPTION_STATIC_RASTER --- > #undef TT_CONFIG_OPTION_STATIC_RASTER 219a230,232 > /* Note that contrary to the `ansi' target, there is no test against C99 */ > /* here, because we really want to control whether we use 64-bit type or */ > /* not. So you have to use TT_USE_LONG_LONG to use it on a 32-bit machine. */ Index: freetype/lib/arch/mac/freetype.c =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/mac/freetype.c,v retrieving revision 1.2 retrieving revision 1.3 diff -r1.2 -r1.3 12,17c12,13 < /* Note, you should define the EXPORT_DEF and EXPORT_FUNC macros here */ < /* if you want to build a DLL. If undefined, the macros are defined */ < /* as "export" and "" (i.e. nothing), which is the normal behaviour. */ < /* The macros are placed before each high-level API function */ < /* declaration. You can then use them to take any compiler-specific */ < /* pragma for DLL-exported symbols. See 'ttconfig.h' for details. */ --- > /* Note, you should define the FT_EXPORT_xxx macros here if you want */ > /* special builds. See 'ttconfig.h' for details. */ Index: freetype/lib/arch/mac/ft_conf.h =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/mac/ft_conf.h,v retrieving revision 1.5 retrieving revision 1.7 diff -r1.5 -r1.7 18,20d17 < /* Define if you have a working `mmap' system call. */ < #undef HAVE_MMAP < 24,26d20 < /* Define if you have the getpagesize function. */ < #undef HAVE_GETPAGESIZE < 33,38d26 < /* Define if you have the valloc function. */ < #undef HAVE_VALLOC < < /* Define if you have the header file. */ < #undef HAVE_FCNTL_H < 84,86c72,74 < /* Define this if you want to completely disable the use of the bytecode */ < /* interpreter. Doing so will produce a much smaller library, but the */ < /* quality of the rendered glyphs will enormously suffer from this. */ --- > /* Define this if you want to compile a bytecode interpreter in the */ > /* TrueType driver. Note that there are important patent issues related */ > /* to the use of the interpreter. */ 88,90c76,77 < /* This switch was introduced due to the Apple patents issue which */ < /* emerged recently on the FreeType lists. We still do not have Apple's */ < /* opinion on the subject and will change this as soon as we have. */ --- > /* By undefining this, you will only compile the code necessary to load */ > /* TrueType glyphs without hinting. */ 92c79 < #undef TT_CONFIG_OPTION_NO_INTERPRETER --- > #undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER 112c99 < /* */ --- > 123c110 < /* */ --- > Index: freetype/lib/arch/mac/ttmmap.c =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/mac/ttmmap.c,v retrieving revision 1.2 retrieving revision 1.3 diff -r1.2 -r1.3 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2001 by David Williss, 49,50c49,50 < EXPORT_FUNC < const TFileFrame TT_Null_FileFrame = { NULL, 0, 0 }; --- > FT_EXPORT_VAR( const TFileFrame ) > TT_Null_FileFrame = { NULL, 0, 0 }; 153,154c153,154 < LOCAL_FUNC < TT_Error TTFile_Init( PEngine_Instance engine ) --- > FT_INTERNAL_FUNC( TT_Error ) > TTFile_Init( PEngine_Instance engine ) 172,173c172,173 < LOCAL_FUNC < TT_Error TTFile_Done( PEngine_Instance engine ) --- > FT_INTERNAL_FUNC( TT_Error ) > TTFile_Done( PEngine_Instance engine ) 194,196c194,196 < EXPORT_FUNC < TT_Error TT_Use_Stream( TT_Stream org_stream, < TT_Stream* stream ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Use_Stream( TT_Stream org_stream, > TT_Stream* stream ) 218,219c218,219 < EXPORT_FUNC < TT_Error TT_Done_Stream( TT_Stream* stream ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Done_Stream( TT_Stream* stream ) 254,255c254,255 < LOCAL_FUNC < TT_Error TTFile_Init( PEngine_Instance engine ) --- > FT_INTERNAL_FUNC( TT_Error ) > TTFile_Init( PEngine_Instance engine ) 271,272c271,272 < LOCAL_FUNC < TT_Error TTFile_Done( PEngine_Instance engine ) --- > FT_INTERNAL_FUNC( TT_Error ) > TTFile_Done( PEngine_Instance engine ) 292,293c292,293 < EXPORT_FUNC < TT_Error TT_Use_Stream( TT_Stream input_stream, --- > FT_EXPORT_FUNC( TT_Error ) > TT_Use_Stream( TT_Stream input_stream, 331,332c331,332 < EXPORT_FUNC < TT_Error TT_Done_Stream( TT_Stream* stream ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Done_Stream( TT_Stream* stream ) 360,361c360,361 < static < TFileMap* Allocate_Map( void ) --- > static TFileMap* > Allocate_Map( void ) 389,390c389,390 < static < void Release_Map ( TFileMap* map ) --- > static void > Release_Map ( TFileMap* map ) 406c406,408 < static char *mystrdup(const char *str) { --- > static char * > mystrdup( const char *str ) > { 412c414,415 < } --- > } > 439,441c442,444 < LOCAL_FUNC < TT_Error TT_Open_Stream( const String* filepathname, < TT_Stream* stream ) --- > FT_INTERNAL_FUNC( TT_Error ) > TT_Open_Stream( const String* filepathname, > TT_Stream* stream ) 546,547c549,550 < LOCAL_FUNC < TT_Error TT_Close_Stream( TT_Stream* stream ) --- > FT_INTERNAL_FUNC( TT_Error ) > TT_Close_Stream( TT_Stream* stream ) 576,577c579,580 < EXPORT_FUNC < TT_Error TT_Flush_Stream( TT_Stream* stream ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Flush_Stream( TT_Stream* stream ) 597,598c600,601 < EXPORT_FUNC < Long TT_Stream_Size( TT_Stream stream ) --- > FT_EXPORT_FUNC( Long ) > TT_Stream_Size( TT_Stream stream ) 622,623c625,626 < EXPORT_FUNC < TT_Error TT_Seek_File( STREAM_ARGS Long position ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Seek_File( STREAM_ARGS Long position ) 646,647c649,650 < EXPORT_FUNC < TT_Error TT_Skip_File( STREAM_ARGS Long distance ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Skip_File( STREAM_ARGS Long distance ) 666,667c669,670 < EXPORT_FUNC < TT_Error TT_Read_File( STREAM_ARGS void* buffer, Long count ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Read_File( STREAM_ARGS void* buffer, Long count ) 694,697c697,700 < EXPORT_FUNC < TT_Error TT_Read_At_File( STREAM_ARGS Long position, < void* buffer, < Long count ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Read_At_File( STREAM_ARGS Long position, > void* buffer, > Long count ) 722,723c725,726 < EXPORT_FUNC < Long TT_File_Pos( STREAM_ARG ) --- > FT_EXPORT_FUNC( Long ) > TT_File_Pos( STREAM_ARG ) 750,751c753,754 < EXPORT_FUNC < TT_Error TT_Access_Frame( STREAM_ARGS FRAME_ARGS Long size ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Access_Frame( STREAM_ARGS FRAME_ARGS Long size ) 800,801c803,804 < EXPORT_FUNC < TT_Error TT_Check_And_Access_Frame( STREAM_ARGS FRAME_ARGS Long size ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Check_And_Access_Frame( STREAM_ARGS FRAME_ARGS Long size ) 847,848c850,851 < EXPORT_FUNC < TT_Error TT_Forget_Frame( FRAME_ARG ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Forget_Frame( FRAME_ARG ) 884,885c887,888 < EXPORT_FUNC < Byte TT_Get_Byte( FRAME_ARG ) --- > FT_EXPORT_FUNC( Byte ) > TT_Get_Byte( FRAME_ARG ) 912,913c915,916 < EXPORT_FUNC < Char TT_Get_Char( FRAME_ARG ) --- > FT_EXPORT_FUNC( Char ) > TT_Get_Char( FRAME_ARG ) 938,939c941,942 < EXPORT_FUNC < Short TT_Get_Short( FRAME_ARG ) --- > FT_EXPORT_FUNC( Short ) > TT_Get_Short( FRAME_ARG ) 974,975c977,978 < EXPORT_FUNC < UShort TT_Get_UShort( FRAME_ARG ) --- > FT_EXPORT_FUNC( UShort ) > TT_Get_UShort( FRAME_ARG ) 1010,1011c1013,1014 < EXPORT_FUNC < Long TT_Get_Long( FRAME_ARG ) --- > FT_EXPORT_FUNC( Long ) > TT_Get_Long( FRAME_ARG ) 1048,1049c1051,1052 < EXPORT_FUNC < ULong TT_Get_ULong( FRAME_ARG ) --- > FT_EXPORT_FUNC( ULong ) > TT_Get_ULong( FRAME_ARG ) Index: freetype/lib/arch/msdos/Makefile.BC =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/msdos/Makefile.BC,v retrieving revision 1.6 retrieving revision 1.8 diff -r1.6 -r1.8 8c8,9 < # Tested with Borland C++ v.3.1, 4.02, 5.0. --- > # Tested with Borland C++ v.3.1, 4.02, 4.51, 5.02. > # See below for a note for Borland C++ 2.0, 3.0 or Turbo C++ 3.0. 22a24,57 > # > # > # Copyright 1996-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. > # > # > # Various notes about specific versions... > # > # NOTE: Borland C++ v. 2.0, 3.0, or Turbo C++ 3.0 > # > # There is something that will fail as it stands: the -i40 option > # passed to CFLAGS was not recognized until v.3.1, so the compiler > # will complain. So you should remove the -i40 option below. > # > # Also, __huge was not introduced before v.3.1, so if you want the > # BIGFONTS option, you should use _huge instead (and perhaps remove > # -A in CFLAGS). > # > # NOTE 2: Turbo C++ 3.0 > # > # You should write `CC=tcc' below, as it should be obvious. > # Alternatively, you can `set CC=tcc', then invoke make with -e. > # > # NOTE 3: Borland C++ 2.0 > # > # Not really very tested; expect problems with make (overflows). > # Alternatively, use Makefile.TC, replacing there tcc with bcc. > 26a62 > !if ! $d(CC) 27a64,65 > !endif > 32a71 > 55,57c94,96 < SRC_X = extend\ftxgasp.c extend\ftxkern.c extend\ftxpost.c\ < extend\ftxcmap.c extend\ftxwidth.c extend\ftxerr18.c\ < extend\ftxsbit.c extend\ftxgsub.c extend\ftxgpos.c\ --- > SRC_X = extend\ftxgasp.c extend\ftxkern.c extend\ftxpost.c \ > extend\ftxcmap.c extend\ftxwidth.c extend\ftxerr18.c \ > extend\ftxsbit.c extend\ftxgsub.c extend\ftxgpos.c \ 61,62c100,101 < SRC_M = ttapi.c ttcache.c ttcalc.c ttcmap.c\ < ttgload.c ttinterp.c ttload.c ttobjs.c\ --- > SRC_M = ttapi.c ttcache.c ttcalc.c ttcmap.c \ > ttgload.c ttinterp.c ttload.c ttobjs.c \ Index: freetype/lib/arch/msdos/Makefile.MS =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/msdos/Makefile.MS,v retrieving revision 1.6 retrieving revision 1.9 diff -r1.6 -r1.9 7a8,11 > # Tested with Microsoft C v.6.0ax, C/C++ v.7.0, Visual C++ v.1.5. > # Microsoft C v.5.1 chokes on some (definitively) ANSI constructs, > # like switch() with an expression of type long. Upgrade your compiler! > # 22a27,36 > # > # > # Copyright 1996-2002 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. 28c42 < LIB = lib /noignorecase /nologo --- > LIB = lib 31c45 < CFLAGS = /Ox /AL /W2 /G2 /I$(ARCH) /I. /Iextend --- > CFLAGS = /Ox /AL /W0 /G2 /I$(ARCH) /I. /Iextend 33c47 < CFLAGS = /Zi /AL /W2 /G2 /I$(ARCH) /I. /Iextend --- > CFLAGS = /Zi /AL /W0 /G2 /I$(ARCH) /I. /Iextend 43c57 < CFLAGS = $(CFLAGS) /DTT_HUGE_PTR=__huge /Ze --- > CFLAGS = $(CFLAGS) /DTT_HUGE_PTR=huge /Ze 53,66c67,81 < # Do not insert spaces between the file names or at end of line, otherwise < # the substitution for LIB command line will fail. Thank you. < # < SRC_X = extend\ftxgasp.c extend\ftxkern.c extend\ftxpost.c\ < extend\ftxcmap.c extend\ftxwidth.c extend\ftxerr18.c extend\ftxsbit.c\ < extend\ftxopen.c extend\ftxgsub.c extend\ftxgpos.c extend\ftxgdef.c < OBJS_X = $(SRC_X:.c=.obj) < < SRC_M = ttapi.c ttcache.c ttcalc.c ttcmap.c ttdebug.c\ < ttgload.c ttinterp.c ttload.c ttobjs.c ttraster.c ttextend.c $(PORT) < OBJS_M = $(SRC_M:.c=.obj) $(OBJS_X) < < SRC_S = $(ARCH)\freetype.c < OBJ_S = $(SRC_S:.c=.obj) --- > OBJS_X = extend\ftxgasp.obj extend\ftxkern.obj extend\ftxpost.obj \ > extend\ftxcmap.obj extend\ftxwidth.obj extend\ftxerr18.obj \ > extend\ftxsbit.obj extend\ftxopen.obj extend\ftxgsub.obj \ > extend\ftxgpos.obj extend\ftxgdef.obj > # the line below does not work with these old versions of nmake... > # OBJS_X = $(SRC_X:.c=.obj) > > OBJS_M = ttapi.obj ttcache.obj ttcalc.obj ttcmap.obj ttdebug.obj \ > ttgload.obj ttinterp.obj ttload.obj ttobjs.obj \ > ttraster.obj ttextend.obj $(PORT) $(OBJS_X) > # OBJS_M = $(SRC_M:.c=.obj) $(OBJS_X) > > # Not used here because the compiler runs out of memory... > OBJ_S = $(ARCH)\freetype.obj > #SRC_S = $(ARCH)\freetype.c 71,76c86,88 < # LIB_FILES="$(OBJS_S)" will excess the capacity of COMMAND.COM, we cheat < # by constructing LIB's response file directly in the `all' target. < # < # Another solution, useful during debugging of part of the library, < # would be to include each .obj in the library as soon as it is compiled. < # It is commented out below. See Makefile.TC for an application. --- > # LIB_FILES="$(OBJS_S)" will excess the capacity of COMMAND.COM, we include > # each .obj in the library as soon as it is compiled. Better schemes are > # used in the other Makefile's, please give them a look. 78,81c90,91 < @$(CC) /c /Fo$@ @<< < $(CFLAGS) $*.c < << < # $(LIB) libttf +-$*.obj --- > $(CC) /c /Fo$@ $(CFLAGS) $*.c > $(LIB) libttf -+$*.obj; 88,91c98,101 < -del libttf.lib < $(LIB) libttf.lib @< # -del libttf.lib > # $(LIB) libttf.lib @< #+ $(OBJS_M: = -+ ); > #< # -del libttf.lib > # $(LIB) libttf.lib @< #+ $(OBJS_M: = -+ ); > #< #$(OBJ_S): $(SRC_S) $(SRC_M) Index: freetype/lib/arch/msdos/Makefile.TC =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/msdos/Makefile.TC,v retrieving revision 1.5 retrieving revision 1.7 diff -r1.5 -r1.7 10a11 > # See below for notes regarding the various versions. 22a24,56 > # > # > # Copyright 1996-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. > # > # > # Various notes about specific versions... > # > # The lack of space in the command line prevents us to turn off the > # -w-use warning (when TCC.CFG file had enable it). > # > # NOTE: Turbo C++ v. 3.0 > # > # The Makefile.TC for this version is common with the older versions. > # Alternatively, you can consider using Makefile.BC instead, changing > # the name of the compiler from BCC to TCC! > # > # NOTE 2: Turbo C++ v. 1.0 > # > # Unlike v.3.0, the version of make shipped with this version is not able > # to cater with some of the possibilities used in Makefile.BC, for example > # the inline construction of the `option' file, with the && command. > # So you should stick with this one. > # > # NOTE 3: Turbo C v. 1.5 > # > # You will need to replace the -v option in CFLAGS by -y. Index: freetype/lib/arch/msdos/Makefile.VC =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/msdos/Makefile.VC,v retrieving revision 1.6 retrieving revision 1.8 diff -r1.6 -r1.8 4c4 < # It also works for Microsoft C/C++ v.7.0 16-bit compiler, but not for --- > # It also works for Microsoft C/C++ v.7.0 (with a minor edit), but not for 6a7,8 > # Tested with Microsoft C/C++ v.7.0, Visual C++ v.1.5. > # 21a24,33 > # > # > # Copyright 1996-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. Index: freetype/lib/arch/msdos/Makefile.dm =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/msdos/Makefile.dm,v retrieving revision 1.9 retrieving revision 1.10 diff -r1.9 -r1.10 9a10,19 > # > # > # Copyright 1996-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. Index: freetype/lib/arch/msdos/Makefile.gcc =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/msdos/Makefile.gcc,v retrieving revision 1.14 retrieving revision 1.19 diff -r1.14 -r1.19 5c5 < # You will need GNU make. --- > # You will need GNU make, and sed if you want to make depend 7c7 < # Use this file while in the lib directory with the following statement: --- > # Use this file while in the lib directory with the following statements: 8a9 > # make -f arch/msdos/Makefile.gcc depend 13a15,27 > # > # You should also modify the path below to reflect where the *.mo > # files are on your system, and install there the one for freetype. > # > # > # Copyright 1996-2002 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. 78c92 < -del $(ARCH)\*.o --- > -del arch\msdos\*.o 85,86c99,102 < depend: $(SRS_S) $(SRC_M) $(SRC_X) < $(CC) -E -M $^ > dep.end --- > depend: $(SRC_S) $(SRC_M) $(SRC_X) > $(CC) -E -MM -I$(ARCH) -I. -Iextend $^ | \ > sed -e "s!^freetype.!$(ARCH)/freetype.!" | \ > sed -e "s!^ftx!extend/ftx!" > dep.end Index: freetype/lib/arch/msdos/Makefile.wat =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/msdos/Makefile.wat,v retrieving revision 1.10 retrieving revision 1.12 diff -r1.10 -r1.12 11a12,28 > # > # Copyright 1996-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 compiler did compile early versions of the FreeType package. > # While we tried our best to maintain the makefiles, the development team > # does not have currently access to a copy of this compiler, and we did not > # receive notices of successfull builts since many years. So be prepared > # to some problems; and if it works for you, or if you can upgrade the > # package in any way, please notify us! > Index: freetype/lib/arch/msdos/depend.dos =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/msdos/depend.dos,v retrieving revision 1.6 retrieving revision 1.7 diff -r1.6 -r1.7 0a1,4 > # This file is part of the FreeType project. > # Automatically generated, but you can customize to fit your needs. > # However, changes will be erased if not made in `makedep'... > # 3c7 < # 07-Mar-2000. --- > # 2002-11-18. 52,55c56,59 < extend\ftxerr18.obj: extend\ftxerr18.c ttconfig.h arch\msdos\ft_conf.h \ < extend\ftxerr18.h freetype.h fterrid.h ftnameid.h extend\ftxkern.h \ < extend\ftxpost.h extend\ftxopen.h extend\ftxgdef.h extend\ftxgsub.h \ < extend\ftxgpos.h --- > extend\ftxerr18.obj: extend\ftxerr18.c extend\ftxerr18.h freetype.h fterrid.h \ > ftnameid.h extend\ftxkern.h extend\ftxpost.h extend\ftxopen.h \ > extend\ftxgdef.h extend\ftxgsub.h extend\ftxgpos.h ttconfig.h \ > arch\msdos\ft_conf.h 77c81 < ttmemory.h ttfile.h ttload.h tttags.h --- > ttload.h ttmemory.h ttfile.h tttags.h Index: freetype/lib/arch/msdos/ft_conf.h =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/msdos/ft_conf.h,v retrieving revision 1.20 retrieving revision 1.25 diff -r1.20 -r1.25 1,3c1,15 < /* This file is part of the FreeType project */ < < /* ft_conf.h for MSDOS */ --- > /******************************************************************* > * > * ft_conf.h for MSDOS > * > * > * Copyright 1996-2002 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. > * > ******************************************************************/ 14,16d25 < /* Define if you have a working `mmap' system call. */ < #undef HAVE_MMAP < 20,22d28 < /* Define if you have the getpagesize function. */ < #undef HAVE_GETPAGESIZE < 29,34d34 < /* Define if you have the valloc function. */ < #undef HAVE_VALLOC < < /* Define if you have the header file. */ < #define HAVE_FCNTL_H < 36c36,37 < #if defined( __EMX__ ) || defined( __DJGPP__ ) || defined( __GO32__ ) --- > #if defined( __EMX__ ) || defined( __DJGPP__ ) || defined( __GO32__ ) \ > || defined( __DJGPP ) /*v.1*/ 45,52d45 < /* Define if you need for console I/O functions. */ < #ifdef __EMX__ < #define HAVE_CONIO_H < #endif < < /* Define if you have the header file. */ < #undef HAVE_LOCALE_H < 54c47 < #undef HAVE_LIBINTL_H --- > /* #undef HAVE_LIBINTL_H */ 56,57c49,51 < /* Define if you have the libintl library. */ < #undef HAVE_LIBINTL --- > /* Define if you have the header file. */ > /* Only meaningful if you have . */ > /* #undef HAVE_LOCALE_H */ 60,61c54,59 < /* The macro HAVE_GETTEXT has to be set in the makefile. */ < #ifdef HAVE_GETTEXT --- > /* The macro HAVE_LIBINTL has to be set in the makefile. */ > #ifdef HAVE_GETTEXT /* backward compatibility */ > #define HAVE_LIBINTL > #endif > > #ifdef HAVE_LIBINTL 64c62 < #define HAVE_LIBINTL --- > #ifndef LOCALEDIR 65a64 > #endif 126,128c125,127 < /* Define this if you want to completely disable the use of the bytecode */ < /* interpreter. Doing so will produce a much smaller library, but the */ < /* quality of the rendered glyphs will enormously suffer from this. */ --- > /* Define this if you want to compile a bytecode interpreter in the */ > /* TrueType driver. Note that there are important patent issues related */ > /* to the use of the interpreter. */ 130,132c129,130 < /* This switch was introduced due to the Apple patents issue which */ < /* emerged recently on the FreeType lists. We still do not have Apple's */ < /* opinion on the subject and will change this as soon as we have. */ --- > /* By undefining this, you will only compile the code necessary to load */ > /* TrueType glyphs without hinting. */ 134c132 < #undef TT_CONFIG_OPTION_NO_INTERPRETER --- > #undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER 154c152 < /* */ --- > 165c163 < /* */ --- > Index: freetype/lib/arch/msdos/hugefile.c =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/msdos/hugefile.c,v retrieving revision 1.3 retrieving revision 1.4 diff -r1.3 -r1.4 9c9 < * Copyright 1999-2000 Dave Hoo, Antoine Leca, --- > * Copyright 1999-2001 by Dave Hoo, Antoine Leca, 36,37c36,37 < LOCAL_FUNC < Long huge_fread ( void *ptr, size_t size, Long n, FILE *stream ); --- > FT_INTERNAL_FUNC( Long ) > huge_fread ( void *ptr, size_t size, Long n, FILE *stream ); 62,63c62,66 < LOCAL_DEF < Long huge_fread ( void *ptr, size_t size, Long n, FILE *stream ) --- > FT_INTERNAL_DEF( Long ) > huge_fread ( void * ptr, > size_t size, > Long n, > FILE * stream ) Index: freetype/lib/arch/msdos/hugemem.c =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/msdos/hugemem.c,v retrieving revision 1.4 retrieving revision 1.5 diff -r1.4 -r1.5 9c9 < * Copyright 1999-2000 Dave Hoo, Antoine Leca, --- > * Copyright 1999-2001 by Dave Hoo, Antoine Leca, 132,133c132,133 < EXPORT_FUNC < TT_Error TT_Alloc( ULong Size, void** P ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Alloc( ULong Size, void** P ) 241,242c241,242 < EXPORT_FUNC < TT_Error TT_Realloc( ULong Size, void** P ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Realloc( ULong Size, void** P ) 316,317c316,317 < EXPORT_FUNC < TT_Error TT_Free( void** P ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Free( void** P ) 385,386c385,386 < LOCAL_FUNC < TT_Error TTMemory_Init( void ) --- > FT_INTERNAL_FUNC( TT_Error ) > TTMemory_Init( void ) 435,436c435,436 < LOCAL_FUNC < TT_Error TTMemory_Done( void ) --- > FT_INTERNAL_FUNC( TT_Error ) > TTMemory_Done( void ) Index: freetype/lib/arch/msdos/makedep =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/msdos/makedep,v retrieving revision 1.3 retrieving revision 1.4 diff -r1.3 -r1.4 4a5,13 > # > # Copyright 1996-2002 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. 6a16,19 > # This file is part of the FreeType project. > # Automatically generated, but you can customize to fit your needs. > # However, changes will be erased if not made in \`makedep'... > # 9c22 < # `date +%d-%b-%Y`. --- > # `date +%Y-%m-%d`. Index: freetype/lib/arch/os2/Makefile.dm =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/os2/Makefile.dm,v retrieving revision 1.9 retrieving revision 1.10 diff -r1.9 -r1.10 9a10,19 > # > # > # Copyright 1996-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. Index: freetype/lib/arch/os2/Makefile.emx =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/os2/Makefile.emx,v retrieving revision 1.17 retrieving revision 1.20 diff -r1.17 -r1.20 7c7 < # Use this file while in the lib directory with the following statement: --- > # Use this file while in the lib directory with the following statements: 8a9 > # make -f arch/os2/Makefile.emx depend 9a11,20 > # > # > # Copyright 1996-2002 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. 85c96 < $(CC) -E -M $^ > dep.end --- > $(CC) -E -MM -I$(ARCH) -I. -Iextend $^ > dep.end Index: freetype/lib/arch/os2/Makefile.icc =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/os2/Makefile.icc,v retrieving revision 1.18 retrieving revision 1.19 diff -r1.18 -r1.19 10a11,19 > # > # Copyright 1996-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. Index: freetype/lib/arch/os2/Makefile.wat =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/os2/Makefile.wat,v retrieving revision 1.11 retrieving revision 1.12 diff -r1.11 -r1.12 10a11,20 > # > # > # Copyright 1996-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. Index: freetype/lib/arch/os2/ft_conf.h =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/os2/ft_conf.h,v retrieving revision 1.17 retrieving revision 1.21 diff -r1.17 -r1.21 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2002 by 41c41,42 < /* The number of bytes in a int. */ --- > /* The number of bytes in a int. */ > /* OS/2 1.x needs editing here, by the way. ;-) */ 56,58d56 < /* Define if you have the header file. */ < #undef HAVE_FCNTL_H < 62,68c60,61 < /* Define if you need for console I/O functions. */ < #if defined(__EMX__) || defined(__IBMC__) < #define HAVE_CONIO_H < #endif < < /* Define if you have the valloc function. */ < #undef HAVE_VALLOC --- > /* Define if you have the header file. */ > /* #undef HAVE_LIBINTL_H */ 70,74c63,65 < /* Define if you have the getpagesize function. */ < #undef HAVE_GETPAGESIZE < < /* Define if you have a working `mmap' system call. */ < #undef HAVE_MMAP --- > /* Define if you have the header file. */ > /* Only meaningful if you have . */ > /* #undef HAVE_LOCALE_H */ 112,114c103,105 < /* Define this if you want to completely disable the use of the bytecode */ < /* interpreter. Doing so will produce a much smaller library, but the */ < /* quality of the rendered glyphs will enormously suffer from this. */ --- > /* Define this if you want to compile a bytecode interpreter in the */ > /* TrueType driver. Note that there are important patent issues related */ > /* to the use of the interpreter. */ 116,118c107,108 < /* This switch was introduced due to the Apple patents issue which */ < /* emerged recently on the FreeType lists. We still do not have Apple's */ < /* opinion on the subject and will change this as soon as we have. */ --- > /* By undefining this, you will only compile the code necessary to load */ > /* TrueType glyphs without hinting. */ 120c110 < #undef TT_CONFIG_OPTION_NO_INTERPRETER --- > #undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER 140c130 < /* */ --- > 151c141 < /* */ --- > Index: freetype/lib/arch/os2/os2file.c =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/os2/os2file.c,v retrieving revision 1.10 retrieving revision 1.11 diff -r1.10 -r1.11 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2001 by Michal Necasek, 51,52c51 < EXPORT_FUNC < const TFileFrame TT_Null_FileFrame = { NULL, 0, 0 }; --- > FT_EXPORT_FUNC( const TFileFrame ) TT_Null_FileFrame = { NULL, 0, 0 }; 169,170c168,169 < LOCAL_FUNC < TT_Error TTFile_Init( PEngine_Instance engine ) --- > FT_INTERNAL_FUNC( TT_Error ) > TTFile_Init( PEngine_Instance engine ) 193,194c192,193 < LOCAL_FUNC < TT_Error TTFile_Done( PEngine_Instance engine ) --- > FT_INTERNAL_FUNC( TT_Error ) > TTFile_Done( PEngine_Instance engine ) 216,218c215,217 < EXPORT_FUNC < TT_Error TT_Use_Stream( TT_Stream org_stream, < TT_Stream* stream ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Use_Stream( TT_Stream org_stream, > TT_Stream* stream ) 243,244c242,243 < EXPORT_FUNC < TT_Error TT_Done_Stream( TT_Stream* stream ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Done_Stream( TT_Stream* stream ) 274,275c273,274 < EXPORT_FUNC < TT_Error TT_Access_Frame( STREAM_ARGS FRAME_ARGS Long size ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Access_Frame( STREAM_ARGS FRAME_ARGS Long size ) 341,342c340,341 < EXPORT_FUNC < TT_Error TT_Check_And_Access_Frame( STREAM_ARGS FRAME_ARGS Long size ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Check_And_Access_Frame( STREAM_ARGS FRAME_ARGS Long size ) 395,396c394,395 < EXPORT_FUNC < TT_Error TT_Forget_Frame( FRAME_ARG ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Forget_Frame( FRAME_ARG ) 440,441c439,440 < LOCAL_FUNC < TT_Error TTFile_Init( PEngine_Instance engine ) --- > FT_INTERNAL_FUNC( TT_Error ) > TTFile_Init( PEngine_Instance engine ) 455,456c454,455 < LOCAL_FUNC < TT_Error TTFile_Done( PEngine_Instance engine ) --- > FT_INTERNAL_FUNC( TT_Error ) > TTFile_Done( PEngine_Instance engine ) 476,478c475,477 < EXPORT_FUNC < TT_Error TT_Use_Stream( TT_Stream input_stream, < TT_Stream* copy ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Use_Stream( TT_Stream input_stream, > TT_Stream* copy ) 498,499c497,498 < EXPORT_FUNC < TT_Error TT_Done_Stream( TT_Stream* stream ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Done_Stream( TT_Stream* stream ) 526,527c525,526 < EXPORT_FUNC < TT_Error TT_Access_Frame( STREAM_ARGS FRAME_ARGS int size ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Access_Frame( STREAM_ARGS FRAME_ARGS int size ) 582,583c581,582 < EXPORT_FUNC < TT_Error TT_Check_And_Access_Frame( STREAM_ARGS FRAME_ARGS int size ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Check_And_Access_Frame( STREAM_ARGS FRAME_ARGS int size ) 624,625c623,624 < EXPORT_FUNC < TT_Error TT_Forget_Frame( FRAME_ARG ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Forget_Frame( FRAME_ARG ) 795,796c794,795 < EXPORT_FUNC < Long TT_Stream_Size( TT_Stream stream ) --- > FT_EXPORT_FUNC( Long ) > TT_Stream_Size( TT_Stream stream ) 824,826c823,825 < LOCAL_FUNC < TT_Error TT_Open_Stream( const String* filepathname, < TT_Stream* stream ) --- > FT_INTERNAL_FUNC( TT_Error ) > TT_Open_Stream( const String* filepathname, > TT_Stream* stream ) 880,881c879,880 < LOCAL_FUNC < TT_Error TT_Close_Stream( TT_Stream* stream ) --- > FT_INTERNAL_FUNC( TT_Error ) > TT_Close_Stream( TT_Stream* stream ) 912,913c911,912 < EXPORT_FUNC < TT_Error TT_Flush_Stream( TT_Stream* stream ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Flush_Stream( TT_Stream* stream ) 940,941c939,940 < EXPORT_FUNC < TT_Error TT_Seek_File( STREAM_ARGS long position ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Seek_File( STREAM_ARGS long position ) 971,972c970,971 < EXPORT_FUNC < TT_Error TT_Skip_File( STREAM_ARGS long distance ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Skip_File( STREAM_ARGS long distance ) 1000,1001c999,1000 < EXPORT_FUNC < TT_Error TT_Read_File( STREAM_ARGS void* buffer, long count ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Read_File( STREAM_ARGS void* buffer, long count ) 1031,1034c1030,1033 < EXPORT_FUNC < TT_Error TT_Read_At_File( STREAM_ARGS long position, < void* buffer, < long count ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Read_At_File( STREAM_ARGS long position, > void* buffer, > long count ) 1059,1060c1058,1059 < EXPORT_FUNC < Long TT_File_Pos( STREAM_ARG ) --- > FT_EXPORT_FUNC( Long ) > TT_File_Pos( STREAM_ARG ) 1086,1087c1085,1086 < EXPORT_FUNC < Byte TT_Get_Byte( FRAME_ARG ) --- > FT_EXPORT_FUNC( Byte ) > TT_Get_Byte( FRAME_ARG ) 1107,1108c1106,1107 < EXPORT_FUNC < Char TT_Get_Char( FRAME_ARG ) --- > FT_EXPORT_FUNC( Char ) > TT_Get_Char( FRAME_ARG ) 1128,1129c1127,1128 < EXPORT_FUNC < short TT_Get_Short( FRAME_ARG ) --- > FT_EXPORT_FUNC( short ) > TT_Get_Short( FRAME_ARG ) 1157,1158c1156,1157 < EXPORT_FUNC < unsigned short TT_Get_UShort( FRAME_ARG ) --- > FT_EXPORT_FUNC( unsigned ) > short TT_Get_UShort( FRAME_ARG ) 1186,1187c1185,1186 < EXPORT_FUNC < long TT_Get_Long( FRAME_ARG ) --- > FT_EXPORT_FUNC( long ) > TT_Get_Long( FRAME_ARG ) 1217,1218c1216,1217 < EXPORT_FUNC < unsigned long TT_Get_ULong( FRAME_ARG ) --- > FT_EXPORT_FUNC( unsigned ) > long TT_Get_ULong( FRAME_ARG ) Index: freetype/lib/arch/unix/Makefile.in =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/unix/Makefile.in,v retrieving revision 1.34 retrieving revision 1.36 diff -r1.34 -r1.36 3a4,13 > # > # > # Copyright 1996-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. 242a253,254 > > .PHONY: all debug do_link install uninstall clean distclean depend Index: freetype/lib/arch/unix/ttmmap.c =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/unix/ttmmap.c,v retrieving revision 1.20 retrieving revision 1.21 diff -r1.20 -r1.21 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2001 by 60,61c60,61 < EXPORT_FUNC < const TFileFrame TT_Null_FileFrame = { NULL, 0, 0 }; --- > FT_EXPORT_FUNC( const TFileFrame ) > TT_Null_FileFrame = { NULL, 0, 0 }; 162,163c162,163 < LOCAL_FUNC < TT_Error TTFile_Init( PEngine_Instance engine ) --- > FT_INTERNAL_FUNC( TT_Error ) > TTFile_Init( PEngine_Instance engine ) 181,182c181,182 < LOCAL_FUNC < TT_Error TTFile_Done( PEngine_Instance engine ) --- > FT_INTERNAL_FUNC( TT_Error ) > TTFile_Done( PEngine_Instance engine ) 203,205c203,205 < EXPORT_FUNC < TT_Error TT_Use_Stream( TT_Stream org_stream, < TT_Stream* stream ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Use_Stream( TT_Stream org_stream, > TT_Stream* stream ) 227,228c227,228 < EXPORT_FUNC < TT_Error TT_Done_Stream( TT_Stream* stream ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Done_Stream( TT_Stream* stream ) 263,264c263,264 < LOCAL_FUNC < TT_Error TTFile_Init( PEngine_Instance engine ) --- > FT_INTERNAL_FUNC( TT_Error ) > TTFile_Init( PEngine_Instance engine ) 280,281c280,281 < LOCAL_FUNC < TT_Error TTFile_Done( PEngine_Instance engine ) --- > FT_INTERNAL_FUNC( TT_Error ) > TTFile_Done( PEngine_Instance engine ) 301,303c301,303 < EXPORT_FUNC < TT_Error TT_Use_Stream( TT_Stream input_stream, < TT_Stream* copy ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Use_Stream( TT_Stream input_stream, > TT_Stream* copy ) 341,342c341,342 < EXPORT_FUNC < TT_Error TT_Done_Stream( TT_Stream* stream ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Done_Stream( TT_Stream* stream ) 370,371c370,371 < static < TFileMap* Allocate_Map( void ) --- > static TFileMap* > Allocate_Map( void ) 399,400c399,400 < static < void Release_Map ( TFileMap* map ) --- > static void > Release_Map ( TFileMap* map ) 427,429c427,429 < LOCAL_FUNC < TT_Error TT_Open_Stream( const String* filepathname, < TT_Stream* stream ) --- > FT_INTERNAL_FUNC( TT_Error ) > TT_Open_Stream( const String* filepathname, > TT_Stream* stream ) 505,506c505,506 < LOCAL_FUNC < TT_Error TT_Close_Stream( TT_Stream* stream ) --- > FT_INTERNAL_FUNC( TT_Error ) > TT_Close_Stream( TT_Stream* stream ) 535,536c535,536 < EXPORT_FUNC < TT_Error TT_Flush_Stream( TT_Stream* stream ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Flush_Stream( TT_Stream* stream ) 556,557c556,557 < EXPORT_FUNC < Long TT_Stream_Size( TT_Stream stream ) --- > FT_EXPORT_FUNC( Long ) > TT_Stream_Size( TT_Stream stream ) 581,582c581,582 < EXPORT_FUNC < TT_Error TT_Seek_File( STREAM_ARGS Long position ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Seek_File( STREAM_ARGS Long position ) 605,606c605,606 < EXPORT_FUNC < TT_Error TT_Skip_File( STREAM_ARGS Long distance ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Skip_File( STREAM_ARGS Long distance ) 625,626c625,626 < EXPORT_FUNC < TT_Error TT_Read_File( STREAM_ARGS void* buffer, Long count ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Read_File( STREAM_ARGS void* buffer, Long count ) 653,656c653,656 < EXPORT_FUNC < TT_Error TT_Read_At_File( STREAM_ARGS Long position, < void* buffer, < Long count ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Read_At_File( STREAM_ARGS Long position, > void* buffer, > Long count ) 681,682c681,682 < EXPORT_FUNC < Long TT_File_Pos( STREAM_ARG ) --- > FT_EXPORT_FUNC( Long ) > TT_File_Pos( STREAM_ARG ) 709,710c709,710 < EXPORT_FUNC < TT_Error TT_Access_Frame( STREAM_ARGS FRAME_ARGS Long size ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Access_Frame( STREAM_ARGS FRAME_ARGS Long size ) 759,760c759,760 < EXPORT_FUNC < TT_Error TT_Check_And_Access_Frame( STREAM_ARGS FRAME_ARGS Long size ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Check_And_Access_Frame( STREAM_ARGS FRAME_ARGS Long size ) 806,807c806,807 < EXPORT_FUNC < TT_Error TT_Forget_Frame( STREAM_ARGS FRAME_ARG ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Forget_Frame( STREAM_ARGS FRAME_ARG ) 843,844c843,844 < EXPORT_FUNC < Byte TT_Get_Byte( FRAME_ARG ) --- > FT_EXPORT_FUNC( Byte ) > TT_Get_Byte( FRAME_ARG ) 871,872c871,872 < EXPORT_FUNC < Char TT_Get_Char( FRAME_ARG ) --- > FT_EXPORT_FUNC( Char ) > TT_Get_Char( FRAME_ARG ) 897,898c897,898 < EXPORT_FUNC < Short TT_Get_Short( FRAME_ARG ) --- > FT_EXPORT_FUNC( Short ) > TT_Get_Short( FRAME_ARG ) 933,934c933,934 < EXPORT_FUNC < UShort TT_Get_UShort( FRAME_ARG ) --- > FT_EXPORT_FUNC( UShort ) > TT_Get_UShort( FRAME_ARG ) 969,970c969,970 < EXPORT_FUNC < Long TT_Get_Long( FRAME_ARG ) --- > FT_EXPORT_FUNC( Long ) > TT_Get_Long( FRAME_ARG ) 1007,1008c1007,1008 < EXPORT_FUNC < ULong TT_Get_ULong( FRAME_ARG ) --- > FT_EXPORT_FUNC( ULong ) > TT_Get_ULong( FRAME_ARG ) Index: freetype/lib/arch/vms/README =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/vms/README,v retrieving revision 1.2 retrieving revision 1.3 diff -r1.2 -r1.3 7c7 < The files are such designed that after unpacking of freetype-1.4 one can --- > The files are such designed that after unpacking of freetype-1.5 one can Index: freetype/lib/arch/vms/descrip.mms =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/vms/descrip.mms,v retrieving revision 1.5 retrieving revision 1.6 diff -r1.5 -r1.6 1,2d0 < # This file is part of the FreeType project. < # 3a2,11 > # > # > # Copyright 1996-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. Index: freetype/lib/arch/vms/ft_conf.h =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/vms/ft_conf.h,v retrieving revision 1.6 retrieving revision 1.8 diff -r1.6 -r1.8 1,3c1,15 < /* This file is part of the FreeType project */ < < /* ft_conf.h for VMS using MMS or MMK */ --- > /******************************************************************* > * > * ft_conf.h for VMS using MMS or MMK > * > * > * Copyright 1996-2002 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. > * > ******************************************************************/ 14,16d25 < /* Define if you have a working `mmap' system call. */ < /* #undef HAVE_MMAP */ < 20,22d28 < /* Define if the X Window System is missing or not being used. */ < /* #undef X_DISPLAY_MISSING */ < 29,31d34 < /* Define if you have the getpagesize function. */ < #define HAVE_GETPAGESIZE 1 < 38,40d40 < /* Define if you have the header file. */ < #define HAVE_FCNTL_H 1 < 44,46d43 < /* Define if you have the header file. */ < #define HAVE_LOCALE_H 1 < 50,51c47,49 < /* Define if you have the libintl library. */ < /* #undef HAVE_LIBINTL */ --- > /* Define if you have the header file. */ > /* Only meaningful if you have . */ > #define HAVE_LOCALE_H 67c65 < /* #undef HAVE_TT_TEXT */ --- > /* #define HAVE_TT_TEXT */ 88,90c86,88 < /* Define this if you want to completely disable the use of the bytecode */ < /* interpreter. Doing so will produce a much smaller library, but the */ < /* quality of the rendered glyphs will enormously suffer from this. */ --- > /* Define this if you want to compile a bytecode interpreter in the */ > /* TrueType driver. Note that there are important patent issues related */ > /* to the use of the interpreter. */ 92,94c90,91 < /* This switch was introduced due to the Apple patents issue which */ < /* emerged recently on the FreeType lists. We still do not have Apple's */ < /* opinion on the subject and will change this as soon as we have. */ --- > /* By undefining this, you will only compile the code necessary to load */ > /* TrueType glyphs without hinting. */ 96c93 < #undef TT_CONFIG_OPTION_NO_INTERPRETER --- > #undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER 116c113 < /* */ --- > 127c124 < /* */ --- > 136c133 < /* #undef TT_CONFIG_OPTION_THREAD_SAFE */ --- > #undef TT_CONFIG_OPTION_THREAD_SAFE 167c164 < /* #undef DEBUG_LEVEL_TRACE */ --- > #undef DEBUG_LEVEL_TRACE 171c168 < /* #undef DEBUG_LEVEL_ERROR */ --- > #undef DEBUG_LEVEL_ERROR Index: freetype/lib/arch/win16/Makefile.BC =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/win16/Makefile.BC,v retrieving revision 1.4 retrieving revision 1.6 diff -r1.4 -r1.6 24a25,34 > # > # > # Copyright 1996-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. 29c39 < FT_DLL = ft14_16.dll --- > FT_DLL = ft15_16.dll Index: freetype/lib/arch/win16/Makefile.MS =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/win16/Makefile.MS,v retrieving revision 1.4 retrieving revision 1.5 diff -r1.4 -r1.5 16a17,26 > # > # > # Copyright 1996-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. Index: freetype/lib/arch/win16/Makefile.VC =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/win16/Makefile.VC,v retrieving revision 1.5 retrieving revision 1.7 diff -r1.5 -r1.7 24a25,34 > # > # > # Copyright 1996-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. 29c39 < FT_DLL = ft14_16.dll --- > FT_DLL = ft15_16.dll Index: freetype/lib/arch/win16/depend.win =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/win16/depend.win,v retrieving revision 1.3 retrieving revision 1.4 diff -r1.3 -r1.4 0a1,4 > # This file is part of the FreeType project. > # Automatically generated, but you can customize to fit your needs. > # However, changes will be erased if not made in `makedep'... > # 3c7 < # 07-Mar-2000. --- > # 2002-11-18. 52,55c56,59 < extend\ftxerr18.obj: extend\ftxerr18.c ttconfig.h arch\win16\ft_conf.h \ < extend\ftxerr18.h freetype.h fterrid.h ftnameid.h extend\ftxkern.h \ < extend\ftxpost.h extend\ftxopen.h extend\ftxgdef.h extend\ftxgsub.h \ < extend\ftxgpos.h --- > extend\ftxerr18.obj: extend\ftxerr18.c extend\ftxerr18.h freetype.h fterrid.h \ > ftnameid.h extend\ftxkern.h extend\ftxpost.h extend\ftxopen.h \ > extend\ftxgdef.h extend\ftxgsub.h extend\ftxgpos.h ttconfig.h \ > arch\win16\ft_conf.h 77c81 < ttmemory.h ttfile.h ttload.h tttags.h --- > ttload.h ttmemory.h ttfile.h tttags.h Index: freetype/lib/arch/win16/freetype.c =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/win16/freetype.c,v retrieving revision 1.3 retrieving revision 1.4 diff -r1.3 -r1.4 7a8,19 > /* Note, you should define the FT_EXPORT_xxx macros here if you */ > /* want to build a Win16 DLL. If undefined, the macros default to */ > /* "extern"/"" (nothing), which is suitable for static libraries. */ > /* See `ttconfig.h' for details. */ > > /* The macro FT_EXPORT_DEF is placed before each high-level API */ > /* function declaration, and FT_EXPORT_FUNC before each */ > /* definition (body). Similarly, FT_EXPORT_DECL is placed before */ > /* each variable declaration, and FT_EXPORT_VAR before its */ > /* definition. You can then use it to take any compiler-specific */ > /* pragma for DLL-exported symbols */ > Index: freetype/lib/arch/win16/ft_conf.h =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/win16/ft_conf.h,v retrieving revision 1.6 retrieving revision 1.10 diff -r1.6 -r1.10 1,3c1,15 < /* This file is part of the FreeType project */ < < /* ft_conf.h for 16-bit Windows */ --- > /******************************************************************* > * > * ft_conf.h for 16-bit Windows > * > * > * Copyright 1996-2002 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. > * > ******************************************************************/ 14,16d25 < /* Define if you have a working `mmap' system call. */ < #undef HAVE_MMAP < 20,22d28 < /* Define if you have the getpagesize function. */ < #undef HAVE_GETPAGESIZE < 29,34d34 < /* Define if you have the valloc function. */ < #undef HAVE_VALLOC < < /* Define if you have the header file. */ < #define HAVE_FCNTL_H < 38,43d37 < /* Define if you need for console I/O functions. */ < #undef HAVE_CONIO_H < < /* Define if you have the header file. */ < #undef HAVE_LOCALE_H < 45c39 < #undef HAVE_LIBINTL_H --- > /* #undef HAVE_LIBINTL_H */ 47,48c41,43 < /* Define if you have the libintl library. */ < #undef HAVE_LIBINTL --- > /* Define if you have the header file. */ > /* Only meaningful if you have . */ > /* #undef HAVE_LOCALE_H */ 98,100c93,95 < /* Define this if you want to completely disable the use of the bytecode */ < /* interpreter. Doing so will produce a much smaller library, but the */ < /* quality of the rendered glyphs will enormously suffer from this. */ --- > /* Define this if you want to compile a bytecode interpreter in the */ > /* TrueType driver. Note that there are important patent issues related */ > /* to the use of the interpreter. */ 102,104c97,98 < /* This switch was introduced due to the Apple patents issue which */ < /* emerged recently on the FreeType lists. We still do not have Apple's */ < /* opinion on the subject and will change this as soon as we have. */ --- > /* By undefining this, you will only compile the code necessary to load */ > /* TrueType glyphs without hinting. */ 106c100 < #undef TT_CONFIG_OPTION_NO_INTERPRETER --- > #undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER 126c120 < /* */ --- > 137c131 < /* */ --- > 205a200,231 > > /**********************************************************************/ > /* */ > /* The following macros does the dusty work of selecting the proper */ > /* of qualifiers in order to build a DLL, exporting only the needed */ > /* functions, using the (in)famous FAR PASCAL EXPORT... */ > /* */ > /* Refer to ttconfig.h for explanations of the machinery. */ > > #if defined( _WINDLL ) || defined( __DLL__ ) || defined( FT_DLL ) > > #if defined( _M_I86 ) || ( defined( __TURBOC__ ) && __TURBOC__ > 0x400 ) > #define FAR __far > #define PASCAL __pascal > #define EXPORT __export > #else > #define FAR _far > #define PASCAL _pascal > #define EXPORT _export > #endif > > #define FT_INTERNAL_FUNC( type ) type > #define FT_INTERNAL_DEF( type ) extern type > > #define FT_EXPORT_DEF( type ) extern type FAR PASCAL EXPORT > #define FT_EXPORT_FUNC( type ) type FAR PASCAL EXPORT > > /* This is for variables. */ > #define FT_EXPORT_DECL( type ) extern type PASCAL > #define FT_EXPORT_VAR( type ) type PASCAL > > #endif /* DLL stuff */ Index: freetype/lib/arch/win16/hugemem.c =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/win16/hugemem.c,v retrieving revision 1.3 retrieving revision 1.4 diff -r1.3 -r1.4 114,115c114,115 < EXPORT_FUNC < TT_Error TT_Alloc( ULong Size, void** P ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Alloc( ULong Size, void** P ) 218,219c218,219 < EXPORT_FUNC < TT_Error TT_Realloc( ULong Size, void** P ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Realloc( ULong Size, void** P ) 351,352c351,352 < EXPORT_FUNC < TT_Error TT_Free( void** P ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Free( void** P ) 429,430c429,430 < LOCAL_FUNC < TT_Error TTMemory_Init( void ) --- > FT_INTERNAL_FUNC( TT_Error ) > TTMemory_Init( void ) 478,479c478,479 < LOCAL_FUNC < TT_Error TTMemory_Done( void ) --- > FT_INTERNAL_FUNC( TT_Error ) > TTMemory_Done( void ) Index: freetype/lib/arch/win16/makedef =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/win16/makedef,v retrieving revision 1.4 retrieving revision 1.7 diff -r1.4 -r1.7 6a7,10 > ; This file is part of the FreeType project. > ; Automatically generated, but you can customize to fit your needs. > ; However, changes will be erased if not made in \`makedef'... > ; 9c13 < ; `date +%d-%b-%Y`. --- > ; `date +%Y-%m-%d`. 11,12c15,16 < LIBRARY ft14_16 < DESCRIPTION 'FreeType 1.4 16-bit DLL © 1996-2000 Turner, Wilhelm, Lemberg' --- > LIBRARY ft15_16 > DESCRIPTION 'FreeType 1.5 16-bit DLL © 1996-2002 Turner, Wilhelm, Lemberg' 20,21c24,25 < sed -n -e "/^ *EXPORT_DEF/!d ; n ; s/(.*$//" \ < -e "s/;$//" -e "s/ const / /" -e "s/ *[a-zA-Z][a-zA-Z_\*]* //" \ --- > sed -n -e "/^ *FT_EXPORT_DE/!d ; n ; s/(.*$//" \ > -e "s/;$//" -e "s/ const / /" -e "s/ *TT_[a-zA-Z_\*]* //" \ Index: freetype/lib/arch/win16/makedep =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/win16/makedep,v retrieving revision 1.3 retrieving revision 1.4 diff -r1.3 -r1.4 4a5,16 > # > # If you run this script under non-Windows operating systems, expect > # warnings that `windows.h' can't be found. > # > # Copyright 1996-2002 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. 6a19,22 > # This file is part of the FreeType project. > # Automatically generated, but you can customize to fit your needs. > # However, changes will be erased if not made in \`makedep'... > # 9c25 < # `date +%d-%b-%Y`. --- > # `date +%Y-%m-%d`. 25,26c41,42 < gcc -MM -Iarch/win16 -I. -Iextend -DTT_HUGE_PTR \ < arch/win16/*.c | \ --- > gcc -MM -Iarch/win16 -I. -Iextend \ > -DTT_HUGE_PTR -Dhuge_alloc -Dhuge_free arch/win16/*.c | \ Index: freetype/lib/arch/win16/ttf.def =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/win16/ttf.def,v retrieving revision 1.4 retrieving revision 1.6 diff -r1.4 -r1.6 0a1,4 > ; This file is part of the FreeType project. > ; Automatically generated, but you can customize to fit your needs. > ; However, changes will be erased if not made in `makedef'... > ; 3c7 < ; 07-Mar-2000. --- > ; 2002-11-18. 5,6c9,10 < LIBRARY ft14_16 < DESCRIPTION 'FreeType 1.4 16-bit DLL © 1996-2000 Turner, Wilhelm, Lemberg' --- > LIBRARY ft15_16 > DESCRIPTION 'FreeType 1.5 16-bit DLL © 1996-2002 Turner, Wilhelm, Lemberg' Index: freetype/lib/arch/win32/Makefile.BC =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/win32/Makefile.BC,v retrieving revision 1.3 retrieving revision 1.5 diff -r1.3 -r1.5 20a21,30 > # > # > # Copyright 1996-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. 24c34 < FT_DLL = ft14_32.dll --- > FT_DLL = ft15_32.dll Index: freetype/lib/arch/win32/Makefile.CL =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/win32/Makefile.CL,v retrieving revision 1.4 retrieving revision 1.6 diff -r1.4 -r1.6 18a19,28 > # > # > # Copyright 1996-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. 22c32 < FT_DLL = ft14_32.dll --- > FT_DLL = ft15_32.dll Index: freetype/lib/arch/win32/Makefile.Min =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/win32/Makefile.Min,v retrieving revision 1.1 retrieving revision 1.4 diff -r1.1 -r1.4 7c7 < # Use this file while in the lib directory with the following statement: --- > # Use this file while in the lib directory with the following statements: 8a9 > # make -f arch/win32/Makefile.Min depend 18a20,29 > # > # > # Copyright 1996-2002 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. 91,92c102,103 < depend: $(SRS_S) $(SRC_M) $(SRC_X) < $(CC) -E -M $^ > dep.end --- > depend: $(SRC_S) $(SRC_M) $(SRC_X) > $(CC) -E -MM -I$(ARCH) -I. -Iextend $^ > dep.end Index: freetype/lib/arch/win32/Makefile.VC =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/win32/Makefile.VC,v retrieving revision 1.2 retrieving revision 1.4 diff -r1.2 -r1.4 19a20,29 > # > # > # Copyright 1996-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. 39c49 < TTF = ttf --- > TTF = ft15_32 Index: freetype/lib/arch/win32/Makefile.gcc =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/win32/Makefile.gcc,v retrieving revision 1.5 retrieving revision 1.8 diff -r1.5 -r1.8 10c10 < # Use this file while in the lib directory with the following statement: --- > # Use this file while in the lib directory with the following statements: 11a12 > # make -f arch/win32/Makefile.gcc depend 17a19,28 > # > # > # Copyright 1996-2002 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. 89,90c100,101 < depend: $(SRS_S) $(SRC_M) $(SRC_X) < $(CC) -E -M $^ > dep.end --- > depend: $(SRC_S) $(SRC_M) $(SRC_X) > $(CC) -E -MM -I$(ARCH) -I. -Iextend $^ > dep.end Index: freetype/lib/arch/win32/depend.win =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/win32/depend.win,v retrieving revision 1.3 retrieving revision 1.4 diff -r1.3 -r1.4 0a1,4 > # This file is part of the FreeType project. > # Automatically generated, but you can customize to fit your needs. > # However, changes will be erased if not made in `makedep'... > # 3c7 < # 07-Mar-2000. --- > # 2002-11-18. 52,55c56,59 < extend\ftxerr18.obj: extend\ftxerr18.c ttconfig.h arch\win32\ft_conf.h \ < extend\ftxerr18.h freetype.h fterrid.h ftnameid.h extend\ftxkern.h \ < extend\ftxpost.h extend\ftxopen.h extend\ftxgdef.h extend\ftxgsub.h \ < extend\ftxgpos.h --- > extend\ftxerr18.obj: extend\ftxerr18.c extend\ftxerr18.h freetype.h fterrid.h \ > ftnameid.h extend\ftxkern.h extend\ftxpost.h extend\ftxopen.h \ > extend\ftxgdef.h extend\ftxgsub.h extend\ftxgpos.h ttconfig.h \ > arch\win32\ft_conf.h 77c81 < ttmemory.h ttfile.h ttload.h tttags.h --- > ttload.h ttmemory.h ttfile.h tttags.h Index: freetype/lib/arch/win32/freetype.c =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/win32/freetype.c,v retrieving revision 1.8 retrieving revision 1.9 diff -r1.8 -r1.9 6,9c6,9 < /* Note, you should define the EXPORT_DEF and EXPORT_FUNC macros */ < /* here if you want to build a Win32 DLL. If undefined, the */ < /* macros default to "extern"/"" (nothing), which is suitable */ < /* for static libraries. See `ttconfig.h' for details. */ --- > /* Note, you should define the FT_EXPORT_xxx macros here if you */ > /* want to build a Win32 DLL. If undefined, the macros default to */ > /* "extern"/"" (nothing), which is suitable for static libraries. */ > /* See `ttconfig.h' for details. */ 11,13c11,15 < /* The macro EXPORT_DEF is placed before each high-level API */ < /* function declaration, and EXPORT_FUNC before each definition */ < /* (body). You can then use it to take any compiler-specific */ --- > /* The macro FT_EXPORT_DEF is placed before each high-level API */ > /* function declaration, and FT_EXPORT_FUNC before each */ > /* definition (body). Similarly, FT_EXPORT_DECL is placed before */ > /* each variable declaration, and FT_EXPORT_VAR before its */ > /* definition. You can then use it to take any compiler-specific */ Index: freetype/lib/arch/win32/freetype.dsp =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/win32/freetype.dsp,v retrieving revision 1.1 retrieving revision 1.3 diff -r1.1 -r1.3 1,104c1,138 < # Microsoft Developer Studio Project File - Name="freetype" - Package Owner=<4> < # Microsoft Developer Studio Generated Build File, Format Version 5.00 < # ** DO NOT EDIT ** < < # TARGTYPE "Win32 (x86) Static Library" 0x0104 < < CFG=freetype - Win32 Debug < !MESSAGE This is not a valid makefile. To build this project using NMAKE, < !MESSAGE use the Export Makefile command and run < !MESSAGE < !MESSAGE NMAKE /f "freetype.mak". < !MESSAGE < !MESSAGE You can specify a configuration when running NMAKE < !MESSAGE by defining the macro CFG on the command line. For example: < !MESSAGE < !MESSAGE NMAKE /f "freetype.mak" CFG="freetype - Win32 Debug" < !MESSAGE < !MESSAGE Possible choices for configuration are: < !MESSAGE < !MESSAGE "freetype - Win32 Release" (based on "Win32 (x86) Static Library") < !MESSAGE "freetype - Win32 Debug" (based on "Win32 (x86) Static Library") < !MESSAGE < < # Begin Project < # PROP Scc_ProjName "" < # PROP Scc_LocalPath "" < CPP=cl.exe < < !IF "$(CFG)" == "freetype - Win32 Release" < < # PROP BASE Use_MFC 0 < # PROP BASE Use_Debug_Libraries 0 < # PROP BASE Output_Dir "Release" < # PROP BASE Intermediate_Dir "Release" < # PROP BASE Target_Dir "" < # PROP Use_MFC 0 < # PROP Use_Debug_Libraries 0 < # PROP Output_Dir "Release" < # PROP Intermediate_Dir "Release" < # PROP Target_Dir "" < # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c < # ADD CPP /nologo /W3 /GX /O1 /I "." /I "..\.." /I "..\..\extend" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c < # SUBTRACT CPP /YX < BSC32=bscmake.exe < # ADD BASE BSC32 /nologo < # ADD BSC32 /nologo < LIB32=link.exe -lib < # ADD BASE LIB32 /nologo < # ADD LIB32 /nologo < < !ELSEIF "$(CFG)" == "freetype - Win32 Debug" < < # PROP BASE Use_MFC 0 < # PROP BASE Use_Debug_Libraries 1 < # PROP BASE Output_Dir "Debug" < # PROP BASE Intermediate_Dir "Debug" < # PROP BASE Target_Dir "" < # PROP Use_MFC 0 < # PROP Use_Debug_Libraries 1 < # PROP Output_Dir "Debug" < # PROP Intermediate_Dir "Debug" < # PROP Target_Dir "" < # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c < # ADD CPP /nologo /W3 /GX /Zi /O1 /I "." /I "..\.." /I "..\..\extend" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c < # SUBTRACT CPP /YX < BSC32=bscmake.exe < # ADD BASE BSC32 /nologo < # ADD BSC32 /nologo < LIB32=link.exe -lib < # ADD BASE LIB32 /nologo < # ADD LIB32 /nologo < < !ENDIF < < # Begin Target < < # Name "freetype - Win32 Release" < # Name "freetype - Win32 Debug" < # Begin Source File < < SOURCE=.\freetype.c < # End Source File < # Begin Source File < < SOURCE=..\..\Extend\Ftxcmap.c < # End Source File < # Begin Source File < < SOURCE=..\..\Extend\ftxerr18.c < # End Source File < # Begin Source File < < SOURCE=..\..\Extend\Ftxgasp.c < # End Source File < # Begin Source File < < SOURCE=..\..\Extend\Ftxkern.c < # End Source File < # Begin Source File < < SOURCE=..\..\Extend\ftxpost.c < # End Source File < # End Target < # End Project --- > # Microsoft Developer Studio Project File - Name="freetype" - Package Owner=<4> > # Microsoft Developer Studio Generated Build File, Format Version 5.00 > # ** DO NOT EDIT ** > # > # > # Copyright 1996-2002 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. > > # TARGTYPE "Win32 (x86) Static Library" 0x0104 > > CFG=freetype - Win32 Debug > !MESSAGE This is not a valid makefile. To build this project using NMAKE, > !MESSAGE use the Export Makefile command and run > !MESSAGE > !MESSAGE NMAKE /f "freetype.mak". > !MESSAGE > !MESSAGE You can specify a configuration when running NMAKE > !MESSAGE by defining the macro CFG on the command line. For example: > !MESSAGE > !MESSAGE NMAKE /f "freetype.mak" CFG="freetype - Win32 Debug" > !MESSAGE > !MESSAGE Possible choices for configuration are: > !MESSAGE > !MESSAGE "freetype - Win32 Release" (based on "Win32 (x86) Static Library") > !MESSAGE "freetype - Win32 Debug" (based on "Win32 (x86) Static Library") > !MESSAGE > > # Begin Project > # PROP Scc_ProjName "" > # PROP Scc_LocalPath "" > CPP=cl.exe > > !IF "$(CFG)" == "freetype - Win32 Release" > > # PROP BASE Use_MFC 0 > # PROP BASE Use_Debug_Libraries 0 > # PROP BASE Output_Dir "." > # PROP BASE Intermediate_Dir "Release" > # PROP BASE Target_Dir "" > # PROP Use_MFC 0 > # PROP Use_Debug_Libraries 0 > # PROP Output_Dir "." > # PROP Intermediate_Dir "Release" > # PROP Target_Dir "" > # ADD BASE CPP /nologo /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c > # ADD CPP /nologo /MT /Za /W3 /GX /O1 /I "." /I "../.." /I "../../extend" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c > # SUBTRACT CPP /YX > BSC32=bscmake.exe > # ADD BASE BSC32 /nologo > # ADD BSC32 /nologo > LIB32=link.exe -lib > # ADD BASE LIB32 /nologo > # ADD LIB32 /nologo /out:"./libttf.lib" > > !ELSEIF "$(CFG)" == "freetype - Win32 Debug" > > # PROP BASE Use_MFC 0 > # PROP BASE Use_Debug_Libraries 1 > # PROP BASE Output_Dir "Debug" > # PROP BASE Intermediate_Dir "Debug" > # PROP BASE Target_Dir "" > # PROP Use_MFC 0 > # PROP Use_Debug_Libraries 1 > # PROP Output_Dir "Debug" > # PROP Intermediate_Dir "Debug" > # PROP Target_Dir "" > # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c > # ADD CPP /nologo /Za /W3 /GX /Zi /Od /I "." /I "../.." /I "../../extend" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c > # SUBTRACT CPP /YX > BSC32=bscmake.exe > # ADD BASE BSC32 /nologo > # ADD BSC32 /nologo > LIB32=link.exe -lib > # ADD BASE LIB32 /nologo > # ADD LIB32 /nologo /out:"Debug/libttf.lib" > > !ENDIF > > # Begin Target > > # Name "freetype - Win32 Release" > # Name "freetype - Win32 Debug" > # Begin Source File > > SOURCE=.\freetype.c > # End Source File > # Begin Source File > > SOURCE=..\..\extend\ftxcmap.c > # End Source File > # Begin Source File > > SOURCE=..\..\extend\ftxerr18.c > # End Source File > # Begin Source File > > SOURCE=..\..\extend\ftxgasp.c > # End Source File > # Begin Source File > > SOURCE=..\..\extend\ftxkern.c > # End Source File > # Begin Source File > > SOURCE=..\..\extend\ftxpost.c > # End Source File > # Begin Source File > > SOURCE=..\..\extend\ftxsbit.c > # End Source File > # Begin Source File > > SOURCE=..\..\extend\ftxwidth.c > # End Source File > # Begin Source File > > SOURCE=..\..\extend\ftxopen.c > # End Source File > # Begin Source File > > SOURCE=..\..\extend\ftxgdef.c > # End Source File > # Begin Source File > > SOURCE=..\..\extend\ftxgsub.c > # End Source File > # Begin Source File > > SOURCE=..\..\extend\ftxgpos.c > # End Source File > # End Target > # End Project Index: freetype/lib/arch/win32/freetype.dsw =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/win32/freetype.dsw,v retrieving revision 1.1 retrieving revision 1.2 diff -r1.1 -r1.2 1,29c1,54 < Microsoft Developer Studio Workspace File, Format Version 5.00 < # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! < < ############################################################################### < < Project: "freetype"=.\freetype.dsp - Package Owner=<4> < < Package=<5> < {{{ < }}} < < Package=<4> < {{{ < }}} < < ############################################################################### < < Global: < < Package=<5> < {{{ < }}} < < Package=<3> < {{{ < }}} < < ############################################################################### < --- > Microsoft Developer Studio Workspace File, Format Version 5.00 > # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! > # > # > # Copyright 1996-2002 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. > > ############################################################################### > > Project: "Freetype"=".\freetype.dsp" - Package Owner=<4> > > Package=<5> > {{{ > }}} > > Package=<4> > {{{ > }}} > > ############################################################################### > > Project: "FT_DLL"=".\ft_dll.dsp" - Package Owner=<4> > > Package=<5> > {{{ > }}} > > Package=<4> > {{{ > Begin Project Dependency > Project_Dep_Name Freetype > End Project Dependency > }}} > > ############################################################################### > > Global: > > Package=<5> > {{{ > }}} > > Package=<3> > {{{ > }}} > > ############################################################################### > Index: freetype/lib/arch/win32/freetype.mak =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/win32/freetype.mak,v retrieving revision 1.1 retrieving revision 1.3 diff -r1.1 -r1.3 1,57c1,67 < # Microsoft Developer Studio Generated NMAKE File, Format Version 4.00 < # ** DO NOT EDIT ** < < # TARGTYPE "Win32 (x86) Static Library" 0x0104 < < !IF "$(CFG)" == "" < CFG=freetype - Win32 Debug < !MESSAGE No configuration specified. Defaulting to freetype - Win32 Debug. < !ENDIF < < !IF "$(CFG)" != "freetype - Win32 Release" && "$(CFG)" !=\ < "freetype - Win32 Debug" < !MESSAGE Invalid configuration "$(CFG)" specified. < !MESSAGE You can specify a configuration when running NMAKE on this makefile < !MESSAGE by defining the macro CFG on the command line. For example: < !MESSAGE < !MESSAGE NMAKE /f "freetype.mak" CFG="freetype - Win32 Debug" < !MESSAGE < !MESSAGE Possible choices for configuration are: < !MESSAGE < !MESSAGE "freetype - Win32 Release" (based on "Win32 (x86) Static Library") < !MESSAGE "freetype - Win32 Debug" (based on "Win32 (x86) Static Library") < !MESSAGE < !ERROR An invalid configuration is specified. < !ENDIF < < !IF "$(OS)" == "Windows_NT" < NULL= < !ELSE < NULL=nul < !ENDIF < ################################################################################ < # Begin Project < # PROP Target_Last_Scanned "freetype - Win32 Debug" < CPP=cl.exe < < !IF "$(CFG)" == "freetype - Win32 Release" < < # PROP BASE Use_MFC 0 < # PROP BASE Use_Debug_Libraries 0 < # PROP BASE Output_Dir "Release" < # PROP BASE Intermediate_Dir "Release" < # PROP BASE Target_Dir "" < # PROP Use_MFC 0 < # PROP Use_Debug_Libraries 0 < # PROP Output_Dir "Release" < # PROP Intermediate_Dir "Release" < # PROP Target_Dir "" < OUTDIR=.\Release < INTDIR=.\Release < < ALL : "$(OUTDIR)\freetype.lib" < < CLEAN : < -@erase ".\Release\freetype.lib" < -@erase ".\Release\Ftxkern.obj" < -@erase ".\Release\ftxpost.obj" --- > # Microsoft Developer Studio Generated NMAKE File, Format Version 4.00 > # ** DO NOT EDIT ** > # > # > # Copyright 1996-2002 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. > > # TARGTYPE "Win32 (x86) Static Library" 0x0104 > > !IF "$(CFG)" == "" > CFG=freetype - Win32 Debug > !MESSAGE No configuration specified. Defaulting to freetype - Win32 Debug. > !ENDIF > > !IF "$(CFG)" != "freetype - Win32 Release" && "$(CFG)" !=\ > "freetype - Win32 Debug" > !MESSAGE Invalid configuration "$(CFG)" specified. > !MESSAGE You can specify a configuration when running NMAKE on this makefile > !MESSAGE by defining the macro CFG on the command line. For example: > !MESSAGE > !MESSAGE NMAKE /f "freetype.mak" CFG="freetype - Win32 Debug" > !MESSAGE > !MESSAGE Possible choices for configuration are: > !MESSAGE > !MESSAGE "freetype - Win32 Release" (based on "Win32 (x86) Static Library") > !MESSAGE "freetype - Win32 Debug" (based on "Win32 (x86) Static Library") > !MESSAGE > !ERROR An invalid configuration is specified. > !ENDIF > > !IF "$(OS)" == "Windows_NT" > NULL= > !ELSE > NULL=nul > !ENDIF > ################################################################################ > # Begin Project > # PROP Target_Last_Scanned "freetype - Win32 Debug" > CPP=cl.exe > > !IF "$(CFG)" == "freetype - Win32 Release" > > # PROP BASE Use_MFC 0 > # PROP BASE Use_Debug_Libraries 0 > # PROP BASE Output_Dir "Release" > # PROP BASE Intermediate_Dir "Release" > # PROP BASE Target_Dir "" > # PROP Use_MFC 0 > # PROP Use_Debug_Libraries 0 > # PROP Output_Dir "." > # PROP Intermediate_Dir "Release" > # PROP Target_Dir "" > OUTDIR=. > INTDIR=.\Release > > ALL : "$(OUTDIR)\libttf.lib" > > CLEAN : > -@erase ".\libttf.lib" > -@erase ".\Release\freetype.obj" > -@erase ".\Release\ftxcmap.obj" 59,83c69,119 < -@erase ".\Release\Ftxcmap.obj" < -@erase ".\Release\Freetype.obj" < -@erase ".\Release\Ftxgasp.obj" < < "$(OUTDIR)" : < if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" < < # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c < # ADD CPP /nologo /W3 /GX /O2 /I "." /I "..\.." /I "..\..\extend" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c < CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "." /I "..\.." /I "..\..\extend" /D "WIN32"\ < /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)/freetype.pch" /YX /Fo"$(INTDIR)/" /c < CPP_OBJS=.\Release/ < CPP_SBRS= < BSC32=bscmake.exe < # ADD BASE BSC32 /nologo < # ADD BSC32 /nologo < BSC32_FLAGS=/nologo /o"$(OUTDIR)/freetype.bsc" < BSC32_SBRS= < LIB32=link.exe -lib < # ADD BASE LIB32 /nologo < # ADD LIB32 /nologo < LIB32_FLAGS=/nologo /out:"$(OUTDIR)/freetype.lib" < LIB32_OBJS= \ < "$(INTDIR)/Ftxkern.obj" \ < "$(INTDIR)/ftxpost.obj" \ --- > -@erase ".\Release\ftxgasp.obj" > -@erase ".\Release\ftxkern.obj" > -@erase ".\Release\ftxpost.obj" > -@erase ".\Release\ftxsbit.obj" > -@erase ".\Release\ftxwidth.obj" > -@erase ".\Release\ftxopen.obj" > -@erase ".\Release\ftxgdef.obj" > -@erase ".\Release\ftxgsub.obj" > -@erase ".\Release\ftxgpos.obj" > > "$(OUTDIR)" : > if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" > > "$(INTDIR)" : > if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" > > "$(OUTDIR)" : > > "$(OUTDIR)\libttf.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) > > .c{$(CPP_OBJS)}.obj: > > .c{$(CPP_SBRS)}.sbr: > > .cpp{$(CPP_OBJS)}.obj: > > .cpp{$(CPP_SBRS)}.sbr: > > .cxx{$(CPP_OBJS)}.obj: > > .cxx{$(CPP_SBRS)}.sbr: > > # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c > # ADD CPP /nologo /MD /Za /W3 /GX /O2 /I "." /I "..\.." /I "..\..\extend" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /c > # SUBTRACT CPP /YX > CPP_PROJ=/nologo /MD /Za /W3 /GX /O2 /I "." /I "..\.." /I "..\..\extend" /D\ > "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fo"$(INTDIR)/" /c > CPP_OBJS=.\Release/ > CPP_SBRS= > BSC32=bscmake.exe > # ADD BASE BSC32 /nologo > # ADD BSC32 /nologo > BSC32_FLAGS=/nologo /o"$(OUTDIR)/freetype.bsc" > BSC32_SBRS= > LIB32=link.exe -lib > # ADD BASE LIB32 /nologo > # ADD LIB32 /nologo /out:"libttf.lib" > LIB32_FLAGS=/nologo /out:"$(OUTDIR)/libttf.lib" > LIB32_OBJS= \ > "$(INTDIR)/freetype.obj" \ > "$(INTDIR)/ftxcmap.obj" \ 85,117c121,156 < "$(INTDIR)/Ftxcmap.obj" \ < "$(INTDIR)/Freetype.obj" \ < "$(INTDIR)/Ftxgasp.obj" < < "$(OUTDIR)\freetype.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) < $(LIB32) @<< < $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) < << < < !ELSEIF "$(CFG)" == "freetype - Win32 Debug" < < # PROP BASE Use_MFC 0 < # PROP BASE Use_Debug_Libraries 1 < # PROP BASE Output_Dir "Debug" < # PROP BASE Intermediate_Dir "Debug" < # PROP BASE Target_Dir "" < # PROP Use_MFC 0 < # PROP Use_Debug_Libraries 1 < # PROP Output_Dir "Debug" < # PROP Intermediate_Dir "Debug" < # PROP Target_Dir "" < OUTDIR=.\Debug < INTDIR=.\Debug < < ALL : "$(OUTDIR)\freetype.lib" < < CLEAN : < -@erase ".\Debug\freetype.lib" < -@erase ".\Debug\Freetype.obj" < -@erase ".\Debug\Ftxkern.obj" < -@erase ".\Debug\ftxpost.obj" < -@erase ".\Debug\Ftxcmap.obj" < -@erase ".\Debug\Ftxgasp.obj" --- > "$(INTDIR)/ftxgasp.obj" \ > "$(INTDIR)/ftxkern.obj" \ > "$(INTDIR)/ftxpost.obj" \ > "$(INTDIR)/ftxsbit.obj" \ > "$(INTDIR)/ftxwidth.obj" \ > "$(INTDIR)/ftxopen.obj" \ > "$(INTDIR)/ftxgdef.obj" \ > "$(INTDIR)/ftxgsub.obj" \ > "$(INTDIR)/ftxgpos.obj" > > "$(OUTDIR)\libttf.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) > $(LIB32) @<< > $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) > << > > !ELSEIF "$(CFG)" == "freetype - Win32 Debug" > > # PROP BASE Use_MFC 0 > # PROP BASE Use_Debug_Libraries 1 > # PROP BASE Output_Dir "Debug" > # PROP BASE Intermediate_Dir "Debug" > # PROP BASE Target_Dir "" > # PROP Use_MFC 0 > # PROP Use_Debug_Libraries 1 > # PROP Output_Dir "Debug" > # PROP Intermediate_Dir "Debug" > # PROP Target_Dir "" > OUTDIR=.\Debug > INTDIR=.\Debug > > ALL : "$(OUTDIR)\libttf.lib" > > CLEAN : > -@erase ".\Debug\libttf.lib" > -@erase ".\Debug\freetype.obj" > -@erase ".\Debug\ftxcmap.obj" 119,141c158,208 < < "$(OUTDIR)" : < if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" < < # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c < # ADD CPP /nologo /W3 /GX /Z7 /Od /I "." /I "..\.." /I "..\..\extend" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c < CPP_PROJ=/nologo /MLd /W3 /GX /Z7 /Od /I "." /I "..\.." /I "..\..\extend" /D\ < "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)/freetype.pch" /YX\ < /Fo"$(INTDIR)/" /c < CPP_OBJS=.\Debug/ < CPP_SBRS= < BSC32=bscmake.exe < # ADD BASE BSC32 /nologo < # ADD BSC32 /nologo < BSC32_FLAGS=/nologo /o"$(OUTDIR)/freetype.bsc" < BSC32_SBRS= < LIB32=link.exe -lib < # ADD BASE LIB32 /nologo < # ADD LIB32 /nologo < LIB32_FLAGS=/nologo /out:"$(OUTDIR)/freetype.lib" < LIB32_OBJS= \ < "$(INTDIR)/Freetype.obj" \ < "$(INTDIR)/Ftxkern.obj" \ --- > -@erase ".\Debug\ftxgasp.obj" > -@erase ".\Debug\ftxkern.obj" > -@erase ".\Debug\ftxpost.obj" > -@erase ".\Debug\ftxsbit.obj" > -@erase ".\Debug\ftxwidth.obj" > -@erase ".\Debug\ftxopen.obj" > -@erase ".\Debug\ftxgdef.obj" > -@erase ".\Debug\ftxgsub.obj" > -@erase ".\Debug\ftxgpos.obj" > > "$(OUTDIR)" : > if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" > > "$(OUTDIR)" : > > "$(OUTDIR)\libttf.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) > > .c{$(CPP_OBJS)}.obj: > > .cpp{$(CPP_OBJS)}.obj: > > .cxx{$(CPP_OBJS)}.obj: > > .c{$(CPP_SBRS)}.sbr: > > .cpp{$(CPP_SBRS)}.sbr: > > .cxx{$(CPP_SBRS)}.sbr: > > # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c > # ADD CPP /nologo /MDd /Za /W3 /GX /Z7 /Od /I "." /I "..\.." /I "..\..\extend" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /c > # SUBTRACT CPP /YX > CPP_PROJ=/nologo /MDd /Za /W3 /GX /Z7 /Od /I "." /I "..\.." /I "..\..\extend"\ > /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fo"$(INTDIR)/" /c > CPP_OBJS=.\Debug/ > CPP_SBRS= > BSC32=bscmake.exe > # ADD BASE BSC32 /nologo > # ADD BSC32 /nologo > BSC32_FLAGS=/nologo /o"$(OUTDIR)/freetype.bsc" > BSC32_SBRS= > LIB32=link.exe -lib > # ADD BASE LIB32 /nologo > # ADD LIB32 /nologo /out:"libttf.lib" > LIB32_FLAGS=/nologo /out:"libttf.lib" > LIB32_OBJS= \ > "$(INTDIR)/freetype.obj" \ > "$(INTDIR)/ftxcmap.obj" \ > "$(INTDIR)/ftxerr18.obj" \ > "$(INTDIR)/ftxgasp.obj" \ > "$(INTDIR)/ftxkern.obj" \ 143,353c210,650 < "$(INTDIR)/Ftxcmap.obj" \ < "$(INTDIR)/Ftxgasp.obj" \ < "$(INTDIR)/ftxerr18.obj" < < "$(OUTDIR)\freetype.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) < $(LIB32) @<< < $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) < << < < !ENDIF < < .c{$(CPP_OBJS)}.obj: < $(CPP) $(CPP_PROJ) $< < < .cpp{$(CPP_OBJS)}.obj: < $(CPP) $(CPP_PROJ) $< < < .cxx{$(CPP_OBJS)}.obj: < $(CPP) $(CPP_PROJ) $< < < .c{$(CPP_SBRS)}.sbr: < $(CPP) $(CPP_PROJ) $< < < .cpp{$(CPP_SBRS)}.sbr: < $(CPP) $(CPP_PROJ) $< < < .cxx{$(CPP_SBRS)}.sbr: < $(CPP) $(CPP_PROJ) $< < < ################################################################################ < # Begin Target < < # Name "freetype - Win32 Release" < # Name "freetype - Win32 Debug" < < !IF "$(CFG)" == "freetype - Win32 Release" < < !ELSEIF "$(CFG)" == "freetype - Win32 Debug" < < !ENDIF < < ################################################################################ < # Begin Source File < < SOURCE=\Freetype\Lib\Extend\ftxpost.c < DEP_CPP_FTXPO=\ < ".\..\..\Extend\ftxpost.h"\ < ".\..\..\tttypes.h"\ < ".\..\..\ttobjs.h"\ < ".\..\..\tttables.h"\ < ".\..\..\ttload.h"\ < ".\..\..\ttfile.h"\ < ".\..\..\tttags.h"\ < ".\..\..\ttmemory.h"\ < ".\..\..\ttextend.h"\ < ".\..\..\freetype.h"\ < "..\..\ttconfig.h"\ < ".\ft_conf.h"\ < "..\..\ttengine.h"\ < "..\..\ttmutex.h"\ < "..\..\ttcache.h"\ < "..\..\ttcmap.h"\ < ".\..\..\ttdebug.h"\ < < < "$(INTDIR)\ftxpost.obj" : $(SOURCE) $(DEP_CPP_FTXPO) "$(INTDIR)" < $(CPP) $(CPP_PROJ) $(SOURCE) < < < # End Source File < ################################################################################ < # Begin Source File < < SOURCE=\Freetype\Lib\Extend\ftxerr18.c < DEP_CPP_FTXER=\ < ".\..\..\Extend\ftxerr18.h"\ < ".\..\..\Extend\ftxkern.h"\ < ".\..\..\Extend\ftxpost.h"\ < ".\..\..\freetype.h"\ < "..\..\ttconfig.h"\ < ".\ft_conf.h"\ < < < "$(INTDIR)\ftxerr18.obj" : $(SOURCE) $(DEP_CPP_FTXER) "$(INTDIR)" < $(CPP) $(CPP_PROJ) $(SOURCE) < < < # End Source File < ################################################################################ < # Begin Source File < < SOURCE=\Freetype\Lib\Extend\Ftxgasp.c < DEP_CPP_FTXGA=\ < ".\..\..\Extend\ftxgasp.h"\ < ".\..\..\tttypes.h"\ < ".\..\..\ttobjs.h"\ < ".\..\..\tttables.h"\ < ".\..\..\freetype.h"\ < "..\..\ttconfig.h"\ < ".\ft_conf.h"\ < "..\..\ttengine.h"\ < "..\..\ttmutex.h"\ < "..\..\ttcache.h"\ < "..\..\ttcmap.h"\ < < < "$(INTDIR)\Ftxgasp.obj" : $(SOURCE) $(DEP_CPP_FTXGA) "$(INTDIR)" < $(CPP) $(CPP_PROJ) $(SOURCE) < < < # End Source File < ################################################################################ < # Begin Source File < < SOURCE=\Freetype\Lib\Extend\Ftxkern.c < DEP_CPP_FTXKE=\ < ".\..\..\Extend\ftxkern.h"\ < ".\..\..\ttextend.h"\ < ".\..\..\tttypes.h"\ < ".\..\..\ttdebug.h"\ < ".\..\..\ttmemory.h"\ < ".\..\..\ttfile.h"\ < ".\..\..\ttobjs.h"\ < ".\..\..\ttload.h"\ < ".\..\..\tttags.h"\ < ".\..\..\freetype.h"\ < "..\..\ttconfig.h"\ < ".\ft_conf.h"\ < "..\..\ttengine.h"\ < "..\..\ttmutex.h"\ < "..\..\ttcache.h"\ < ".\..\..\tttables.h"\ < "..\..\ttcmap.h"\ < < < "$(INTDIR)\Ftxkern.obj" : $(SOURCE) $(DEP_CPP_FTXKE) "$(INTDIR)" < $(CPP) $(CPP_PROJ) $(SOURCE) < < < # End Source File < ################################################################################ < # Begin Source File < < SOURCE=\Freetype\Lib\Extend\Ftxcmap.c < DEP_CPP_FTXCM=\ < ".\..\..\Extend\ftxcmap.h"\ < ".\..\..\tttypes.h"\ < ".\..\..\ttobjs.h"\ < ".\..\..\tttables.h"\ < ".\..\..\freetype.h"\ < "..\..\ttconfig.h"\ < ".\ft_conf.h"\ < "..\..\ttengine.h"\ < "..\..\ttmutex.h"\ < "..\..\ttcache.h"\ < "..\..\ttcmap.h"\ < < < "$(INTDIR)\Ftxcmap.obj" : $(SOURCE) $(DEP_CPP_FTXCM) "$(INTDIR)" < $(CPP) $(CPP_PROJ) $(SOURCE) < < < # End Source File < ################################################################################ < # Begin Source File < < SOURCE=.\Freetype.c < DEP_CPP_FREET=\ < ".\..\..\ttapi.c"\ < ".\..\..\ttcache.c"\ < ".\..\..\ttcalc.c"\ < ".\..\..\ttcmap.c"\ < ".\..\..\ttgload.c"\ < ".\..\..\ttinterp.c"\ < ".\..\..\ttload.c"\ < ".\..\..\ttobjs.c"\ < ".\..\..\ttraster.c"\ < ".\..\..\ttfile.c"\ < ".\..\..\ttmemory.c"\ < ".\..\..\ttmutex.c"\ < ".\..\..\ttextend.c"\ < ".\..\..\freetype.h"\ < "..\..\ttengine.h"\ < "..\..\ttcalc.h"\ < ".\..\..\ttmemory.h"\ < "..\..\ttcache.h"\ < ".\..\..\ttfile.h"\ < ".\..\..\ttobjs.h"\ < ".\..\..\ttload.h"\ < "..\..\ttgload.h"\ < "..\..\ttraster.h"\ < ".\..\..\ttextend.h"\ < "..\..\ttconfig.h"\ < ".\ft_conf.h"\ < "..\..\ttmutex.h"\ < ".\..\..\tttypes.h"\ < ".\..\..\ttdebug.h"\ < ".\..\..\tttables.h"\ < "..\..\ttcmap.h"\ < ".\..\..\tttags.h"\ < "..\..\ttinterp.h"\ < {$(INCLUDE)}"\unistd.h"\ < < < "$(INTDIR)\Freetype.obj" : $(SOURCE) $(DEP_CPP_FREET) "$(INTDIR)" < < < # End Source File < # End Target < # End Project < ################################################################################ --- > "$(INTDIR)/ftxsbit.obj" \ > "$(INTDIR)/ftxwidth.obj" \ > "$(INTDIR)/ftxopen.obj" \ > "$(INTDIR)/ftxgdef.obj" \ > "$(INTDIR)/ftxgsub.obj" \ > "$(INTDIR)/ftxgpos.obj" > > "$(OUTDIR)\libttf.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) > $(LIB32) @<< > $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) > << > > !ENDIF > > .c{$(CPP_OBJS)}.obj: > $(CPP) $(CPP_PROJ) $< > > .cpp{$(CPP_OBJS)}.obj: > $(CPP) $(CPP_PROJ) $< > > .cxx{$(CPP_OBJS)}.obj: > $(CPP) $(CPP_PROJ) $< > > .c{$(CPP_SBRS)}.sbr: > $(CPP) $(CPP_PROJ) $< > > .cpp{$(CPP_SBRS)}.sbr: > $(CPP) $(CPP_PROJ) $< > > .cxx{$(CPP_SBRS)}.sbr: > $(CPP) $(CPP_PROJ) $< > > ################################################################################ > # Begin Target > > # Name "freetype - Win32 Release" > # Name "freetype - Win32 Debug" > > !IF "$(CFG)" == "freetype - Win32 Release" > > !ELSEIF "$(CFG)" == "freetype - Win32 Debug" > > !ENDIF > > ################################################################################ > # Begin Source File > > SOURCE=..\..\extend\ftxgpos.c > DEP_CPP_FTXGP=\ > {$(INCLUDE)}"\tttypes.h"\ > {$(INCLUDE)}"\tttags.h"\ > {$(INCLUDE)}"\ttload.h"\ > {$(INCLUDE)}"\ttextend.h"\ > {$(INCLUDE)}"\ttmemory.h"\ > {$(INCLUDE)}"\ttfile.h"\ > "..\..\extend\ftxopen.h"\ > "..\..\extend\ftxopenf.h"\ > {$(INCLUDE)}"\ttconfig.h"\ > {$(INCLUDE)}"\freetype.h"\ > {$(INCLUDE)}"\ft_conf.h"\ > "..\..\fterrid.h"\ > "..\..\ftnameid.h"\ > {$(INCLUDE)}"\ttobjs.h"\ > "..\..\ttengine.h"\ > "..\..\ttmutex.h"\ > "..\..\ttcache.h"\ > {$(INCLUDE)}"\tttables.h"\ > "..\..\ttcmap.h"\ > {$(INCLUDE)}"\ttdebug.h"\ > "..\..\extend\ftxgdef.h"\ > "..\..\extend\ftxgsub.h"\ > "..\..\extend\ftxgpos.h"\ > > > !IF "$(CFG)" == "freetype - Win32 Release" > > > "$(INTDIR)\ftxgpos.obj" : $(SOURCE) $(DEP_CPP_FTXGP) "$(INTDIR)" > $(CPP) $(CPP_PROJ) $(SOURCE) > > > !ELSEIF "$(CFG)" == "freetype - Win32 Debug" > > > "$(INTDIR)\ftxgpos.obj" : $(SOURCE) $(DEP_CPP_FTXGP) "$(INTDIR)" > $(CPP) $(CPP_PROJ) $(SOURCE) > > > !ENDIF > > # End Source File > ################################################################################ > # Begin Source File > > SOURCE=..\..\extend\ftxgsub.c > DEP_CPP_FTXGS=\ > {$(INCLUDE)}"\tttypes.h"\ > {$(INCLUDE)}"\tttags.h"\ > {$(INCLUDE)}"\ttload.h"\ > {$(INCLUDE)}"\ttextend.h"\ > {$(INCLUDE)}"\ttmemory.h"\ > {$(INCLUDE)}"\ttfile.h"\ > "..\..\extend\ftxopen.h"\ > "..\..\extend\ftxopenf.h"\ > {$(INCLUDE)}"\ttconfig.h"\ > {$(INCLUDE)}"\freetype.h"\ > {$(INCLUDE)}"\ft_conf.h"\ > "..\..\fterrid.h"\ > "..\..\ftnameid.h"\ > {$(INCLUDE)}"\ttobjs.h"\ > "..\..\ttengine.h"\ > "..\..\ttmutex.h"\ > "..\..\ttcache.h"\ > {$(INCLUDE)}"\tttables.h"\ > "..\..\ttcmap.h"\ > {$(INCLUDE)}"\ttdebug.h"\ > "..\..\extend\ftxgdef.h"\ > "..\..\extend\ftxgsub.h"\ > "..\..\extend\ftxgpos.h"\ > > > "$(INTDIR)\ftxgsub.obj" : $(SOURCE) $(DEP_CPP_FTXGS) "$(INTDIR)" > $(CPP) $(CPP_PROJ) $(SOURCE) > > > # End Source File > ################################################################################ > # Begin Source File > > SOURCE=..\..\extend\ftxgdef.c > DEP_CPP_FTXGD=\ > {$(INCLUDE)}"\tttypes.h"\ > {$(INCLUDE)}"\tttags.h"\ > {$(INCLUDE)}"\ttload.h"\ > {$(INCLUDE)}"\ttextend.h"\ > {$(INCLUDE)}"\ttmemory.h"\ > {$(INCLUDE)}"\ttfile.h"\ > "..\..\extend\ftxopen.h"\ > "..\..\extend\ftxopenf.h"\ > {$(INCLUDE)}"\ttconfig.h"\ > {$(INCLUDE)}"\freetype.h"\ > {$(INCLUDE)}"\ft_conf.h"\ > "..\..\fterrid.h"\ > "..\..\ftnameid.h"\ > {$(INCLUDE)}"\ttobjs.h"\ > "..\..\ttengine.h"\ > "..\..\ttmutex.h"\ > "..\..\ttcache.h"\ > {$(INCLUDE)}"\tttables.h"\ > "..\..\ttcmap.h"\ > {$(INCLUDE)}"\ttdebug.h"\ > "..\..\extend\ftxgdef.h"\ > "..\..\extend\ftxgsub.h"\ > "..\..\extend\ftxgpos.h"\ > > > "$(INTDIR)\ftxgdef.obj" : $(SOURCE) $(DEP_CPP_FTXGD) "$(INTDIR)" > $(CPP) $(CPP_PROJ) $(SOURCE) > > > # End Source File > ################################################################################ > # Begin Source File > > SOURCE=..\..\extend\ftxopen.c > DEP_CPP_FTXOP=\ > {$(INCLUDE)}"\tttypes.h"\ > {$(INCLUDE)}"\ttload.h"\ > {$(INCLUDE)}"\ttextend.h"\ > {$(INCLUDE)}"\ttmemory.h"\ > {$(INCLUDE)}"\ttfile.h"\ > "..\..\extend\ftxopen.h"\ > "..\..\extend\ftxopenf.h"\ > {$(INCLUDE)}"\ttconfig.h"\ > {$(INCLUDE)}"\freetype.h"\ > {$(INCLUDE)}"\ft_conf.h"\ > "..\..\fterrid.h"\ > "..\..\ftnameid.h"\ > {$(INCLUDE)}"\ttobjs.h"\ > "..\..\ttengine.h"\ > "..\..\ttmutex.h"\ > "..\..\ttcache.h"\ > {$(INCLUDE)}"\tttables.h"\ > "..\..\ttcmap.h"\ > {$(INCLUDE)}"\ttdebug.h"\ > "..\..\extend\ftxgdef.h"\ > "..\..\extend\ftxgsub.h"\ > "..\..\extend\ftxgpos.h"\ > > > "$(INTDIR)\ftxopen.obj" : $(SOURCE) $(DEP_CPP_FTXOP) "$(INTDIR)" > $(CPP) $(CPP_PROJ) $(SOURCE) > > > # End Source File > ################################################################################ > # Begin Source File > > SOURCE=..\..\extend\ftxwidth.c > DEP_CPP_FTXWI=\ > "..\..\extend\ftxwidth.h"\ > {$(INCLUDE)}"\ttdebug.h"\ > {$(INCLUDE)}"\ttobjs.h"\ > {$(INCLUDE)}"\ttfile.h"\ > {$(INCLUDE)}"\tttags.h"\ > {$(INCLUDE)}"\ttload.h"\ > {$(INCLUDE)}"\freetype.h"\ > "..\..\fterrid.h"\ > "..\..\ftnameid.h"\ > {$(INCLUDE)}"\ttconfig.h"\ > {$(INCLUDE)}"\tttypes.h"\ > {$(INCLUDE)}"\ft_conf.h"\ > "..\..\ttengine.h"\ > "..\..\ttmutex.h"\ > "..\..\ttcache.h"\ > {$(INCLUDE)}"\tttables.h"\ > "..\..\ttcmap.h"\ > > > "$(INTDIR)\ftxwidth.obj" : $(SOURCE) $(DEP_CPP_FTXWI) "$(INTDIR)" > $(CPP) $(CPP_PROJ) $(SOURCE) > > > # End Source File > ################################################################################ > # Begin Source File > > SOURCE=..\..\extend\ftxsbit.c > DEP_CPP_FTXSB=\ > "..\..\extend\ftxsbit.h"\ > {$(INCLUDE)}"\ttobjs.h"\ > {$(INCLUDE)}"\ttfile.h"\ > {$(INCLUDE)}"\ttload.h"\ > {$(INCLUDE)}"\ttmemory.h"\ > {$(INCLUDE)}"\tttags.h"\ > {$(INCLUDE)}"\ttextend.h"\ > {$(INCLUDE)}"\ttdebug.h"\ > {$(INCLUDE)}"\freetype.h"\ > "..\..\fterrid.h"\ > "..\..\ftnameid.h"\ > {$(INCLUDE)}"\ttconfig.h"\ > "..\..\ttengine.h"\ > "..\..\ttmutex.h"\ > "..\..\ttcache.h"\ > {$(INCLUDE)}"\tttables.h"\ > "..\..\ttcmap.h"\ > {$(INCLUDE)}"\ft_conf.h"\ > {$(INCLUDE)}"\tttypes.h"\ > > > "$(INTDIR)\ftxsbit.obj" : $(SOURCE) $(DEP_CPP_FTXSB) "$(INTDIR)" > $(CPP) $(CPP_PROJ) $(SOURCE) > > > # End Source File > ################################################################################ > # Begin Source File > > SOURCE=..\..\extend\ftxpost.c > DEP_CPP_FTXPO=\ > "..\..\extend\ftxpost.h"\ > {$(INCLUDE)}"\tttypes.h"\ > {$(INCLUDE)}"\ttobjs.h"\ > {$(INCLUDE)}"\tttables.h"\ > {$(INCLUDE)}"\ttload.h"\ > {$(INCLUDE)}"\ttfile.h"\ > {$(INCLUDE)}"\tttags.h"\ > {$(INCLUDE)}"\ttmemory.h"\ > {$(INCLUDE)}"\ttextend.h"\ > {$(INCLUDE)}"\freetype.h"\ > "..\..\fterrid.h"\ > "..\..\ftnameid.h"\ > {$(INCLUDE)}"\ttconfig.h"\ > {$(INCLUDE)}"\ft_conf.h"\ > "..\..\ttengine.h"\ > "..\..\ttmutex.h"\ > "..\..\ttcache.h"\ > "..\..\ttcmap.h"\ > {$(INCLUDE)}"\ttdebug.h"\ > > > "$(INTDIR)\ftxpost.obj" : $(SOURCE) $(DEP_CPP_FTXPO) "$(INTDIR)" > $(CPP) $(CPP_PROJ) $(SOURCE) > > > # End Source File > ################################################################################ > # Begin Source File > > SOURCE=..\..\extend\ftxkern.c > DEP_CPP_FTXKE=\ > "..\..\extend\ftxkern.h"\ > {$(INCLUDE)}"\ttextend.h"\ > {$(INCLUDE)}"\tttypes.h"\ > {$(INCLUDE)}"\ttdebug.h"\ > {$(INCLUDE)}"\ttload.h"\ > {$(INCLUDE)}"\ttmemory.h"\ > {$(INCLUDE)}"\ttfile.h"\ > {$(INCLUDE)}"\ttobjs.h"\ > {$(INCLUDE)}"\tttags.h"\ > {$(INCLUDE)}"\freetype.h"\ > "..\..\fterrid.h"\ > "..\..\ftnameid.h"\ > {$(INCLUDE)}"\ttconfig.h"\ > {$(INCLUDE)}"\ft_conf.h"\ > "..\..\ttengine.h"\ > "..\..\ttmutex.h"\ > "..\..\ttcache.h"\ > {$(INCLUDE)}"\tttables.h"\ > "..\..\ttcmap.h"\ > > > "$(INTDIR)\ftxkern.obj" : $(SOURCE) $(DEP_CPP_FTXKE) "$(INTDIR)" > $(CPP) $(CPP_PROJ) $(SOURCE) > > > # End Source File > ################################################################################ > # Begin Source File > > SOURCE=..\..\extend\ftxgasp.c > DEP_CPP_FTXGA=\ > "..\..\extend\ftxgasp.h"\ > {$(INCLUDE)}"\tttypes.h"\ > {$(INCLUDE)}"\ttobjs.h"\ > {$(INCLUDE)}"\tttables.h"\ > {$(INCLUDE)}"\freetype.h"\ > "..\..\fterrid.h"\ > "..\..\ftnameid.h"\ > {$(INCLUDE)}"\ttconfig.h"\ > {$(INCLUDE)}"\ft_conf.h"\ > "..\..\ttengine.h"\ > "..\..\ttmutex.h"\ > "..\..\ttcache.h"\ > "..\..\ttcmap.h"\ > > > "$(INTDIR)\ftxgasp.obj" : $(SOURCE) $(DEP_CPP_FTXGA) "$(INTDIR)" > $(CPP) $(CPP_PROJ) $(SOURCE) > > > # End Source File > ################################################################################ > # Begin Source File > > SOURCE=..\..\extend\ftxerr18.c > DEP_CPP_FTXER=\ > "..\..\extend\ftxerr18.h"\ > "..\..\extend\ftxkern.h"\ > "..\..\extend\ftxpost.h"\ > "..\..\extend\ftxopen.h"\ > {$(INCLUDE)}"\ttconfig.h"\ > {$(INCLUDE)}"\freetype.h"\ > "..\..\fterrid.h"\ > "..\..\ftnameid.h"\ > "..\..\extend\ftxgdef.h"\ > "..\..\extend\ftxgsub.h"\ > "..\..\extend\ftxgpos.h"\ > {$(INCLUDE)}"\ft_conf.h"\ > > > "$(INTDIR)\ftxerr18.obj" : $(SOURCE) $(DEP_CPP_FTXER) "$(INTDIR)" > $(CPP) $(CPP_PROJ) $(SOURCE) > > > # End Source File > ################################################################################ > # Begin Source File > > SOURCE=..\..\extend\ftxcmap.c > DEP_CPP_FTXCM=\ > "..\..\extend\ftxcmap.h"\ > {$(INCLUDE)}"\tttypes.h"\ > {$(INCLUDE)}"\ttobjs.h"\ > {$(INCLUDE)}"\tttables.h"\ > {$(INCLUDE)}"\freetype.h"\ > "..\..\fterrid.h"\ > "..\..\ftnameid.h"\ > {$(INCLUDE)}"\ttconfig.h"\ > {$(INCLUDE)}"\ft_conf.h"\ > "..\..\ttengine.h"\ > "..\..\ttmutex.h"\ > "..\..\ttcache.h"\ > "..\..\ttcmap.h"\ > > > "$(INTDIR)\ftxcmap.obj" : $(SOURCE) $(DEP_CPP_FTXCM) "$(INTDIR)" > $(CPP) $(CPP_PROJ) $(SOURCE) > > > # End Source File > ################################################################################ > # Begin Source File > > SOURCE=.\freetype.c > DEP_CPP_FREET=\ > {$(INCLUDE)}"\ttapi.c"\ > {$(INCLUDE)}"\ttcache.c"\ > {$(INCLUDE)}"\ttcalc.c"\ > {$(INCLUDE)}"\ttcmap.c"\ > {$(INCLUDE)}"\ttdebug.c"\ > {$(INCLUDE)}"\ttgload.c"\ > {$(INCLUDE)}"\ttinterp.c"\ > {$(INCLUDE)}"\ttload.c"\ > {$(INCLUDE)}"\ttobjs.c"\ > {$(INCLUDE)}"\ttraster.c"\ > {$(INCLUDE)}"\ttfile.c"\ > {$(INCLUDE)}"\ttmemory.c"\ > {$(INCLUDE)}"\ttmutex.c"\ > {$(INCLUDE)}"\ttextend.c"\ > {$(INCLUDE)}"\ttconfig.h"\ > {$(INCLUDE)}"\freetype.h"\ > "..\..\ttengine.h"\ > "..\..\ttcalc.h"\ > {$(INCLUDE)}"\ttmemory.h"\ > "..\..\ttcache.h"\ > {$(INCLUDE)}"\ttfile.h"\ > {$(INCLUDE)}"\ttobjs.h"\ > {$(INCLUDE)}"\ttload.h"\ > "..\..\ttgload.h"\ > "..\..\ttraster.h"\ > {$(INCLUDE)}"\ttextend.h"\ > {$(INCLUDE)}"\ft_conf.h"\ > "..\..\fterrid.h"\ > "..\..\ftnameid.h"\ > {$(INCLUDE)}"\tttypes.h"\ > "..\..\ttmutex.h"\ > {$(INCLUDE)}"\ttdebug.h"\ > {$(INCLUDE)}"\tttables.h"\ > "..\..\ttcmap.h"\ > {$(INCLUDE)}"\tttags.h"\ > "..\..\ttinterp.h"\ > > > "$(INTDIR)\freetype.obj" : $(SOURCE) $(DEP_CPP_FREET) "$(INTDIR)" > > > # End Source File > # End Target > # End Project > ################################################################################ Index: freetype/lib/arch/win32/freetype.mdp =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/win32/freetype.mdp,v retrieving revision 1.1 retrieving revision 1.2 diff -r1.1 -r1.2 Binary files /tmp/cvs02343Oda and /tmp/cvs02343Pda differ Index: freetype/lib/arch/win32/ft_conf.h =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/win32/ft_conf.h,v retrieving revision 1.13 retrieving revision 1.17 diff -r1.13 -r1.17 1,3c1,15 < /* This file is part of the FreeType project */ < < /* ft_conf.h for Win32 */ --- > /******************************************************************* > * > * ft_conf.h for Win32 > * > * > * Copyright 1996-2002 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. > * > ******************************************************************/ 18,20d29 < /* Define if you have a working `mmap' system call. */ < #undef HAVE_MMAP < 24,26d32 < /* Define if you have the getpagesize function. */ < #undef HAVE_GETPAGESIZE < 33,38d38 < /* Define if you have the valloc function. */ < #undef HAVE_VALLOC < < /* Define if you have the header file. */ < #undef HAVE_FCNTL_H < 47a48,66 > /* Define if you have the header file. */ > /* #undef HAVE_LIBINTL_H */ > > /* Command-line selection. */ > #ifdef HAVE_LIBINTL > #define HAVE_LIBINTL_H > #ifndef LOCALEDIR > #define LOCALEDIR "C:/Program Files/gettext/share/locale" > #endif > #endif > /* Backward compatibility. */ > #ifdef HAVE_GETTEXT > #define HAVE_LIBINTL_H > #endif > > /* Define if you have the header file. */ > /* Only meaningful if you have . */ > #define HAVE_LOCALE_H > 84,86c103,105 < /* Define this if you want to completely disable the use of the bytecode */ < /* interpreter. Doing so will produce a much smaller library, but the */ < /* quality of the rendered glyphs will enormously suffer from this. */ --- > /* Define this if you want to compile a bytecode interpreter in the */ > /* TrueType driver. Note that there are important patent issues related */ > /* to the use of the interpreter. */ 88,90c107,108 < /* This switch was introduced due to the Apple patents issue which */ < /* emerged recently on the FreeType lists. We still do not have Apple's */ < /* opinion on the subject and will change this as soon as we have. */ --- > /* By undefining this, you will only compile the code necessary to load */ > /* TrueType glyphs without hinting. */ 92c110 < #undef TT_CONFIG_OPTION_NO_INTERPRETER --- > #undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER 112c130 < /* */ --- > 123c141 < /* */ --- > 207d224 < #endif /* FT_CONF_H */ 208a226,236 > #if defined( _MSC_VER ) /* Visual C++ (and Intel C++) */ > > /* We disable some warnings in order to compile cleanly with the maximum */ > /* level of warnings. But do not worry: all these warnings have been */ > /* checked, and resulted harmless. */ > #pragma warning( disable : 4244 ) > #pragma warning( disable : 4761 ) > > #endif /* _MSC_VER */ > > #endif /* FT_CONF_H */ Index: freetype/lib/arch/win32/makedef =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/win32/makedef,v retrieving revision 1.4 retrieving revision 1.7 diff -r1.4 -r1.7 6a7,10 > ; This file is part of the FreeType project. > ; Automatically generated, but you can customize to fit your needs. > ; However, changes will be erased if not made in \`makedef'... > ; 9c13 < ; `date +%d-%b-%Y`. --- > ; `date +%Y-%m-%d`. 11,12c15,16 < LIBRARY ft14_32 < DESCRIPTION 'FreeType 1.4 32-bit DLL © 1996-2000 Turner, Wilhelm, Lemberg' --- > LIBRARY ft15_32 > DESCRIPTION 'FreeType 1.5 32-bit DLL © 1996-2002 Turner, Wilhelm, Lemberg' 20,21c24,25 < sed -n -e "/^ *EXPORT_DEF/!d ; n ; s/(.*$//" \ < -e "s/;$//" -e "s/ const / /" -e "s/ *[a-zA-Z][a-zA-Z_\*]* //" \ --- > sed -n -e "/^ *FT_EXPORT_DE/!d ; n ; s/(.*$//" \ > -e "s/;$//" -e "s/ const / /" -e "s/ *TT_[a-zA-Z_\*]* //" \ Index: freetype/lib/arch/win32/makedep =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/win32/makedep,v retrieving revision 1.2 retrieving revision 1.3 diff -r1.2 -r1.3 4a5,16 > # > # If you run this script under non-Windows operating systems, expect > # warnings that `windows.h' can't be found. > # > # Copyright 1996-2002 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. 6a19,22 > # This file is part of the FreeType project. > # Automatically generated, but you can customize to fit your needs. > # However, changes will be erased if not made in \`makedep'... > # 9c25 < # `date +%d-%b-%Y`. --- > # `date +%Y-%m-%d`. Index: freetype/lib/arch/win32/ttf.def =================================================================== RCS file: /cvs/freetype/freetype/lib/arch/win32/ttf.def,v retrieving revision 1.5 retrieving revision 1.7 diff -r1.5 -r1.7 0a1,4 > ; This file is part of the FreeType project. > ; Automatically generated, but you can customize to fit your needs. > ; However, changes will be erased if not made in `makedef'... > ; 3c7 < ; 07-Mar-2000. --- > ; 2002-11-18. 5,6c9,10 < LIBRARY ft14_32 < DESCRIPTION 'FreeType 1.4 32-bit DLL © 1996-2000 Turner, Wilhelm, Lemberg' --- > LIBRARY ft15_32 > DESCRIPTION 'FreeType 1.5 32-bit DLL © 1996-2002 Turner, Wilhelm, Lemberg' Index: freetype/lib/extend/ftxcmap.c =================================================================== RCS file: /cvs/freetype/freetype/lib/extend/ftxcmap.c,v retrieving revision 1.17 retrieving revision 1.22 diff -r1.17 -r1.22 3c3 < * ftxcmap.h 1.0 --- > * ftxcmap.c 7c7 < * Copyright 1996-2000 by Juliusz Chroboczek, --- > * Copyright 1996-2002 by Juliusz Chroboczek, 45,46d44 < * Notes : < * 49,51c47,49 < EXPORT_FUNC < TT_Long TT_CharMap_First( TT_CharMap charMap, < TT_UShort* id ) --- > FT_EXPORT_FUNC( TT_Long ) > TT_CharMap_First( TT_CharMap charMap, > TT_UShort* id ) 57c55 < if ( !( cmap = HANDLE_CharMap( charMap ) ) ) --- > if ( ( cmap = HANDLE_CharMap( charMap ) ) == 0 ) 77a76,81 > case 8: > case 12: > if ( id ) > *id = (TT_UShort)cmap->c.cmap8_12.groups[0].startGlyphID; > return (TT_Long)cmap->c.cmap8_12.groups[0].startCharCode; > 132,133d135 < * Notes : < * 136,139c138,141 < EXPORT_FUNC < TT_Long TT_CharMap_Next( TT_CharMap charMap, < TT_UShort index, < TT_UShort* id ) --- > FT_EXPORT_FUNC( TT_Long ) > TT_CharMap_Next( TT_CharMap charMap, > TT_ULong index, > TT_UShort* id ) 166c168 < UShort firstCode = cmap->c.cmap6.firstCode; --- > UInt firstCode = cmap->c.cmap6.firstCode; 178a181,223 > case 8: > case 12: > { > PCMapGroup group, limit; > > > limit = cmap->c.cmap8_12.groups + cmap->c.cmap8_12.nGroups; > group = cmap->c.cmap8_12.last_group; > > if ( (ULong)( index - group->startCharCode ) < > (ULong)( group->endCharCode - group->startCharCode ) ) > goto Found; > > for ( group = cmap->c.cmap8_12.groups; group < limit; group++ ) > { > if ( index > group->endCharCode ) > continue; > > if ( index >= group->startCharCode ) > goto Found; > } > > return -1; > > Found: > if ( index < group->endCharCode ) > { > cmap->c.cmap8_12.last_group = group; > *id = (UShort)( group->startGlyphID + > ( index - group->startCharCode ) + 1 ); > return index + 1; > } > > group++; > > if ( group == limit ) > return -1; > > cmap->c.cmap8_12.last_group = group; > *id = (UShort)group->startGlyphID; > return group->startCharCode; > } > 274,275d318 < * Notes : < * 278,280c321,323 < EXPORT_FUNC < TT_Long TT_CharMap_Last( TT_CharMap charMap, < TT_UShort* id ) --- > FT_EXPORT_FUNC( TT_Long ) > TT_CharMap_Last( TT_CharMap charMap, > TT_UShort* id ) 286c329 < if ( !( cmap = HANDLE_CharMap( charMap ) ) ) --- > if ( ( cmap = HANDLE_CharMap( charMap ) ) == 0 ) 305a349,362 > > case 8: > case 12: > { > PCMapGroup group; > > > group = cmap->c.cmap8_12.groups + cmap->c.cmap8_12.nGroups - 1; > > if ( id ) > *id = (UShort)( group->startGlyphID + > ( group->endCharCode - group->startCharCode ) ); > return group->endCharCode; > } Index: freetype/lib/extend/ftxcmap.h =================================================================== RCS file: /cvs/freetype/freetype/lib/extend/ftxcmap.h,v retrieving revision 1.9 retrieving revision 1.11 diff -r1.9 -r1.11 7c7 < * Copyright 1996-2000 by Juliusz Chroboczek, --- > * Copyright 1996-2001 by Juliusz Chroboczek, 32,34c32,34 < EXPORT_DEF < TT_Long TT_CharMap_First( TT_CharMap charMap, < TT_UShort* id ); --- > FT_EXPORT_DEF( TT_Long ) > TT_CharMap_First( TT_CharMap charMap, > TT_UShort* id ); 39,42c39,42 < EXPORT_DEF < TT_Long TT_CharMap_Next( TT_CharMap charMap, < TT_UShort startId, < TT_UShort* id ); --- > FT_EXPORT_DEF( TT_Long ) > TT_CharMap_Next( TT_CharMap charMap, > TT_ULong startId, > TT_UShort* id ); 48,50c48,50 < EXPORT_DEF < TT_Long TT_CharMap_Last( TT_CharMap charMap, < TT_UShort* id ); --- > FT_EXPORT_DEF( TT_Long ) > TT_CharMap_Last( TT_CharMap charMap, > TT_UShort* id ); Index: freetype/lib/extend/ftxerr18.c =================================================================== RCS file: /cvs/freetype/freetype/lib/extend/ftxerr18.c,v retrieving revision 1.15 retrieving revision 1.18 diff -r1.15 -r1.18 14c14,15 < /* ./configure (on Unix). */ --- > /* */ > /* ./configure --disable-nls (on Unix). */ 19,20d19 < #include "ttconfig.h" < 25a25,30 > #include "ttconfig.h" /* will pull up "ft_conf.h" */ > > #ifdef HAVE_LIBINTL_H > > #include > 30,31d34 < #ifdef HAVE_LIBINTL_H < #include 34c37,63 < #else --- > > #if 0 > char documentation[] = _( > "Welcome to the translation of the Freetype v.1 library!\n" > "\n" > "This message is not really part of the library (it is bracketed by\n" > " #if 0 / #endif), but is really intended to be the first one in the .po\n" > "file, and the first one that a new translator should see, to give hints.\n" > "\n" > "First, while this .po might seems big, the real interesting part of it\n" > "is only the messages in this file, lib/extend/ftxerr18.c. The other\n" > "messages are part of the demonstration programs, and are more intended\n" > "to help grasping how to use i18n with the Freetype library. So the real\n" > "work is the about 65 first ones. Unfortunately they are the harder ones!\n" > "\n" > "A difficulty is that there are some specialized vocabulary, about\n" > "``faces'', ``glyph'' and similar things. These are typographical things,\n" > "and this should be researched before attempting to translate the whole\n" > "thing. A quick look across the TrueType documentation might help to\n" > "understand many things, too.\n" > "\n" > "Best wiches for your translation!\n" > "Antoine Leca - 2002-11-08" ); > #endif /* 0 */ > > #else /* ! HAVE_LIBINTL_H */ > 36d64 < #endif 37a66 > #endif /* HAVE_LIBINTL_H */ 39,40c68,70 < EXPORT_FUNC < TT_String* TT_ErrToString18( TT_Error error ) --- > > FT_EXPORT_FUNC( TT_String* ) > TT_ErrToString18( TT_Error error ) 67d96 < 138a168,169 > case TT_Err_Too_Many_FDefs: > return _( "Too many function definitions (FDEF)." ); 206a238 > 214d245 < 222a254,256 > case TTO_Err_No_MM_Interpreter: > return _( "No MM (Adobe MultipleMaster) interpreter available." ); > 226a261 > 230a266,270 > > case TTO_Err_Invalid_GDEF_SubTable_Format: > return _( "Invalid glyph definition (GDEF) table format." ); > case TTO_Err_Invalid_GDEF_SubTable: > return _( "Invalid glyph definition (GDEF) table." ); Index: freetype/lib/extend/ftxerr18.h =================================================================== RCS file: /cvs/freetype/freetype/lib/extend/ftxerr18.h,v retrieving revision 1.10 retrieving revision 1.11 diff -r1.10 -r1.11 28,29c28,29 < EXPORT_DEF < TT_String* TT_ErrToString18( TT_Error i ); --- > FT_EXPORT_DEF( TT_String* ) > TT_ErrToString18( TT_Error i ); Index: freetype/lib/extend/ftxgasp.c =================================================================== RCS file: /cvs/freetype/freetype/lib/extend/ftxgasp.c,v retrieving revision 1.10 retrieving revision 1.11 diff -r1.10 -r1.11 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2001 by 30,34c30,34 < EXPORT_FUNC < TT_Error TT_Get_Face_Gasp_Flags( TT_Face face, < TT_UShort point_size, < TT_Bool* grid_fit, < TT_Bool* smooth_font ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Get_Face_Gasp_Flags( TT_Face face, > TT_UShort point_size, > TT_Bool* grid_fit, > TT_Bool* smooth_font ) Index: freetype/lib/extend/ftxgasp.h =================================================================== RCS file: /cvs/freetype/freetype/lib/extend/ftxgasp.h,v retrieving revision 1.12 retrieving revision 1.13 diff -r1.12 -r1.13 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2001 by 40,44c40,44 < EXPORT_DEF < TT_Error TT_Get_Face_Gasp_Flags( TT_Face face, < TT_UShort point_size, < TT_Bool* grid_fit, < TT_Bool* smooth_font ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Get_Face_Gasp_Flags( TT_Face face, > TT_UShort point_size, > TT_Bool* grid_fit, > TT_Bool* smooth_font ); Index: freetype/lib/extend/ftxgdef.c =================================================================== RCS file: /cvs/freetype/freetype/lib/extend/ftxgdef.c,v retrieving revision 1.9 retrieving revision 1.14 diff -r1.9 -r1.14 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2001 by 29,31d28 < #define GDEF_ID Build_Extension_ID( 'G', 'D', 'E', 'F' ) < < 113,114c110,111 < EXPORT_FUNC < TT_Error TT_Init_GDEF_Extension( TT_Engine engine ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Init_GDEF_Extension( TT_Engine engine ) 130,132c127,129 < EXPORT_FUNC < TT_Error TT_Load_GDEF_Table( TT_Face face, < TTO_GDEFHeader* retptr ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Load_GDEF_Table( TT_Face face, > TTO_GDEFHeader* retptr ) 728,731c725,728 < EXPORT_FUNC < TT_Error TT_GDEF_Get_Glyph_Property( TTO_GDEFHeader* gdef, < TT_UShort glyphID, < TT_UShort* property ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_GDEF_Get_Glyph_Property( TTO_GDEFHeader* gdef, > TT_UShort glyphID, > TT_UShort* property ) 825,830c822,827 < EXPORT_FUNC < TT_Error TT_GDEF_Build_ClassDefinition( TTO_GDEFHeader* gdef, < TT_UShort num_glyphs, < TT_UShort glyph_count, < TT_UShort* glyph_array, < TT_UShort* class_array ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_GDEF_Build_ClassDefinition( TTO_GDEFHeader* gdef, > TT_UShort num_glyphs, > TT_UShort glyph_count, > TT_UShort* glyph_array, > TT_UShort* class_array ) 1112,1113d1108 < /* This is OpenType 1.2 */ < 1114a1110,1112 > { > /* This is OpenType 1.2 */ > 1117,1119c1115,1119 < < if ( flags & *property ) < return TTO_Err_Not_Covered; --- > } > else { > if ( flags & *property ) > return TTO_Err_Not_Covered; > } Index: freetype/lib/extend/ftxgdef.h =================================================================== RCS file: /cvs/freetype/freetype/lib/extend/ftxgdef.h,v retrieving revision 1.5 retrieving revision 1.9 diff -r1.5 -r1.9 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2001 by 31a32,33 > #define GDEF_ID Build_Extension_ID( 'G', 'D', 'E', 'F' ) > 190,191c192,193 < EXPORT_DEF < TT_Error TT_Init_GDEF_Extension( TT_Engine engine ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Init_GDEF_Extension( TT_Engine engine ); 193,206c195,208 < EXPORT_DEF < TT_Error TT_Load_GDEF_Table( TT_Face face, < TTO_GDEFHeader* gdef ); < < EXPORT_DEF < TT_Error TT_GDEF_Get_Glyph_Property( TTO_GDEFHeader* gdef, < TT_UShort glyphID, < TT_UShort* property ); < EXPORT_DEF < TT_Error TT_GDEF_Build_ClassDefinition( TTO_GDEFHeader* gdef, < TT_UShort num_glyphs, < TT_UShort glyph_count, < TT_UShort* glyph_array, < TT_UShort* class_array ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Load_GDEF_Table( TT_Face face, > TTO_GDEFHeader* gdef ); > > FT_EXPORT_DEF( TT_Error ) > TT_GDEF_Get_Glyph_Property( TTO_GDEFHeader* gdef, > TT_UShort glyphID, > TT_UShort* property ); > FT_EXPORT_DEF( TT_Error ) > TT_GDEF_Build_ClassDefinition( TTO_GDEFHeader* gdef, > TT_UShort num_glyphs, > TT_UShort glyph_count, > TT_UShort* glyph_array, > TT_UShort* class_array ); Index: freetype/lib/extend/ftxgpos.c =================================================================== RCS file: /cvs/freetype/freetype/lib/extend/ftxgpos.c,v retrieving revision 1.7 retrieving revision 1.17 diff -r1.7 -r1.17 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2001 by 35,37d34 < #define GPOS_ID Build_Extension_ID( 'G', 'P', 'O', 'S' ) < < 45a43,44 > UShort first; /* the first glyph in a chain of > cursive connections */ 149,150c148,149 < EXPORT_FUNC < TT_Error TT_Init_GPOS_Extension( TT_Engine engine ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Init_GPOS_Extension( TT_Engine engine ) 166,169c165,168 < EXPORT_FUNC < TT_Error TT_Load_GPOS_Table( TT_Face face, < TTO_GPOSHeader* retptr, < TTO_GDEFHeader* gdef ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Load_GPOS_Table( TT_Face face, > TTO_GPOSHeader* retptr, > TTO_GDEFHeader* gdef ) 174a174 > TTO_GDEFHeader* gdef_reg; 277c277 < new_offset += base_offset; --- > new_offset += gdef->offset; 283a284,291 > /* copy the class definition pointer into the extension structure */ > > error = TT_Extension_Get( faze, GDEF_ID, (void**)&gdef_reg ); > if ( error ) > return error; > > *gdef_reg = *gdef; > 1679c1687 < if ( in->pos >= in->length ) --- > if ( in->pos >= in->length - 1 ) 1918c1926 < to understand, but there are pitfalls! The reason is, that --- > to understand, but there are pitfalls! The reason is that 2065a2074,2075 > if ( gpi->first == 0xFFFF ) > gpi->first = in->pos; 2281c2291,2292 < UShort i, j, mark_index, base_index, property, class; --- > TT_UInt i, j; > UShort mark_index, base_index, property, class; 2310c2321 < /* now we search backwards for a base glyph */ --- > /* now we search backwards for a non-mark glyph */ 2322c2333 < if ( property != TTO_MARK ) --- > if ( !( property == TTO_MARK || property & IGNORE_SPECIAL_MARKS ) ) 2328a2340,2341 > /* The following assertion is too strong -- at least for mangal.ttf. */ > #if 0 2330a2344 > #endif 2673c2687,2688 < UShort i, j, mark_index, lig_index, property, class; --- > TT_UInt i, j; > UShort mark_index, lig_index, property, class; 2705c2720 < /* now we search backwards for a ligature */ --- > /* now we search backwards for a non-mark glyph */ 2717c2732 < if ( property != TTO_MARK ) --- > if ( !( property == TTO_MARK || property & IGNORE_SPECIAL_MARKS ) ) 2723a2739,2741 > /* Similar to Lookup_MarkBasePos(), I suspect that this assertion is > too strong, thus it is commented out. */ > #if 0 2725a2744 > #endif 4717a4737,4738 > /* backtrack and lookahead data can be optional */ > 4719,4722c4740,4746 < if ( FILE_Seek( backtrack_offset ) || < ( error = Load_ClassDefinition( &ccpf2->BacktrackClassDef, count, < input ) ) != TT_Err_Ok ) < goto Fail5; --- > if ( backtrack_offset != base_offset ) > { > if ( FILE_Seek( backtrack_offset ) || > ( error = Load_ClassDefinition( &ccpf2->BacktrackClassDef, count, > input ) ) != TT_Err_Ok ) > goto Fail5; > } 4727,4730c4751,4757 < if ( FILE_Seek( lookahead_offset ) || < ( error = Load_ClassDefinition( &ccpf2->LookaheadClassDef, count, < input ) ) != TT_Err_Ok ) < goto Fail3; --- > if ( lookahead_offset != base_offset ) > { > if ( FILE_Seek( lookahead_offset ) || > ( error = Load_ClassDefinition( &ccpf2->LookaheadClassDef, count, > input ) ) != TT_Err_Ok ) > goto Fail3; > } 5091,5092c5118,5119 < UShort flags, < UShort context_length, --- > TT_UInt flags, > TT_UInt context_length, 5096,5097c5123,5124 < UShort i, j, k, num_cpr, curr_pos; < UShort bgc, igc, lgc; --- > TT_UInt i, j, k, num_cpr, curr_pos; > TT_UInt bgc, igc, lgc; 5142c5169 < for ( i = bgc, j = in->pos - 1; i > 0; i--, j-- ) --- > for ( i = 0, j = in->pos - 1; i < bgc; i++, j-- ) 5155c5182,5192 < if ( s_in[j] != curr_cpr.Backtrack[i - 1] ) --- > /* In OpenType 1.3, it is undefined whether the offsets of > backtrack glyphs is in logical order or not. Version 1.4 > will clarify this: > > Logical order - a b c d e f g h i j > i > Input offsets - 0 1 > Backtrack offsets - 3 2 1 0 > Lookahead offsets - 0 1 2 3 */ > > if ( s_in[j] != curr_cpr.Backtrack[i] ) 5159c5196 < if ( i != 0 ) --- > if ( i != bgc ) 5228,5229c5265,5266 < UShort flags, < UShort context_length, --- > TT_UInt flags, > TT_UInt context_length, 5234,5235c5271,5272 < UShort i, j, k, curr_pos; < UShort bgc, igc, lgc; --- > TT_UInt i, j, k, curr_pos; > TT_UInt bgc, igc, lgc; 5293c5330 < for ( k = 0; k < cpcs->ChainPosClassRuleCount; k++ ) --- > for ( k = 0; k < (TT_UInt)cpcs->ChainPosClassRuleCount; k++ ) 5331c5368 < if ( i >= known_backtrack_classes ) --- > if ( i >= (TT_UInt)known_backtrack_classes ) 5342c5379 < if ( bc[bgc - 1 - i] != backtrack_classes[i] ) --- > if ( bc[i] != backtrack_classes[i] ) 5369c5406 < if ( i >= known_input_classes ) --- > if ( i >= (TT_UInt)known_input_classes ) 5405c5442 < if ( i >= known_lookahead_classes ) --- > if ( i >= (TT_UInt)known_lookahead_classes ) 5448,5449c5485,5486 < UShort flags, < UShort context_length, --- > TT_UInt flags, > TT_UInt context_length, 5452,5453c5489,5490 < UShort index, i, j, curr_pos, property; < UShort bgc, igc, lgc; --- > UShort index, property; > TT_UInt i, j, curr_pos, bgc, igc, lgc; 5490c5527 < for ( i = bgc, j = in->pos - 1; i > 0; i--, j-- ) --- > for ( i = 0, j = in->pos - 1; i < bgc; i++, j-- ) 5503c5540 < error = Coverage_Index( &bc[i - 1], s_in[j], &index ); --- > error = Coverage_Index( &bc[i], s_in[j], &index ); 5533,5534c5570,5571 < /* we are starting for lookahead glyphs right after the last context < glyph */ --- > /* we are starting to check for lookahead glyphs right after the > last context glyph */ 5606,5609c5643,5646 < EXPORT_FUNC < TT_Error TT_GPOS_Select_Script( TTO_GPOSHeader* gpos, < TT_ULong script_tag, < TT_UShort* script_index ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_GPOS_Select_Script( TTO_GPOSHeader* gpos, > TT_ULong script_tag, > TT_UShort* script_index ) 5635,5640c5672,5677 < EXPORT_FUNC < TT_Error TT_GPOS_Select_Language( TTO_GPOSHeader* gpos, < TT_ULong language_tag, < TT_UShort script_index, < TT_UShort* language_index, < TT_UShort* req_feature_index ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_GPOS_Select_Language( TTO_GPOSHeader* gpos, > TT_ULong language_tag, > TT_UShort script_index, > TT_UShort* language_index, > TT_UShort* req_feature_index ) 5678,5683c5715,5720 < EXPORT_FUNC < TT_Error TT_GPOS_Select_Feature( TTO_GPOSHeader* gpos, < TT_ULong feature_tag, < TT_UShort script_index, < TT_UShort language_index, < TT_UShort* feature_index ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_GPOS_Select_Feature( TTO_GPOSHeader* gpos, > TT_ULong feature_tag, > TT_UShort script_index, > TT_UShort language_index, > TT_UShort* feature_index ) 5744,5746c5781,5783 < EXPORT_FUNC < TT_Error TT_GPOS_Query_Scripts( TTO_GPOSHeader* gpos, < TT_ULong** script_tag_list ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_GPOS_Query_Scripts( TTO_GPOSHeader* gpos, > TT_ULong** script_tag_list ) 5775,5778c5812,5815 < EXPORT_FUNC < TT_Error TT_GPOS_Query_Languages( TTO_GPOSHeader* gpos, < TT_UShort script_index, < TT_ULong** language_tag_list ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_GPOS_Query_Languages( TTO_GPOSHeader* gpos, > TT_UShort script_index, > TT_ULong** language_tag_list ) 5818,5822c5855,5859 < EXPORT_FUNC < TT_Error TT_GPOS_Query_Features( TTO_GPOSHeader* gpos, < TT_UShort script_index, < TT_UShort language_index, < TT_ULong** feature_tag_list ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_GPOS_Query_Features( TTO_GPOSHeader* gpos, > TT_UShort script_index, > TT_UShort language_index, > TT_ULong** feature_tag_list ) 5997a6035,6036 > TT_UInt i; > TT_Pos offset; 6000c6039,6040 < gpi->last = 0xFFFF; /* no last valid glyph for cursive pos. */ --- > gpi->first = 0xFFFF; > gpi->last = 0xFFFF; /* no last valid glyph for cursive pos. */ 6030a6071,6086 > /* test whether we have to adjust the offsets for cursive connections */ > > if ( gpi->first != 0xFFFF && gpi->last == 0xFFFF && > gpos->LookupList.Lookup[lookup_index].LookupFlag & RIGHT_TO_LEFT ) > { > offset = out[in->pos].y_pos; > > /* no horizontal offsets (for vertical writing direction) > supported yet */ > > for ( i = gpi->first; i <= (TT_UInt)in->pos; i++ ) > out[i].y_pos -= offset; > > gpi->first = 0xFFFF; > } > 6039,6042c6095,6098 < EXPORT_FUNC < TT_Error TT_GPOS_Add_Feature( TTO_GPOSHeader* gpos, < TT_UShort feature_index, < TT_UShort property ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_GPOS_Add_Feature( TTO_GPOSHeader* gpos, > TT_UShort feature_index, > TT_UShort property ) 6067,6068c6123,6124 < EXPORT_FUNC < TT_Error TT_GPOS_Clear_Features( TTO_GPOSHeader* gpos ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_GPOS_Clear_Features( TTO_GPOSHeader* gpos ) 6087,6089c6143,6145 < EXPORT_FUNC < TT_Error TT_GPOS_Register_Glyph_Function( TTO_GPOSHeader* gpos, < TTO_GlyphFunction gfunc ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_GPOS_Register_Glyph_Function( TTO_GPOSHeader* gpos, > TTO_GlyphFunction gfunc ) 6100,6103c6156,6159 < EXPORT_FUNC < TT_Error TT_GPOS_Register_MM_Function( TTO_GPOSHeader* gpos, < TTO_MMFunction mmfunc, < void* data ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_GPOS_Register_MM_Function( TTO_GPOSHeader* gpos, > TTO_MMFunction mmfunc, > void* data ) 6118,6126c6174,6182 < EXPORT_FUNC < TT_Error TT_GPOS_Apply_String( TT_Instance instance, < TT_Glyph glyph, < TTO_GPOSHeader* gpos, < TT_UShort load_flags, < TTO_GSUB_String* in, < TTO_GPOS_Data** out, < TT_Bool dvi, < TT_Bool r2l ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_GPOS_Apply_String( TT_Instance instance, > TT_Glyph glyph, > TTO_GPOSHeader* gpos, > TT_UShort load_flags, > TTO_GSUB_String* in, > TTO_GPOS_Data** out, > TT_Bool dvi, > TT_Bool r2l ) Index: freetype/lib/extend/ftxgpos.h =================================================================== RCS file: /cvs/freetype/freetype/lib/extend/ftxgpos.h,v retrieving revision 1.12 retrieving revision 1.15 diff -r1.12 -r1.15 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2001 by 31a32,33 > #define GPOS_ID Build_Extension_ID( 'G', 'P', 'O', 'S' ) > 35,42c37,45 < #define GPOS_LOOKUP_SINGLE 1 < #define GPOS_LOOKUP_PAIR 2 < #define GPOS_LOOKUP_CURSIVE 3 < #define GPOS_LOOKUP_MARKBASE 4 < #define GPOS_LOOKUP_MARKLIG 5 < #define GPOS_LOOKUP_MARKMARK 6 < #define GPOS_LOOKUP_CONTEXT 7 < #define GPOS_LOOKUP_CHAIN 8 --- > #define GPOS_LOOKUP_SINGLE 1 > #define GPOS_LOOKUP_PAIR 2 > #define GPOS_LOOKUP_CURSIVE 3 > #define GPOS_LOOKUP_MARKBASE 4 > #define GPOS_LOOKUP_MARKLIG 5 > #define GPOS_LOOKUP_MARKMARK 6 > #define GPOS_LOOKUP_CONTEXT 7 > #define GPOS_LOOKUP_CHAIN 8 > #define GPOS_LOOKUP_EXTENSION 9 783,784c786,787 < EXPORT_DEF < TT_Error TT_Init_GPOS_Extension( TT_Engine engine ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Init_GPOS_Extension( TT_Engine engine ); 786,835c789,843 < EXPORT_DEF < TT_Error TT_Load_GPOS_Table( TT_Face face, < TTO_GPOSHeader* gpos, < TTO_GDEFHeader* gdef ); < < EXPORT_DEF < TT_Error TT_GPOS_Select_Script( TTO_GPOSHeader* gpos, < TT_ULong script_tag, < TT_UShort* script_index ); < EXPORT_DEF < TT_Error TT_GPOS_Select_Language( TTO_GPOSHeader* gpos, < TT_ULong language_tag, < TT_UShort script_index, < TT_UShort* language_index, < TT_UShort* req_feature_index ); < EXPORT_DEF < TT_Error TT_GPOS_Select_Feature( TTO_GPOSHeader* gpos, < TT_ULong feature_tag, < TT_UShort script_index, < TT_UShort language_index, < TT_UShort* feature_index ); < < EXPORT_DEF < TT_Error TT_GPOS_Query_Scripts( TTO_GPOSHeader* gpos, < TT_ULong** script_tag_list ); < EXPORT_DEF < TT_Error TT_GPOS_Query_Languages( TTO_GPOSHeader* gpos, < TT_UShort script_index, < TT_ULong** language_tag_list ); < EXPORT_DEF < TT_Error TT_GPOS_Query_Features( TTO_GPOSHeader* gpos, < TT_UShort script_index, < TT_UShort language_index, < TT_ULong** feature_tag_list ); < < EXPORT_DEF < TT_Error TT_GPOS_Add_Feature( TTO_GPOSHeader* gpos, < TT_UShort feature_index, < TT_UShort property ); < EXPORT_DEF < TT_Error TT_GPOS_Clear_Features( TTO_GPOSHeader* gpos ); < < EXPORT_DEF < TT_Error TT_GPOS_Register_Glyph_Function( TTO_GPOSHeader* gpos, < TTO_GlyphFunction gfunc ); < < EXPORT_DEF < TT_Error TT_GPOS_Register_MM_Function( TTO_GPOSHeader* gpos, < TTO_MMFunction mmfunc, < void* data ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Load_GPOS_Table( TT_Face face, > TTO_GPOSHeader* gpos, > TTO_GDEFHeader* gdef ); > > FT_EXPORT_DEF( TT_Error ) > TT_GPOS_Select_Script( TTO_GPOSHeader* gpos, > TT_ULong script_tag, > TT_UShort* script_index ); > > FT_EXPORT_DEF( TT_Error ) > TT_GPOS_Select_Language( TTO_GPOSHeader* gpos, > TT_ULong language_tag, > TT_UShort script_index, > TT_UShort* language_index, > TT_UShort* req_feature_index ); > > FT_EXPORT_DEF( TT_Error ) > TT_GPOS_Select_Feature( TTO_GPOSHeader* gpos, > TT_ULong feature_tag, > TT_UShort script_index, > TT_UShort language_index, > TT_UShort* feature_index ); > > FT_EXPORT_DEF( TT_Error ) > TT_GPOS_Query_Scripts( TTO_GPOSHeader* gpos, > TT_ULong** script_tag_list ); > > FT_EXPORT_DEF( TT_Error ) > TT_GPOS_Query_Languages( TTO_GPOSHeader* gpos, > TT_UShort script_index, > TT_ULong** language_tag_list ); > > FT_EXPORT_DEF( TT_Error ) > TT_GPOS_Query_Features( TTO_GPOSHeader* gpos, > TT_UShort script_index, > TT_UShort language_index, > TT_ULong** feature_tag_list ); > > FT_EXPORT_DEF( TT_Error ) > TT_GPOS_Add_Feature( TTO_GPOSHeader* gpos, > TT_UShort feature_index, > TT_UShort property ); > > FT_EXPORT_DEF( TT_Error ) > TT_GPOS_Clear_Features( TTO_GPOSHeader* gpos ); > > FT_EXPORT_DEF( TT_Error ) > TT_GPOS_Register_Glyph_Function( TTO_GPOSHeader* gpos, > TTO_GlyphFunction gfunc ); > > FT_EXPORT_DEF( TT_Error ) > TT_GPOS_Register_MM_Function( TTO_GPOSHeader* gpos, > TTO_MMFunction mmfunc, > void* data ); 840,848c848,856 < EXPORT_DEF < TT_Error TT_GPOS_Apply_String( TT_Instance instance, < TT_Glyph glyph, < TTO_GPOSHeader* gpos, < TT_UShort load_flags, < TTO_GSUB_String* in, < TTO_GPOS_Data** out, < TT_Bool dvi, < TT_Bool r2l ); --- > FT_EXPORT_DEF( TT_Error ) > TT_GPOS_Apply_String( TT_Instance instance, > TT_Glyph glyph, > TTO_GPOSHeader* gpos, > TT_UShort load_flags, > TTO_GSUB_String* in, > TTO_GPOS_Data** out, > TT_Bool dvi, > TT_Bool r2l ); Index: freetype/lib/extend/ftxgsub.c =================================================================== RCS file: /cvs/freetype/freetype/lib/extend/ftxgsub.c,v retrieving revision 1.35 retrieving revision 1.47 diff -r1.35 -r1.47 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2001 by 35,37d34 < #define GSUB_ID Build_Extension_ID( 'G', 'S', 'U', 'B' ) < < 78,85c75,82 < EXPORT_FUNC < TT_Error TT_GSUB_Add_String( TTO_GSUB_String* in, < UShort num_in, < TTO_GSUB_String* out, < UShort num_out, < UShort* glyph_data, < UShort component, < UShort ligID ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_GSUB_Add_String( TTO_GSUB_String* in, > UShort num_in, > TTO_GSUB_String* out, > UShort num_out, > UShort* glyph_data, > UShort component, > UShort ligID ) 88c85 < UShort i; --- > TT_UInt i; 168,169c165,167 < static TT_Error GSUB_Create( void* ext, < PFace face ) --- > static TT_Error > GSUB_Create( void* ext, > PFace face ) 207,208c205,207 < static TT_Error GSUB_Destroy( void* ext, < PFace face ) --- > static TT_Error > GSUB_Destroy( void* ext, > PFace face ) 229,230c228,229 < EXPORT_FUNC < TT_Error TT_Init_GSUB_Extension( TT_Engine engine ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Init_GSUB_Extension( TT_Engine engine ) 246,249c245,248 < EXPORT_FUNC < TT_Error TT_Load_GSUB_Table( TT_Face face, < TTO_GSUBHeader* retptr, < TTO_GDEFHeader* gdef ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Load_GSUB_Table( TT_Face face, > TTO_GSUBHeader* retptr, > TTO_GDEFHeader* gdef ) 254a254 > TTO_GDEFHeader* gdef_reg; 357c357 < new_offset += base_offset; --- > new_offset += gdef->offset; 363a364,371 > /* copy the class definition pointer into the extension structure */ > > error = TT_Extension_Get( faze, GDEF_ID, (void**)&gdef_reg ); > if ( error ) > return error; > > *gdef_reg = *gdef; > 1176c1184,1185 < UShort* s_in; --- > UShort first_ligID, first_comp; > UShort *s_in, *lig_in, *comp_in; 1185c1194 < if ( property == TTO_MARK ) --- > if ( property == TTO_MARK || property & IGNORE_SPECIAL_MARKS ) 1204,1205c1213,1218 < s_in = &in->string[in->pos]; < c = lig->Component; --- > s_in = &in->string[in->pos]; > lig_in = &in->ligIDs[in->pos]; > comp_in = &in->components[in->pos]; > first_ligID = *lig_in; > first_comp = *comp_in; > c = lig->Component; 1225c1238,1258 < if ( property != TTO_MARK ) --- > /* don't apply a ligature lookup to glyphs with different > ligature IDs. Example: > > ' > ^' ' ^ > f ^ l ' -> fl ^ ' -> fl but not fl ^ -> fl */ > > if ( first_ligID != lig_in[j] ) > break; > > /* don't apply a ligature lookup to glyphs with different > component values. Example: > > ' > ^' ' ^ > f ^ f ' l -> ffl ^ ' -> ffl but not ffl ^ -> ffl */ > > if ( first_comp != comp_in[j] ) > break; > > if ( !( property == TTO_MARK || property & IGNORE_SPECIAL_MARKS ) ) 2164c2197 < if ( error ) --- > if ( error && error != TTO_Err_Not_Covered ) 2931a2965,2966 > /* backtrack and lookahead data can be optional */ > 2933,2936c2968,2973 < if ( FILE_Seek( backtrack_offset ) || < ( error = Load_ClassDefinition( &ccsf2->BacktrackClassDef, count, < input ) ) != TT_Err_Ok ) < goto Fail5; --- > if ( backtrack_offset != base_offset ) { > if ( FILE_Seek( backtrack_offset ) || > ( error = Load_ClassDefinition( &ccsf2->BacktrackClassDef, count, > input ) ) != TT_Err_Ok ) > goto Fail5; > } 2941,2944c2978,2983 < if ( FILE_Seek( lookahead_offset ) || < ( error = Load_ClassDefinition( &ccsf2->LookaheadClassDef, count, < input ) ) != TT_Err_Ok ) < goto Fail3; --- > if ( lookahead_offset != base_offset ) { > if ( FILE_Seek( lookahead_offset ) || > ( error = Load_ClassDefinition( &ccsf2->LookaheadClassDef, count, > input ) ) != TT_Err_Ok ) > goto Fail3; > } 3307,3308c3346,3347 < UShort flags, < UShort context_length, --- > TT_UInt flags, > TT_UInt context_length, 3312,3313c3351,3352 < UShort i, j, k, num_csr, curr_pos; < UShort bgc, igc, lgc; --- > TT_UInt i, j, k, num_csr, curr_pos; > TT_UInt bgc, igc, lgc; 3351c3390 < /* Since we don't know in advance the number of glyphs to inspect, --- > /* since we don't know in advance the number of glyphs to inspect, 3357c3396 < for ( i = bgc, j = in->pos - 1; i > 0; i--, j-- ) --- > for ( i = 0, j = in->pos - 1; i < bgc; i++, j-- ) 3370c3409,3419 < if ( s_in[j] != curr_csr.Backtrack[i - 1] ) --- > /* In OpenType 1.3, it is undefined whether the offsets of > backtrack glyphs is in logical order or not. Version 1.4 > will clarify this: > > Logical order - a b c d e f g h i j > i > Input offsets - 0 1 > Backtrack offsets - 3 2 1 0 > Lookahead offsets - 0 1 2 3 */ > > if ( s_in[j] != curr_csr.Backtrack[i] ) 3374c3423 < if ( i != 0 ) --- > if ( i != bgc ) 3443,3444c3492,3493 < UShort flags, < UShort context_length, --- > UInt flags, > UInt context_length, 3449,3450c3498,3499 < UShort i, j, k, curr_pos; < UShort bgc, igc, lgc; --- > UInt i, j, k, curr_pos; > UInt bgc, igc, lgc; 3497c3546 < if ( error ) --- > if ( error && error != TTO_Err_Not_Covered ) 3507c3556 < for ( k = 0; k < cscs->ChainSubClassRuleCount; k++ ) --- > for ( k = 0; k < (UInt)cscs->ChainSubClassRuleCount; k++ ) 3545c3594 < if ( i >= known_backtrack_classes ) --- > if ( i >= (UInt)known_backtrack_classes ) 3556c3605 < if ( bc[bgc - 1 - i] != backtrack_classes[i] ) --- > if ( bc[i] != backtrack_classes[i] ) 3583c3632 < if ( i >= known_input_classes ) --- > if ( i >= (UInt)known_input_classes ) 3619c3668 < if ( i >= known_lookahead_classes ) --- > if ( i >= (UInt)known_lookahead_classes ) 3662,3663c3711,3712 < UShort flags, < UShort context_length, --- > UInt flags, > UInt context_length, 3666,3667c3715,3716 < UShort index, i, j, curr_pos, property; < UShort bgc, igc, lgc; --- > UShort index, property; > UInt i, j, curr_pos, bgc, igc, lgc; 3703c3752 < for ( i = bgc, j = in->pos - 1; i > 0; i--, j-- ) --- > for ( i = 0, j = in->pos - 1; i < bgc; i++, j-- ) 3716c3765 < error = Coverage_Index( &bc[i - 1], s_in[j], &index ); --- > error = Coverage_Index( &bc[i], s_in[j], &index ); 3819,3822c3868,3871 < EXPORT_FUNC < TT_Error TT_GSUB_Select_Script( TTO_GSUBHeader* gsub, < TT_ULong script_tag, < TT_UShort* script_index ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_GSUB_Select_Script( TTO_GSUBHeader* gsub, > TT_ULong script_tag, > TT_UShort* script_index ) 3848,3853c3897,3902 < EXPORT_FUNC < TT_Error TT_GSUB_Select_Language( TTO_GSUBHeader* gsub, < TT_ULong language_tag, < TT_UShort script_index, < TT_UShort* language_index, < TT_UShort* req_feature_index ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_GSUB_Select_Language( TTO_GSUBHeader* gsub, > TT_ULong language_tag, > TT_UShort script_index, > TT_UShort* language_index, > TT_UShort* req_feature_index ) 3891,3896c3940,3945 < EXPORT_FUNC < TT_Error TT_GSUB_Select_Feature( TTO_GSUBHeader* gsub, < TT_ULong feature_tag, < TT_UShort script_index, < TT_UShort language_index, < TT_UShort* feature_index ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_GSUB_Select_Feature( TTO_GSUBHeader* gsub, > TT_ULong feature_tag, > TT_UShort script_index, > TT_UShort language_index, > TT_UShort* feature_index ) 3957,3959c4006,4008 < EXPORT_FUNC < TT_Error TT_GSUB_Query_Scripts( TTO_GSUBHeader* gsub, < TT_ULong** script_tag_list ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_GSUB_Query_Scripts( TTO_GSUBHeader* gsub, > TT_ULong** script_tag_list ) 3988,3991c4037,4040 < EXPORT_FUNC < TT_Error TT_GSUB_Query_Languages( TTO_GSUBHeader* gsub, < TT_UShort script_index, < TT_ULong** language_tag_list ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_GSUB_Query_Languages( TTO_GSUBHeader* gsub, > TT_UShort script_index, > TT_ULong** language_tag_list ) 4031,4035c4080,4084 < EXPORT_FUNC < TT_Error TT_GSUB_Query_Features( TTO_GSUBHeader* gsub, < TT_UShort script_index, < TT_UShort language_index, < TT_ULong** feature_tag_list ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_GSUB_Query_Features( TTO_GSUBHeader* gsub, > TT_UShort script_index, > TT_UShort language_index, > TT_ULong** feature_tag_list ) 4206c4255 < if ( error == TTO_Err_Not_Covered ) --- > if ( error == TTO_Err_Not_Covered ) 4215,4218c4264,4267 < EXPORT_FUNC < TT_Error TT_GSUB_Add_Feature( TTO_GSUBHeader* gsub, < TT_UShort feature_index, < TT_UShort property ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_GSUB_Add_Feature( TTO_GSUBHeader* gsub, > TT_UShort feature_index, > TT_UShort property ) 4243,4244c4292,4293 < EXPORT_FUNC < TT_Error TT_GSUB_Clear_Features( TTO_GSUBHeader* gsub ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_GSUB_Clear_Features( TTO_GSUBHeader* gsub ) 4263,4266c4312,4315 < EXPORT_FUNC < TT_Error TT_GSUB_Register_Alternate_Function( TTO_GSUBHeader* gsub, < TTO_AltFunction altfunc, < void* data ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_GSUB_Register_Alternate_Function( TTO_GSUBHeader* gsub, > TTO_AltFunction altfunc, > void* data ) 4278,4281c4327,4330 < EXPORT_FUNC < TT_Error TT_GSUB_Apply_String( TTO_GSUBHeader* gsub, < TTO_GSUB_String* in, < TTO_GSUB_String* out ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_GSUB_Apply_String( TTO_GSUBHeader* gsub, > TTO_GSUB_String* in, > TTO_GSUB_String* out ) Index: freetype/lib/extend/ftxgsub.h =================================================================== RCS file: /cvs/freetype/freetype/lib/extend/ftxgsub.h,v retrieving revision 1.28 retrieving revision 1.31 diff -r1.28 -r1.31 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2001 by 31a32,33 > #define GSUB_ID Build_Extension_ID( 'G', 'S', 'U', 'B' ) > 40a43 > #define GSUB_LOOKUP_EXTENSION 7 521,522c524,525 < EXPORT_DEF < TT_Error TT_Init_GSUB_Extension( TT_Engine engine ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Init_GSUB_Extension( TT_Engine engine ); 524,583c527,591 < EXPORT_DEF < TT_Error TT_Load_GSUB_Table( TT_Face face, < TTO_GSUBHeader* gsub, < TTO_GDEFHeader* gdef ); < < EXPORT_DEF < TT_Error TT_GSUB_Select_Script( TTO_GSUBHeader* gsub, < TT_ULong script_tag, < TT_UShort* script_index ); < EXPORT_DEF < TT_Error TT_GSUB_Select_Language( TTO_GSUBHeader* gsub, < TT_ULong language_tag, < TT_UShort script_index, < TT_UShort* language_index, < TT_UShort* req_feature_index ); < EXPORT_DEF < TT_Error TT_GSUB_Select_Feature( TTO_GSUBHeader* gsub, < TT_ULong feature_tag, < TT_UShort script_index, < TT_UShort language_index, < TT_UShort* feature_index ); < < EXPORT_DEF < TT_Error TT_GSUB_Query_Scripts( TTO_GSUBHeader* gsub, < TT_ULong** script_tag_list ); < EXPORT_DEF < TT_Error TT_GSUB_Query_Languages( TTO_GSUBHeader* gsub, < TT_UShort script_index, < TT_ULong** language_tag_list ); < EXPORT_DEF < TT_Error TT_GSUB_Query_Features( TTO_GSUBHeader* gsub, < TT_UShort script_index, < TT_UShort language_index, < TT_ULong** feature_tag_list ); < < EXPORT_DEF < TT_Error TT_GSUB_Add_Feature( TTO_GSUBHeader* gsub, < TT_UShort feature_index, < TT_UShort property ); < EXPORT_DEF < TT_Error TT_GSUB_Clear_Features( TTO_GSUBHeader* gsub ); < < EXPORT_DEF < TT_Error TT_GSUB_Register_Alternate_Function( TTO_GSUBHeader* gsub, < TTO_AltFunction altfunc, < void* data ); < < EXPORT_DEF < TT_Error TT_GSUB_Apply_String( TTO_GSUBHeader* gsub, < TTO_GSUB_String* in, < TTO_GSUB_String* out ); < < EXPORT_DEF < TT_Error TT_GSUB_Add_String( TTO_GSUB_String* in, < TT_UShort num_in, < TTO_GSUB_String* out, < TT_UShort num_out, < TT_UShort* glyph_data, < TT_UShort component, < TT_UShort ligID ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Load_GSUB_Table( TT_Face face, > TTO_GSUBHeader* gsub, > TTO_GDEFHeader* gdef ); > > FT_EXPORT_DEF( TT_Error ) > TT_GSUB_Select_Script( TTO_GSUBHeader* gsub, > TT_ULong script_tag, > TT_UShort* script_index ); > > FT_EXPORT_DEF( TT_Error ) > TT_GSUB_Select_Language( TTO_GSUBHeader* gsub, > TT_ULong language_tag, > TT_UShort script_index, > TT_UShort* language_index, > TT_UShort* req_feature_index ); > > FT_EXPORT_DEF( TT_Error ) > TT_GSUB_Select_Feature( TTO_GSUBHeader* gsub, > TT_ULong feature_tag, > TT_UShort script_index, > TT_UShort language_index, > TT_UShort* feature_index ); > > FT_EXPORT_DEF( TT_Error ) > TT_GSUB_Query_Scripts( TTO_GSUBHeader* gsub, > TT_ULong** script_tag_list ); > > FT_EXPORT_DEF( TT_Error ) > TT_GSUB_Query_Languages( TTO_GSUBHeader* gsub, > TT_UShort script_index, > TT_ULong** language_tag_list ); > > FT_EXPORT_DEF( TT_Error ) > TT_GSUB_Query_Features( TTO_GSUBHeader* gsub, > TT_UShort script_index, > TT_UShort language_index, > TT_ULong** feature_tag_list ); > > FT_EXPORT_DEF( TT_Error ) > TT_GSUB_Add_Feature( TTO_GSUBHeader* gsub, > TT_UShort feature_index, > TT_UShort property ); > > FT_EXPORT_DEF( TT_Error ) > TT_GSUB_Clear_Features( TTO_GSUBHeader* gsub ); > > FT_EXPORT_DEF( TT_Error ) > TT_GSUB_Register_Alternate_Function( TTO_GSUBHeader* gsub, > TTO_AltFunction altfunc, > void* data ); > > FT_EXPORT_DEF( TT_Error ) > TT_GSUB_Apply_String( TTO_GSUBHeader* gsub, > TTO_GSUB_String* in, > TTO_GSUB_String* out ); > > FT_EXPORT_DEF( TT_Error ) > TT_GSUB_Add_String( TTO_GSUB_String* in, > TT_UShort num_in, > TTO_GSUB_String* out, > TT_UShort num_out, > TT_UShort* glyph_data, > TT_UShort component, > TT_UShort ligID ); Index: freetype/lib/extend/ftxkern.c =================================================================== RCS file: /cvs/freetype/freetype/lib/extend/ftxkern.c,v retrieving revision 1.22 retrieving revision 1.27 diff -r1.22 -r1.27 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2002 by 25a26 > #include "ttload.h" 29d29 < #include "ttload.h" /* For the macros */ 32d31 < #include /* for qsort */ 43,45c42,43 < /* compare two kerning pairs, for qsort() */ < static < int compare_kern_pairs( const void* a, const void* b ) --- > /* compare two kerning pairs, for sorting */ > static int compare_kern_pairs( const void* a, const void* b ) 56a55,95 > > /* a simple shell sort algorithm to avoid calling qsort */ > /* (since this creates problems on 16-bit machines) */ > static void > sort_kern_pairs( TT_Kern_0_Pair* pairs, > int count ) > { > TT_Kern_0_Pair *i, *j, *limit = pairs + count; > TT_Kern_0_Pair temp; > int gap; > > > /* compute initial gap */ > for ( gap = 0; ++gap < count; gap *= 3 ) > ; > > while ( gap /= 3 ) > { > for ( i = pairs + gap; i < limit; i++ ) > { > for ( j = i - gap; ; j -= gap ) > { > TT_Kern_0_Pair* k = j + gap; > > > if ( compare_kern_pairs( j, k ) < 0 ) > break; > > temp = *j; > *j = *k; > *k = temp; > > if ( j < pairs + gap ) > break; > } > } > } > } > > > 58,59c97,98 < static < int is_sorted( TT_Kern_0_Pair* table, TT_ULong num_pairs ) --- > static int > is_sorted( TT_Kern_0_Pair* table, TT_ULong num_pairs ) 91,92c130,132 < static TT_Error Subtable_Load_0( TT_Kern_0* kern0, < PFace input ) --- > static TT_Error > Subtable_Load_0( TT_Kern_0* kern0, > PFace input ) 141c181 < qsort( kern0->pairs, num_pairs, sizeof(TT_Kern_0_Pair), compare_kern_pairs ); --- > sort_kern_pairs( kern0->pairs, num_pairs ); 173,174c213,215 < static TT_Error Subtable_Load_2( TT_Kern_2* kern2, < PFace input ) --- > static TT_Error > Subtable_Load_2( TT_Kern_2* kern2, > PFace input ) 272c313 < for ( n = 0; n < array_size/2; n++ ) --- > for ( n = 0; (UInt)n < array_size/2; n++ ) 316,317c357,359 < static TT_Error Kerning_Create( void* ext, < PFace face ) --- > static TT_Error > Kerning_Create( void* ext, > PFace face ) 407,408c449,451 < static TT_Error Kerning_Destroy( void* ext, < PFace face ) --- > static TT_Error > Kerning_Destroy( void* ext, > PFace face ) 492,494c535,537 < EXPORT_FUNC < TT_Error TT_Get_Kerning_Directory( TT_Face face, < TT_Kerning* directory ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Get_Kerning_Directory( TT_Face face, > TT_Kerning* directory ) 528,530c571,573 < EXPORT_FUNC < TT_Error TT_Load_Kerning_Table( TT_Face face, < TT_UShort kern_index ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Load_Kerning_Table( TT_Face face, > TT_UShort kern_index ) 582,583c625,626 < EXPORT_FUNC < TT_Error TT_Init_Kerning_Extension( TT_Engine engine ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Init_Kerning_Extension( TT_Engine engine ) Index: freetype/lib/extend/ftxkern.h =================================================================== RCS file: /cvs/freetype/freetype/lib/extend/ftxkern.h,v retrieving revision 1.17 retrieving revision 1.18 diff -r1.17 -r1.18 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2001 by 152,153c152,153 < EXPORT_DEF < TT_Error TT_Init_Kerning_Extension( TT_Engine engine ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Init_Kerning_Extension( TT_Engine engine ); 163,165c163,165 < EXPORT_DEF < TT_Error TT_Get_Kerning_Directory( TT_Face face, < TT_Kerning* directory ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Get_Kerning_Directory( TT_Face face, > TT_Kerning* directory ); 170,172c170,172 < EXPORT_DEF < TT_Error TT_Load_Kerning_Table( TT_Face face, < TT_UShort kern_index ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Load_Kerning_Table( TT_Face face, > TT_UShort kern_index ); Index: freetype/lib/extend/ftxopen.c =================================================================== RCS file: /cvs/freetype/freetype/lib/extend/ftxopen.c,v retrieving revision 1.19 retrieving revision 1.21 diff -r1.19 -r1.21 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2001 by 563a564,565 > Bool is_extension = FALSE; > 582a585,588 > if ( ( type == GSUB && l->LookupType == GSUB_LOOKUP_EXTENSION ) || > ( type == GPOS && l->LookupType == GPOS_LOOKUP_EXTENSION ) ) > is_extension = TRUE; > 592a599,611 > > if ( is_extension ) > { > if ( FILE_Seek( new_offset ) || ACCESS_Frame( 8L ) ) > goto Fail; > > (void)GET_UShort(); /* format should be 1 */ > l->LookupType = GET_UShort(); > new_offset = GET_ULong() + base_offset; > > FORGET_Frame(); > } > Index: freetype/lib/extend/ftxopen.h =================================================================== RCS file: /cvs/freetype/freetype/lib/extend/ftxopen.h,v retrieving revision 1.16 retrieving revision 1.20 diff -r1.16 -r1.20 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2001 by 42c42 < struct TTO_LangSys_ --- > typedef struct TTO_LangSys_ 48c48,49 < }; --- > > } TTO_LangSys; 50d50 < typedef struct TTO_LangSys_ TTO_LangSys; 53c53 < struct TTO_LangSysRecord_ --- > typedef struct TTO_LangSysRecord_ 57c57,58 < }; --- > > } TTO_LangSysRecord; 59d59 < typedef struct TTO_LangSysRecord_ TTO_LangSysRecord; 62c62 < struct TTO_Script_ --- > typedef struct TTO_Script_ 67c67,68 < }; --- > > } TTO_Script; 69d69 < typedef struct TTO_Script_ TTO_Script; 71,72c71 < < struct TTO_ScriptRecord_ --- > typedef struct TTO_ScriptRecord_ 76,78c75,76 < }; < < typedef struct TTO_ScriptRecord_ TTO_ScriptRecord; --- > > } TTO_ScriptRecord; 81c79 < struct TTO_ScriptList_ --- > typedef struct TTO_ScriptList_ 85c83,84 < }; --- > > } TTO_ScriptList; 87d85 < typedef struct TTO_ScriptList_ TTO_ScriptList; 92c90 < struct TTO_Feature_ --- > typedef struct TTO_Feature_ 97,99c95,96 < }; < < typedef struct TTO_Feature_ TTO_Feature; --- > > } TTO_Feature; 102c99 < struct TTO_FeatureRecord_ --- > typedef struct TTO_FeatureRecord_ 106c103,104 < }; --- > > } TTO_FeatureRecord; 108d105 < typedef struct TTO_FeatureRecord_ TTO_FeatureRecord; 110,111c107 < < struct TTO_FeatureList_ --- > typedef struct TTO_FeatureList_ 115,117c111,112 < }; < < typedef struct TTO_FeatureList_ TTO_FeatureList; --- > > } TTO_FeatureList; 122,123c117 < struct TTO_SubTable_; /* defined below after inclusion < of ftxgsub.h and ftxgpos.h */ --- > struct TTO_SubTable_; 127c121 < struct TTO_Lookup_ --- > typedef struct TTO_Lookup_ 133,135c127,128 < }; < < typedef struct TTO_Lookup_ TTO_Lookup; --- > > } TTO_Lookup; 144c137 < struct TTO_LookupList_ --- > typedef struct TTO_LookupList_ 149c142,143 < }; --- > > } TTO_LookupList; 151d144 < typedef struct TTO_LookupList_ TTO_LookupList; 152a146,150 > /* Possible LookupFlag bit masks. `IGNORE_SPECIAL_MARKS' comes from the > OpenType 1.2 specification; RIGHT_TO_LEFT has been (re)introduced in > OpenType 1.3 -- if set, the last glyph in a cursive attachment > sequence has to be positioned on the baseline -- regardless of the > writing direction. */ 154,156c152 < /* Possible LookupFlag bit masks. `IGNORE_SPECIAL_MARKS' comes from the < OpenType 1.2 specification. */ < --- > #define RIGHT_TO_LEFT 0x0001 163c159 < struct TTO_CoverageFormat1_ --- > typedef struct TTO_CoverageFormat1_ 167,169c163,164 < }; < < typedef struct TTO_CoverageFormat1_ TTO_CoverageFormat1; --- > > } TTO_CoverageFormat1; 172c167 < struct TTO_RangeRecord_ --- > typedef struct TTO_RangeRecord_ 178,180c173 < }; < < typedef struct TTO_RangeRecord_ TTO_RangeRecord; --- > } TTO_RangeRecord; 183c176 < struct TTO_CoverageFormat2_ --- > typedef struct TTO_CoverageFormat2_ 187c180,181 < }; --- > > } TTO_CoverageFormat2; 189d182 < typedef struct TTO_CoverageFormat2_ TTO_CoverageFormat2; 191,192c184 < < struct TTO_Coverage_ --- > typedef struct TTO_Coverage_ 201d192 < }; 203c194 < typedef struct TTO_Coverage_ TTO_Coverage; --- > } TTO_Coverage; 206c197 < struct TTO_ClassDefFormat1_ --- > typedef struct TTO_ClassDefFormat1_ 212d202 < }; 214c204 < typedef struct TTO_ClassDefFormat1_ TTO_ClassDefFormat1; --- > } TTO_ClassDefFormat1; 217c207 < struct TTO_ClassRangeRecord_ --- > typedef struct TTO_ClassRangeRecord_ 222d211 < }; 224c213 < typedef struct TTO_ClassRangeRecord_ TTO_ClassRangeRecord; --- > } TTO_ClassRangeRecord; 227c216 < struct TTO_ClassDefFormat2_ --- > typedef struct TTO_ClassDefFormat2_ 233,235c222 < }; < < typedef struct TTO_ClassDefFormat2_ TTO_ClassDefFormat2; --- > } TTO_ClassDefFormat2; 243c230 < struct TTO_ClassDefinition_ --- > typedef struct TTO_ClassDefinition_ 257d243 < }; 259c245 < typedef struct TTO_ClassDefinition_ TTO_ClassDefinition; --- > } TTO_ClassDefinition; 262c248 < struct TTO_Device_ --- > typedef struct TTO_Device_ 269d254 < }; 271c256 < typedef struct TTO_Device_ TTO_Device; --- > } TTO_Device; Index: freetype/lib/extend/ftxopenf.h =================================================================== RCS file: /cvs/freetype/freetype/lib/extend/ftxopenf.h,v retrieving revision 1.9 retrieving revision 1.10 diff -r1.9 -r1.10 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2001 by Index: freetype/lib/extend/ftxpost.c =================================================================== RCS file: /cvs/freetype/freetype/lib/extend/ftxpost.c,v retrieving revision 1.16 retrieving revision 1.18 diff -r1.16 -r1.18 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2002 by 129c129 < UShort nameindex, n, num; --- > UShort n, num_glyphs, num_names; 136c136 < num = GET_UShort(); --- > num_glyphs = GET_UShort(); 145c145,146 < if ( num > input->numGlyphs ) --- > > if ( num_glyphs > input->numGlyphs ) 148c149 < post20->numGlyphs = num; --- > post20->numGlyphs = num_glyphs; 150c151,153 < if ( ALLOC_ARRAY( post20->glyphNameIndex, num, TT_UShort ) ) --- > /* load the indices */ > > if ( ALLOC_ARRAY( post20->glyphNameIndex, num_glyphs, TT_UShort ) ) 153c156 < if ( ACCESS_Frame( num * 2L ) ) --- > if ( ACCESS_Frame( num_glyphs * 2L ) ) 156c159 < for ( n = 0; n < num; n++ ) --- > for ( n = 0; n < num_glyphs; n++ ) 158a162,164 > } > > FORGET_Frame(); 160c166,175 < if ( post20->glyphNameIndex[n] > 258 + num ) --- > /* compute number of names stored in table */ > num_names = 0; > > for ( n = 0; n < num_glyphs; n++ ) > { > UShort idx; > > > idx = post20->glyphNameIndex[n]; > if ( idx >= 258 ) 162,164c177,186 < FORGET_Frame(); < error = TT_Err_Invalid_Post_Table; < goto Fail; --- > idx -= 257; > #if 0 /* FIXME This test has been dropped in Freetype 2. Why? */ > if ( idx > num_glyphs ) > { > error = TT_Err_Invalid_Post_Table; > goto Fail; > } > #endif > if ( idx > num_names ) > num_names = idx; 168c190 < FORGET_Frame(); --- > post20->numNames = num_names; 170c192,196 < if ( ALLOC_ARRAY( post20->glyphNames, num, Char* ) ) --- > if ( num_names == 0 ) /* nothing more to do */ > return TT_Err_Ok; > > /* now load the name strings */ > if ( ALLOC_ARRAY( post20->glyphNames, num_names, Char* ) ) 175c201,202 < for ( n = 0; n < num; n++ ) --- > /* FIXME is it still really needed? */ > for ( n = 0; n < num_names; n++ ) 180c207 < for ( n = 0; n < num; n++ ) --- > for ( n = 0; n < num_names; n++ ) 182,189c209,210 < nameindex = post20->glyphNameIndex[n]; < < if ( nameindex < 258 ) < ; /* default Mac glyph, do nothing */ < else < { < if ( ACCESS_Frame( 1L ) ) < goto Fail1; --- > if ( ACCESS_Frame( 1L ) ) > goto Fail1; 191c212 < len = GET_Byte(); --- > len = GET_Byte(); 193c214 < FORGET_Frame(); --- > FORGET_Frame(); 195,198c216,218 < if ( ALLOC_ARRAY( post20->glyphNames[nameindex - 258], < len + 1, Char ) || < FILE_Read( post20->glyphNames[nameindex - 258], len ) ) < goto Fail1; --- > if ( ALLOC_ARRAY( post20->glyphNames[n], len + 1, Char ) || > FILE_Read( post20->glyphNames[n], len ) ) > goto Fail1; 200,202c220,221 < /* we make a C string */ < post20->glyphNames[nameindex - 258][len] = '\0'; < } --- > /* we make a C string */ > post20->glyphNames[n][len] = '\0'; 209c228 < for ( n = 0; n < num; n++ ) --- > for ( n = 0; n < num_names; n++ ) 314,317c333,339 < for ( n = 0; n < post->p.post20.numGlyphs; n++ ) < if ( post->p.post20.glyphNames[n] ) < FREE( post->p.post20.glyphNames[n] ); < FREE( post->p.post20.glyphNames ); --- > if ( post->p.post20.numNames ) > { > for ( n = 0; n < post->p.post20.numNames; n++ ) > if ( post->p.post20.glyphNames[n] ) > FREE( post->p.post20.glyphNames[n] ); > FREE( post->p.post20.glyphNames ); > } 342,343c364,365 < EXPORT_FUNC < TT_Error TT_Init_Post_Extension( TT_Engine engine ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Init_Post_Extension( TT_Engine engine ) 372,374c394,396 < EXPORT_FUNC < TT_Error TT_Load_PS_Names( TT_Face face, < TT_Post* ppost ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Load_PS_Names( TT_Face face, > TT_Post* ppost ) 458,461c480,483 < EXPORT_FUNC < TT_Error TT_Get_PS_Name( TT_Face face, < TT_UShort index, < TT_String** PSname ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Get_PS_Name( TT_Face face, > TT_UShort index, > TT_String** PSname ) Index: freetype/lib/extend/ftxpost.h =================================================================== RCS file: /cvs/freetype/freetype/lib/extend/ftxpost.h,v retrieving revision 1.7 retrieving revision 1.9 diff -r1.7 -r1.9 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2001 by 44a45 > TT_UShort numNames; 89,90c90,91 < EXPORT_DEF < TT_Error TT_Init_Post_Extension( TT_Engine engine ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Init_Post_Extension( TT_Engine engine ); 92,98c93,100 < EXPORT_DEF < TT_Error TT_Load_PS_Names( TT_Face face, < TT_Post* post ); < EXPORT_DEF < TT_Error TT_Get_PS_Name( TT_Face face, < TT_UShort index, < TT_String** PSname ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Load_PS_Names( TT_Face face, > TT_Post* post ); > > FT_EXPORT_DEF( TT_Error ) > TT_Get_PS_Name( TT_Face face, > TT_UShort index, > TT_String** PSname ); Index: freetype/lib/extend/ftxsbit.c =================================================================== RCS file: /cvs/freetype/freetype/lib/extend/ftxsbit.c,v retrieving revision 1.16 retrieving revision 1.19 diff -r1.16 -r1.19 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2001 by 58,66c58,66 < static < TT_Error Load_BitmapData( TT_SBit_Image* image, < Int image_size, < Byte x_offset, < Byte y_offset, < UShort source_width, < UShort source_height, < Bool byte_padded, < PFace face ) --- > static TT_Error > Load_BitmapData( TT_SBit_Image* image, > Int image_size, > Byte x_offset, > Byte y_offset, > UShort source_width, > UShort source_height, > Bool byte_padded, > PFace face ) 151,152c151 < static < void Crop_Bitmap( TT_SBit_Image* image ) --- > static void Crop_Bitmap( TT_SBit_Image* image ) 345,348c344,347 < static < TT_Error Load_Range_Codes( TT_SBit_Range* range, < PFace face, < Bool load_offsets ) --- > static TT_Error > Load_Range_Codes( TT_SBit_Range* range, > PFace face, > Bool load_offsets ) 396,399c395,398 < static < TT_Error Load_SBit_Range( TT_SBit_Strike* strike, < TT_SBit_Range* range, < PFace face ) --- > static TT_Error > Load_SBit_Range( TT_SBit_Strike* strike, > TT_SBit_Range* range, > PFace face ) 507,509c506,508 < static < TT_Error Load_TrueType_Eblc( PFace face, < TT_EBLC* eblc ) --- > static TT_Error > Load_TrueType_Eblc( PFace face, > TT_EBLC* eblc ) 514c513 < UShort i; --- > UInt i; 563c562 < for ( i = 0; i < eblc->num_strikes; i++, strike++ ) --- > for ( i = 0; i < (UInt)eblc->num_strikes; i++, strike++ ) 665,666c664 < static < void Free_TrueType_Eblc( TT_EBLC* eblc ) --- > static void Free_TrueType_Eblc( TT_EBLC* eblc ) 699,703c697,701 < static < TT_Error Load_SBit_Metrics( TT_Big_Glyph_Metrics* metrics, < TT_SBit_Range* range, < ULong ebdt_offset, < PFace face ) --- > static TT_Error > Load_SBit_Metrics( TT_Big_Glyph_Metrics* metrics, > TT_SBit_Range* range, > ULong ebdt_offset, > PFace face ) 806,814c804,812 < static < TT_Error Load_SBit_Image( TT_SBit_Strike strike, < UShort glyph_index, < Byte x_offset, < Byte y_offset, < ULong ebdt_offset, < TT_SBit_Image* image, < UShort component_depth, < PFace face ) --- > static TT_Error > Load_SBit_Image( TT_SBit_Strike strike, > UShort glyph_index, > Byte x_offset, > Byte y_offset, > ULong ebdt_offset, > TT_SBit_Image* image, > UShort component_depth, > PFace face ) 861c859 < for ( n = 0; n < cur->num_glyphs; n++ ) --- > for ( n = 0; (UInt)n < cur->num_glyphs; n++ ) 866,867c864,865 < ? cur->glyph_offsets[n] < : cur->image_offset + cur->image_size * n; --- > ? cur->glyph_offsets[n] > : cur->image_offset + cur->image_size * n; 997,1001c995,999 < static < TT_Error Load_TrueType_Ebdt( PFace face, < TT_SBit_Strike strike, < ULong glyph_index, < TT_SBit_Image* image ) --- > static TT_Error > Load_TrueType_Ebdt( PFace face, > TT_SBit_Strike strike, > ULong glyph_index, > TT_SBit_Image* image ) 1098,1099c1096,1097 < EXPORT_FUNC < TT_Error TT_Init_SBit_Extension( TT_Engine engine ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Init_SBit_Extension( TT_Engine engine ) 1141,1143c1139,1141 < EXPORT_FUNC < TT_Error TT_Get_Face_Bitmaps( TT_Face face, < TT_EBLC* eblc_table ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Get_Face_Bitmaps( TT_Face face, > TT_EBLC* eblc_table ) 1189,1192c1187,1190 < EXPORT_FUNC < TT_Error TT_Get_SBit_Strike( TT_Face face, < TT_Instance instance, < TT_SBit_Strike* strike ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Get_SBit_Strike( TT_Face face, > TT_Instance instance, > TT_SBit_Strike* strike ) 1263,1267c1261,1265 < EXPORT_FUNC < TT_Error TT_Load_Glyph_Bitmap( TT_Face face, < TT_Instance instance, < TT_UShort glyph_index, < TT_SBit_Image* image ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Load_Glyph_Bitmap( TT_Face face, > TT_Instance instance, > TT_UShort glyph_index, > TT_SBit_Image* image ) 1369,1370c1367,1368 < EXPORT_FUNC < TT_Error TT_New_SBit_Image( TT_SBit_Image** image ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_New_SBit_Image( TT_SBit_Image** image ) 1387,1388c1385,1386 < EXPORT_FUNC < void TT_Done_SBit_Image( TT_SBit_Image* image ) --- > FT_EXPORT_FUNC( void ) > TT_Done_SBit_Image( TT_SBit_Image* image ) Index: freetype/lib/extend/ftxsbit.h =================================================================== RCS file: /cvs/freetype/freetype/lib/extend/ftxsbit.h,v retrieving revision 1.8 retrieving revision 1.10 diff -r1.8 -r1.10 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2001 by 366,367c366,367 < EXPORT_DEF < TT_Error TT_Init_SBit_Extension( TT_Engine engine ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Init_SBit_Extension( TT_Engine engine ); 392,394c392,394 < EXPORT_DEF < TT_Error TT_Get_Face_Bitmaps( TT_Face face, < TT_EBLC* eblc_table ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Get_Face_Bitmaps( TT_Face face, > TT_EBLC* eblc_table ); 411,412c411,412 < EXPORT_DEF < TT_Error TT_New_SBit_Image( TT_SBit_Image** image ); --- > FT_EXPORT_DEF( TT_Error ) > TT_New_SBit_Image( TT_SBit_Image** image ); 426,427c426,427 < EXPORT_DEF < void TT_Done_SBit_Image( TT_SBit_Image* image ); --- > FT_EXPORT_DEF( void ) > TT_Done_SBit_Image( TT_SBit_Image* image ); 449,452c449,452 < EXPORT_DEF < TT_Error TT_Get_SBit_Strike( TT_Face face, < TT_Instance instance, < TT_SBit_Strike* strike ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Get_SBit_Strike( TT_Face face, > TT_Instance instance, > TT_SBit_Strike* strike ); 477,481c477,481 < EXPORT_DEF < TT_Error TT_Load_Glyph_Bitmap( TT_Face face, < TT_Instance instance, < TT_UShort glyph_index, < TT_SBit_Image* bitmap ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Load_Glyph_Bitmap( TT_Face face, > TT_Instance instance, > TT_UShort glyph_index, > TT_SBit_Image* bitmap ); Index: freetype/lib/extend/ftxwidth.c =================================================================== RCS file: /cvs/freetype/freetype/lib/extend/ftxwidth.c,v retrieving revision 1.10 retrieving revision 1.11 diff -r1.10 -r1.11 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2001 by 71,76c71,76 < EXPORT_FUNC < TT_Error TT_Get_Face_Widths( TT_Face face, < TT_UShort first_glyph, < TT_UShort last_glyph, < TT_UShort* widths, < TT_UShort* heights ) --- > FT_EXPORT_FUNC( TT_Error ) > TT_Get_Face_Widths( TT_Face face, > TT_UShort first_glyph, > TT_UShort last_glyph, > TT_UShort* widths, > TT_UShort* heights ) Index: freetype/lib/extend/ftxwidth.h =================================================================== RCS file: /cvs/freetype/freetype/lib/extend/ftxwidth.h,v retrieving revision 1.5 retrieving revision 1.6 diff -r1.5 -r1.6 7c7 < * Copyright 1996-2000 by --- > * Copyright 1996-2001 by 66,71c66,71 < EXPORT_DEF < TT_Error TT_Get_Face_Widths( TT_Face face, < TT_UShort first_glyph, < TT_UShort last_glyph, < TT_UShort* widths, < TT_UShort* heights ); --- > FT_EXPORT_DEF( TT_Error ) > TT_Get_Face_Widths( TT_Face face, > TT_UShort first_glyph, > TT_UShort last_glyph, > TT_UShort* widths, > TT_UShort* heights ); Index: freetype/pascal/README =================================================================== RCS file: /cvs/freetype/freetype/pascal/README,v retrieving revision 1.2 retrieving revision 1.3 diff -r1.2 -r1.3 1,5c1,5 < In previous releases of Freetype v.1.x, this directory hold a Pascal version < of the FreeType library. Since it has proven to be difficult to keep the < Pascal version in sync with the C version, we decided to split the two < projects, making the Pascal version of the Freetype 1.4 library available < separately. --- > In previous releases of Freetype v.1.x, this directory hold a Pascal > version of the FreeType library. Since it has proven to be difficult > to keep the Pascal version in sync with the C version, we decided to > split the two projects, making the Pascal version of the Freetype > 1.5 library available separately. 7,8c7,10 < If you are interested in the Pascal version, please download < `ftpascal.zip' or `ftpascal.tar.gz' from ftp://ftp.freetype.org/pub. --- > If you are interested in the Pascal version, please visit > http://www.freetype.org for more information. > > --- end of pascal/README --- Index: freetype/po/Makefile.in.in =================================================================== RCS file: /cvs/freetype/freetype/po/Makefile.in.in,v retrieving revision 1.11 retrieving revision 1.13 diff -r1.11 -r1.13 61c61 < DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot --- > DISTFILES = Makefile.in.in POTFILES.in $(PACKAGE).pot 216a217,220 > > .PHONY: all all-yes all-no install install-exec install-data install-data-no \ > install-data-yes installcheck uninstall check mostlyclean clean \ > distclean maintainer-clean dist distdir update-po Index: freetype/po/cs.po =================================================================== RCS file: /cvs/freetype/freetype/po/cs.po,v retrieving revision 1.34 retrieving revision 1.39 diff -r1.34 -r1.39 2,3c2,3 < # Copyright (C) 1998-2000 Pavel Kaòkovský < # Pavel Kaòkovský , 1998-2000 --- > # Copyright (C) 1998-2002 Pavel Kaòkovský > # Pavel Kaòkovský , 1998-2002 7,10c7,10 < "Project-Id-Version: FreeType 1.4\n" < "POT-Creation-Date: 2000-03-07 21:59+0000\n" < "PO-Revision-Date: 2000-03-19\n" < "Last-Translator: Pavel Kaòkovský , 1999\n" --- > "Project-Id-Version: FreeType 1.5\n" > "POT-Creation-Date: 2002-11-08 18:11+0000\n" > "PO-Revision-Date: 2002-12-25\n" > "Last-Translator: Pavel Kaòkovský , 2002\n" 16c16,41 < #: lib/extend/ftxerr18.c:47 --- > #: lib/extend/ftxerr18.c:40 > msgid "" > "Welcome to the translation of the Freetype v.1 library!\n" > "\n" > "This message is not really part of the library (it is bracketed by\n" > " #if 0 / #endif), but is really intended to be the first one in the .po\n" > "file, and the first one that a new translator should see, to give hints.\n" > "\n" > "First, while this .po might seems big, the real interesting part of it\n" > "is only the messages in this file, lib/extend/ftxerr18.c. The other\n" > "messages are part of the demonstration programs, and are more intended\n" > "to help grasping how to use i18n with the Freetype library. So the real\n" > "work is the about 65 first ones. Unfortunately they are the harder ones!\n" > "\n" > "A difficulty is that there are some specialized vocabulary, about\n" > "``faces'', ``glyph'' and similar things. These are typographical things,\n" > "and this should be researched before attempting to translate the whole\n" > "thing. A quick look across the TrueType documentation might help to\n" > "understand many things, too.\n" > "\n" > "Best wiches for your translation!\n" > "Antoine Leca - 2002-11-08" > msgstr "" > "(Read)" > > #: lib/extend/ftxerr18.c:77 20c45 < #: lib/extend/ftxerr18.c:50 --- > #: lib/extend/ftxerr18.c:80 24c49 < #: lib/extend/ftxerr18.c:52 --- > #: lib/extend/ftxerr18.c:82 28c53 < #: lib/extend/ftxerr18.c:54 --- > #: lib/extend/ftxerr18.c:84 32c57 < #: lib/extend/ftxerr18.c:56 --- > #: lib/extend/ftxerr18.c:86 36c61 < #: lib/extend/ftxerr18.c:58 --- > #: lib/extend/ftxerr18.c:88 40c65 < #: lib/extend/ftxerr18.c:60 --- > #: lib/extend/ftxerr18.c:90 44c69 < #: lib/extend/ftxerr18.c:62 --- > #: lib/extend/ftxerr18.c:92 48c73 < #: lib/extend/ftxerr18.c:64 --- > #: lib/extend/ftxerr18.c:94 52c77 < #: lib/extend/ftxerr18.c:66 --- > #: lib/extend/ftxerr18.c:96 56c81 < #: lib/extend/ftxerr18.c:69 --- > #: lib/extend/ftxerr18.c:98 60c85 < #: lib/extend/ftxerr18.c:71 --- > #: lib/extend/ftxerr18.c:100 64c89 < #: lib/extend/ftxerr18.c:73 --- > #: lib/extend/ftxerr18.c:102 68c93 < #: lib/extend/ftxerr18.c:75 --- > #: lib/extend/ftxerr18.c:104 72c97 < #: lib/extend/ftxerr18.c:77 --- > #: lib/extend/ftxerr18.c:106 76c101 < #: lib/extend/ftxerr18.c:80 --- > #: lib/extend/ftxerr18.c:109 80c105 < #: lib/extend/ftxerr18.c:83 --- > #: lib/extend/ftxerr18.c:112 84c109 < #: lib/extend/ftxerr18.c:85 --- > #: lib/extend/ftxerr18.c:114 88c113 < #: lib/extend/ftxerr18.c:87 --- > #: lib/extend/ftxerr18.c:116 92c117 < #: lib/extend/ftxerr18.c:89 --- > #: lib/extend/ftxerr18.c:118 96c121 < #: lib/extend/ftxerr18.c:92 --- > #: lib/extend/ftxerr18.c:121 100c125 < #: lib/extend/ftxerr18.c:95 --- > #: lib/extend/ftxerr18.c:124 102c127 < msgstr "Tabulka maximálních hodnot (MAXP) chybí." --- > msgstr "Chybìjící tabulka maximálních hodnot (MAXP)." 104c129 < #: lib/extend/ftxerr18.c:97 --- > #: lib/extend/ftxerr18.c:126 106c131 < msgstr "Tabulka HEAD chybí." --- > msgstr "Chybìjící tabulka hlavièky písma (HEAD)." 108c133 < #: lib/extend/ftxerr18.c:99 --- > #: lib/extend/ftxerr18.c:128 110c135 < msgstr "Tabulka HHEA chybí." --- > msgstr "Chybìjící tabulka horizontální hlavièky (HHEA)." 112c137 < #: lib/extend/ftxerr18.c:101 --- > #: lib/extend/ftxerr18.c:130 114c139 < msgstr "Tabulka pozic liter (LOCA) chybí." --- > msgstr "Chybìjící tabulka adres liter (LOCA)." 116c141 < #: lib/extend/ftxerr18.c:103 --- > #: lib/extend/ftxerr18.c:132 118c143 < msgstr "Tabulka jmen (NAME) chybí." --- > msgstr "Chybìjící tabulka jmen (NAME)." 120c145 < #: lib/extend/ftxerr18.c:105 --- > #: lib/extend/ftxerr18.c:134 122c147 < msgstr "Tabulky znakových map (CMAP) chybí." --- > msgstr "Chybìjící tabulky znakových map (CMAP)." 124c149 < #: lib/extend/ftxerr18.c:107 --- > #: lib/extend/ftxerr18.c:136 126c151 < msgstr "Tabulka horizontálních metrik (HTMX) chybí." --- > msgstr "Chybìjící tabulka horizontálních metrik (HTMX)." 128c153 < #: lib/extend/ftxerr18.c:109 --- > #: lib/extend/ftxerr18.c:138 130c155 < msgstr "Tabulka OS/2 chybí." --- > msgstr "Chybìjící tabulka OS/2." 132c157 < #: lib/extend/ftxerr18.c:111 --- > #: lib/extend/ftxerr18.c:140 134c159 < msgstr "Tabulka dat pro PostScript (POST) chybí." --- > msgstr "Chybìjící tabulka dat pro PostScript (POST)." 136c161 < #: lib/extend/ftxerr18.c:113 --- > #: lib/extend/ftxerr18.c:142 138c163 < msgstr "Tabulka liter (GLYF) chybí." --- > msgstr "Chybìjící tabulka liter (GLYF)." 140c165 < #: lib/extend/ftxerr18.c:118 --- > #: lib/extend/ftxerr18.c:147 144c169 < #: lib/extend/ftxerr18.c:123 --- > #: lib/extend/ftxerr18.c:152 146c171 < msgstr "Neplatná pozice v souboru." --- > msgstr "Neplatná adresa v souboru." 148c173 < #: lib/extend/ftxerr18.c:125 --- > #: lib/extend/ftxerr18.c:154 152c177 < #: lib/extend/ftxerr18.c:127 --- > #: lib/extend/ftxerr18.c:156 156c181 < #: lib/extend/ftxerr18.c:132 --- > #: lib/extend/ftxerr18.c:161 160c185 < #: lib/extend/ftxerr18.c:134 --- > #: lib/extend/ftxerr18.c:163 164c189 < #: lib/extend/ftxerr18.c:136 --- > #: lib/extend/ftxerr18.c:165 168c193 < #: lib/extend/ftxerr18.c:138 --- > #: lib/extend/ftxerr18.c:167 172c197,201 < #: lib/extend/ftxerr18.c:143 --- > #: lib/extend/ftxerr18.c:169 > msgid "Too many function definitions (FDEF)." > msgstr "Pøíli¹ mnoho definic funkcí (FDEF)." > > #: lib/extend/ftxerr18.c:174 176c205 < #: lib/extend/ftxerr18.c:145 --- > #: lib/extend/ftxerr18.c:176 180c209 < #: lib/extend/ftxerr18.c:147 --- > #: lib/extend/ftxerr18.c:178 184c213 < #: lib/extend/ftxerr18.c:149 --- > #: lib/extend/ftxerr18.c:180 188c217 < #: lib/extend/ftxerr18.c:151 --- > #: lib/extend/ftxerr18.c:182 192c221 < #: lib/extend/ftxerr18.c:153 --- > #: lib/extend/ftxerr18.c:184 196c225 < #: lib/extend/ftxerr18.c:155 --- > #: lib/extend/ftxerr18.c:186 200c229 < #: lib/extend/ftxerr18.c:157 --- > #: lib/extend/ftxerr18.c:188 204c233 < #: lib/extend/ftxerr18.c:159 --- > #: lib/extend/ftxerr18.c:190 208c237 < #: lib/extend/ftxerr18.c:161 --- > #: lib/extend/ftxerr18.c:192 212c241 < #: lib/extend/ftxerr18.c:163 --- > #: lib/extend/ftxerr18.c:194 214c243 < msgstr "Interpolace mezi body v soumraèné zónì." --- > msgstr "Interpolace mezi body v \"soumraèné zónì\"." 216c245 < #: lib/extend/ftxerr18.c:165 --- > #: lib/extend/ftxerr18.c:196 220c249 < #: lib/extend/ftxerr18.c:167 --- > #: lib/extend/ftxerr18.c:198 224c253 < #: lib/extend/ftxerr18.c:169 --- > #: lib/extend/ftxerr18.c:200 228c257 < #: lib/extend/ftxerr18.c:171 --- > #: lib/extend/ftxerr18.c:202 232c261 < #: lib/extend/ftxerr18.c:173 --- > #: lib/extend/ftxerr18.c:204 236c265 < #: lib/extend/ftxerr18.c:175 --- > #: lib/extend/ftxerr18.c:206 240c269 < #: lib/extend/ftxerr18.c:177 --- > #: lib/extend/ftxerr18.c:208 244c273 < #: lib/extend/ftxerr18.c:182 --- > #: lib/extend/ftxerr18.c:213 248c277 < #: lib/extend/ftxerr18.c:184 --- > #: lib/extend/ftxerr18.c:215 252c281 < #: lib/extend/ftxerr18.c:186 --- > #: lib/extend/ftxerr18.c:217 256c285 < #: lib/extend/ftxerr18.c:188 --- > #: lib/extend/ftxerr18.c:219 260c289 < #: lib/extend/ftxerr18.c:193 --- > #: lib/extend/ftxerr18.c:224 264c293 < #: lib/extend/ftxerr18.c:195 --- > #: lib/extend/ftxerr18.c:226 268c297 < #: lib/extend/ftxerr18.c:197 --- > #: lib/extend/ftxerr18.c:228 272c301 < #: lib/extend/ftxerr18.c:199 --- > #: lib/extend/ftxerr18.c:230 276c305 < #: lib/extend/ftxerr18.c:204 --- > #: lib/extend/ftxerr18.c:235 280c309 < #: lib/extend/ftxerr18.c:206 --- > #: lib/extend/ftxerr18.c:237 284c313 < #: lib/extend/ftxerr18.c:208 --- > #: lib/extend/ftxerr18.c:240 288c317 < #: lib/extend/ftxerr18.c:210 --- > #: lib/extend/ftxerr18.c:242 292c321 < #: lib/extend/ftxerr18.c:216 --- > #: lib/extend/ftxerr18.c:247 296c325 < #: lib/extend/ftxerr18.c:218 --- > #: lib/extend/ftxerr18.c:249 300c329 < #: lib/extend/ftxerr18.c:220 --- > #: lib/extend/ftxerr18.c:251 304c333 < #: lib/extend/ftxerr18.c:222 --- > #: lib/extend/ftxerr18.c:253 306c335 < msgstr "Pøíli¹ mnoho vlo¾ených kontextových substitucí." --- > msgstr "Pøíli¹ mnoho vnoøených kontextových substitucí." 308c337,341 < #: lib/extend/ftxerr18.c:224 --- > #: lib/extend/ftxerr18.c:255 > msgid "No MM (Adobe MultipleMaster) interpreter available." > msgstr "®ádný interpreter MM (Adobe MultipleMaster) není k dispozici." > > #: lib/extend/ftxerr18.c:258 312c345 < #: lib/extend/ftxerr18.c:226 --- > #: lib/extend/ftxerr18.c:260 316c349 < #: lib/extend/ftxerr18.c:228 --- > #: lib/extend/ftxerr18.c:263 320c353 < #: lib/extend/ftxerr18.c:230 --- > #: lib/extend/ftxerr18.c:265 324c357,365 < #: lib/extend/ftxerr18.c:237 --- > #: lib/extend/ftxerr18.c:268 > msgid "Invalid glyph definition (GDEF) table format." > msgstr "Neplatný formát tabulky definic liter (GDEF)." > > #: lib/extend/ftxerr18.c:270 > msgid "Invalid glyph definition (GDEF) table." > msgstr "Neplatná tabulka definic liter (GDEF)." > > #: lib/extend/ftxerr18.c:277 328c369,385 < #: test/fterror.c:60 --- > #: test/fterror.c:49 > msgid "" > "fterror: test TT_ErrToString18 functionality\n" > "\n" > msgstr "" > "fterror: test funkce TT_ErrToString18\n" > "\n" > > #: test/fterror.c:50 > msgid "" > " with an optional numerical argument, dumps the associated message.\n" > "\n" > msgstr "" > " pøi zadání èíselného argumentu vypí¹e odpovídající hlá¹ení.\n" > "\n" > > #: test/fterror.c:73 332c389 < #: test/fterror.c:68 --- > #: test/fterror.c:81 336c393,398 < #: test/ftdump.c:168 test/ftlint.c:207 test/ftmetric.c:292 --- > #: test/fterror.c:96 > #, c-format > msgid "Freetype error code 0x%04lX (%lu): %s\n" > msgstr "Chybové hlá¹ení FreeType 0x%04lX (%lu): %s\n" > > #: test/ftdump.c:169 test/ftlint.c:207 test/ftmetric.c:294 340c402 < #: test/ftdump.c:178 test/ftlint.c:215 test/ftmetric.c:301 test/ftsbit.c:213 --- > #: test/ftdump.c:179 test/ftlint.c:215 test/ftmetric.c:303 test/ftsbit.c:214 344c406 < #: test/ftdump.c:187 --- > #: test/ftdump.c:188 348c410 < #: test/ftdump.c:193 --- > #: test/ftdump.c:194 352c414 < #: test/ftdump.c:201 --- > #: test/ftdump.c:202 356c418 < #: test/ftdump.c:202 --- > #: test/ftdump.c:203 360c422 < #: test/ftdump.c:203 --- > #: test/ftdump.c:204 364c426 < #: test/ftdump.c:207 --- > #: test/ftdump.c:208 368c430 < #: test/ftdump.c:214 --- > #: test/ftdump.c:215 372,374c434,436 < #: test/ftdump.c:222 test/ftdump.c:574 test/ftdump.c:784 test/ftdump.c:988 < #: test/ftdump.c:1135 test/ftlint.c:274 test/ftlint.c:287 test/ftmetric.c:387 < #: test/ftsbit.c:284 --- > #: test/ftdump.c:223 test/ftdump.c:579 test/ftdump.c:789 test/ftdump.c:993 > #: test/ftdump.c:1139 test/ftlint.c:274 test/ftlint.c:287 test/ftmetric.c:390 > #: test/ftsbit.c:286 379c441 < #: test/ftdump.c:299 --- > #: test/ftdump.c:300 383c445 < #: test/ftdump.c:309 --- > #: test/ftdump.c:310 392c454 < #: test/ftdump.c:332 --- > #: test/ftdump.c:333 396c458 < #: test/ftdump.c:339 test/ftdump.c:483 --- > #: test/ftdump.c:340 test/ftdump.c:488 400c462 < #: test/ftdump.c:343 test/ftdump.c:487 --- > #: test/ftdump.c:344 test/ftdump.c:492 409c471 < #: test/ftdump.c:348 --- > #: test/ftdump.c:349 414c476 < #: test/ftdump.c:375 test/ftdump.c:384 test/ftdump.c:447 --- > #: test/ftdump.c:376 test/ftdump.c:385 test/ftdump.c:452 419c481 < #: test/ftdump.c:454 --- > #: test/ftdump.c:459 423c485 < #: test/ftdump.c:476 --- > #: test/ftdump.c:481 427c489 < #: test/ftdump.c:493 --- > #: test/ftdump.c:498 432c494 < #: test/ftdump.c:498 --- > #: test/ftdump.c:503 435c497 < msgstr "první: index litery %hu, kód znaku 0x%lx\n" --- > msgstr "první: index litery %hu, kód znaku 0x%lx\n" 437c499 < #: test/ftdump.c:502 --- > #: test/ftdump.c:507 440c502 < msgstr "dal¹í: index litery %hu, kód znaku 0x%lx\n" --- > msgstr "dal¹í: index litery %hu, kód znaku 0x%lx\n" 442c504 < #: test/ftdump.c:506 --- > #: test/ftdump.c:511 445c507 < msgstr "poslední: glyph index %hu, character code 0x%lx\n" --- > msgstr "poslední: index litery %hu, kód znaku 0x%lx\n" 447c509 < #: test/ftdump.c:528 test/ftmetric.c:282 --- > #: test/ftdump.c:533 test/ftmetric.c:284 451c513 < #: test/ftdump.c:532 --- > #: test/ftdump.c:537 453c515 < msgstr "tabulka vlo¾ených bimap\n" --- > msgstr "tabulka vlo¾ených bitmap\n" 455c517 < #: test/ftdump.c:535 --- > #: test/ftdump.c:540 460c522 < #: test/ftdump.c:537 --- > #: test/ftdump.c:542 465c527 < #: test/ftdump.c:547 --- > #: test/ftdump.c:552 470c532 < #: test/ftdump.c:550 --- > #: test/ftdump.c:555 475c537 < #: test/ftdump.c:559 --- > #: test/ftdump.c:564 480c542 < #: test/ftdump.c:610 --- > #: test/ftdump.c:615 484c546 < #: test/ftdump.c:614 --- > #: test/ftdump.c:619 488c550 < #: test/ftdump.c:621 --- > #: test/ftdump.c:626 492c554 < #: test/ftdump.c:634 --- > #: test/ftdump.c:639 497c559 < #: test/ftdump.c:639 test/ftdump.c:843 --- > #: test/ftdump.c:644 test/ftdump.c:848 502c564 < #: test/ftdump.c:647 --- > #: test/ftdump.c:652 508c570 < #: test/ftdump.c:652 test/ftdump.c:856 --- > #: test/ftdump.c:657 test/ftdump.c:861 512c574 < #: test/ftdump.c:665 --- > #: test/ftdump.c:670 521c583 < #: test/ftdump.c:671 test/ftdump.c:752 test/ftdump.c:875 test/ftdump.c:956 --- > #: test/ftdump.c:676 test/ftdump.c:757 test/ftdump.c:880 test/ftdump.c:961 526c588 < #: test/ftdump.c:687 --- > #: test/ftdump.c:692 531c593 < #: test/ftdump.c:704 --- > #: test/ftdump.c:709 536c598 < #: test/ftdump.c:709 test/ftdump.c:913 --- > #: test/ftdump.c:714 test/ftdump.c:918 541c603 < #: test/ftdump.c:714 test/ftdump.c:918 --- > #: test/ftdump.c:719 test/ftdump.c:923 546c608 < #: test/ftdump.c:729 --- > #: test/ftdump.c:734 555c617 < #: test/ftdump.c:746 --- > #: test/ftdump.c:751 564c626 < #: test/ftdump.c:771 test/ftdump.c:975 --- > #: test/ftdump.c:776 test/ftdump.c:980 572c634 < #: test/ftdump.c:774 test/ftdump.c:978 --- > #: test/ftdump.c:779 test/ftdump.c:983 577c639 < #: test/ftdump.c:814 --- > #: test/ftdump.c:819 581c643 < #: test/ftdump.c:818 --- > #: test/ftdump.c:823 585c647 < #: test/ftdump.c:825 --- > #: test/ftdump.c:830 589c651 < #: test/ftdump.c:838 --- > #: test/ftdump.c:843 594c656 < #: test/ftdump.c:851 --- > #: test/ftdump.c:856 600c662 < #: test/ftdump.c:869 --- > #: test/ftdump.c:874 609c671 < #: test/ftdump.c:891 --- > #: test/ftdump.c:896 614c676 < #: test/ftdump.c:908 --- > #: test/ftdump.c:913 619c681 < #: test/ftdump.c:933 --- > #: test/ftdump.c:938 628c690 < #: test/ftdump.c:950 --- > #: test/ftdump.c:955 637c699 < #: test/ftdump.c:1013 --- > #: test/ftdump.c:1018 642c704 < #: test/ftdump.c:1017 --- > #: test/ftdump.c:1022 651c713 < #: test/ftdump.c:1049 test/ftlint.c:134 test/ftmetric.c:226 test/ftsbit.c:126 --- > #: test/ftdump.c:1054 test/ftlint.c:134 test/ftmetric.c:228 test/ftsbit.c:127 655c717 < #: test/ftdump.c:1056 test/ftmetric.c:234 test/ftsbit.c:133 --- > #: test/ftdump.c:1061 test/ftmetric.c:236 test/ftsbit.c:134 659c721 < #: test/ftdump.c:1063 --- > #: test/ftdump.c:1068 663c725 < #: test/ftdump.c:1070 --- > #: test/ftdump.c:1075 667c729 < #: test/ftdump.c:1086 test/ftlint.c:187 test/ftmetric.c:249 test/ftsbit.c:181 --- > #: test/ftdump.c:1091 test/ftlint.c:187 test/ftmetric.c:251 test/ftsbit.c:182 672c734 < #: test/ftdump.c:1089 test/ftlint.c:193 test/ftmetric.c:252 test/ftsbit.c:187 --- > #: test/ftdump.c:1094 test/ftlint.c:193 test/ftmetric.c:254 test/ftsbit.c:188 688c750 < "Pou¾ití: %s ppem název-písma[.ttf|.ttc] [název-dal¹ího-písma..]\n" --- > "Pou¾ití: %s ppem název-písma[.ttf|.ttc] [název-dal¹ího-písma...]\n" 691c753 < #: test/ftlint.c:226 test/ftsbit.c:224 --- > #: test/ftlint.c:226 test/ftsbit.c:225 718c780 < #: test/ftmetric.c:68 --- > #: test/ftmetric.c:70 723c785 < #: test/ftmetric.c:72 --- > #: test/ftmetric.c:74 734c796 < "Pou¾ití: %s [volby viz ní¾e] bodová-velikost název-písma[.ttf|.ttc]\n" --- > "Pou¾ití: %s [volby (viz ní¾e)] bodová-velikost název-písma[.ttf|.ttc]\n" 742c804 < #: test/ftmetric.c:259 --- > #: test/ftmetric.c:261 747c809 < #: test/ftmetric.c:264 --- > #: test/ftmetric.c:266 752c814 < #: test/ftmetric.c:278 --- > #: test/ftmetric.c:280 756c818 < #: test/ftmetric.c:308 --- > #: test/ftmetric.c:310 760c822 < #: test/ftmetric.c:315 --- > #: test/ftmetric.c:317 764c826 < #: test/ftmetric.c:321 --- > #: test/ftmetric.c:323 769c831 < #: test/ftmetric.c:331 test/ftsbit.c:233 --- > #: test/ftmetric.c:333 test/ftsbit.c:234 773c835 < #: test/ftmetric.c:339 test/ftsbit.c:257 --- > #: test/ftmetric.c:341 test/ftsbit.c:258 778c840 < #: test/ftmetric.c:366 --- > #: test/ftmetric.c:368 782c844 < #: test/ftmetric.c:368 --- > #: test/ftmetric.c:370 786c848 < #: test/ftsbit.c:89 --- > #: test/ftsbit.c:90 791c853 < #: test/ftsbit.c:94 --- > #: test/ftsbit.c:95 797c859 < "Pou¾ití: %s ppem název-písma[.ttf|.ttc] index-litery [index-dal¹í-litery..]\n" --- > "Pou¾ití: %s ppem název-písma[.ttf|.ttc] index-litery [index-dal¹í-litery...]\n" 800c862 < #: test/ftsbit.c:199 --- > #: test/ftsbit.c:200 804c866 < #: test/ftsbit.c:205 --- > #: test/ftsbit.c:206 808c870 < #: test/ftsbit.c:251 --- > #: test/ftsbit.c:252 813c875 < #: test/ftsbit.c:263 --- > #: test/ftsbit.c:264 818c880 < #: test/ftsbit.c:266 --- > #: test/ftsbit.c:267 Index: freetype/po/de.po =================================================================== RCS file: /cvs/freetype/freetype/po/de.po,v retrieving revision 1.37 retrieving revision 1.42 diff -r1.37 -r1.42 7,9c7,9 < "Project-Id-Version: FreeType 1.4\n" < "POT-Creation-Date: 2000-03-07 21:59+0000\n" < "PO-Revision-Date: 2000-01-05\n" --- > "Project-Id-Version: FreeType 1.5\n" > "POT-Creation-Date: 2002-11-08 18:11+0000\n" > "PO-Revision-Date: 2002-11-10\n" 16c16,40 < #: lib/extend/ftxerr18.c:47 --- > #: lib/extend/ftxerr18.c:40 > msgid "" > "Welcome to the translation of the Freetype v.1 library!\n" > "\n" > "This message is not really part of the library (it is bracketed by\n" > " #if 0 / #endif), but is really intended to be the first one in the .po\n" > "file, and the first one that a new translator should see, to give hints.\n" > "\n" > "First, while this .po might seems big, the real interesting part of it\n" > "is only the messages in this file, lib/extend/ftxerr18.c. The other\n" > "messages are part of the demonstration programs, and are more intended\n" > "to help grasping how to use i18n with the Freetype library. So the real\n" > "work is the about 65 first ones. Unfortunately they are the harder ones!\n" > "\n" > "A difficulty is that there are some specialized vocabulary, about\n" > "``faces'', ``glyph'' and similar things. These are typographical things,\n" > "and this should be researched before attempting to translate the whole\n" > "thing. A quick look across the TrueType documentation might help to\n" > "understand many things, too.\n" > "\n" > "Best wiches for your translation!\n" > "Antoine Leca - 2002-11-08" > msgstr "no translation needed" > > #: lib/extend/ftxerr18.c:77 20c44 < #: lib/extend/ftxerr18.c:50 --- > #: lib/extend/ftxerr18.c:80 22c46 < msgstr "Ungültiger Schrifthenkel." --- > msgstr "Ungültiges Schriftobjekt." 24c48 < #: lib/extend/ftxerr18.c:52 --- > #: lib/extend/ftxerr18.c:82 26c50 < msgstr "Ungültiger Instanzenhenkel." --- > msgstr "Ungültiges Instanzenobjekt." 28c52 < #: lib/extend/ftxerr18.c:54 --- > #: lib/extend/ftxerr18.c:84 30c54 < msgstr "Ungültiger Glyphhenkel." --- > msgstr "Ungültiges Glyphobjekt." 32c56 < #: lib/extend/ftxerr18.c:56 --- > #: lib/extend/ftxerr18.c:86 34c58 < msgstr "Ungültiger Charmaphenkel." --- > msgstr "Ungültiges Objekt für Zeichenkodierungstabelle (charmap)." 36c60 < #: lib/extend/ftxerr18.c:58 --- > #: lib/extend/ftxerr18.c:88 40c64 < #: lib/extend/ftxerr18.c:60 --- > #: lib/extend/ftxerr18.c:90 44c68 < #: lib/extend/ftxerr18.c:62 --- > #: lib/extend/ftxerr18.c:92 48c72 < #: lib/extend/ftxerr18.c:64 --- > #: lib/extend/ftxerr18.c:94 52c76 < #: lib/extend/ftxerr18.c:66 --- > #: lib/extend/ftxerr18.c:96 56c80 < #: lib/extend/ftxerr18.c:69 --- > #: lib/extend/ftxerr18.c:98 60c84 < #: lib/extend/ftxerr18.c:71 --- > #: lib/extend/ftxerr18.c:100 64c88 < #: lib/extend/ftxerr18.c:73 --- > #: lib/extend/ftxerr18.c:102 66c90 < msgstr "Ungültiges Format der Zeichenkodierungstabelle." --- > msgstr "Ungültiges Format der Zeichenkodierungstabelle (charmap)." 68c92 < #: lib/extend/ftxerr18.c:75 --- > #: lib/extend/ftxerr18.c:104 72c96 < #: lib/extend/ftxerr18.c:77 --- > #: lib/extend/ftxerr18.c:106 76c100 < #: lib/extend/ftxerr18.c:80 --- > #: lib/extend/ftxerr18.c:109 80c104 < #: lib/extend/ftxerr18.c:83 --- > #: lib/extend/ftxerr18.c:112 84c108 < #: lib/extend/ftxerr18.c:85 --- > #: lib/extend/ftxerr18.c:114 88c112 < #: lib/extend/ftxerr18.c:87 --- > #: lib/extend/ftxerr18.c:116 92c116 < #: lib/extend/ftxerr18.c:89 --- > #: lib/extend/ftxerr18.c:118 96c120 < #: lib/extend/ftxerr18.c:92 --- > #: lib/extend/ftxerr18.c:121 100c124 < #: lib/extend/ftxerr18.c:95 --- > #: lib/extend/ftxerr18.c:124 104c128 < #: lib/extend/ftxerr18.c:97 --- > #: lib/extend/ftxerr18.c:126 108c132 < #: lib/extend/ftxerr18.c:99 --- > #: lib/extend/ftxerr18.c:128 112c136 < #: lib/extend/ftxerr18.c:101 --- > #: lib/extend/ftxerr18.c:130 116c140 < #: lib/extend/ftxerr18.c:103 --- > #: lib/extend/ftxerr18.c:132 120c144 < #: lib/extend/ftxerr18.c:105 --- > #: lib/extend/ftxerr18.c:134 124c148 < #: lib/extend/ftxerr18.c:107 --- > #: lib/extend/ftxerr18.c:136 128c152 < #: lib/extend/ftxerr18.c:109 --- > #: lib/extend/ftxerr18.c:138 132c156 < #: lib/extend/ftxerr18.c:111 --- > #: lib/extend/ftxerr18.c:140 136c160 < #: lib/extend/ftxerr18.c:113 --- > #: lib/extend/ftxerr18.c:142 140c164 < #: lib/extend/ftxerr18.c:118 --- > #: lib/extend/ftxerr18.c:147 144c168 < #: lib/extend/ftxerr18.c:123 --- > #: lib/extend/ftxerr18.c:152 148c172 < #: lib/extend/ftxerr18.c:125 --- > #: lib/extend/ftxerr18.c:154 152c176 < #: lib/extend/ftxerr18.c:127 --- > #: lib/extend/ftxerr18.c:156 154c178 < msgstr "Ungültiger Speicherrahmenzugriff." --- > msgstr "Ungültiger Zugriff auf Speicherfenster (frame)." 156c180 < #: lib/extend/ftxerr18.c:132 --- > #: lib/extend/ftxerr18.c:161 160c184 < #: lib/extend/ftxerr18.c:134 --- > #: lib/extend/ftxerr18.c:163 164c188 < #: lib/extend/ftxerr18.c:136 --- > #: lib/extend/ftxerr18.c:165 166c190 < msgstr "Ungültiges zusammengesetztes Glyph." --- > msgstr "Ungültiger zusammengesetzter Glyph." 168c192 < #: lib/extend/ftxerr18.c:138 --- > #: lib/extend/ftxerr18.c:167 172c196,200 < #: lib/extend/ftxerr18.c:143 --- > #: lib/extend/ftxerr18.c:169 > msgid "Too many function definitions (FDEF)." > msgstr "Zu viele Funktionsdefinitionen (FDEF)." > > #: lib/extend/ftxerr18.c:174 176c204 < #: lib/extend/ftxerr18.c:145 --- > #: lib/extend/ftxerr18.c:176 180c208 < #: lib/extend/ftxerr18.c:147 --- > #: lib/extend/ftxerr18.c:178 182c210 < msgstr "Stacküberlauf." --- > msgstr "Stack-Überlauf." 184c212 < #: lib/extend/ftxerr18.c:149 --- > #: lib/extend/ftxerr18.c:180 186c214 < msgstr "Codeüberlauf." --- > msgstr "Code-Überlauf." 188c216 < #: lib/extend/ftxerr18.c:151 --- > #: lib/extend/ftxerr18.c:182 192c220 < #: lib/extend/ftxerr18.c:153 --- > #: lib/extend/ftxerr18.c:184 196c224 < #: lib/extend/ftxerr18.c:155 --- > #: lib/extend/ftxerr18.c:186 200c228 < #: lib/extend/ftxerr18.c:157 --- > #: lib/extend/ftxerr18.c:188 204c232 < #: lib/extend/ftxerr18.c:159 --- > #: lib/extend/ftxerr18.c:190 208c236 < #: lib/extend/ftxerr18.c:161 --- > #: lib/extend/ftxerr18.c:192 212c240 < #: lib/extend/ftxerr18.c:163 --- > #: lib/extend/ftxerr18.c:194 216c244 < #: lib/extend/ftxerr18.c:165 --- > #: lib/extend/ftxerr18.c:196 220c248 < #: lib/extend/ftxerr18.c:167 --- > #: lib/extend/ftxerr18.c:198 224c252 < #: lib/extend/ftxerr18.c:169 --- > #: lib/extend/ftxerr18.c:200 226c254 < msgstr "Außerhalb des Codebereichs." --- > msgstr "Außerhalb der Code-Bereiche." 228c256 < #: lib/extend/ftxerr18.c:171 --- > #: lib/extend/ftxerr18.c:202 232c260 < #: lib/extend/ftxerr18.c:173 --- > #: lib/extend/ftxerr18.c:204 236c264 < #: lib/extend/ftxerr18.c:175 --- > #: lib/extend/ftxerr18.c:206 240c268 < #: lib/extend/ftxerr18.c:177 --- > #: lib/extend/ftxerr18.c:208 246c274 < #: lib/extend/ftxerr18.c:182 --- > #: lib/extend/ftxerr18.c:213 248c276 < msgstr "Verschachtelter Speicherrahmenzugriff." --- > msgstr "Verschachtelter Zugriff auf Speicherfenster (frame)." 250c278 < #: lib/extend/ftxerr18.c:184 --- > #: lib/extend/ftxerr18.c:215 254c282 < #: lib/extend/ftxerr18.c:186 --- > #: lib/extend/ftxerr18.c:217 258c286 < #: lib/extend/ftxerr18.c:188 --- > #: lib/extend/ftxerr18.c:219 262c290 < #: lib/extend/ftxerr18.c:193 --- > #: lib/extend/ftxerr18.c:224 266c294 < #: lib/extend/ftxerr18.c:195 --- > #: lib/extend/ftxerr18.c:226 270c298 < #: lib/extend/ftxerr18.c:197 --- > #: lib/extend/ftxerr18.c:228 274c302 < #: lib/extend/ftxerr18.c:199 --- > #: lib/extend/ftxerr18.c:230 278c306 < #: lib/extend/ftxerr18.c:204 --- > #: lib/extend/ftxerr18.c:235 282c310 < #: lib/extend/ftxerr18.c:206 --- > #: lib/extend/ftxerr18.c:237 286c314 < #: lib/extend/ftxerr18.c:208 --- > #: lib/extend/ftxerr18.c:240 290c318 < #: lib/extend/ftxerr18.c:210 --- > #: lib/extend/ftxerr18.c:242 294c322 < #: lib/extend/ftxerr18.c:216 --- > #: lib/extend/ftxerr18.c:247 298c326 < #: lib/extend/ftxerr18.c:218 --- > #: lib/extend/ftxerr18.c:249 302c330 < #: lib/extend/ftxerr18.c:220 --- > #: lib/extend/ftxerr18.c:251 306c334 < #: lib/extend/ftxerr18.c:222 --- > #: lib/extend/ftxerr18.c:253 310c338,342 < #: lib/extend/ftxerr18.c:224 --- > #: lib/extend/ftxerr18.c:255 > msgid "No MM (Adobe MultipleMaster) interpreter available." > msgstr "Kein MM-Interpreter (für Adobe MultipleMaster Fonts) verfügbar." > > #: lib/extend/ftxerr18.c:258 314c346 < #: lib/extend/ftxerr18.c:226 --- > #: lib/extend/ftxerr18.c:260 318c350 < #: lib/extend/ftxerr18.c:228 --- > #: lib/extend/ftxerr18.c:263 322c354 < #: lib/extend/ftxerr18.c:230 --- > #: lib/extend/ftxerr18.c:265 326c358,366 < #: lib/extend/ftxerr18.c:237 --- > #: lib/extend/ftxerr18.c:268 > msgid "Invalid glyph definition (GDEF) table format." > msgstr "Ungültiges Format der `glyph definition (GDEF)'-Tabelle." > > #: lib/extend/ftxerr18.c:270 > msgid "Invalid glyph definition (GDEF) table." > msgstr "Ungültige `glyph definition (GDEF)'-Tabelle." > > #: lib/extend/ftxerr18.c:277 330c370,386 < #: test/fterror.c:60 --- > #: test/fterror.c:49 > msgid "" > "fterror: test TT_ErrToString18 functionality\n" > "\n" > msgstr "" > "fterror: Teste Funktionalität von TT_ErrToString18\n" > "\n" > > #: test/fterror.c:50 > msgid "" > " with an optional numerical argument, dumps the associated message.\n" > "\n" > msgstr "" > " ein optionales numerisches Argument liefert die assoziierte Meldung.\n" > "\n" > > #: test/fterror.c:73 334c390 < #: test/fterror.c:68 --- > #: test/fterror.c:81 338c394,398 < #: test/ftdump.c:168 test/ftlint.c:207 test/ftmetric.c:292 --- > #: test/fterror.c:96 > msgid "Freetype error code 0x%04lX (%lu): %s\n" > msgstr "FreeType Fehlercode 0x%04lX (%lu): %s\n" > > #: test/ftdump.c:169 test/ftlint.c:207 test/ftmetric.c:294 342c402 < #: test/ftdump.c:178 test/ftlint.c:215 test/ftmetric.c:301 test/ftsbit.c:213 --- > #: test/ftdump.c:179 test/ftlint.c:215 test/ftmetric.c:303 test/ftsbit.c:214 346c406 < #: test/ftdump.c:187 --- > #: test/ftdump.c:188 350c410 < #: test/ftdump.c:193 --- > #: test/ftdump.c:194 354c414 < #: test/ftdump.c:201 --- > #: test/ftdump.c:202 358c418 < #: test/ftdump.c:202 --- > #: test/ftdump.c:203 362c422 < #: test/ftdump.c:203 --- > #: test/ftdump.c:204 366c426 < #: test/ftdump.c:207 --- > #: test/ftdump.c:208 370c430 < #: test/ftdump.c:214 --- > #: test/ftdump.c:215 374,376c434,436 < #: test/ftdump.c:222 test/ftdump.c:574 test/ftdump.c:784 test/ftdump.c:988 < #: test/ftdump.c:1135 test/ftlint.c:274 test/ftlint.c:287 test/ftmetric.c:387 < #: test/ftsbit.c:284 --- > #: test/ftdump.c:223 test/ftdump.c:579 test/ftdump.c:789 test/ftdump.c:993 > #: test/ftdump.c:1139 test/ftlint.c:274 test/ftlint.c:287 test/ftmetric.c:390 > #: test/ftsbit.c:286 381c441 < #: test/ftdump.c:299 --- > #: test/ftdump.c:300 385c445 < #: test/ftdump.c:309 --- > #: test/ftdump.c:310 394c454 < #: test/ftdump.c:332 --- > #: test/ftdump.c:333 396c456 < msgstr "Zeichenkodierungstabellen\n" --- > msgstr "Zeichenkodierungstabellen (cmaps)\n" 398c458 < #: test/ftdump.c:339 test/ftdump.c:483 --- > #: test/ftdump.c:340 test/ftdump.c:488 402c462 < #: test/ftdump.c:343 test/ftdump.c:487 --- > #: test/ftdump.c:344 test/ftdump.c:492 411c471 < #: test/ftdump.c:348 --- > #: test/ftdump.c:349 416c476 < #: test/ftdump.c:375 test/ftdump.c:384 test/ftdump.c:447 --- > #: test/ftdump.c:376 test/ftdump.c:385 test/ftdump.c:452 421c481 < #: test/ftdump.c:454 --- > #: test/ftdump.c:459 425c485 < #: test/ftdump.c:476 --- > #: test/ftdump.c:481 429c489 < #: test/ftdump.c:493 --- > #: test/ftdump.c:498 434c494 < #: test/ftdump.c:498 --- > #: test/ftdump.c:503 439c499 < #: test/ftdump.c:502 --- > #: test/ftdump.c:507 444c504 < #: test/ftdump.c:506 --- > #: test/ftdump.c:511 449c509 < #: test/ftdump.c:528 test/ftmetric.c:282 --- > #: test/ftdump.c:533 test/ftmetric.c:284 453c513 < #: test/ftdump.c:532 --- > #: test/ftdump.c:537 457c517 < #: test/ftdump.c:535 --- > #: test/ftdump.c:540 462c522 < #: test/ftdump.c:537 --- > #: test/ftdump.c:542 467c527 < #: test/ftdump.c:547 --- > #: test/ftdump.c:552 472c532 < #: test/ftdump.c:550 --- > #: test/ftdump.c:555 477c537 < #: test/ftdump.c:559 --- > #: test/ftdump.c:564 482c542 < #: test/ftdump.c:610 --- > #: test/ftdump.c:615 486c546 < #: test/ftdump.c:614 --- > #: test/ftdump.c:619 490c550 < #: test/ftdump.c:621 --- > #: test/ftdump.c:626 494c554 < #: test/ftdump.c:634 --- > #: test/ftdump.c:639 499c559 < #: test/ftdump.c:639 test/ftdump.c:843 --- > #: test/ftdump.c:644 test/ftdump.c:848 504c564 < #: test/ftdump.c:647 --- > #: test/ftdump.c:652 510c570 < #: test/ftdump.c:652 test/ftdump.c:856 --- > #: test/ftdump.c:657 test/ftdump.c:861 514c574 < #: test/ftdump.c:665 --- > #: test/ftdump.c:670 523c583 < #: test/ftdump.c:671 test/ftdump.c:752 test/ftdump.c:875 test/ftdump.c:956 --- > #: test/ftdump.c:676 test/ftdump.c:757 test/ftdump.c:880 test/ftdump.c:961 528c588 < #: test/ftdump.c:687 --- > #: test/ftdump.c:692 533c593 < #: test/ftdump.c:704 --- > #: test/ftdump.c:709 538c598 < #: test/ftdump.c:709 test/ftdump.c:913 --- > #: test/ftdump.c:714 test/ftdump.c:918 543c603 < #: test/ftdump.c:714 test/ftdump.c:918 --- > #: test/ftdump.c:719 test/ftdump.c:923 548c608 < #: test/ftdump.c:729 --- > #: test/ftdump.c:734 557c617 < #: test/ftdump.c:746 --- > #: test/ftdump.c:751 566c626 < #: test/ftdump.c:771 test/ftdump.c:975 --- > #: test/ftdump.c:776 test/ftdump.c:980 574c634 < #: test/ftdump.c:774 test/ftdump.c:978 --- > #: test/ftdump.c:779 test/ftdump.c:983 579c639 < #: test/ftdump.c:814 --- > #: test/ftdump.c:819 583c643 < #: test/ftdump.c:818 --- > #: test/ftdump.c:823 587c647 < #: test/ftdump.c:825 --- > #: test/ftdump.c:830 591c651 < #: test/ftdump.c:838 --- > #: test/ftdump.c:843 596c656 < #: test/ftdump.c:851 --- > #: test/ftdump.c:856 602c662 < #: test/ftdump.c:869 --- > #: test/ftdump.c:874 611c671 < #: test/ftdump.c:891 --- > #: test/ftdump.c:896 616c676 < #: test/ftdump.c:908 --- > #: test/ftdump.c:913 621c681 < #: test/ftdump.c:933 --- > #: test/ftdump.c:938 630c690 < #: test/ftdump.c:950 --- > #: test/ftdump.c:955 639c699 < #: test/ftdump.c:1013 --- > #: test/ftdump.c:1018 643c703 < #: test/ftdump.c:1017 --- > #: test/ftdump.c:1022 652c712 < #: test/ftdump.c:1049 test/ftlint.c:134 test/ftmetric.c:226 test/ftsbit.c:126 --- > #: test/ftdump.c:1054 test/ftlint.c:134 test/ftmetric.c:228 test/ftsbit.c:127 656c716 < #: test/ftdump.c:1056 test/ftmetric.c:234 test/ftsbit.c:133 --- > #: test/ftdump.c:1061 test/ftmetric.c:236 test/ftsbit.c:134 660c720 < #: test/ftdump.c:1063 --- > #: test/ftdump.c:1068 664c724 < #: test/ftdump.c:1070 --- > #: test/ftdump.c:1075 668c728 < #: test/ftdump.c:1086 test/ftlint.c:187 test/ftmetric.c:249 test/ftsbit.c:181 --- > #: test/ftdump.c:1091 test/ftlint.c:187 test/ftmetric.c:251 test/ftsbit.c:182 673c733 < #: test/ftdump.c:1089 test/ftlint.c:193 test/ftmetric.c:252 test/ftsbit.c:187 --- > #: test/ftdump.c:1094 test/ftlint.c:193 test/ftmetric.c:254 test/ftsbit.c:188 693c753 < #: test/ftlint.c:226 test/ftsbit.c:224 --- > #: test/ftlint.c:226 test/ftsbit.c:225 713c773 < msgstr "1 mal gescheitert.\n" --- > msgstr "einmal gescheitert.\n" 720c780 < #: test/ftmetric.c:68 --- > #: test/ftmetric.c:70 726c786 < #: test/ftmetric.c:72 --- > #: test/ftmetric.c:74 746c806 < #: test/ftmetric.c:259 --- > #: test/ftmetric.c:261 751c811 < #: test/ftmetric.c:264 --- > #: test/ftmetric.c:266 756c816 < #: test/ftmetric.c:278 --- > #: test/ftmetric.c:280 760c820 < #: test/ftmetric.c:308 --- > #: test/ftmetric.c:310 764c824 < #: test/ftmetric.c:315 --- > #: test/ftmetric.c:317 768c828 < #: test/ftmetric.c:321 --- > #: test/ftmetric.c:323 773c833 < #: test/ftmetric.c:331 test/ftsbit.c:233 --- > #: test/ftmetric.c:333 test/ftsbit.c:234 777c837 < #: test/ftmetric.c:339 test/ftsbit.c:257 --- > #: test/ftmetric.c:341 test/ftsbit.c:258 782c842 < #: test/ftmetric.c:366 --- > #: test/ftmetric.c:368 786c846 < #: test/ftmetric.c:368 --- > #: test/ftmetric.c:370 790c850 < #: test/ftsbit.c:89 --- > #: test/ftsbit.c:90 795c855 < #: test/ftsbit.c:94 --- > #: test/ftsbit.c:95 804c864 < #: test/ftsbit.c:199 --- > #: test/ftsbit.c:200 808c868 < #: test/ftsbit.c:205 --- > #: test/ftsbit.c:206 812c872 < #: test/ftsbit.c:251 --- > #: test/ftsbit.c:252 817c877 < #: test/ftsbit.c:263 --- > #: test/ftsbit.c:264 822c882 < #: test/ftsbit.c:266 --- > #: test/ftsbit.c:267 Index: freetype/po/es.po =================================================================== RCS file: /cvs/freetype/freetype/po/es.po,v retrieving revision 1.22 retrieving revision 1.26 diff -r1.22 -r1.26 2c2 < # Copyright (C) 1998-2000 Miguel A. Pérez Valdenebro --- > # Copyright (C) 1998-2002 Miguel A. Pérez Valdenebro 7,9c7,9 < "Project-Id-Version: FreeType 1.4\n" < "POT-Creation-Date: 2000-03-07 21:59+0000\n" < "PO-Revision-Date: 2000-01-17 15:00+0100\n" --- > "Project-Id-Version: FreeType 1.5\n" > "POT-Creation-Date: 2002-11-08 18:11+0000\n" > "PO-Revision-Date: 2002-11-08 18:30+0100\n" 16c16,40 < #: lib/extend/ftxerr18.c:47 --- > #: lib/extend/ftxerr18.c:40 > msgid "" > "Welcome to the translation of the Freetype v.1 library!\n" > "\n" > "This message is not really part of the library (it is bracketed by\n" > " #if 0 / #endif), but is really intended to be the first one in the .po\n" > "file, and the first one that a new translator should see, to give hints.\n" > "\n" > "First, while this .po might seems big, the real interesting part of it\n" > "is only the messages in this file, lib/extend/ftxerr18.c. The other\n" > "messages are part of the demonstration programs, and are more intended\n" > "to help grasping how to use i18n with the Freetype library. So the real\n" > "work is the about 65 first ones. Unfortunately they are the harder ones!\n" > "\n" > "A difficulty is that there are some specialized vocabulary, about\n" > "``faces'', ``glyph'' and similar things. These are typographical things,\n" > "and this should be researched before attempting to translate the whole\n" > "thing. A quick look across the TrueType documentation might help to\n" > "understand many things, too.\n" > "\n" > "Best wiches for your translation!\n" > "Antoine Leca - 2002-11-08" > msgstr "" > > #: lib/extend/ftxerr18.c:77 20c44 < #: lib/extend/ftxerr18.c:50 --- > #: lib/extend/ftxerr18.c:80 24c48 < #: lib/extend/ftxerr18.c:52 --- > #: lib/extend/ftxerr18.c:82 28c52 < #: lib/extend/ftxerr18.c:54 --- > #: lib/extend/ftxerr18.c:84 32c56 < #: lib/extend/ftxerr18.c:56 --- > #: lib/extend/ftxerr18.c:86 36c60 < #: lib/extend/ftxerr18.c:58 --- > #: lib/extend/ftxerr18.c:88 40c64 < #: lib/extend/ftxerr18.c:60 --- > #: lib/extend/ftxerr18.c:90 44c68 < #: lib/extend/ftxerr18.c:62 --- > #: lib/extend/ftxerr18.c:92 48c72 < #: lib/extend/ftxerr18.c:64 --- > #: lib/extend/ftxerr18.c:94 52c76 < #: lib/extend/ftxerr18.c:66 --- > #: lib/extend/ftxerr18.c:96 56c80 < #: lib/extend/ftxerr18.c:69 --- > #: lib/extend/ftxerr18.c:98 60c84 < #: lib/extend/ftxerr18.c:71 --- > #: lib/extend/ftxerr18.c:100 64c88 < #: lib/extend/ftxerr18.c:73 --- > #: lib/extend/ftxerr18.c:102 68c92 < #: lib/extend/ftxerr18.c:75 --- > #: lib/extend/ftxerr18.c:104 72c96 < #: lib/extend/ftxerr18.c:77 --- > #: lib/extend/ftxerr18.c:106 76c100 < #: lib/extend/ftxerr18.c:80 --- > #: lib/extend/ftxerr18.c:109 80c104 < #: lib/extend/ftxerr18.c:83 --- > #: lib/extend/ftxerr18.c:112 84c108 < #: lib/extend/ftxerr18.c:85 --- > #: lib/extend/ftxerr18.c:114 88c112 < #: lib/extend/ftxerr18.c:87 --- > #: lib/extend/ftxerr18.c:116 92c116 < #: lib/extend/ftxerr18.c:89 --- > #: lib/extend/ftxerr18.c:118 96c120 < #: lib/extend/ftxerr18.c:92 --- > #: lib/extend/ftxerr18.c:121 100c124 < #: lib/extend/ftxerr18.c:95 --- > #: lib/extend/ftxerr18.c:124 104c128 < #: lib/extend/ftxerr18.c:97 --- > #: lib/extend/ftxerr18.c:126 108c132 < #: lib/extend/ftxerr18.c:99 --- > #: lib/extend/ftxerr18.c:128 112c136 < #: lib/extend/ftxerr18.c:101 --- > #: lib/extend/ftxerr18.c:130 116c140 < #: lib/extend/ftxerr18.c:103 --- > #: lib/extend/ftxerr18.c:132 120c144 < #: lib/extend/ftxerr18.c:105 --- > #: lib/extend/ftxerr18.c:134 125c149 < #: lib/extend/ftxerr18.c:107 --- > #: lib/extend/ftxerr18.c:136 129c153 < #: lib/extend/ftxerr18.c:109 --- > #: lib/extend/ftxerr18.c:138 133c157 < #: lib/extend/ftxerr18.c:111 --- > #: lib/extend/ftxerr18.c:140 137c161 < #: lib/extend/ftxerr18.c:113 --- > #: lib/extend/ftxerr18.c:142 141c165 < #: lib/extend/ftxerr18.c:118 --- > #: lib/extend/ftxerr18.c:147 145c169 < #: lib/extend/ftxerr18.c:123 --- > #: lib/extend/ftxerr18.c:152 149c173 < #: lib/extend/ftxerr18.c:125 --- > #: lib/extend/ftxerr18.c:154 153c177 < #: lib/extend/ftxerr18.c:127 --- > #: lib/extend/ftxerr18.c:156 157c181 < #: lib/extend/ftxerr18.c:132 --- > #: lib/extend/ftxerr18.c:161 161c185 < #: lib/extend/ftxerr18.c:134 --- > #: lib/extend/ftxerr18.c:163 165c189 < #: lib/extend/ftxerr18.c:136 --- > #: lib/extend/ftxerr18.c:165 169c193 < #: lib/extend/ftxerr18.c:138 --- > #: lib/extend/ftxerr18.c:167 173c197,201 < #: lib/extend/ftxerr18.c:143 --- > #: lib/extend/ftxerr18.c:169 > msgid "Too many function definitions (FDEF)." > msgstr "Demasiadas definiciones de funciones (FDEF)." > > #: lib/extend/ftxerr18.c:174 177c205 < #: lib/extend/ftxerr18.c:145 --- > #: lib/extend/ftxerr18.c:176 181c209 < #: lib/extend/ftxerr18.c:147 --- > #: lib/extend/ftxerr18.c:178 185c213 < #: lib/extend/ftxerr18.c:149 --- > #: lib/extend/ftxerr18.c:180 189c217 < #: lib/extend/ftxerr18.c:151 --- > #: lib/extend/ftxerr18.c:182 193c221 < #: lib/extend/ftxerr18.c:153 --- > #: lib/extend/ftxerr18.c:184 197c225 < #: lib/extend/ftxerr18.c:155 --- > #: lib/extend/ftxerr18.c:186 201c229 < #: lib/extend/ftxerr18.c:157 --- > #: lib/extend/ftxerr18.c:188 205c233 < #: lib/extend/ftxerr18.c:159 --- > #: lib/extend/ftxerr18.c:190 209c237 < #: lib/extend/ftxerr18.c:161 --- > #: lib/extend/ftxerr18.c:192 213c241 < #: lib/extend/ftxerr18.c:163 --- > #: lib/extend/ftxerr18.c:194 217c245 < #: lib/extend/ftxerr18.c:165 --- > #: lib/extend/ftxerr18.c:196 221c249 < #: lib/extend/ftxerr18.c:167 --- > #: lib/extend/ftxerr18.c:198 225c253 < #: lib/extend/ftxerr18.c:169 --- > #: lib/extend/ftxerr18.c:200 229c257 < #: lib/extend/ftxerr18.c:171 --- > #: lib/extend/ftxerr18.c:202 233c261 < #: lib/extend/ftxerr18.c:173 --- > #: lib/extend/ftxerr18.c:204 237c265 < #: lib/extend/ftxerr18.c:175 --- > #: lib/extend/ftxerr18.c:206 241c269 < #: lib/extend/ftxerr18.c:177 --- > #: lib/extend/ftxerr18.c:208 246c274 < #: lib/extend/ftxerr18.c:182 --- > #: lib/extend/ftxerr18.c:213 250c278 < #: lib/extend/ftxerr18.c:184 --- > #: lib/extend/ftxerr18.c:215 254c282 < #: lib/extend/ftxerr18.c:186 --- > #: lib/extend/ftxerr18.c:217 258c286 < #: lib/extend/ftxerr18.c:188 --- > #: lib/extend/ftxerr18.c:219 262c290 < #: lib/extend/ftxerr18.c:193 --- > #: lib/extend/ftxerr18.c:224 266c294 < #: lib/extend/ftxerr18.c:195 --- > #: lib/extend/ftxerr18.c:226 270c298 < #: lib/extend/ftxerr18.c:197 --- > #: lib/extend/ftxerr18.c:228 274c302 < #: lib/extend/ftxerr18.c:199 --- > #: lib/extend/ftxerr18.c:230 278c306 < #: lib/extend/ftxerr18.c:204 --- > #: lib/extend/ftxerr18.c:235 282c310 < #: lib/extend/ftxerr18.c:206 --- > #: lib/extend/ftxerr18.c:237 286c314 < #: lib/extend/ftxerr18.c:208 --- > #: lib/extend/ftxerr18.c:240 290c318 < #: lib/extend/ftxerr18.c:210 --- > #: lib/extend/ftxerr18.c:242 294c322 < #: lib/extend/ftxerr18.c:216 --- > #: lib/extend/ftxerr18.c:247 298c326 < #: lib/extend/ftxerr18.c:218 --- > #: lib/extend/ftxerr18.c:249 302c330 < #: lib/extend/ftxerr18.c:220 --- > #: lib/extend/ftxerr18.c:251 306c334 < #: lib/extend/ftxerr18.c:222 --- > #: lib/extend/ftxerr18.c:253 310c338,342 < #: lib/extend/ftxerr18.c:224 --- > #: lib/extend/ftxerr18.c:255 > msgid "No MM (Adobe MultipleMaster) interpreter available." > msgstr "No encontrado el intérprete per MM (Adobe MultipleMaster)." > > #: lib/extend/ftxerr18.c:258 314c346 < #: lib/extend/ftxerr18.c:226 --- > #: lib/extend/ftxerr18.c:260 318c350 < #: lib/extend/ftxerr18.c:228 --- > #: lib/extend/ftxerr18.c:263 322c354 < #: lib/extend/ftxerr18.c:230 --- > #: lib/extend/ftxerr18.c:265 326c358,366 < #: lib/extend/ftxerr18.c:237 --- > #: lib/extend/ftxerr18.c:268 > msgid "Invalid glyph definition (GDEF) table format." > msgstr "Formato de la tabla de definiciones de los glifos (GDEF) incorrecto." > > #: lib/extend/ftxerr18.c:270 > msgid "Invalid glyph definition (GDEF) table." > msgstr "Tabla de definiciones de los glifos (GDEF) inválida." > > #: lib/extend/ftxerr18.c:277 330c370,382 < #: test/fterror.c:60 --- > #: test/fterror.c:49 > msgid "" > "fterror: test TT_ErrToString18 functionality\n" > "\n" > msgstr "fterror: ensayo si funcciona TT_ErrToString18\n\n" > > #: test/fterror.c:50 > msgid "" > " with an optional numerical argument, dumps the associated message.\n" > "\n" > msgstr " con un argumento númerico opcional, escribe el mensaje asociado.\n\n" > > #: test/fterror.c:73 334c386 < #: test/fterror.c:68 --- > #: test/fterror.c:81 338c390,395 < #: test/ftdump.c:168 test/ftlint.c:207 test/ftmetric.c:292 --- > #: test/fterror.c:96 > #, c-format > msgid "Freetype error code 0x%04lX (%lu): %s\n" > msgstr "Código de error FreeType 0x%04lX (%lu):\n" > > #: test/ftdump.c:169 test/ftlint.c:207 test/ftmetric.c:294 342c399 < #: test/ftdump.c:178 test/ftlint.c:215 test/ftmetric.c:301 test/ftsbit.c:213 --- > #: test/ftdump.c:179 test/ftlint.c:215 test/ftmetric.c:303 test/ftsbit.c:214 346c403 < #: test/ftdump.c:187 --- > #: test/ftdump.c:188 350c407 < #: test/ftdump.c:193 --- > #: test/ftdump.c:194 354c411 < #: test/ftdump.c:201 --- > #: test/ftdump.c:202 358c415 < #: test/ftdump.c:202 --- > #: test/ftdump.c:203 362c419 < #: test/ftdump.c:203 --- > #: test/ftdump.c:204 366c423 < #: test/ftdump.c:207 --- > #: test/ftdump.c:208 370c427 < #: test/ftdump.c:214 --- > #: test/ftdump.c:215 374,376c431,433 < #: test/ftdump.c:222 test/ftdump.c:574 test/ftdump.c:784 test/ftdump.c:988 < #: test/ftdump.c:1135 test/ftlint.c:274 test/ftlint.c:287 test/ftmetric.c:387 < #: test/ftsbit.c:284 --- > #: test/ftdump.c:223 test/ftdump.c:579 test/ftdump.c:789 test/ftdump.c:993 > #: test/ftdump.c:1139 test/ftlint.c:274 test/ftlint.c:287 test/ftmetric.c:390 > #: test/ftsbit.c:286 381c438 < #: test/ftdump.c:299 --- > #: test/ftdump.c:300 385c442 < #: test/ftdump.c:309 --- > #: test/ftdump.c:310 391c448 < "Nombre de la PostScript: %s\n" --- > "Nombre PostScript: %s\n" 394c451 < #: test/ftdump.c:332 --- > #: test/ftdump.c:333 398c455 < #: test/ftdump.c:339 test/ftdump.c:483 --- > #: test/ftdump.c:340 test/ftdump.c:488 402c459 < #: test/ftdump.c:343 test/ftdump.c:487 --- > #: test/ftdump.c:344 test/ftdump.c:492 411c468 < #: test/ftdump.c:348 --- > #: test/ftdump.c:349 416c473 < #: test/ftdump.c:375 test/ftdump.c:384 test/ftdump.c:447 --- > #: test/ftdump.c:376 test/ftdump.c:385 test/ftdump.c:452 421c478 < #: test/ftdump.c:454 --- > #: test/ftdump.c:459 425c482 < #: test/ftdump.c:476 --- > #: test/ftdump.c:481 429c486 < #: test/ftdump.c:493 --- > #: test/ftdump.c:498 434c491 < #: test/ftdump.c:498 --- > #: test/ftdump.c:503 439c496 < #: test/ftdump.c:502 --- > #: test/ftdump.c:507 444c501 < #: test/ftdump.c:506 --- > #: test/ftdump.c:511 449c506 < #: test/ftdump.c:528 test/ftmetric.c:282 --- > #: test/ftdump.c:533 test/ftmetric.c:284 453c510 < #: test/ftdump.c:532 --- > #: test/ftdump.c:537 457c514 < #: test/ftdump.c:535 --- > #: test/ftdump.c:540 462c519 < #: test/ftdump.c:537 --- > #: test/ftdump.c:542 467c524 < #: test/ftdump.c:547 --- > #: test/ftdump.c:552 472c529 < #: test/ftdump.c:550 --- > #: test/ftdump.c:555 477c534 < #: test/ftdump.c:559 --- > #: test/ftdump.c:564 482c539 < #: test/ftdump.c:610 --- > #: test/ftdump.c:615 486c543 < #: test/ftdump.c:614 --- > #: test/ftdump.c:619 490c547 < #: test/ftdump.c:621 --- > #: test/ftdump.c:626 494c551 < #: test/ftdump.c:634 --- > #: test/ftdump.c:639 499c556 < #: test/ftdump.c:639 test/ftdump.c:843 --- > #: test/ftdump.c:644 test/ftdump.c:848 504c561 < #: test/ftdump.c:647 --- > #: test/ftdump.c:652 511c568 < #: test/ftdump.c:652 test/ftdump.c:856 --- > #: test/ftdump.c:657 test/ftdump.c:861 515c572 < #: test/ftdump.c:665 --- > #: test/ftdump.c:670 524c581 < #: test/ftdump.c:671 test/ftdump.c:752 test/ftdump.c:875 test/ftdump.c:956 --- > #: test/ftdump.c:676 test/ftdump.c:757 test/ftdump.c:880 test/ftdump.c:961 529c586 < #: test/ftdump.c:687 --- > #: test/ftdump.c:692 535c592 < #: test/ftdump.c:704 --- > #: test/ftdump.c:709 542c599 < #: test/ftdump.c:709 test/ftdump.c:913 --- > #: test/ftdump.c:714 test/ftdump.c:918 547c604 < #: test/ftdump.c:714 test/ftdump.c:918 --- > #: test/ftdump.c:719 test/ftdump.c:923 552c609 < #: test/ftdump.c:729 --- > #: test/ftdump.c:734 561c618 < #: test/ftdump.c:746 --- > #: test/ftdump.c:751 570c627 < #: test/ftdump.c:771 test/ftdump.c:975 --- > #: test/ftdump.c:776 test/ftdump.c:980 576c633 < #: test/ftdump.c:774 test/ftdump.c:978 --- > #: test/ftdump.c:779 test/ftdump.c:983 581c638 < #: test/ftdump.c:814 --- > #: test/ftdump.c:819 585c642 < #: test/ftdump.c:818 --- > #: test/ftdump.c:823 589c646 < #: test/ftdump.c:825 --- > #: test/ftdump.c:830 593c650 < #: test/ftdump.c:838 --- > #: test/ftdump.c:843 598c655 < #: test/ftdump.c:851 --- > #: test/ftdump.c:856 605c662 < #: test/ftdump.c:869 --- > #: test/ftdump.c:874 614c671 < #: test/ftdump.c:891 --- > #: test/ftdump.c:896 620c677 < #: test/ftdump.c:908 --- > #: test/ftdump.c:913 627c684 < #: test/ftdump.c:933 --- > #: test/ftdump.c:938 636c693 < #: test/ftdump.c:950 --- > #: test/ftdump.c:955 645,646c702 < # < #: test/ftdump.c:1013 --- > #: test/ftdump.c:1018 651c707 < #: test/ftdump.c:1017 --- > #: test/ftdump.c:1022 660c716 < #: test/ftdump.c:1049 test/ftlint.c:134 test/ftmetric.c:226 test/ftsbit.c:126 --- > #: test/ftdump.c:1054 test/ftlint.c:134 test/ftmetric.c:228 test/ftsbit.c:127 664c720 < #: test/ftdump.c:1056 test/ftmetric.c:234 test/ftsbit.c:133 --- > #: test/ftdump.c:1061 test/ftmetric.c:236 test/ftsbit.c:134 668c724 < #: test/ftdump.c:1063 --- > #: test/ftdump.c:1068 672c728 < #: test/ftdump.c:1070 --- > #: test/ftdump.c:1075 676c732 < #: test/ftdump.c:1086 test/ftlint.c:187 test/ftmetric.c:249 test/ftsbit.c:181 --- > #: test/ftdump.c:1091 test/ftlint.c:187 test/ftmetric.c:251 test/ftsbit.c:182 681c737 < #: test/ftdump.c:1089 test/ftlint.c:193 test/ftmetric.c:252 test/ftsbit.c:187 --- > #: test/ftdump.c:1094 test/ftlint.c:193 test/ftmetric.c:254 test/ftsbit.c:188 701c757 < #: test/ftlint.c:226 test/ftsbit.c:224 --- > #: test/ftlint.c:226 test/ftsbit.c:225 728c784 < #: test/ftmetric.c:68 --- > #: test/ftmetric.c:70 735c791 < #: test/ftmetric.c:72 --- > #: test/ftmetric.c:74 754c810 < #: test/ftmetric.c:259 --- > #: test/ftmetric.c:261 759c815 < #: test/ftmetric.c:264 --- > #: test/ftmetric.c:266 764c820 < #: test/ftmetric.c:278 --- > #: test/ftmetric.c:280 768c824 < #: test/ftmetric.c:308 --- > #: test/ftmetric.c:310 772c828 < #: test/ftmetric.c:315 --- > #: test/ftmetric.c:317 776c832 < #: test/ftmetric.c:321 --- > #: test/ftmetric.c:323 781c837 < #: test/ftmetric.c:331 test/ftsbit.c:233 --- > #: test/ftmetric.c:333 test/ftsbit.c:234 785c841 < #: test/ftmetric.c:339 test/ftsbit.c:257 --- > #: test/ftmetric.c:341 test/ftsbit.c:258 790c846 < #: test/ftmetric.c:366 --- > #: test/ftmetric.c:368 794c850 < #: test/ftmetric.c:368 --- > #: test/ftmetric.c:370 798c854 < #: test/ftsbit.c:89 --- > #: test/ftsbit.c:90 802c858 < #: test/ftsbit.c:94 --- > #: test/ftsbit.c:95 811c867 < #: test/ftsbit.c:199 --- > #: test/ftsbit.c:200 815c871 < #: test/ftsbit.c:205 --- > #: test/ftsbit.c:206 819c875 < #: test/ftsbit.c:251 --- > #: test/ftsbit.c:252 824c880 < #: test/ftsbit.c:263 --- > #: test/ftsbit.c:264 829c885 < #: test/ftsbit.c:266 --- > #: test/ftsbit.c:267 Index: freetype/po/fr.po =================================================================== RCS file: /cvs/freetype/freetype/po/fr.po,v retrieving revision 1.43 retrieving revision 1.47 diff -r1.43 -r1.47 2,3c2,3 < # Copyright (C) 1998-2000 David Turner < # David Turner , 1998 --- > # Copyright (C) 1998-2002 David Turner > # David Turner , 1998 7,10c7,10 < "Project-Id-Version: FreeType 1.4\n" < "POT-Creation-Date: 2000-03-07 21:59+0000\n" < "PO-Revision-Date: 2000-01-17 15:00+0100\n" < "Last-Translator: David Turner \n" --- > "Project-Id-Version: FreeType 1.5\n" > "POT-Creation-Date: 2002-11-08 18:11+0000\n" > "PO-Revision-Date: 2002-11-08 18:20+0100\n" > "Last-Translator: Antoine Leca \n" 16c16,40 < #: lib/extend/ftxerr18.c:47 --- > #: lib/extend/ftxerr18.c:40 > msgid "" > "Welcome to the translation of the Freetype v.1 library!\n" > "\n" > "This message is not really part of the library (it is bracketed by\n" > " #if 0 / #endif), but is really intended to be the first one in the .po\n" > "file, and the first one that a new translator should see, to give hints.\n" > "\n" > "First, while this .po might seems big, the real interesting part of it\n" > "is only the messages in this file, lib/extend/ftxerr18.c. The other\n" > "messages are part of the demonstration programs, and are more intended\n" > "to help grasping how to use i18n with the Freetype library. So the real\n" > "work is the about 65 first ones. Unfortunately they are the harder ones!\n" > "\n" > "A difficulty is that there are some specialized vocabulary, about\n" > "``faces'', ``glyph'' and similar things. These are typographical things,\n" > "and this should be researched before attempting to translate the whole\n" > "thing. A quick look across the TrueType documentation might help to\n" > "understand many things, too.\n" > "\n" > "Best wiches for your translation!\n" > "Antoine Leca - 2002-11-08" > msgstr "(Lu - Antoine Leca, 2002-11-08)" > > #: lib/extend/ftxerr18.c:77 20c44 < #: lib/extend/ftxerr18.c:50 --- > #: lib/extend/ftxerr18.c:80 24c48 < #: lib/extend/ftxerr18.c:52 --- > #: lib/extend/ftxerr18.c:82 28c52 < #: lib/extend/ftxerr18.c:54 --- > #: lib/extend/ftxerr18.c:84 32c56 < #: lib/extend/ftxerr18.c:56 --- > #: lib/extend/ftxerr18.c:86 36c60 < #: lib/extend/ftxerr18.c:58 --- > #: lib/extend/ftxerr18.c:88 40c64 < #: lib/extend/ftxerr18.c:60 --- > #: lib/extend/ftxerr18.c:90 44c68 < #: lib/extend/ftxerr18.c:62 --- > #: lib/extend/ftxerr18.c:92 48c72 < #: lib/extend/ftxerr18.c:64 --- > #: lib/extend/ftxerr18.c:94 52c76 < #: lib/extend/ftxerr18.c:66 --- > #: lib/extend/ftxerr18.c:96 56c80 < #: lib/extend/ftxerr18.c:69 --- > #: lib/extend/ftxerr18.c:98 60c84 < #: lib/extend/ftxerr18.c:71 --- > #: lib/extend/ftxerr18.c:100 64c88 < #: lib/extend/ftxerr18.c:73 --- > #: lib/extend/ftxerr18.c:102 68c92 < #: lib/extend/ftxerr18.c:75 --- > #: lib/extend/ftxerr18.c:104 72c96 < #: lib/extend/ftxerr18.c:77 --- > #: lib/extend/ftxerr18.c:106 76c100 < #: lib/extend/ftxerr18.c:80 --- > #: lib/extend/ftxerr18.c:109 80c104 < #: lib/extend/ftxerr18.c:83 --- > #: lib/extend/ftxerr18.c:112 84c108 < #: lib/extend/ftxerr18.c:85 --- > #: lib/extend/ftxerr18.c:114 88c112 < #: lib/extend/ftxerr18.c:87 --- > #: lib/extend/ftxerr18.c:116 92c116 < #: lib/extend/ftxerr18.c:89 --- > #: lib/extend/ftxerr18.c:118 96c120 < #: lib/extend/ftxerr18.c:92 --- > #: lib/extend/ftxerr18.c:121 100c124 < #: lib/extend/ftxerr18.c:95 --- > #: lib/extend/ftxerr18.c:124 104c128 < #: lib/extend/ftxerr18.c:97 --- > #: lib/extend/ftxerr18.c:126 108c132 < #: lib/extend/ftxerr18.c:99 --- > #: lib/extend/ftxerr18.c:128 112c136 < #: lib/extend/ftxerr18.c:101 --- > #: lib/extend/ftxerr18.c:130 116c140 < #: lib/extend/ftxerr18.c:103 --- > #: lib/extend/ftxerr18.c:132 120c144 < #: lib/extend/ftxerr18.c:105 --- > #: lib/extend/ftxerr18.c:134 124c148 < #: lib/extend/ftxerr18.c:107 --- > #: lib/extend/ftxerr18.c:136 128c152 < #: lib/extend/ftxerr18.c:109 --- > #: lib/extend/ftxerr18.c:138 132c156 < #: lib/extend/ftxerr18.c:111 --- > #: lib/extend/ftxerr18.c:140 136c160 < #: lib/extend/ftxerr18.c:113 --- > #: lib/extend/ftxerr18.c:142 140c164 < #: lib/extend/ftxerr18.c:118 --- > #: lib/extend/ftxerr18.c:147 144c168 < #: lib/extend/ftxerr18.c:123 --- > #: lib/extend/ftxerr18.c:152 148c172 < #: lib/extend/ftxerr18.c:125 --- > #: lib/extend/ftxerr18.c:154 152c176 < #: lib/extend/ftxerr18.c:127 --- > #: lib/extend/ftxerr18.c:156 156c180 < #: lib/extend/ftxerr18.c:132 --- > #: lib/extend/ftxerr18.c:161 160c184 < #: lib/extend/ftxerr18.c:134 --- > #: lib/extend/ftxerr18.c:163 164c188 < #: lib/extend/ftxerr18.c:136 --- > #: lib/extend/ftxerr18.c:165 168c192 < #: lib/extend/ftxerr18.c:138 --- > #: lib/extend/ftxerr18.c:167 172c196,200 < #: lib/extend/ftxerr18.c:143 --- > #: lib/extend/ftxerr18.c:169 > msgid "Too many function definitions (FDEF)." > msgstr "Trop de definitions de fonctions (FDEF)." > > #: lib/extend/ftxerr18.c:174 176c204 < #: lib/extend/ftxerr18.c:145 --- > #: lib/extend/ftxerr18.c:176 180c208 < #: lib/extend/ftxerr18.c:147 --- > #: lib/extend/ftxerr18.c:178 184c212 < #: lib/extend/ftxerr18.c:149 --- > #: lib/extend/ftxerr18.c:180 188c216 < #: lib/extend/ftxerr18.c:151 --- > #: lib/extend/ftxerr18.c:182 192c220 < #: lib/extend/ftxerr18.c:153 --- > #: lib/extend/ftxerr18.c:184 196c224 < #: lib/extend/ftxerr18.c:155 --- > #: lib/extend/ftxerr18.c:186 200c228 < #: lib/extend/ftxerr18.c:157 --- > #: lib/extend/ftxerr18.c:188 204c232 < #: lib/extend/ftxerr18.c:159 --- > #: lib/extend/ftxerr18.c:190 208c236 < #: lib/extend/ftxerr18.c:161 --- > #: lib/extend/ftxerr18.c:192 212c240 < #: lib/extend/ftxerr18.c:163 --- > #: lib/extend/ftxerr18.c:194 216c244 < #: lib/extend/ftxerr18.c:165 --- > #: lib/extend/ftxerr18.c:196 220c248 < #: lib/extend/ftxerr18.c:167 --- > #: lib/extend/ftxerr18.c:198 224c252 < #: lib/extend/ftxerr18.c:169 --- > #: lib/extend/ftxerr18.c:200 228c256 < #: lib/extend/ftxerr18.c:171 --- > #: lib/extend/ftxerr18.c:202 232c260 < #: lib/extend/ftxerr18.c:173 --- > #: lib/extend/ftxerr18.c:204 236c264 < #: lib/extend/ftxerr18.c:175 --- > #: lib/extend/ftxerr18.c:206 240c268 < #: lib/extend/ftxerr18.c:177 --- > #: lib/extend/ftxerr18.c:208 244c272 < #: lib/extend/ftxerr18.c:182 --- > #: lib/extend/ftxerr18.c:213 248c276 < #: lib/extend/ftxerr18.c:184 --- > #: lib/extend/ftxerr18.c:215 252c280 < #: lib/extend/ftxerr18.c:186 --- > #: lib/extend/ftxerr18.c:217 256c284 < #: lib/extend/ftxerr18.c:188 --- > #: lib/extend/ftxerr18.c:219 260c288 < #: lib/extend/ftxerr18.c:193 --- > #: lib/extend/ftxerr18.c:224 264c292 < #: lib/extend/ftxerr18.c:195 --- > #: lib/extend/ftxerr18.c:226 268c296 < #: lib/extend/ftxerr18.c:197 --- > #: lib/extend/ftxerr18.c:228 272c300 < #: lib/extend/ftxerr18.c:199 --- > #: lib/extend/ftxerr18.c:230 276c304 < #: lib/extend/ftxerr18.c:204 --- > #: lib/extend/ftxerr18.c:235 280c308 < #: lib/extend/ftxerr18.c:206 --- > #: lib/extend/ftxerr18.c:237 284c312 < #: lib/extend/ftxerr18.c:208 --- > #: lib/extend/ftxerr18.c:240 288c316 < #: lib/extend/ftxerr18.c:210 --- > #: lib/extend/ftxerr18.c:242 292c320 < #: lib/extend/ftxerr18.c:216 --- > #: lib/extend/ftxerr18.c:247 296c324 < #: lib/extend/ftxerr18.c:218 --- > #: lib/extend/ftxerr18.c:249 300c328 < #: lib/extend/ftxerr18.c:220 --- > #: lib/extend/ftxerr18.c:251 304c332 < #: lib/extend/ftxerr18.c:222 --- > #: lib/extend/ftxerr18.c:253 308c336,340 < #: lib/extend/ftxerr18.c:224 --- > #: lib/extend/ftxerr18.c:255 > msgid "No MM (Adobe MultipleMaster) interpreter available." > msgstr "Pas d'interpreteur MM (Adobe MultipleMaster) disponible." > > #: lib/extend/ftxerr18.c:258 312c344 < #: lib/extend/ftxerr18.c:226 --- > #: lib/extend/ftxerr18.c:260 316c348 < #: lib/extend/ftxerr18.c:228 --- > #: lib/extend/ftxerr18.c:263 320c352 < #: lib/extend/ftxerr18.c:230 --- > #: lib/extend/ftxerr18.c:265 324c356,364 < #: lib/extend/ftxerr18.c:237 --- > #: lib/extend/ftxerr18.c:268 > msgid "Invalid glyph definition (GDEF) table format." > msgstr "Format de table de definition des glyphes (GDEF) invalide." > > #: lib/extend/ftxerr18.c:270 > msgid "Invalid glyph definition (GDEF) table." > msgstr "Table de definition des glyphes (GDEF) incorrecte." > > #: lib/extend/ftxerr18.c:277 328c368,384 < #: test/fterror.c:60 --- > #: test/fterror.c:49 > msgid "" > "fterror: test TT_ErrToString18 functionality\n" > "\n" > msgstr "" > "fterror: teste la fonctionnalite TT_ErrToString18\n" > "\n" > > #: test/fterror.c:50 > msgid "" > " with an optional numerical argument, dumps the associated message.\n" > "\n" > msgstr "" > " avec un argument numerique optionnel, ecrit le message associe.\n" > "\n" > > #: test/fterror.c:73 332c388 < #: test/fterror.c:68 --- > #: test/fterror.c:81 336c392,397 < #: test/ftdump.c:168 test/ftlint.c:207 test/ftmetric.c:292 --- > #: test/fterror.c:96 > #, c-format > msgid "Freetype error code 0x%04lX (%lu): %s\n" > msgstr "Code d'erreur FreeType 0x%04lX (%lu) : %s\n" > > #: test/ftdump.c:169 test/ftlint.c:207 test/ftmetric.c:294 340c401 < #: test/ftdump.c:178 test/ftlint.c:215 test/ftmetric.c:301 test/ftsbit.c:213 --- > #: test/ftdump.c:179 test/ftlint.c:215 test/ftmetric.c:303 test/ftsbit.c:214 344c405 < #: test/ftdump.c:187 --- > #: test/ftdump.c:188 348c409 < #: test/ftdump.c:193 --- > #: test/ftdump.c:194 352c413 < #: test/ftdump.c:201 --- > #: test/ftdump.c:202 356c417 < #: test/ftdump.c:202 --- > #: test/ftdump.c:203 360c421 < #: test/ftdump.c:203 --- > #: test/ftdump.c:204 364c425 < #: test/ftdump.c:207 --- > #: test/ftdump.c:208 368c429 < #: test/ftdump.c:214 --- > #: test/ftdump.c:215 372,374c433,435 < #: test/ftdump.c:222 test/ftdump.c:574 test/ftdump.c:784 test/ftdump.c:988 < #: test/ftdump.c:1135 test/ftlint.c:274 test/ftlint.c:287 test/ftmetric.c:387 < #: test/ftsbit.c:284 --- > #: test/ftdump.c:223 test/ftdump.c:579 test/ftdump.c:789 test/ftdump.c:993 > #: test/ftdump.c:1139 test/ftlint.c:274 test/ftlint.c:287 test/ftmetric.c:390 > #: test/ftsbit.c:286 379c440 < #: test/ftdump.c:299 --- > #: test/ftdump.c:300 383c444 < #: test/ftdump.c:309 --- > #: test/ftdump.c:310 385,390c446,447 < msgid "" < "PostScript name: %s\n" < "\n" < msgstr "" < "Nom de Postscript : %s\n" < "\n" --- > msgid "PostScript name: %s\n\n" > msgstr "Nom Postscript : %s\n\n" 392c449 < #: test/ftdump.c:332 --- > #: test/ftdump.c:333 396c453 < #: test/ftdump.c:339 test/ftdump.c:483 --- > #: test/ftdump.c:340 test/ftdump.c:488 400c457 < #: test/ftdump.c:343 test/ftdump.c:487 --- > #: test/ftdump.c:344 test/ftdump.c:492 409c466 < #: test/ftdump.c:348 --- > #: test/ftdump.c:349 414c471 < #: test/ftdump.c:375 test/ftdump.c:384 test/ftdump.c:447 --- > #: test/ftdump.c:376 test/ftdump.c:385 test/ftdump.c:452 419c476 < #: test/ftdump.c:454 --- > #: test/ftdump.c:459 423c480 < #: test/ftdump.c:476 --- > #: test/ftdump.c:481 427c484 < #: test/ftdump.c:493 --- > #: test/ftdump.c:498 432c489 < #: test/ftdump.c:498 --- > #: test/ftdump.c:503 437c494 < #: test/ftdump.c:502 --- > #: test/ftdump.c:507 442c499 < #: test/ftdump.c:506 --- > #: test/ftdump.c:511 447c504 < #: test/ftdump.c:528 test/ftmetric.c:282 --- > #: test/ftdump.c:533 test/ftmetric.c:284 451c508 < #: test/ftdump.c:532 --- > #: test/ftdump.c:537 455c512 < #: test/ftdump.c:535 --- > #: test/ftdump.c:540 460c517 < #: test/ftdump.c:537 --- > #: test/ftdump.c:542 465c522 < #: test/ftdump.c:547 --- > #: test/ftdump.c:552 470c527 < #: test/ftdump.c:550 --- > #: test/ftdump.c:555 475c532 < #: test/ftdump.c:559 --- > #: test/ftdump.c:564 480c537 < #: test/ftdump.c:610 --- > #: test/ftdump.c:615 484c541 < #: test/ftdump.c:614 --- > #: test/ftdump.c:619 488c545 < #: test/ftdump.c:621 --- > #: test/ftdump.c:626 492c549 < #: test/ftdump.c:634 --- > #: test/ftdump.c:639 497c554 < #: test/ftdump.c:639 test/ftdump.c:843 --- > #: test/ftdump.c:644 test/ftdump.c:848 502c559 < #: test/ftdump.c:647 --- > #: test/ftdump.c:652 509c566 < #: test/ftdump.c:652 test/ftdump.c:856 --- > #: test/ftdump.c:657 test/ftdump.c:861 511c568 < msgstr " Langue standard :\n" --- > msgstr " langue standard :\n" 513c570 < #: test/ftdump.c:665 --- > #: test/ftdump.c:670 522c579 < #: test/ftdump.c:671 test/ftdump.c:752 test/ftdump.c:875 test/ftdump.c:956 --- > #: test/ftdump.c:676 test/ftdump.c:757 test/ftdump.c:880 test/ftdump.c:961 527c584 < #: test/ftdump.c:687 --- > #: test/ftdump.c:692 533c590 < #: test/ftdump.c:704 --- > #: test/ftdump.c:709 540c597 < #: test/ftdump.c:709 test/ftdump.c:913 --- > #: test/ftdump.c:714 test/ftdump.c:918 545c602 < #: test/ftdump.c:714 test/ftdump.c:918 --- > #: test/ftdump.c:719 test/ftdump.c:923 550c607 < #: test/ftdump.c:729 --- > #: test/ftdump.c:734 559c616 < #: test/ftdump.c:746 --- > #: test/ftdump.c:751 568c625 < #: test/ftdump.c:771 test/ftdump.c:975 --- > #: test/ftdump.c:776 test/ftdump.c:980 574c631 < #: test/ftdump.c:774 test/ftdump.c:978 --- > #: test/ftdump.c:779 test/ftdump.c:983 579c636 < #: test/ftdump.c:814 --- > #: test/ftdump.c:819 583c640 < #: test/ftdump.c:818 --- > #: test/ftdump.c:823 587c644 < #: test/ftdump.c:825 --- > #: test/ftdump.c:830 591c648 < #: test/ftdump.c:838 --- > #: test/ftdump.c:843 596c653 < #: test/ftdump.c:851 --- > #: test/ftdump.c:856 603c660 < #: test/ftdump.c:869 --- > #: test/ftdump.c:874 612c669 < #: test/ftdump.c:891 --- > #: test/ftdump.c:896 618c675 < #: test/ftdump.c:908 --- > #: test/ftdump.c:913 625c682 < #: test/ftdump.c:933 --- > #: test/ftdump.c:938 634c691 < #: test/ftdump.c:950 --- > #: test/ftdump.c:955 643c700 < #: test/ftdump.c:1013 --- > #: test/ftdump.c:1018 647c704 < #: test/ftdump.c:1017 --- > #: test/ftdump.c:1022 656c713 < #: test/ftdump.c:1049 test/ftlint.c:134 test/ftmetric.c:226 test/ftsbit.c:126 --- > #: test/ftdump.c:1054 test/ftlint.c:134 test/ftmetric.c:228 test/ftsbit.c:127 660c717 < #: test/ftdump.c:1056 test/ftmetric.c:234 test/ftsbit.c:133 --- > #: test/ftdump.c:1061 test/ftmetric.c:236 test/ftsbit.c:134 664c721 < #: test/ftdump.c:1063 --- > #: test/ftdump.c:1068 668c725 < #: test/ftdump.c:1070 --- > #: test/ftdump.c:1075 672c729 < #: test/ftdump.c:1086 test/ftlint.c:187 test/ftmetric.c:249 test/ftsbit.c:181 --- > #: test/ftdump.c:1091 test/ftlint.c:187 test/ftmetric.c:251 test/ftsbit.c:182 677c734 < #: test/ftdump.c:1089 test/ftlint.c:193 test/ftmetric.c:252 test/ftsbit.c:187 --- > #: test/ftdump.c:1094 test/ftlint.c:193 test/ftmetric.c:254 test/ftsbit.c:188 697c754 < #: test/ftlint.c:226 test/ftsbit.c:224 --- > #: test/ftlint.c:226 test/ftsbit.c:225 724c781 < #: test/ftmetric.c:68 --- > #: test/ftmetric.c:70 729c786 < #: test/ftmetric.c:72 --- > #: test/ftmetric.c:74 748c805 < #: test/ftmetric.c:259 --- > #: test/ftmetric.c:261 753c810 < #: test/ftmetric.c:264 --- > #: test/ftmetric.c:266 758c815 < #: test/ftmetric.c:278 --- > #: test/ftmetric.c:280 762c819 < #: test/ftmetric.c:308 --- > #: test/ftmetric.c:310 766c823 < #: test/ftmetric.c:315 --- > #: test/ftmetric.c:317 770c827 < #: test/ftmetric.c:321 --- > #: test/ftmetric.c:323 775c832 < #: test/ftmetric.c:331 test/ftsbit.c:233 --- > #: test/ftmetric.c:333 test/ftsbit.c:234 779c836 < #: test/ftmetric.c:339 test/ftsbit.c:257 --- > #: test/ftmetric.c:341 test/ftsbit.c:258 784c841 < #: test/ftmetric.c:366 --- > #: test/ftmetric.c:368 788c845 < #: test/ftmetric.c:368 --- > #: test/ftmetric.c:370 792c849 < #: test/ftsbit.c:89 --- > #: test/ftsbit.c:90 796c853 < #: test/ftsbit.c:94 --- > #: test/ftsbit.c:95 805c862 < #: test/ftsbit.c:199 --- > #: test/ftsbit.c:200 809c866 < #: test/ftsbit.c:205 --- > #: test/ftsbit.c:206 813c870 < #: test/ftsbit.c:251 --- > #: test/ftsbit.c:252 818c875 < #: test/ftsbit.c:263 --- > #: test/ftsbit.c:264 823c880 < #: test/ftsbit.c:266 --- > #: test/ftsbit.c:267 Index: freetype/po/freetype.pot =================================================================== RCS file: /cvs/freetype/freetype/po/freetype.pot,v retrieving revision 1.48 retrieving revision 1.52 diff -r1.48 -r1.52 9c9 < "POT-Creation-Date: 2000-03-07 21:59+0000\n" --- > "POT-Creation-Date: 2002-11-08 18:11+0000\n" 15c15 < "Content-Transfer-Encoding: ENCODING\n" --- > "Content-Transfer-Encoding: 8bit\n" 17c17,41 < #: lib/extend/ftxerr18.c:47 --- > #: lib/extend/ftxerr18.c:40 > msgid "" > "Welcome to the translation of the Freetype v.1 library!\n" > "\n" > "This message is not really part of the library (it is bracketed by\n" > " #if 0 / #endif), but is really intended to be the first one in the .po\n" > "file, and the first one that a new translator should see, to give hints.\n" > "\n" > "First, while this .po might seems big, the real interesting part of it\n" > "is only the messages in this file, lib/extend/ftxerr18.c. The other\n" > "messages are part of the demonstration programs, and are more intended\n" > "to help grasping how to use i18n with the Freetype library. So the real\n" > "work is the about 65 first ones. Unfortunately they are the harder ones!\n" > "\n" > "A difficulty is that there are some specialized vocabulary, about\n" > "``faces'', ``glyph'' and similar things. These are typographical things,\n" > "and this should be researched before attempting to translate the whole\n" > "thing. A quick look across the TrueType documentation might help to\n" > "understand many things, too.\n" > "\n" > "Best wiches for your translation!\n" > "Antoine Leca - 2002-11-08" > msgstr "" > > #: lib/extend/ftxerr18.c:77 21c45 < #: lib/extend/ftxerr18.c:50 --- > #: lib/extend/ftxerr18.c:80 25c49 < #: lib/extend/ftxerr18.c:52 --- > #: lib/extend/ftxerr18.c:82 29c53 < #: lib/extend/ftxerr18.c:54 --- > #: lib/extend/ftxerr18.c:84 33c57 < #: lib/extend/ftxerr18.c:56 --- > #: lib/extend/ftxerr18.c:86 37c61 < #: lib/extend/ftxerr18.c:58 --- > #: lib/extend/ftxerr18.c:88 41c65 < #: lib/extend/ftxerr18.c:60 --- > #: lib/extend/ftxerr18.c:90 45c69 < #: lib/extend/ftxerr18.c:62 --- > #: lib/extend/ftxerr18.c:92 49c73 < #: lib/extend/ftxerr18.c:64 --- > #: lib/extend/ftxerr18.c:94 53c77 < #: lib/extend/ftxerr18.c:66 --- > #: lib/extend/ftxerr18.c:96 57c81 < #: lib/extend/ftxerr18.c:69 --- > #: lib/extend/ftxerr18.c:98 61c85 < #: lib/extend/ftxerr18.c:71 --- > #: lib/extend/ftxerr18.c:100 65c89 < #: lib/extend/ftxerr18.c:73 --- > #: lib/extend/ftxerr18.c:102 69c93 < #: lib/extend/ftxerr18.c:75 --- > #: lib/extend/ftxerr18.c:104 73c97 < #: lib/extend/ftxerr18.c:77 --- > #: lib/extend/ftxerr18.c:106 77c101 < #: lib/extend/ftxerr18.c:80 --- > #: lib/extend/ftxerr18.c:109 81c105 < #: lib/extend/ftxerr18.c:83 --- > #: lib/extend/ftxerr18.c:112 85c109 < #: lib/extend/ftxerr18.c:85 --- > #: lib/extend/ftxerr18.c:114 89c113 < #: lib/extend/ftxerr18.c:87 --- > #: lib/extend/ftxerr18.c:116 93c117 < #: lib/extend/ftxerr18.c:89 --- > #: lib/extend/ftxerr18.c:118 97c121 < #: lib/extend/ftxerr18.c:92 --- > #: lib/extend/ftxerr18.c:121 101c125 < #: lib/extend/ftxerr18.c:95 --- > #: lib/extend/ftxerr18.c:124 105c129 < #: lib/extend/ftxerr18.c:97 --- > #: lib/extend/ftxerr18.c:126 109c133 < #: lib/extend/ftxerr18.c:99 --- > #: lib/extend/ftxerr18.c:128 113c137 < #: lib/extend/ftxerr18.c:101 --- > #: lib/extend/ftxerr18.c:130 117c141 < #: lib/extend/ftxerr18.c:103 --- > #: lib/extend/ftxerr18.c:132 121c145 < #: lib/extend/ftxerr18.c:105 --- > #: lib/extend/ftxerr18.c:134 125c149 < #: lib/extend/ftxerr18.c:107 --- > #: lib/extend/ftxerr18.c:136 129c153 < #: lib/extend/ftxerr18.c:109 --- > #: lib/extend/ftxerr18.c:138 133c157 < #: lib/extend/ftxerr18.c:111 --- > #: lib/extend/ftxerr18.c:140 137c161 < #: lib/extend/ftxerr18.c:113 --- > #: lib/extend/ftxerr18.c:142 141c165 < #: lib/extend/ftxerr18.c:118 --- > #: lib/extend/ftxerr18.c:147 145c169 < #: lib/extend/ftxerr18.c:123 --- > #: lib/extend/ftxerr18.c:152 149c173 < #: lib/extend/ftxerr18.c:125 --- > #: lib/extend/ftxerr18.c:154 153c177 < #: lib/extend/ftxerr18.c:127 --- > #: lib/extend/ftxerr18.c:156 157c181 < #: lib/extend/ftxerr18.c:132 --- > #: lib/extend/ftxerr18.c:161 161c185 < #: lib/extend/ftxerr18.c:134 --- > #: lib/extend/ftxerr18.c:163 165c189 < #: lib/extend/ftxerr18.c:136 --- > #: lib/extend/ftxerr18.c:165 169c193 < #: lib/extend/ftxerr18.c:138 --- > #: lib/extend/ftxerr18.c:167 173c197,201 < #: lib/extend/ftxerr18.c:143 --- > #: lib/extend/ftxerr18.c:169 > msgid "Too many function definitions (FDEF)." > msgstr "" > > #: lib/extend/ftxerr18.c:174 177c205 < #: lib/extend/ftxerr18.c:145 --- > #: lib/extend/ftxerr18.c:176 181c209 < #: lib/extend/ftxerr18.c:147 --- > #: lib/extend/ftxerr18.c:178 185c213 < #: lib/extend/ftxerr18.c:149 --- > #: lib/extend/ftxerr18.c:180 189c217 < #: lib/extend/ftxerr18.c:151 --- > #: lib/extend/ftxerr18.c:182 193c221 < #: lib/extend/ftxerr18.c:153 --- > #: lib/extend/ftxerr18.c:184 197c225 < #: lib/extend/ftxerr18.c:155 --- > #: lib/extend/ftxerr18.c:186 201c229 < #: lib/extend/ftxerr18.c:157 --- > #: lib/extend/ftxerr18.c:188 205c233 < #: lib/extend/ftxerr18.c:159 --- > #: lib/extend/ftxerr18.c:190 209c237 < #: lib/extend/ftxerr18.c:161 --- > #: lib/extend/ftxerr18.c:192 213c241 < #: lib/extend/ftxerr18.c:163 --- > #: lib/extend/ftxerr18.c:194 217c245 < #: lib/extend/ftxerr18.c:165 --- > #: lib/extend/ftxerr18.c:196 221c249 < #: lib/extend/ftxerr18.c:167 --- > #: lib/extend/ftxerr18.c:198 225c253 < #: lib/extend/ftxerr18.c:169 --- > #: lib/extend/ftxerr18.c:200 229c257 < #: lib/extend/ftxerr18.c:171 --- > #: lib/extend/ftxerr18.c:202 233c261 < #: lib/extend/ftxerr18.c:173 --- > #: lib/extend/ftxerr18.c:204 237c265 < #: lib/extend/ftxerr18.c:175 --- > #: lib/extend/ftxerr18.c:206 241c269 < #: lib/extend/ftxerr18.c:177 --- > #: lib/extend/ftxerr18.c:208 245c273 < #: lib/extend/ftxerr18.c:182 --- > #: lib/extend/ftxerr18.c:213 249c277 < #: lib/extend/ftxerr18.c:184 --- > #: lib/extend/ftxerr18.c:215 253c281 < #: lib/extend/ftxerr18.c:186 --- > #: lib/extend/ftxerr18.c:217 257c285 < #: lib/extend/ftxerr18.c:188 --- > #: lib/extend/ftxerr18.c:219 261c289 < #: lib/extend/ftxerr18.c:193 --- > #: lib/extend/ftxerr18.c:224 265c293 < #: lib/extend/ftxerr18.c:195 --- > #: lib/extend/ftxerr18.c:226 269c297 < #: lib/extend/ftxerr18.c:197 --- > #: lib/extend/ftxerr18.c:228 273c301 < #: lib/extend/ftxerr18.c:199 --- > #: lib/extend/ftxerr18.c:230 277c305 < #: lib/extend/ftxerr18.c:204 --- > #: lib/extend/ftxerr18.c:235 281c309 < #: lib/extend/ftxerr18.c:206 --- > #: lib/extend/ftxerr18.c:237 285c313 < #: lib/extend/ftxerr18.c:208 --- > #: lib/extend/ftxerr18.c:240 289c317 < #: lib/extend/ftxerr18.c:210 --- > #: lib/extend/ftxerr18.c:242 293c321 < #: lib/extend/ftxerr18.c:216 --- > #: lib/extend/ftxerr18.c:247 297c325 < #: lib/extend/ftxerr18.c:218 --- > #: lib/extend/ftxerr18.c:249 301c329 < #: lib/extend/ftxerr18.c:220 --- > #: lib/extend/ftxerr18.c:251 305c333 < #: lib/extend/ftxerr18.c:222 --- > #: lib/extend/ftxerr18.c:253 309c337,341 < #: lib/extend/ftxerr18.c:224 --- > #: lib/extend/ftxerr18.c:255 > msgid "No MM (Adobe MultipleMaster) interpreter available." > msgstr "" > > #: lib/extend/ftxerr18.c:258 313c345 < #: lib/extend/ftxerr18.c:226 --- > #: lib/extend/ftxerr18.c:260 317c349 < #: lib/extend/ftxerr18.c:228 --- > #: lib/extend/ftxerr18.c:263 321c353 < #: lib/extend/ftxerr18.c:230 --- > #: lib/extend/ftxerr18.c:265 325c357,365 < #: lib/extend/ftxerr18.c:237 --- > #: lib/extend/ftxerr18.c:268 > msgid "Invalid glyph definition (GDEF) table format." > msgstr "" > > #: lib/extend/ftxerr18.c:270 > msgid "Invalid glyph definition (GDEF) table." > msgstr "" > > #: lib/extend/ftxerr18.c:277 329c369,381 < #: test/fterror.c:60 --- > #: test/fterror.c:49 > msgid "" > "fterror: test TT_ErrToString18 functionality\n" > "\n" > msgstr "" > > #: test/fterror.c:50 > msgid "" > " with an optional numerical argument, dumps the associated message.\n" > "\n" > msgstr "" > > #: test/fterror.c:73 333c385 < #: test/fterror.c:68 --- > #: test/fterror.c:81 337c389,394 < #: test/ftdump.c:168 test/ftlint.c:207 test/ftmetric.c:292 --- > #: test/fterror.c:96 > #, c-format > msgid "Freetype error code 0x%04lX (%lu): %s\n" > msgstr "" > > #: test/ftdump.c:169 test/ftlint.c:207 test/ftmetric.c:294 341c398 < #: test/ftdump.c:178 test/ftlint.c:215 test/ftmetric.c:301 test/ftsbit.c:213 --- > #: test/ftdump.c:179 test/ftlint.c:215 test/ftmetric.c:303 test/ftsbit.c:214 345c402 < #: test/ftdump.c:187 --- > #: test/ftdump.c:188 349c406 < #: test/ftdump.c:193 --- > #: test/ftdump.c:194 353c410 < #: test/ftdump.c:201 --- > #: test/ftdump.c:202 357c414 < #: test/ftdump.c:202 --- > #: test/ftdump.c:203 361c418 < #: test/ftdump.c:203 --- > #: test/ftdump.c:204 365c422 < #: test/ftdump.c:207 --- > #: test/ftdump.c:208 369c426 < #: test/ftdump.c:214 --- > #: test/ftdump.c:215 373,375c430,432 < #: test/ftdump.c:222 test/ftdump.c:574 test/ftdump.c:784 test/ftdump.c:988 < #: test/ftdump.c:1135 test/ftlint.c:274 test/ftlint.c:287 test/ftmetric.c:387 < #: test/ftsbit.c:284 --- > #: test/ftdump.c:223 test/ftdump.c:579 test/ftdump.c:789 test/ftdump.c:993 > #: test/ftdump.c:1139 test/ftlint.c:274 test/ftlint.c:287 test/ftmetric.c:390 > #: test/ftsbit.c:286 380c437 < #: test/ftdump.c:299 --- > #: test/ftdump.c:300 384c441 < #: test/ftdump.c:309 --- > #: test/ftdump.c:310 391c448 < #: test/ftdump.c:332 --- > #: test/ftdump.c:333 395c452 < #: test/ftdump.c:339 test/ftdump.c:483 --- > #: test/ftdump.c:340 test/ftdump.c:488 399c456 < #: test/ftdump.c:343 test/ftdump.c:487 --- > #: test/ftdump.c:344 test/ftdump.c:492 406c463 < #: test/ftdump.c:348 --- > #: test/ftdump.c:349 411c468 < #: test/ftdump.c:375 test/ftdump.c:384 test/ftdump.c:447 --- > #: test/ftdump.c:376 test/ftdump.c:385 test/ftdump.c:452 416c473 < #: test/ftdump.c:454 --- > #: test/ftdump.c:459 420c477 < #: test/ftdump.c:476 --- > #: test/ftdump.c:481 424c481 < #: test/ftdump.c:493 --- > #: test/ftdump.c:498 429c486 < #: test/ftdump.c:498 --- > #: test/ftdump.c:503 434c491 < #: test/ftdump.c:502 --- > #: test/ftdump.c:507 439c496 < #: test/ftdump.c:506 --- > #: test/ftdump.c:511 444c501 < #: test/ftdump.c:528 test/ftmetric.c:282 --- > #: test/ftdump.c:533 test/ftmetric.c:284 448c505 < #: test/ftdump.c:532 --- > #: test/ftdump.c:537 452c509 < #: test/ftdump.c:535 --- > #: test/ftdump.c:540 457c514 < #: test/ftdump.c:537 --- > #: test/ftdump.c:542 462c519 < #: test/ftdump.c:547 --- > #: test/ftdump.c:552 467c524 < #: test/ftdump.c:550 --- > #: test/ftdump.c:555 472c529 < #: test/ftdump.c:559 --- > #: test/ftdump.c:564 477c534 < #: test/ftdump.c:610 --- > #: test/ftdump.c:615 481c538 < #: test/ftdump.c:614 --- > #: test/ftdump.c:619 485c542 < #: test/ftdump.c:621 --- > #: test/ftdump.c:626 489c546 < #: test/ftdump.c:634 --- > #: test/ftdump.c:639 494c551 < #: test/ftdump.c:639 test/ftdump.c:843 --- > #: test/ftdump.c:644 test/ftdump.c:848 499c556 < #: test/ftdump.c:647 --- > #: test/ftdump.c:652 504c561 < #: test/ftdump.c:652 test/ftdump.c:856 --- > #: test/ftdump.c:657 test/ftdump.c:861 508c565 < #: test/ftdump.c:665 --- > #: test/ftdump.c:670 515c572 < #: test/ftdump.c:671 test/ftdump.c:752 test/ftdump.c:875 test/ftdump.c:956 --- > #: test/ftdump.c:676 test/ftdump.c:757 test/ftdump.c:880 test/ftdump.c:961 520c577 < #: test/ftdump.c:687 --- > #: test/ftdump.c:692 525c582 < #: test/ftdump.c:704 --- > #: test/ftdump.c:709 530c587 < #: test/ftdump.c:709 test/ftdump.c:913 --- > #: test/ftdump.c:714 test/ftdump.c:918 535c592 < #: test/ftdump.c:714 test/ftdump.c:918 --- > #: test/ftdump.c:719 test/ftdump.c:923 540c597 < #: test/ftdump.c:729 --- > #: test/ftdump.c:734 547c604 < #: test/ftdump.c:746 --- > #: test/ftdump.c:751 554c611 < #: test/ftdump.c:771 test/ftdump.c:975 --- > #: test/ftdump.c:776 test/ftdump.c:980 560c617 < #: test/ftdump.c:774 test/ftdump.c:978 --- > #: test/ftdump.c:779 test/ftdump.c:983 565c622 < #: test/ftdump.c:814 --- > #: test/ftdump.c:819 569c626 < #: test/ftdump.c:818 --- > #: test/ftdump.c:823 573c630 < #: test/ftdump.c:825 --- > #: test/ftdump.c:830 577c634 < #: test/ftdump.c:838 --- > #: test/ftdump.c:843 582c639 < #: test/ftdump.c:851 --- > #: test/ftdump.c:856 587c644 < #: test/ftdump.c:869 --- > #: test/ftdump.c:874 594c651 < #: test/ftdump.c:891 --- > #: test/ftdump.c:896 599c656 < #: test/ftdump.c:908 --- > #: test/ftdump.c:913 604c661 < #: test/ftdump.c:933 --- > #: test/ftdump.c:938 611c668 < #: test/ftdump.c:950 --- > #: test/ftdump.c:955 618c675 < #: test/ftdump.c:1013 --- > #: test/ftdump.c:1018 622c679 < #: test/ftdump.c:1017 --- > #: test/ftdump.c:1022 629c686 < #: test/ftdump.c:1049 test/ftlint.c:134 test/ftmetric.c:226 test/ftsbit.c:126 --- > #: test/ftdump.c:1054 test/ftlint.c:134 test/ftmetric.c:228 test/ftsbit.c:127 633c690 < #: test/ftdump.c:1056 test/ftmetric.c:234 test/ftsbit.c:133 --- > #: test/ftdump.c:1061 test/ftmetric.c:236 test/ftsbit.c:134 637c694 < #: test/ftdump.c:1063 --- > #: test/ftdump.c:1068 641c698 < #: test/ftdump.c:1070 --- > #: test/ftdump.c:1075 645c702 < #: test/ftdump.c:1086 test/ftlint.c:187 test/ftmetric.c:249 test/ftsbit.c:181 --- > #: test/ftdump.c:1091 test/ftlint.c:187 test/ftmetric.c:251 test/ftsbit.c:182 650c707 < #: test/ftdump.c:1089 test/ftlint.c:193 test/ftmetric.c:252 test/ftsbit.c:187 --- > #: test/ftdump.c:1094 test/ftlint.c:193 test/ftmetric.c:254 test/ftsbit.c:188 667c724 < #: test/ftlint.c:226 test/ftsbit.c:224 --- > #: test/ftlint.c:226 test/ftsbit.c:225 692c749 < #: test/ftmetric.c:68 --- > #: test/ftmetric.c:70 697c754 < #: test/ftmetric.c:72 --- > #: test/ftmetric.c:74 709c766 < #: test/ftmetric.c:259 --- > #: test/ftmetric.c:261 714c771 < #: test/ftmetric.c:264 --- > #: test/ftmetric.c:266 719c776 < #: test/ftmetric.c:278 --- > #: test/ftmetric.c:280 723c780 < #: test/ftmetric.c:308 --- > #: test/ftmetric.c:310 727c784 < #: test/ftmetric.c:315 --- > #: test/ftmetric.c:317 731c788 < #: test/ftmetric.c:321 --- > #: test/ftmetric.c:323 736c793 < #: test/ftmetric.c:331 test/ftsbit.c:233 --- > #: test/ftmetric.c:333 test/ftsbit.c:234 740c797 < #: test/ftmetric.c:339 test/ftsbit.c:257 --- > #: test/ftmetric.c:341 test/ftsbit.c:258 745c802 < #: test/ftmetric.c:366 --- > #: test/ftmetric.c:368 749c806 < #: test/ftmetric.c:368 --- > #: test/ftmetric.c:370 753c810 < #: test/ftsbit.c:89 --- > #: test/ftsbit.c:90 757c814 < #: test/ftsbit.c:94 --- > #: test/ftsbit.c:95 764c821 < #: test/ftsbit.c:199 --- > #: test/ftsbit.c:200 768c825 < #: test/ftsbit.c:205 --- > #: test/ftsbit.c:206 772c829 < #: test/ftsbit.c:251 --- > #: test/ftsbit.c:252 777c834 < #: test/ftsbit.c:263 --- > #: test/ftsbit.c:264 782c839 < #: test/ftsbit.c:266 --- > #: test/ftsbit.c:267 Index: freetype/po/nl.po =================================================================== RCS file: /cvs/freetype/freetype/po/nl.po,v retrieving revision 1.29 retrieving revision 1.33 diff -r1.29 -r1.33 7,8c7,8 < "Project-Id-Version: FreeType 1.4\n" < "POT-Creation-Date: 2000-03-07 21:59+0000\n" --- > "Project-Id-Version: FreeType 1.5\n" > "POT-Creation-Date: 2002-11-08 18:11+0000\n" 16c16,40 < #: lib/extend/ftxerr18.c:47 --- > #: lib/extend/ftxerr18.c:40 > msgid "" > "Welcome to the translation of the Freetype v.1 library!\n" > "\n" > "This message is not really part of the library (it is bracketed by\n" > " #if 0 / #endif), but is really intended to be the first one in the .po\n" > "file, and the first one that a new translator should see, to give hints.\n" > "\n" > "First, while this .po might seems big, the real interesting part of it\n" > "is only the messages in this file, lib/extend/ftxerr18.c. The other\n" > "messages are part of the demonstration programs, and are more intended\n" > "to help grasping how to use i18n with the Freetype library. So the real\n" > "work is the about 65 first ones. Unfortunately they are the harder ones!\n" > "\n" > "A difficulty is that there are some specialized vocabulary, about\n" > "``faces'', ``glyph'' and similar things. These are typographical things,\n" > "and this should be researched before attempting to translate the whole\n" > "thing. A quick look across the TrueType documentation might help to\n" > "understand many things, too.\n" > "\n" > "Best wiches for your translation!\n" > "Antoine Leca - 2002-11-08" > msgstr "" > > #: lib/extend/ftxerr18.c:77 20c44 < #: lib/extend/ftxerr18.c:50 --- > #: lib/extend/ftxerr18.c:80 24c48 < #: lib/extend/ftxerr18.c:52 --- > #: lib/extend/ftxerr18.c:82 28c52 < #: lib/extend/ftxerr18.c:54 --- > #: lib/extend/ftxerr18.c:84 32c56 < #: lib/extend/ftxerr18.c:56 --- > #: lib/extend/ftxerr18.c:86 36c60 < #: lib/extend/ftxerr18.c:58 --- > #: lib/extend/ftxerr18.c:88 40c64 < #: lib/extend/ftxerr18.c:60 --- > #: lib/extend/ftxerr18.c:90 44c68 < #: lib/extend/ftxerr18.c:62 --- > #: lib/extend/ftxerr18.c:92 48c72 < #: lib/extend/ftxerr18.c:64 --- > #: lib/extend/ftxerr18.c:94 52c76 < #: lib/extend/ftxerr18.c:66 --- > #: lib/extend/ftxerr18.c:96 56c80 < #: lib/extend/ftxerr18.c:69 --- > #: lib/extend/ftxerr18.c:98 60c84 < #: lib/extend/ftxerr18.c:71 --- > #: lib/extend/ftxerr18.c:100 64c88 < #: lib/extend/ftxerr18.c:73 --- > #: lib/extend/ftxerr18.c:102 68c92 < #: lib/extend/ftxerr18.c:75 --- > #: lib/extend/ftxerr18.c:104 72c96 < #: lib/extend/ftxerr18.c:77 --- > #: lib/extend/ftxerr18.c:106 76c100 < #: lib/extend/ftxerr18.c:80 --- > #: lib/extend/ftxerr18.c:109 80c104 < #: lib/extend/ftxerr18.c:83 --- > #: lib/extend/ftxerr18.c:112 84c108 < #: lib/extend/ftxerr18.c:85 --- > #: lib/extend/ftxerr18.c:114 88c112 < #: lib/extend/ftxerr18.c:87 --- > #: lib/extend/ftxerr18.c:116 92c116 < #: lib/extend/ftxerr18.c:89 --- > #: lib/extend/ftxerr18.c:118 96c120 < #: lib/extend/ftxerr18.c:92 --- > #: lib/extend/ftxerr18.c:121 100c124 < #: lib/extend/ftxerr18.c:95 --- > #: lib/extend/ftxerr18.c:124 104c128 < #: lib/extend/ftxerr18.c:97 --- > #: lib/extend/ftxerr18.c:126 108c132 < #: lib/extend/ftxerr18.c:99 --- > #: lib/extend/ftxerr18.c:128 112c136 < #: lib/extend/ftxerr18.c:101 --- > #: lib/extend/ftxerr18.c:130 116c140 < #: lib/extend/ftxerr18.c:103 --- > #: lib/extend/ftxerr18.c:132 120c144 < #: lib/extend/ftxerr18.c:105 --- > #: lib/extend/ftxerr18.c:134 124c148 < #: lib/extend/ftxerr18.c:107 --- > #: lib/extend/ftxerr18.c:136 128c152 < #: lib/extend/ftxerr18.c:109 --- > #: lib/extend/ftxerr18.c:138 132c156 < #: lib/extend/ftxerr18.c:111 --- > #: lib/extend/ftxerr18.c:140 136c160 < #: lib/extend/ftxerr18.c:113 --- > #: lib/extend/ftxerr18.c:142 140c164 < #: lib/extend/ftxerr18.c:118 --- > #: lib/extend/ftxerr18.c:147 144c168 < #: lib/extend/ftxerr18.c:123 --- > #: lib/extend/ftxerr18.c:152 148c172 < #: lib/extend/ftxerr18.c:125 --- > #: lib/extend/ftxerr18.c:154 152c176 < #: lib/extend/ftxerr18.c:127 --- > #: lib/extend/ftxerr18.c:156 156c180 < #: lib/extend/ftxerr18.c:132 --- > #: lib/extend/ftxerr18.c:161 160c184 < #: lib/extend/ftxerr18.c:134 --- > #: lib/extend/ftxerr18.c:163 164c188 < #: lib/extend/ftxerr18.c:136 --- > #: lib/extend/ftxerr18.c:165 168c192 < #: lib/extend/ftxerr18.c:138 --- > #: lib/extend/ftxerr18.c:167 172c196,201 < #: lib/extend/ftxerr18.c:143 --- > #: lib/extend/ftxerr18.c:169 > #, fuzzy > msgid "Too many function definitions (FDEF)." > msgstr "Functiedefinities genest." > > #: lib/extend/ftxerr18.c:174 176c205 < #: lib/extend/ftxerr18.c:145 --- > #: lib/extend/ftxerr18.c:176 180c209 < #: lib/extend/ftxerr18.c:147 --- > #: lib/extend/ftxerr18.c:178 184c213 < #: lib/extend/ftxerr18.c:149 --- > #: lib/extend/ftxerr18.c:180 188c217 < #: lib/extend/ftxerr18.c:151 --- > #: lib/extend/ftxerr18.c:182 192c221 < #: lib/extend/ftxerr18.c:153 --- > #: lib/extend/ftxerr18.c:184 196c225 < #: lib/extend/ftxerr18.c:155 --- > #: lib/extend/ftxerr18.c:186 200c229 < #: lib/extend/ftxerr18.c:157 --- > #: lib/extend/ftxerr18.c:188 204c233 < #: lib/extend/ftxerr18.c:159 --- > #: lib/extend/ftxerr18.c:190 208c237 < #: lib/extend/ftxerr18.c:161 --- > #: lib/extend/ftxerr18.c:192 212c241 < #: lib/extend/ftxerr18.c:163 --- > #: lib/extend/ftxerr18.c:194 216c245 < #: lib/extend/ftxerr18.c:165 --- > #: lib/extend/ftxerr18.c:196 220c249 < #: lib/extend/ftxerr18.c:167 --- > #: lib/extend/ftxerr18.c:198 224c253 < #: lib/extend/ftxerr18.c:169 --- > #: lib/extend/ftxerr18.c:200 228c257 < #: lib/extend/ftxerr18.c:171 --- > #: lib/extend/ftxerr18.c:202 232c261 < #: lib/extend/ftxerr18.c:173 --- > #: lib/extend/ftxerr18.c:204 236c265 < #: lib/extend/ftxerr18.c:175 --- > #: lib/extend/ftxerr18.c:206 240c269 < #: lib/extend/ftxerr18.c:177 --- > #: lib/extend/ftxerr18.c:208 244c273 < #: lib/extend/ftxerr18.c:182 --- > #: lib/extend/ftxerr18.c:213 248c277 < #: lib/extend/ftxerr18.c:184 --- > #: lib/extend/ftxerr18.c:215 252c281 < #: lib/extend/ftxerr18.c:186 --- > #: lib/extend/ftxerr18.c:217 256c285 < #: lib/extend/ftxerr18.c:188 --- > #: lib/extend/ftxerr18.c:219 260c289 < #: lib/extend/ftxerr18.c:193 --- > #: lib/extend/ftxerr18.c:224 264c293 < #: lib/extend/ftxerr18.c:195 --- > #: lib/extend/ftxerr18.c:226 268c297 < #: lib/extend/ftxerr18.c:197 --- > #: lib/extend/ftxerr18.c:228 272c301 < #: lib/extend/ftxerr18.c:199 --- > #: lib/extend/ftxerr18.c:230 276c305 < #: lib/extend/ftxerr18.c:204 --- > #: lib/extend/ftxerr18.c:235 280c309 < #: lib/extend/ftxerr18.c:206 --- > #: lib/extend/ftxerr18.c:237 284c313 < #: lib/extend/ftxerr18.c:208 --- > #: lib/extend/ftxerr18.c:240 288c317 < #: lib/extend/ftxerr18.c:210 --- > #: lib/extend/ftxerr18.c:242 292c321 < #: lib/extend/ftxerr18.c:216 --- > #: lib/extend/ftxerr18.c:247 296c325 < #: lib/extend/ftxerr18.c:218 --- > #: lib/extend/ftxerr18.c:249 300c329 < #: lib/extend/ftxerr18.c:220 --- > #: lib/extend/ftxerr18.c:251 304c333 < #: lib/extend/ftxerr18.c:222 --- > #: lib/extend/ftxerr18.c:253 308c337,341 < #: lib/extend/ftxerr18.c:224 --- > #: lib/extend/ftxerr18.c:255 > msgid "No MM (Adobe MultipleMaster) interpreter available." > msgstr "" > > #: lib/extend/ftxerr18.c:258 312c345 < #: lib/extend/ftxerr18.c:226 --- > #: lib/extend/ftxerr18.c:260 316c349 < #: lib/extend/ftxerr18.c:228 --- > #: lib/extend/ftxerr18.c:263 320c353 < #: lib/extend/ftxerr18.c:230 --- > #: lib/extend/ftxerr18.c:265 324c357,367 < #: lib/extend/ftxerr18.c:237 --- > #: lib/extend/ftxerr18.c:268 > #, fuzzy > msgid "Invalid glyph definition (GDEF) table format." > msgstr "Ongeldige Glyph plaatsing (GPOS) tabel opmaak." > > #: lib/extend/ftxerr18.c:270 > #, fuzzy > msgid "Invalid glyph definition (GDEF) table." > msgstr "Ongeldige Glyph plaatsing (GPOS) tabel." > > #: lib/extend/ftxerr18.c:277 328c371,383 < #: test/fterror.c:60 --- > #: test/fterror.c:49 > msgid "" > "fterror: test TT_ErrToString18 functionality\n" > "\n" > msgstr "" > > #: test/fterror.c:50 > msgid "" > " with an optional numerical argument, dumps the associated message.\n" > "\n" > msgstr "" > > #: test/fterror.c:73 332c387 < #: test/fterror.c:68 --- > #: test/fterror.c:81 336c391,396 < #: test/ftdump.c:168 test/ftlint.c:207 test/ftmetric.c:292 --- > #: test/fterror.c:96 > #, fuzzy, c-format > msgid "Freetype error code 0x%04lX (%lu): %s\n" > msgstr "FreeType foutmelding: %s\n" > > #: test/ftdump.c:169 test/ftlint.c:207 test/ftmetric.c:294 340c400 < #: test/ftdump.c:178 test/ftlint.c:215 test/ftmetric.c:301 test/ftsbit.c:213 --- > #: test/ftdump.c:179 test/ftlint.c:215 test/ftmetric.c:303 test/ftsbit.c:214 344c404 < #: test/ftdump.c:187 --- > #: test/ftdump.c:188 348c408 < #: test/ftdump.c:193 --- > #: test/ftdump.c:194 352c412 < #: test/ftdump.c:201 --- > #: test/ftdump.c:202 356c416 < #: test/ftdump.c:202 --- > #: test/ftdump.c:203 360c420 < #: test/ftdump.c:203 --- > #: test/ftdump.c:204 364c424 < #: test/ftdump.c:207 --- > #: test/ftdump.c:208 368c428 < #: test/ftdump.c:214 --- > #: test/ftdump.c:215 372,374c432,434 < #: test/ftdump.c:222 test/ftdump.c:574 test/ftdump.c:784 test/ftdump.c:988 < #: test/ftdump.c:1135 test/ftlint.c:274 test/ftlint.c:287 test/ftmetric.c:387 < #: test/ftsbit.c:284 --- > #: test/ftdump.c:223 test/ftdump.c:579 test/ftdump.c:789 test/ftdump.c:993 > #: test/ftdump.c:1139 test/ftlint.c:274 test/ftlint.c:287 test/ftmetric.c:390 > #: test/ftsbit.c:286 379c439 < #: test/ftdump.c:299 --- > #: test/ftdump.c:300 383c443 < #: test/ftdump.c:309 --- > #: test/ftdump.c:310 392c452 < #: test/ftdump.c:332 --- > #: test/ftdump.c:333 396c456 < #: test/ftdump.c:339 test/ftdump.c:483 --- > #: test/ftdump.c:340 test/ftdump.c:488 400c460 < #: test/ftdump.c:343 test/ftdump.c:487 --- > #: test/ftdump.c:344 test/ftdump.c:492 409c469 < #: test/ftdump.c:348 --- > #: test/ftdump.c:349 414c474 < #: test/ftdump.c:375 test/ftdump.c:384 test/ftdump.c:447 --- > #: test/ftdump.c:376 test/ftdump.c:385 test/ftdump.c:452 419c479 < #: test/ftdump.c:454 --- > #: test/ftdump.c:459 423c483 < #: test/ftdump.c:476 --- > #: test/ftdump.c:481 427c487 < #: test/ftdump.c:493 --- > #: test/ftdump.c:498 432c492 < #: test/ftdump.c:498 --- > #: test/ftdump.c:503 437c497 < #: test/ftdump.c:502 --- > #: test/ftdump.c:507 442c502 < #: test/ftdump.c:506 --- > #: test/ftdump.c:511 447c507 < #: test/ftdump.c:528 test/ftmetric.c:282 --- > #: test/ftdump.c:533 test/ftmetric.c:284 451c511 < #: test/ftdump.c:532 --- > #: test/ftdump.c:537 455c515 < #: test/ftdump.c:535 --- > #: test/ftdump.c:540 460c520 < #: test/ftdump.c:537 --- > #: test/ftdump.c:542 465c525 < #: test/ftdump.c:547 --- > #: test/ftdump.c:552 470c530 < #: test/ftdump.c:550 --- > #: test/ftdump.c:555 475c535 < #: test/ftdump.c:559 --- > #: test/ftdump.c:564 480c540 < #: test/ftdump.c:610 --- > #: test/ftdump.c:615 484c544 < #: test/ftdump.c:614 --- > #: test/ftdump.c:619 488c548 < #: test/ftdump.c:621 --- > #: test/ftdump.c:626 492c552 < #: test/ftdump.c:634 --- > #: test/ftdump.c:639 497c557 < #: test/ftdump.c:639 test/ftdump.c:843 --- > #: test/ftdump.c:644 test/ftdump.c:848 502c562 < #: test/ftdump.c:647 --- > #: test/ftdump.c:652 508c568 < #: test/ftdump.c:652 test/ftdump.c:856 --- > #: test/ftdump.c:657 test/ftdump.c:861 512c572 < #: test/ftdump.c:665 --- > #: test/ftdump.c:670 521c581 < #: test/ftdump.c:671 test/ftdump.c:752 test/ftdump.c:875 test/ftdump.c:956 --- > #: test/ftdump.c:676 test/ftdump.c:757 test/ftdump.c:880 test/ftdump.c:961 526c586 < #: test/ftdump.c:687 --- > #: test/ftdump.c:692 531c591 < #: test/ftdump.c:704 --- > #: test/ftdump.c:709 536c596 < #: test/ftdump.c:709 test/ftdump.c:913 --- > #: test/ftdump.c:714 test/ftdump.c:918 541c601 < #: test/ftdump.c:714 test/ftdump.c:918 --- > #: test/ftdump.c:719 test/ftdump.c:923 546c606 < #: test/ftdump.c:729 --- > #: test/ftdump.c:734 555c615 < #: test/ftdump.c:746 --- > #: test/ftdump.c:751 564c624 < #: test/ftdump.c:771 test/ftdump.c:975 --- > #: test/ftdump.c:776 test/ftdump.c:980 572c632 < #: test/ftdump.c:774 test/ftdump.c:978 --- > #: test/ftdump.c:779 test/ftdump.c:983 577c637 < #: test/ftdump.c:814 --- > #: test/ftdump.c:819 581c641 < #: test/ftdump.c:818 --- > #: test/ftdump.c:823 585c645 < #: test/ftdump.c:825 --- > #: test/ftdump.c:830 589c649 < #: test/ftdump.c:838 --- > #: test/ftdump.c:843 594c654 < #: test/ftdump.c:851 --- > #: test/ftdump.c:856 600c660 < #: test/ftdump.c:869 --- > #: test/ftdump.c:874 609c669 < #: test/ftdump.c:891 --- > #: test/ftdump.c:896 614c674 < #: test/ftdump.c:908 --- > #: test/ftdump.c:913 619c679 < #: test/ftdump.c:933 --- > #: test/ftdump.c:938 628c688 < #: test/ftdump.c:950 --- > #: test/ftdump.c:955 637c697 < #: test/ftdump.c:1013 --- > #: test/ftdump.c:1018 642c702 < #: test/ftdump.c:1017 --- > #: test/ftdump.c:1022 651c711 < #: test/ftdump.c:1049 test/ftlint.c:134 test/ftmetric.c:226 test/ftsbit.c:126 --- > #: test/ftdump.c:1054 test/ftlint.c:134 test/ftmetric.c:228 test/ftsbit.c:127 655c715 < #: test/ftdump.c:1056 test/ftmetric.c:234 test/ftsbit.c:133 --- > #: test/ftdump.c:1061 test/ftmetric.c:236 test/ftsbit.c:134 659c719 < #: test/ftdump.c:1063 --- > #: test/ftdump.c:1068 663c723 < #: test/ftdump.c:1070 --- > #: test/ftdump.c:1075 667c727 < #: test/ftdump.c:1086 test/ftlint.c:187 test/ftmetric.c:249 test/ftsbit.c:181 --- > #: test/ftdump.c:1091 test/ftlint.c:187 test/ftmetric.c:251 test/ftsbit.c:182 672c732 < #: test/ftdump.c:1089 test/ftlint.c:193 test/ftmetric.c:252 test/ftsbit.c:187 --- > #: test/ftdump.c:1094 test/ftlint.c:193 test/ftmetric.c:254 test/ftsbit.c:188 692c752 < #: test/ftlint.c:226 test/ftsbit.c:224 --- > #: test/ftlint.c:226 test/ftsbit.c:225 719c779 < #: test/ftmetric.c:68 --- > #: test/ftmetric.c:70 725c785 < #: test/ftmetric.c:72 --- > #: test/ftmetric.c:74 745c805 < #: test/ftmetric.c:259 --- > #: test/ftmetric.c:261 750c810 < #: test/ftmetric.c:264 --- > #: test/ftmetric.c:266 755c815 < #: test/ftmetric.c:278 --- > #: test/ftmetric.c:280 759c819 < #: test/ftmetric.c:308 --- > #: test/ftmetric.c:310 763c823 < #: test/ftmetric.c:315 --- > #: test/ftmetric.c:317 767c827 < #: test/ftmetric.c:321 --- > #: test/ftmetric.c:323 772c832 < #: test/ftmetric.c:331 test/ftsbit.c:233 --- > #: test/ftmetric.c:333 test/ftsbit.c:234 776c836 < #: test/ftmetric.c:339 test/ftsbit.c:257 --- > #: test/ftmetric.c:341 test/ftsbit.c:258 781c841 < #: test/ftmetric.c:366 --- > #: test/ftmetric.c:368 785c845 < #: test/ftmetric.c:368 --- > #: test/ftmetric.c:370 789c849 < #: test/ftsbit.c:89 --- > #: test/ftsbit.c:90 793c853 < #: test/ftsbit.c:94 --- > #: test/ftsbit.c:95 802c862 < #: test/ftsbit.c:199 --- > #: test/ftsbit.c:200 806c866 < #: test/ftsbit.c:205 --- > #: test/ftsbit.c:206 810c870 < #: test/ftsbit.c:251 --- > #: test/ftsbit.c:252 815c875 < #: test/ftsbit.c:263 --- > #: test/ftsbit.c:264 820c880 < #: test/ftsbit.c:266 --- > #: test/ftsbit.c:267 Index: freetype/test/arabic.c =================================================================== RCS file: /cvs/freetype/freetype/test/arabic.c,v retrieving revision 1.8 retrieving revision 1.9 diff -r1.8 -r1.9 153a154 > 251,254c252,255 < static joining_class Get_Joining_Class( TT_UShort* string, < TT_UShort pos, < TT_UShort length, < int direction ) --- > static joining_class Get_Joining_Class( TT_ULong* string, > TT_UShort pos, > TT_UShort length, > int direction ) 278c279 < j = arabic[string[pos] - 0x0620]; --- > j = arabic[string[pos] - 0x0620]; 286c287 < TT_Error Assign_Arabic_Properties( TT_UShort* string, --- > TT_Error Assign_Arabic_Properties( TT_ULong* string, Index: freetype/test/arabic.h =================================================================== RCS file: /cvs/freetype/freetype/test/arabic.h,v retrieving revision 1.5 retrieving revision 1.6 diff -r1.5 -r1.6 58c58 < TT_Error Assign_Arabic_Properties( TT_UShort* string, --- > TT_Error Assign_Arabic_Properties( TT_ULong* string, Index: freetype/test/blitter.h =================================================================== RCS file: /cvs/freetype/freetype/test/blitter.h,v retrieving revision 1.3 retrieving revision 1.4 diff -r1.3 -r1.4 5c5 < /* Copyright 1996-2000 by */ --- > /* Copyright 1996-2001 by */ 15c15 < #include --- > #include "freetype.h" Index: freetype/test/common.c =================================================================== RCS file: /cvs/freetype/freetype/test/common.c,v retrieving revision 1.15 retrieving revision 1.16 diff -r1.15 -r1.16 5c5 < /* Copyright 1996-2000 by */ --- > /* Copyright 1996-2001 by */ 26c26 < static char rcsid[] __attribute__ ((unused)) = "$Id: common.c,v 1.15 2000/08/31 00:08:39 antoineL Exp $"; --- > static char rcsid[] __attribute__ ((unused)) = "$Id: common.c,v 1.16 2001/12/25 20:13:04 antoineL Exp $"; 28c28 < static char rcsid[] = "$Id: common.c,v 1.15 2000/08/31 00:08:39 antoineL Exp $"; --- > static char rcsid[] = "$Id: common.c,v 1.16 2001/12/25 20:13:04 antoineL Exp $"; 38d37 < #include "freetype.h" /* TT_Raster_Map */ 236a236 > /****************************************************************************/ 256,290c256 < < void < #ifdef __STDC__ < Show_Single_Glyph( const TT_Raster_Map* map ) < #else < Show_Single_Glyph( map ) < const TT_Raster_Map* map; < #endif < { < int y; < < unsigned char* line = map->bitmap; < < < for ( y = 0; y < map->rows; y++, line += map->cols ) < { < unsigned char* ptr = line; < int x; < unsigned char mask = 0x80; < < < for ( x = 0; x < map->width; x++ ) < { < printf( "%c", (ptr[0] & mask) ? '*' : '.' ); < mask >>= 1; < if ( mask == 0 ) < { < mask = 0x80; < ptr++; < } < } < printf( "\n" ); < } < } < --- > /****************************************************************************/ Index: freetype/test/common.h =================================================================== RCS file: /cvs/freetype/freetype/test/common.h,v retrieving revision 1.11 retrieving revision 1.12 diff -r1.11 -r1.12 5c5 < /* Copyright 1996-2000 by */ --- > /* Copyright 1996-2001 by */ 17d16 < #include "freetype.h" /* TT_Raster_Map */ 44a44,50 > /****************************************************************************/ > /* */ > /* Stupid but useful functions... */ > /* */ > /* rewritten by DavidT to get rid of GPLed programs in the FreeType engine. */ > > 56,62d61 < #endif < ); < < < extern void Show_Single_Glyph( < #ifdef __STDC__ < const TT_Raster_Map* map Index: freetype/test/fdebug.c =================================================================== RCS file: /cvs/freetype/freetype/test/fdebug.c,v retrieving revision 1.16 retrieving revision 1.18 diff -r1.16 -r1.18 5c5 < {* Copyright 1996-2000 by *} --- > {* Copyright 1996-2001 by *} 274a275 > TT_Close_Face( face ); Index: freetype/test/ftdump.c =================================================================== RCS file: /cvs/freetype/freetype/test/ftdump.c,v retrieving revision 1.47 retrieving revision 1.53 diff -r1.47 -r1.53 5c5 < /* Copyright 1996-2000 by */ --- > /* Copyright 1996-2001 by */ 23c23 < #include "common.h" /* for Panic() etc. */ --- > #include "common.h" 42a43 > #include "ttmemory.h" /* We use FREE() to satisfy -DDEBUG_MEMORY */ 143c144,150 < #define FOOTPRINT( field ) Save_Memory( &memory_footprint.##field ) --- > #define FT_initial_overhead memory_footprint.initial_overhead > #define FT_face_object memory_footprint.face_object > #define FT_glyph_object memory_footprint.glyph_object > #define FT_first_instance memory_footprint.first_instance > #define FT_second_instance memory_footprint.second_instance > > #define FOOTPRINT( field ) Save_Memory( &FT_ ## field ) 155,156c162 < #define PRINT_MEM( field, string ) \ < Print_Mem( memory_footprint.##field, string ) --- > #define PRINT_MEM( field, string ) Print_Mem( FT_ ## field, string ) 325,327c331,333 < unsigned short n, i; < unsigned short platform, encoding; < char* platStr, *encoStr; --- > unsigned short n, i; > unsigned short platform, encoding; > char* platStr, *encoStr; 329c335 < char tempStr[128]; --- > char tempStr[128]; 332,333c338,339 < printf( gettext( "character map encodings\n" ) ); < separator_line( stdout, 78 ); --- > printf( gettext( "character map encodings\n" ) ); > separator_line( stdout, 78 ); 335,341c341,347 < n = properties.num_CharMaps; < if ( n == 0 ) < { < printf( gettext( < "The file doesn't seem to have any encoding table.\n" ) ); < return; < } --- > n = properties.num_CharMaps; > if ( n == 0 ) > { > printf( gettext( > "The file doesn't seem to have any encoding table.\n" ) ); > return; > } 343c349 < printf( gettext( "There are %hu encodings:\n\n" ), n ); --- > printf( gettext( "There are %hu encodings:\n\n" ), n ); 345,348c351,354 < for ( i = 0; i < n; i++ ) < { < TT_Get_CharMap_ID( face, i, &platform, &encoding ); < printf( gettext( "encoding %2u: " ), i ); --- > for ( i = 0; i < n; i++ ) > { > TT_Get_CharMap_ID( face, i, &platform, &encoding ); > printf( gettext( "encoding %2u: " ), i ); 350c356 < platStr = encoStr = NULL; --- > platStr = encoStr = NULL; 352,456c358,384 < switch ( platform ) < { < case TT_PLATFORM_APPLE_UNICODE: < platStr = "Apple Unicode"; < switch ( encoding ) < { < case TT_APPLE_ID_DEFAULT: < encoStr = ""; < break; < < case TT_APPLE_ID_UNICODE_1_1: < encoStr = "(v.1.1)"; < break; < < case TT_APPLE_ID_ISO_10646: < encoStr = "(ISO 10646-1:1993)"; < break; < < case TT_APPLE_ID_UNICODE_2_0: < encoStr = "(v.2.0)"; < break; < < default: < sprintf( tempStr, gettext( "Unknown value %hu" ), encoding ); < encoStr = tempStr; < } < break; < < case TT_PLATFORM_MACINTOSH: < platStr = "Apple"; < if ( encoding > 32 ) < { < sprintf( tempStr, gettext( "Unknown value %hu" ), encoding ); < encoStr = tempStr; < } < else < encoStr = (char*)Apple_Encodings[encoding]; < break; < < case TT_PLATFORM_ISO: < platStr = "Iso"; < switch ( encoding ) < { < case TT_ISO_ID_7BIT_ASCII: < platStr = "Ascii"; < encoStr = "7-bit"; < break; < < case TT_ISO_ID_10646: < encoStr = "10646"; < break; < < case TT_ISO_ID_8859_1: < encoStr = "8859-1"; < break; < < default: < sprintf( tempStr, "%hu", encoding ); < encoStr = tempStr; < } < break; < < case TT_PLATFORM_MICROSOFT: < platStr = "Windows"; < switch ( encoding ) < { < case TT_MS_ID_SYMBOL_CS: < encoStr = "Symbol"; < break; < < case TT_MS_ID_UNICODE_CS: < encoStr = "Unicode"; < break; < < case TT_MS_ID_SJIS: < encoStr = "Shift-JIS"; < break; < < case TT_MS_ID_GB2312: < encoStr = "GB2312"; < break; < < case TT_MS_ID_BIG_5: < encoStr = "Big 5"; < break; < < case TT_MS_ID_WANSUNG: < encoStr = "WanSung"; < break; < < case TT_MS_ID_JOHAB: < encoStr = "Johab"; < break; < < default: < sprintf( tempStr, gettext( "Unknown value %hu" ), encoding ); < encoStr = tempStr; < } < break; < < default: < sprintf( tempStr, "%hu - %hu", platform, encoding ); < platStr = gettext( "Unknown" ); < encoStr = tempStr; < } --- > switch ( platform ) > { > case TT_PLATFORM_APPLE_UNICODE: > platStr = "Apple Unicode"; > switch ( encoding ) > { > case TT_APPLE_ID_DEFAULT: > encoStr = ""; > break; > > case TT_APPLE_ID_UNICODE_1_1: > encoStr = "(v.1.1)"; > break; > > case TT_APPLE_ID_ISO_10646: > encoStr = "(ISO 10646-1:1993)"; > break; > > case TT_APPLE_ID_UNICODE_2_0: > encoStr = "(v.2.0)"; > break; > > default: > sprintf( tempStr, gettext( "Unknown value %hu" ), encoding ); > encoStr = tempStr; > } > break; 458,459c386,418 < printf( "%s %s\n", platStr, encoStr ); < } --- > case TT_PLATFORM_MACINTOSH: > platStr = "Apple"; > if ( encoding > 32 ) > { > sprintf( tempStr, gettext( "Unknown value %hu" ), encoding ); > encoStr = tempStr; > } > else > encoStr = (char*)Apple_Encodings[encoding]; > break; > > case TT_PLATFORM_ISO: > platStr = "Iso"; > switch ( encoding ) > { > case TT_ISO_ID_7BIT_ASCII: > platStr = "Ascii"; > encoStr = "7-bit"; > break; > > case TT_ISO_ID_10646: > encoStr = "10646"; > break; > > case TT_ISO_ID_8859_1: > encoStr = "8859-1"; > break; > > default: > sprintf( tempStr, "%hu", encoding ); > encoStr = tempStr; > } > break; 461,462c420,472 < printf( "\n" ); < separator_line( stdout, 78 ); --- > case TT_PLATFORM_MICROSOFT: > platStr = "Windows"; > switch ( encoding ) > { > case TT_MS_ID_SYMBOL_CS: > encoStr = "Symbol"; > break; > > case TT_MS_ID_UNICODE_CS: > encoStr = "Unicode"; > break; > > case TT_MS_ID_SJIS: > encoStr = "Shift-JIS"; > break; > > case TT_MS_ID_GB2312: > encoStr = "GB2312"; > break; > > case TT_MS_ID_BIG_5: > encoStr = "Big 5"; > break; > > case TT_MS_ID_WANSUNG: > encoStr = "WanSung"; > break; > > case TT_MS_ID_JOHAB: > encoStr = "Johab"; > break; > > case TT_MS_ID_UCS_4: > encoStr = "UCS-4"; > break; > > default: > sprintf( tempStr, gettext( "Unknown value %hu" ), encoding ); > encoStr = tempStr; > } > break; > > default: > sprintf( tempStr, "%hu - %hu", platform, encoding ); > platStr = gettext( "Unknown" ); > encoStr = tempStr; > } > > printf( "%s %s\n", platStr, encoStr ); > } > > printf( "\n" ); > separator_line( stdout, 78 ); 680c690 < free( feature_tag_list ); --- > FREE( feature_tag_list ); 761c771 < free( feature_tag_list ); --- > FREE( feature_tag_list ); 763c773 < free( language_tag_list ); --- > FREE( language_tag_list ); 765c775 < free( script_tag_list ); --- > FREE( script_tag_list ); 884c894 < free( feature_tag_list ); --- > FREE( feature_tag_list ); 965c975 < free( feature_tag_list ); --- > FREE( feature_tag_list ); 967c977 < free( language_tag_list ); --- > FREE( language_tag_list ); 969c979 < free( script_tag_list ); --- > FREE( script_tag_list ); 1099a1110,1111 > printf( "Total number of glyphs: %d\n", num_glyphs ); > 1126d1137 < Index: freetype/test/fterror.c =================================================================== RCS file: /cvs/freetype/freetype/test/fterror.c,v retrieving revision 1.14 retrieving revision 1.19 diff -r1.14 -r1.19 5c5,6 < /* E. Dieterich */ --- > /* Copyright 1996-2002 by E. Dieterich, A.Leca, */ > /* D. Turner, R.Wilhelm, and W. Lemberg */ 7c8,10 < /* fterror: test errstr functionality. */ --- > /* fterror: test TT_ErrToString18 functionality. */ > /* */ > /* This program dumps locale-sensitive error messages. */ 11d13 < 43a46,54 > static void > Usage( void ) > { > fprintf(stderr, gettext( "fterror: test TT_ErrToString18 functionality\n\n" ) ); > fprintf(stderr, gettext( " with an optional numerical argument, dumps the associated message.\n\n" ) ); > exit( EXIT_FAILURE ); > } > > 45c56 < main( void ) --- > main( int argc, char** argv ) 47d57 < int i; 56a67,69 > if( argc <= 1 ) > { > int i; 58c71 < printf( "domain: %s\n", domain = textdomain( "" ) ); --- > printf( "domain: %s\n", domain = textdomain( "" ) ); 60c73 < printf( gettext( "Start of fterror.\n" ) ); --- > printf( gettext( "Start of fterror.\n" ) ); 62,63c75,76 < for ( i = 0; i < 10; i++ ) < printf( "Code: %i, %s\n", i, TT_ErrToString18( i ) ); --- > for ( i = 0; i < 10; i++ ) > printf( "Code: %i, %s\n", i, TT_ErrToString18( i ) ); 66c79 < printf( "domain: %s\n", domain = textdomain( "" ) ); --- > printf( "domain: %s\n", domain = textdomain( "" ) ); 68c81,99 < printf( gettext( "End of fterror.\n" ) ); --- > printf( gettext( "End of fterror.\n" ) ); > } > else > { > int arg; > unsigned long cod; > char *end; > > > for ( arg = 1; arg < argc; ++arg ) > { > cod = strtoul(argv[arg], &end, 0); > > if( *end != '\0' || cod < 0 ) > Usage(); > printf( gettext( "Freetype error code 0x%04lX (%lu): %s\n" ), > cod, cod, TT_ErrToString18( cod ) ); > } > } Index: freetype/test/ftlint.c =================================================================== RCS file: /cvs/freetype/freetype/test/ftlint.c,v retrieving revision 1.29 retrieving revision 1.30 diff -r1.29 -r1.30 42c42 < #else /* !HAVE_LIBINTL */ --- > #else /* !HAVE_LIBINTL_H */ 58c58 < #endif /* !HAVE_LIBINTL */ --- > #endif /* !HAVE_LIBINTL_H */ Index: freetype/test/ftmetric.c =================================================================== RCS file: /cvs/freetype/freetype/test/ftmetric.c,v retrieving revision 1.8 retrieving revision 1.11 diff -r1.8 -r1.11 5c5 < /* Copyright 1999-2000 by */ --- > /* Copyright 1999-2001 by */ 22a23,24 > #include "textdisp.h" > 43c45 < #else /* !HAVE_LIBINTL */ --- > #else /* !HAVE_LIBINTL_H */ 59c61 < #endif /* !HAVE_LIBINTL */ --- > #endif /* !HAVE_LIBINTL_H */ 378a381 > TT_Close_Face( face ); Index: freetype/test/ftsbit.c =================================================================== RCS file: /cvs/freetype/freetype/test/ftsbit.c,v retrieving revision 1.9 retrieving revision 1.12 diff -r1.9 -r1.12 5c5 < /* Copyright 1996-2000 by */ --- > /* Copyright 1996-2001 by */ 20d19 < 23a23,24 > #include "textdisp.h" > 44c45 < #else /* !HAVE_LIBINTL */ --- > #else /* !HAVE_LIBINTL_H */ 59c60 < #endif /* !HAVE_LIBINTL */ --- > #endif /* !HAVE_LIBINTL_H */ 275a277 > TT_Close_Face( face ); Index: freetype/test/ftstring.c =================================================================== RCS file: /cvs/freetype/freetype/test/ftstring.c,v retrieving revision 1.31 retrieving revision 1.33 diff -r1.31 -r1.33 5c5 < /* Copyright 1996-2000 by */ --- > /* Copyright 1996-2001 by */ 31c31 < #include "common.h" /* for Panic() and Message() only */ --- > #include "common.h" 471a472 > TT_Close_Face( face ); Index: freetype/test/ftstrpnm.c =================================================================== RCS file: /cvs/freetype/freetype/test/ftstrpnm.c,v retrieving revision 1.23 retrieving revision 1.24 diff -r1.23 -r1.24 5c5 < /* Copyright 1996-2000 by */ --- > /* Copyright 1996-2001 by */ 21c21 < #include "common.h" /* for ft_getopt() */ --- > #include "common.h" Index: freetype/test/ftstrtto.c =================================================================== RCS file: /cvs/freetype/freetype/test/ftstrtto.c,v retrieving revision 1.20 retrieving revision 1.24 diff -r1.20 -r1.24 5c5 < /* Copyright 1996-2000 by */ --- > /* Copyright 1996-2001 by */ 39c39 < #include "common.h" /* for Panic() only */ --- > #include "common.h" 50a51,53 > /* we want to use FREE() to make a compilation with DEBUG_MEMORY happy */ > > #include "ttmemory.h" 110c113 < TT_UShort char_code[128]; --- > TT_ULong char_code[128]; 142a146,147 > /* try pid/eid (3,10) before (3,1) */ > 146c151 < if ( platform == 3 && encoding == 1 ) --- > if ( platform == 3 && encoding == 10 ) 152a158,170 > if ( i == n ) > { > for ( i = 0; i < n; i++ ) > { > TT_Get_CharMap_ID( face, i, &platform, &encoding ); > if ( platform == 3 && encoding == 1 ) > { > TT_Get_CharMap( face, i, &char_map ); > break; > } > } > } > 197c215 < char_code[n] = (TT_UShort)( (unsigned char)source[n] ); --- > char_code[n] = (TT_ULong)( (unsigned char)source[n] ); 207c225,226 < TT_UShort in, out, in_code, out_code; --- > TT_UShort in, out, in_code; > TT_ULong out_code; 224c243 < if ( in_code < 0xE0 ) /* U+0080 - U+07FF */ --- > if ( in_code < 0xE0 ) /* U+0080 - U+07FF */ 229c248 < else if ( in_code < 0xF0 ) /* U+0800 - U+FFFF */ --- > else if ( in_code < 0xF0 ) /* U+0800 - U+FFFF */ 233a253,257 > else if ( in_code < 0xF8 ) /* U+10000 - U+1FFFFF */ > { > limit = 4; > out_code = in_code & 0x07; > } 729,730c753,757 < if ( out.string ) < free( out.string ); --- > if ( out.string ) { > FREE( out.string ); > FREE( out.components ); > FREE( out.ligIDs ); > } 732c759 < free( out.properties ); --- > FREE( out.properties ); 736c763 < free( gd ); --- > FREE( gd ); 1114a1142,1143 > /* we allocate one element more to always have a non-zero value > for malloc */ 1116c1145,1146 < malloc( num_features * sizeof ( TT_UShort ) ); --- > malloc( ( num_features + 1 ) * > sizeof ( TT_UShort ) ); 1118c1148,1149 < malloc( num_features * sizeof ( TT_UShort ) ); --- > malloc( ( num_features + 1 ) * > sizeof ( TT_UShort ) ); 1431a1463,1464 > TT_Done_SBit_Image( sbit ); > TT_Close_Face( face ); Index: freetype/test/fttimer.c =================================================================== RCS file: /cvs/freetype/freetype/test/fttimer.c,v retrieving revision 1.21 retrieving revision 1.23 diff -r1.21 -r1.23 5c5 < /* Copyright 1996-2000 by */ --- > /* Copyright 1996-2001 by */ 26c26 < #include "common.h" /* for Panic() */ --- > #include "common.h" 77c77 < TT_Raster_Map Bit; --- > extern TT_Raster_Map Bit; Index: freetype/test/ftview.c =================================================================== RCS file: /cvs/freetype/freetype/test/ftview.c,v retrieving revision 1.31 retrieving revision 1.33 diff -r1.31 -r1.33 5c5 < /* Copyright 1996-2000 by */ --- > /* Copyright 1996-2001 by */ 59c59 < #include "common.h" /* for Panic() only */ --- > #include "common.h" 525a526,527 > TT_Done_SBit_Image( sbit ); > TT_Close_Face( face ); Index: freetype/test/ftzoom.c =================================================================== RCS file: /cvs/freetype/freetype/test/ftzoom.c,v retrieving revision 1.40 retrieving revision 1.43 diff -r1.40 -r1.43 5c5 < /* Copyright 1996-2000 by */ --- > /* Copyright 1996-2001 by */ 60c60 < #include "common.h" /* for Panic() only */ --- > #include "common.h" 108c108 < TT_Raster_Map Bit; --- > extern TT_Raster_Map Bit; 670a671 > TT_Close_Face( face ); Index: freetype/test/gmain.h =================================================================== RCS file: /cvs/freetype/freetype/test/gmain.h,v retrieving revision 1.8 retrieving revision 1.9 diff -r1.8 -r1.9 9c9 < * Copyright 1996-2000 by --- > * Copyright 1996-2001 by 42c42 < /* set a graphics mode, chosen from the FS_Graphics_xxx list */ --- > /* set a graphics mode, chosen from the Graphics_Mode_xxx list */ Index: freetype/test/arch/amigaos/Makefile.gcc =================================================================== RCS file: /cvs/freetype/freetype/test/arch/amigaos/Makefile.gcc,v retrieving revision 1.10 retrieving revision 1.13 diff -r1.10 -r1.13 9a10,19 > # > # > # Copyright 1996-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. 23a34 > textdisp.c \ 79c90 < ftsbit: ftsbit.o common.o $(LIBDIR)/libttf.a --- > ftsbit: ftsbit.o common.o textdisp.o $(LIBDIR)/libttf.a 81c92 < ftmetric: ftmetric.o common.o $(LIBDIR)/libttf.a --- > ftmetric: ftmetric.o common.o textdisp.o $(LIBDIR)/libttf.a 82a94 > fterror: fterror.o $(LIBDIR)/libttf.a Index: freetype/test/arch/amigaos/TODO =================================================================== RCS file: /cvs/freetype/freetype/test/arch/amigaos/TODO,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -r1.1.1.1 -r1.2 16c16 < Send them to: map@medusa.es or to freetype@lists.lrz-muenchen.de --- > Send them to: map@medusa.es or to freetype@freetype.org Index: freetype/test/arch/amigaos/gw_amiga.c =================================================================== RCS file: /cvs/freetype/freetype/test/arch/amigaos/gw_amiga.c,v retrieving revision 1.7 retrieving revision 1.9 diff -r1.7 -r1.9 8c8 < * Copyright 1996-2000 by --- > * Copyright 1996-2000, 2002 by 39,45d38 < #ifdef __GNUC__ < #include < #include < #include < #include < #include < #else 51d43 < #endif 82c74 < struct Library *GadToolsBase = NULL; --- > struct Library* GadToolsBase = NULL; 147c139,140 < {NM_ITEM, (STRPTR)"Toggle GSUB", (STRPTR)"G", 0, 0L, (APTR)'G'}, --- > {NM_ITEM, (STRPTR)"Toggle GSUB", (STRPTR)"S", 0, 0L, (APTR)'S'}, > {NM_ITEM, (STRPTR)"Toggle GPOS", (STRPTR)"P", 0, 0L, (APTR)'P'}, 207d199 < 289c281 < if ( ! ( ftmenus = CreateMenus( ftNewMenu, GTMN_FrontPen, 0L, TAG_DONE))) --- > if ( !( ftmenus = CreateMenus( ftNewMenu, GTMN_FrontPen, 0L, TAG_DONE ) ) ) 302c294,296 < WA_IDCMP, IDCMP_MENUPICK | IDCMP_VANILLAKEY | IDCMP_CLOSEWINDOW, --- > WA_IDCMP, IDCMP_MENUPICK | > IDCMP_VANILLAKEY | > IDCMP_CLOSEWINDOW, 309c303 < WA_Flags, WFLG_DEPTHGADGET | WFLG_SMART_REFRESH, --- > WA_Flags, WFLG_DEPTHGADGET | WFLG_SMART_REFRESH, 311c305 < WA_NewLookMenus, TRUE, --- > WA_NewLookMenus, TRUE, 331c325,327 < } else { --- > } > else > { 369,371c365,367 < GT_BeginRefresh( ftw ); < GT_EndRefresh( ftw, TRUE ); < break; --- > GT_BeginRefresh( ftw ); > GT_EndRefresh( ftw, TRUE ); > break; 381,386c377,382 < { < n = ItemAddress( ftmenus, code ); < rc = (int)GTMENUITEM_USERDATA( n ); < code = n->NextSelect; < } /* despite loop, we only do one */ < return (char)rc; --- > { > n = ItemAddress( ftmenus, code ); > rc = (int)GTMENUITEM_USERDATA( n ); > code = n->NextSelect; > } /* despite loop, we only do one */ > return (char)rc; 390d385 < 419,422c414,417 < int y, z; < char* target; < char old = 0; < extern char Header[]; --- > int y, z; > char* target; > char old = 0; > extern char Header[]; 424d418 < SetWindowTitles(ftw,Header,Header); 425a420 > SetWindowTitles(ftw,Header,Header); 457a453 > 475a472 > Index: freetype/test/arch/amigaos/smakefile =================================================================== RCS file: /cvs/freetype/freetype/test/arch/amigaos/smakefile,v retrieving revision 1.6 retrieving revision 1.10 diff -r1.6 -r1.10 14a15,24 > # > # > # Copyright 1996-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. 22,23c32,33 < OBJX = ftxgasp.o ftxkern.o ftxpost.o ftxcmap.o ftxwidth.o ftxerr18.o \ < ftxsbit.o ftxgsub.o ftxopen.o --- > OBJX = ftxgasp.o ftxkern.o ftxpost.o ftxcmap.o ftxwidth.o \ > ftxsbit.o ftxgsub.o ftxgpos.o ftxgdef.o ftxopen.o 31c41 < SCFLAGS = idlen=40 idir=$(CORE)arch/amigaos idir=$(CORE) --- > SCFLAGS = idlen=40 idir=$(CORE)arch/amigaos idir=$(CORE) idir=$(COREXT) 33c43 < TSCFLAGS = $(SCFLAGS) idir=$(TST) idir=$(COREXT) --- > TSCFLAGS = $(SCFLAGS) idir=$(TST) 42c52 < TOBJ = gw_amiga.o gmain.o common.o blitter.o --- > TOBJ = gw_amiga.o gmain.o common.o textdisp.o blitter.o display.o 113,114d122 < ftxerr18.o: $(COREXT)ftxerr18.c < sc $(SCFLAGS) objname=$@ $< 118a127,130 > ftxgpos.o: $(COREXT)ftxgpos.c > sc $(SCFLAGS) objname=$@ $< code=far > ftxgdef.o: $(COREXT)ftxgdef.c > sc $(SCFLAGS) objname=$@ $< 135,136c147,148 < ftstring: $(TST)ftstring.c $(TOBJ) display.o $(LIB) < sc $(TST)ftstring.c uchar programname=$@ $(TOBJ) display.o $(TOPTS) --- > ftstring: $(TST)ftstring.c $(TOBJ) $(LIB) > sc $(TST)ftstring.c uchar programname=$@ $(TOBJ) $(TOPTS) 138,139c150,151 < ftview: $(TST)ftview.c $(TOBJ) display.o $(LIB) < sc $(TST)ftview.c programname=$@ $(TOBJ) display.o $(TOPTS) --- > ftview: $(TST)ftview.c $(TOBJ) $(LIB) > sc $(TST)ftview.c programname=$@ $(TOBJ) $(TOPTS) 147,148c159,160 < ftsbit: $(TST)ftsbit.c common.o $(LIB) < sc $(TST)ftsbit.c programname=$@ common.o $(TOPTS) --- > ftsbit: $(TST)ftsbit.c common.o textdisp.o $(LIB) > sc $(TST)ftsbit.c programname=$@ common.o textdisp.o $(TOPTS) 150,151c162,163 < ftmetric: $(TST)ftmetric.c common.o $(LIB) < sc $(TST)ftmetric.c programname=$@ common.o $(TOPTS) --- > ftmetric: $(TST)ftmetric.c common.o textdisp.o $(LIB) > sc $(TST)ftmetric.c programname=$@ common.o textdisp.o $(TOPTS) 154c166 < ftstrtto: $(TST)ftstrtto.c $(TOBJ) display.o arabic.o $(LIB) --- > ftstrtto: $(TST)ftstrtto.c $(TOBJ) arabic.o $(LIB) 156c168 < arabic.o display.o $(TOPTS) --- > arabic.o $(TOPTS) 165a178,180 > sc $(TSCFLAGS) objname=$@ $< > > textdisp.o: $(TST)textdisp.c Index: freetype/test/arch/debugger/Makefile =================================================================== RCS file: /cvs/freetype/freetype/test/arch/debugger/Makefile,v retrieving revision 1.6 retrieving revision 1.8 diff -r1.6 -r1.8 7c7 < # Use this file while in the `test' directory with the following statement: --- > # Use this file while in the `test' directory with the following statements: 8a9 > # make -f arch/debugger/Makefile depend 9a11,20 > # > # > # Copyright 1996-2002 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. 93c104 < $(CC) -E -M $(INCDIRS) $^ > dep.end --- > $(CC) -E -MM $(INCDIRS) $^ > dep.end Index: freetype/test/arch/msdos/Makefile.BC =================================================================== RCS file: /cvs/freetype/freetype/test/arch/msdos/Makefile.BC,v retrieving revision 1.6 retrieving revision 1.8 diff -r1.6 -r1.8 22a23,32 > # > # > # Copyright 1996-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. 56d65 < 58a68 > textdisp.c \ 153,154c163,164 < ftsbit.exe: ftsbit.obj common.obj $(LIBDIR)\libttf.lib < $(CC) $(LDFLAGS) ftsbit.obj common.obj $(LIBDIR)\libttf.lib --- > ftsbit.exe: $(TDOBJ) ftsbit.obj common.obj $(LIBDIR)\libttf.lib > $(CC) $(LDFLAGS) ftsbit.obj textdisp.obj common.obj $(LIBDIR)\libttf.lib 156,157c166,167 < ftmetric.exe: ftmetric.obj common.obj $(LIBDIR)\libttf.lib < $(CC) $(LDFLAGS) ftmetric.obj common.obj $(LIBDIR)\libttf.lib --- > ftmetric.exe: $(TDOBJ) ftmetric.obj common.obj $(LIBDIR)\libttf.lib > $(CC) $(LDFLAGS) ftmetric.obj textdisp.obj common.obj $(LIBDIR)\libttf.lib Index: freetype/test/arch/msdos/Makefile.MS =================================================================== RCS file: /cvs/freetype/freetype/test/arch/msdos/Makefile.MS,v retrieving revision 1.4 retrieving revision 1.6 diff -r1.4 -r1.6 22a23,32 > # > # > # Copyright 1996-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. 49d58 < 51a61 > textdisp.c \ 119,120c129,130 < ftsbit.exe: ftsbit.obj common.obj $(LIBDIR)\libttf.lib < ftmetric.exe: ftmetric.obj common.obj $(LIBDIR)\libttf.lib --- > ftsbit.exe: ftsbit.obj common.obj textdisp.obj $(LIBDIR)\libttf.lib > ftmetric.exe: ftmetric.obj common.obj textdisp.obj $(LIBDIR)\libttf.lib Index: freetype/test/arch/msdos/Makefile.TC =================================================================== RCS file: /cvs/freetype/freetype/test/arch/msdos/Makefile.TC,v retrieving revision 1.6 retrieving revision 1.9 diff -r1.6 -r1.9 8a9 > # See below for notes regarding the various versions. 21a23,74 > # > # > # Copyright 1996-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. > # > # > # > # Various notes about specific versions... > # > # The lack of space in the command line prevents us to turn off the > # -w-use warning (when TCC.CFG file had enabled it). > # > # Due to lack of space in the command line, we are not able to > # switch off all the irrelevant warnings for the demo program. > # Under the default settings, only one warning should be shown. > # If more of the ``verbose'' warnings are enabled, much more can > # appear. However, rest assured that any of them have been dealt > # with, and they are just that, warnings, not indicating real > # problems. > # > # NOTE: Turbo C++ v. 3.0 > # > # The Makefile.TC for this version is common with the older versions. > # Alternatively, you can consider using Makefile.BC instead, changing > # the name of the compiler from BCC to TCC! > # > # NOTE 2: Turbo C v. 2.0 > # > # This version lacks an ANSI compliant header, so it causes > # problems when compiling the demo program fttimer. We worked around > # this difficulty in a very hacky way. > # The detection is based on the version of make used, so if you use > # a more recent version, please take a closer look at the Makefile. > # > # NOTE 3: Turbo C v. 1.5 > # > # Yes, this old compiler is able to compile the FreeType library, even > # if it predates the ANSI standard by months! However, this is a > # huge piece for such a small compiler, and several things are not > # possible. First, as always with real-mode compilers, you need a lot > # of available memory, probably more than 512KB at the C> prompt. > # Also, compiling for debug is ardeous: both Makefile.TC assume the > # -v option, which was not available in this version. > # > # The hack for is used there too, as with v.2.0. > 40,41c93,95 < CFLAGS_LEAN = -y -N -ml -w-pia -A $(INCDIRS) < LDFLAGS = -y -ml --- > # You should have applied the same change in the lib Makefile, too. > CFLAGS_LEAN = -v -N -ml -w-pia -A $(INCDIRS) > LDFLAGS = -v -ml 58d111 < 60a114 > textdisp.c \ 185,186c239,240 < ftsbit.exe: ftsbit.obj common.obj $(LIBDIR)\libttf.lib < $(CC) $(LDFLAGS) ftsbit.obj common.obj $(LIBDIR)\libttf.lib --- > ftsbit.exe: $(TDOBJ) ftsbit.obj common.obj $(LIBDIR)\libttf.lib > $(CC) $(LDFLAGS) ftsbit.obj textdisp.obj common.obj $(LIBDIR)\libttf.lib 188,189c242,243 < ftmetric.exe: ftmetric.obj common.obj $(LIBDIR)\libttf.lib < $(CC) $(LDFLAGS) ftmetric.obj common.obj $(LIBDIR)\libttf.lib --- > ftmetric.exe: $(TDOBJ) ftmetric.obj common.obj $(LIBDIR)\libttf.lib > $(CC) $(LDFLAGS) ftmetric.obj textdisp.obj common.obj $(LIBDIR)\libttf.lib Index: freetype/test/arch/msdos/Makefile.VC =================================================================== RCS file: /cvs/freetype/freetype/test/arch/msdos/Makefile.VC,v retrieving revision 1.4 retrieving revision 1.6 diff -r1.4 -r1.6 21a22,31 > # > # > # Copyright 1996-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. 50d59 < 52a62 > textdisp.c \ 120,121c130,131 < ftsbit.exe: ftsbit.obj common.obj $(LIBDIR)\libttf.lib < ftmetric.exe: ftmetric.obj common.obj $(LIBDIR)\libttf.lib --- > ftsbit.exe: ftsbit.obj common.obj textdisp.obj $(LIBDIR)\libttf.lib > ftmetric.exe: ftmetric.obj common.obj textdisp.obj $(LIBDIR)\libttf.lib Index: freetype/test/arch/msdos/Makefile.dm =================================================================== RCS file: /cvs/freetype/freetype/test/arch/msdos/Makefile.dm,v retrieving revision 1.9 retrieving revision 1.11 diff -r1.9 -r1.11 9a10,19 > # > # > # Copyright 1996-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. 36a47 > textdisp.c \ 101,102c112,113 < ftsbit.exe: ftsbit.o common.o $(LIBDIR)/libttf.a < ftmetric.exe: ftmetric.o common.o $(LIBDIR)/libttf.a --- > ftsbit.exe: ftsbit.o common.o textdisp.o $(LIBDIR)/libttf.a > ftmetric.exe: ftmetric.o common.o textdisp.o $(LIBDIR)/libttf.a Index: freetype/test/arch/msdos/Makefile.gcc =================================================================== RCS file: /cvs/freetype/freetype/test/arch/msdos/Makefile.gcc,v retrieving revision 1.12 retrieving revision 1.17 diff -r1.12 -r1.17 7c7 < # Use this file while in the 'test' directory with the following statement: --- > # Use this file while in the 'test' directory with the following statements: 8a9 > # make -f arch/msdos/Makefile.gcc depend 14a16,32 > # > # Note that this version takes in account new versions of GNU gettext, > # which in turn requires the iconv library. If you have an old version > # of gettext and don't have the iconv library, just erase the `-l iconv'. > # > # Also take a look at the lib Makefile (at ../lib/arch/msdos/Makefile.gcc), > # about the need to have the path to the *.mo files correct. > # > # > # Copyright 1996-2002 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. 33c51 < GDRIVER = $(ARCH)/gfs_dos.c --- > GDRIVER = $(ARCH)/gfs_dos.c $(ARCH)/gmain_dj.c 36a55 > textdisp.c \ 49c68 < GSRC = gmain.c display.c blitter.c $(GDRIVER) --- > GSRC = display.c blitter.c $(GDRIVER) 59c78,80 < $(CC) $(CFLAGS) -o $@ $^ -lintl --- > $(CC) $(CFLAGS) -o $@ $^ -lintl -liconv > # Remove `-l iconv' above if you have an old version > # of GNU gettext (like 0.10.35) and no iconv library. 103,104c124,125 < ftsbit.exe: ftsbit.o common.o $(LIBDIR)/libttf.a < ftmetric.exe: ftmetric.o common.o $(LIBDIR)/libttf.a --- > ftsbit.exe: ftsbit.o common.o textdisp.o $(LIBDIR)/libttf.a > ftmetric.exe: ftmetric.o common.o textdisp.o $(LIBDIR)/libttf.a 124c145 < $(CC) -E -M $(INCDIRS) $^ > dep.end --- > $(CC) -E -MM $(INCDIRS) $^ > dep.end Index: freetype/test/arch/msdos/depend.dos =================================================================== RCS file: /cvs/freetype/freetype/test/arch/msdos/depend.dos,v retrieving revision 1.6 retrieving revision 1.8 diff -r1.6 -r1.8 0a1,4 > # This file is part of the FreeType project. > # Automatically generated, but you can customize to fit your needs. > # However, changes will be erased if not made in `makedep'... > # 3c7 < # 07-Mar-2000. --- > # 2002-02-19. 5,6c9,11 < arabic.obj: arabic.c arabic.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h ..\lib\extend\ftxopen.h ..\lib\extend\ftxgdef.h \ --- > arabic.obj: arabic.c arabic.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h \ > ..\lib\extend\ftxopen.h ..\lib\extend\ftxgdef.h \ 8,19c13,27 < blitter.obj: blitter.c blitter.h < common.obj: common.c common.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h < display.obj: display.c display.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h gmain.h < fdebug.obj: fdebug.c ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h ..\lib\tttypes.h ..\lib\ttconfig.h \ < ..\lib\arch\msdos\ft_conf.h ..\lib\ttdebug.h ..\lib\ttobjs.h \ < ..\lib\ttengine.h ..\lib\ttmutex.h ..\lib\ttcache.h ..\lib\tttables.h \ < ..\lib\ttcmap.h < ftdump.obj: ftdump.c common.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h ..\lib\extend\ftxcmap.h ..\lib\extend\ftxopen.h \ --- > blitter.obj: blitter.c blitter.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h > common.obj: common.c common.h > display.obj: display.c display.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h gmain.h > fdebug.obj: fdebug.c ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h \ > ..\lib\tttypes.h ..\lib\ttconfig.h \ > ..\lib\arch\msdos\ft_conf.h ..\lib\ttdebug.h \ > ..\lib\ttobjs.h ..\lib\ttengine.h \ > ..\lib\ttmutex.h ..\lib\ttcache.h \ > ..\lib\tttables.h ..\lib\ttcmap.h > ftdump.obj: ftdump.c common.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h \ > ..\lib\extend\ftxcmap.h ..\lib\extend\ftxopen.h \ 21,26c29,37 < ..\lib\extend\ftxgpos.h ..\lib\extend\ftxsbit.h ..\lib\ttobjs.h \ < ..\lib\ttconfig.h ..\lib\arch\msdos\ft_conf.h ..\lib\ttengine.h \ < ..\lib\tttypes.h ..\lib\ttmutex.h ..\lib\ttcache.h ..\lib\tttables.h \ < ..\lib\ttcmap.h < fterror.obj: fterror.c ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h ..\lib\extend\ftxerr18.h \ --- > ..\lib\extend\ftxgpos.h ..\lib\extend\ftxsbit.h \ > ..\lib\ttobjs.h ..\lib\ttconfig.h \ > ..\lib\arch\msdos\ft_conf.h ..\lib\ttengine.h \ > ..\lib\tttypes.h ..\lib\ttmutex.h \ > ..\lib\ttcache.h ..\lib\tttables.h \ > ..\lib\ttcmap.h ..\lib\ttmemory.h > fterror.obj: fterror.c ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h \ > ..\lib\extend\ftxerr18.h \ 28,41c39,64 < ftlint.obj: ftlint.c common.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h ..\lib\arch\msdos\ft_conf.h < ftmetric.obj: ftmetric.c common.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h ..\lib\extend\ftxsbit.h ..\lib\arch\msdos\ft_conf.h < ftsbit.obj: ftsbit.c common.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h ..\lib\extend\ftxsbit.h ..\lib\arch\msdos\ft_conf.h < ftstring.obj: ftstring.c common.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h display.h gevents.h gdriver.h gmain.h < ftstrpnm.obj: ftstrpnm.c common.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h < ftstrtto.obj: ftstrtto.c arabic.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h ..\lib\extend\ftxopen.h ..\lib\extend\ftxgdef.h \ < ..\lib\extend\ftxgsub.h ..\lib\extend\ftxgpos.h blitter.h common.h \ < display.h ..\lib\extend\ftxkern.h ..\lib\extend\ftxsbit.h gdriver.h \ --- > ftlint.obj: ftlint.c common.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h \ > ..\lib\arch\msdos\ft_conf.h > ftmetric.obj: ftmetric.c common.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h \ > ..\lib\extend\ftxsbit.h textdisp.h \ > ..\lib\arch\msdos\ft_conf.h > ftsbit.obj: ftsbit.c common.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h \ > ..\lib\extend\ftxsbit.h textdisp.h \ > ..\lib\arch\msdos\ft_conf.h > ftstring.obj: ftstring.c common.h display.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h gevents.h \ > gdriver.h gmain.h > ftstrpnm.obj: ftstrpnm.c common.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h > ftstrtto.obj: ftstrtto.c arabic.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h \ > ..\lib\extend\ftxopen.h ..\lib\extend\ftxgdef.h \ > ..\lib\extend\ftxgsub.h ..\lib\extend\ftxgpos.h \ > blitter.h common.h display.h ..\lib\extend\ftxkern.h \ > ..\lib\extend\ftxsbit.h gdriver.h gevents.h gmain.h \ > ..\lib\ttmemory.h ..\lib\ttconfig.h \ > ..\lib\arch\msdos\ft_conf.h ..\lib\tttypes.h > fttimer.obj: fttimer.c common.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h gdriver.h \ 43,48c66,72 < fttimer.obj: fttimer.c common.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h gdriver.h gevents.h gmain.h < ftview.obj: ftview.c blitter.h common.h display.h \ < ..\lib\extend\ftxsbit.h gdriver.h gevents.h gmain.h < ftzoom.obj: ftzoom.c common.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h ..\lib\extend\ftxpost.h gdriver.h gevents.h gmain.h --- > ftview.obj: ftview.c blitter.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h common.h \ > display.h ..\lib\extend\ftxsbit.h gdriver.h gevents.h \ > gmain.h > ftzoom.obj: ftzoom.c common.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h \ > ..\lib\extend\ftxpost.h gdriver.h gevents.h gmain.h 49a74,75 > textdisp.obj: textdisp.c textdisp.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h Index: freetype/test/arch/msdos/gfs_dos.c =================================================================== RCS file: /cvs/freetype/freetype/test/arch/msdos/gfs_dos.c,v retrieving revision 1.17 retrieving revision 1.19 diff -r1.17 -r1.19 8c8 < * Copyright 1996-2000 by --- > * Copyright 1996-2002 by 40,41c40 < /* DJGPP v1.x */ < #if !defined( __DJGPP__ ) && defined( __GO32__ ) --- > #if defined( __DJGPP__ ) || defined( __DJGPP ) || defined( __GO32__ ) 43d41 < #define DJGPP1 45c43,46 < #include --- > #ifndef DJGPP > #define DJGPP > #endif > 47d47 < #include 48a49 > #include 50c51,52 < #define reg_ax regs.x.ax --- > #if !defined( __DJGPP__ ) > /* DJGPP v1.x */ 52c54 < #endif --- > const int djgpp_use_nearpointers = 0; /* V.1 did not know about them */ 53a56 > #else 55d57 < #ifdef __DJGPP__ 57,61c59,67 < #define DJGPP2 < #undef __STRICT_ANSI__ < #include < #include < #include --- > #ifdef DJGPP_NEAR_POINTERS > #include > int djgpp_use_nearpointers = -1; /* to be tested if they works */ > #else > const int djgpp_use_nearpointers = 0; /* don't even try */ > #endif > > #endif /* DJGPP v.? */ > 79a86,87 > #else > #define int86( a, b, c ) int86( a, b, c ) 116a125,129 > > #ifndef FP_SEG > #define FP_SEG(fp) (*((unsigned __far *)&(fp) + 1)) > #endif > 232c245 < #elif defined( DJGPP1 ) || defined( DJGPP2 ) --- > #elif defined( DJGPP ) 265,269d277 < < #ifndef FP_SEG < #define FP_SEG(fp) (*((unsigned __far *)&(fp) + 1)) < #endif < 282,283c290 < < #ifdef DJGPP2 --- > #ifdef DJGPP 286,296c293 < for( i = 0; i < vio_Height*vio_ScanLineWidth; i++ ) < dosmemput( &cbuf, 1, (unsigned long) Vio+i ); < #else < < #ifdef DJGPP1 < __djgpp_nearptr_enable(); < Vio += __djgpp_conventional_base; < < #else < < memset( Vio, 0, vio_Height * vio_ScanLineWidth ); --- > #endif 298c295,302 < #endif /* DJGPP1 */ --- > #ifdef DJGPP_USE_NEAR_POINTERS > if( djgpp_use_nearpointers ) > if( ! __djgpp_nearptr_enable() ) > /* doesn't work, probably under some real OS like NT or dosemu! */ > djgpp_use_nearpointers = 0; > else > Vio += __djgpp_conventional_base; > #endif 300c304,311 < #endif /* DJGPP2 */ --- > #ifdef DJGPP > if( !djgpp_use_nearpointers ) > for( i = 0; i < vio_Height*vio_ScanLineWidth; i++ ) > dosmemput( &cbuf, 1, (unsigned long) Vio+i ); > else > /*FALLTHROUGH*/ > #endif > memset( Vio, 0, vio_Height * vio_ScanLineWidth ); 313,316c324,328 < #ifdef DJGPP2 < dosmemput( buffer, used_col, (unsigned long)target ); < #else < memcpy( target, buffer, used_col ); --- > #ifdef DJGPP > if( !djgpp_use_nearpointers ) > dosmemput( buffer, used_col, (unsigned long)target ); > else > /*FALLTHROUGH*/ 317a330,331 > memcpy( target, buffer, used_col ); > 322,324c336,341 < #ifdef DJGPP1 < __djgpp_nearptr_disable(); < Vio -= __djgpp_conventional_base; --- > #ifdef DJGPP_USE_NEAR_POINTERS > if( djgpp_use_nearpointers ) > { > Vio -= __djgpp_conventional_base; > __djgpp_nearptr_disable(); > } 326c343 < --- > 333,334c350,351 < int i; < char c; --- > int i; > int c; Index: freetype/test/arch/msdos/makedep =================================================================== RCS file: /cvs/freetype/freetype/test/arch/msdos/makedep,v retrieving revision 1.2 retrieving revision 1.4 diff -r1.2 -r1.4 4a5,13 > # > # Copyright 1996-2002 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. 6a16,19 > # This file is part of the FreeType project. > # Automatically generated, but you can customize to fit your needs. > # However, changes will be erased if not made in \`makedep'... > # 9c22 < # `date +%d-%b-%Y`. --- > # `date +%Y-%m-%d`. 17c30 < gcc -MM -I../lib/arch/win16 -I../lib -I../lib/extend -I. \ --- > gcc -MM -I../lib/arch/msdos -I../lib -I../lib/extend -I. \ Index: freetype/test/arch/os2/Makefile.dm =================================================================== RCS file: /cvs/freetype/freetype/test/arch/os2/Makefile.dm,v retrieving revision 1.7 retrieving revision 1.9 diff -r1.7 -r1.9 9a10,19 > # > # > # Copyright 1996-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. 40c50 < ftsbit.c common.c blitter.c ftmetric.c ftstrtto.c arabic.c --- > ftsbit.c common.c blitter.c ftmetric.c ftstrtto.c arabic.c textdisp.c 104,105c114,115 < ftsbit.exe: ftsbit.o common.o $(LIBDIR)/libttf.a < ftmetric.exe: ftmetric.o common.o $(LIBDIR)/libttf.a --- > ftsbit.exe: ftsbit.o common.o textdisp.o $(LIBDIR)/libttf.a > ftmetric.exe: ftmetric.o common.o textdisp.o $(LIBDIR)/libttf.a Index: freetype/test/arch/os2/Makefile.emx =================================================================== RCS file: /cvs/freetype/freetype/test/arch/os2/Makefile.emx,v retrieving revision 1.20 retrieving revision 1.23 diff -r1.20 -r1.23 7c7 < # Use this file while in the 'test' directory with the following statement: --- > # Use this file while in the 'test' directory with the following statements: 8a9 > # make -f arch/os2/Makefile.emx depend 9a11,20 > # > # > # Copyright 1996-2002 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. 27c38 < ftsbit.c common.c blitter.c ftmetric.c ftstrtto.c arabic.c --- > ftsbit.c common.c blitter.c ftmetric.c ftstrtto.c arabic.c textdisp.o 82,83c93,94 < ftsbit.exe: ftsbit.o common.o $(LIBDIR)/libttf.a < ftmetric.exe: ftmetric.o common.o $(LIBDIR)/libttf.a --- > ftsbit.exe: ftsbit.o common.o textdisp.o $(LIBDIR)/libttf.a > ftmetric.exe: ftmetric.o common.o textdisp.o $(LIBDIR)/libttf.a 102c113 < $(CC) -E -M $(INCDIRS) $^ > dep.end --- > $(CC) -E -MM $(INCDIRS) $^ > dep.end Index: freetype/test/arch/os2/Makefile.icc =================================================================== RCS file: /cvs/freetype/freetype/test/arch/os2/Makefile.icc,v retrieving revision 1.16 retrieving revision 1.18 diff -r1.16 -r1.18 9a10,19 > # > # > # Copyright 1996-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. 30c40 < SRC = gmain.c display.c common.c arabic.c \ --- > SRC = gmain.c display.c common.c arabic.c textdisp.c \ 47a58,59 > OBJ11 = arabic.obj > OBJ12 = textdisp.obj 116c128 < ftsbit.exe: $(OBJ8) $(LIBDIR)\libttf.lib $(COMMON) --- > ftsbit.exe: $(OBJ8) $(OBJ12) $(LIBDIR)\libttf.lib $(COMMON) 119c131 < ftmetric.exe: $(OBJ9) $(LIBDIR)\libttf.lib $(COMMON) --- > ftmetric.exe: $(OBJ9) $(OBJ12) $(LIBDIR)\libttf.lib $(COMMON) 122c134 < ftstrtfs.exe: $(GFSOBJS) $(OBJ10) $(LIBDIR)\libttf.lib --- > ftstrtfs.exe: $(GFSOBJS) $(OBJ10) $(OBJ11) $(LIBDIR)\libttf.lib 125c137 < ftstrtto.exe: $(GPMOBJS) $(OBJ10) arabic.obj $(LIBDIR)\libttf.lib --- > ftstrtto.exe: $(GPMOBJS) $(OBJ10) $(OBJ11) $(LIBDIR)\libttf.lib Index: freetype/test/arch/os2/Makefile.wat =================================================================== RCS file: /cvs/freetype/freetype/test/arch/os2/Makefile.wat,v retrieving revision 1.8 retrieving revision 1.11 diff -r1.8 -r1.11 7a8,24 > # > # > # Copyright 1996-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 compiler did compile early versions of the FreeType package. > # While we tried our best to maintain the makefiles, the development team > # does not have currently access to a copy of this compiler, and we did not > # receive notices of successful builts since many years. So be prepared > # to have some problems; and if it works for you, or if you can upgrade the > # package in any way, please notify us! 38c55 < SRC = gmain.c display.c blitter.c & --- > SRC = gmain.c display.c blitter.c textdisp.c & 128,129c145,146 < ftsbit.exe: ftsbit.obj $(LIBFILE) < $(CC) $(CCFLAGS) $(LIBFILE) common.obj $[*.c /fe=$[*.exe --- > ftsbit.exe: ftsbit.obj textdisp.obj $(LIBFILE) > $(CC) $(CCFLAGS) $(LIBFILE) common.obj textdisp.obj $[*.c /fe=$[*.exe 131,132c148,149 < ftmetric.exe: ftmetric.obj $(LIBFILE) < $(CC) $(CCFLAGS) $(LIBFILE) common.obj $[*.c /fe=$[*.exe --- > ftmetric.exe: ftmetric.obj textdisp.obj $(LIBFILE) > $(CC) $(CCFLAGS) $(LIBFILE) common.obj textdisp.obj $[*.c /fe=$[*.exe Index: freetype/test/arch/unix/Makefile.in =================================================================== RCS file: /cvs/freetype/freetype/test/arch/unix/Makefile.in,v retrieving revision 1.25 retrieving revision 1.28 diff -r1.25 -r1.28 3a4,13 > # > # > # Copyright 1996-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. 38a49 > $(srcdir)/textdisp.c \ 103,104c114,115 < ftmetric: ftmetric.o common.o $(LIBTTF) < $(PROCESS) -o ftmetric ftmetric.o common.o \ --- > ftmetric: ftmetric.o common.o textdisp.o $(LIBTTF) > $(PROCESS) -o ftmetric ftmetric.o common.o textdisp.o \ 107,108c118,119 < ftsbit: ftsbit.o common.o $(LIBTTF) < $(PROCESS) -o ftsbit ftsbit.o common.o \ --- > ftsbit: ftsbit.o common.o textdisp.o $(LIBTTF) > $(PROCESS) -o ftsbit ftsbit.o common.o textdisp.o \ 169a181,182 > > .PHONY: all install uninstall clean distclean do_clean depend Index: freetype/test/arch/win16/Makefile.BC =================================================================== RCS file: /cvs/freetype/freetype/test/arch/win16/Makefile.BC,v retrieving revision 1.5 retrieving revision 1.8 diff -r1.5 -r1.8 30a31,40 > # > # > # Copyright 1996-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. 34c44 < FT_DLL = ft14_16.dll --- > FT_DLL = ft15_16.dll 71d80 < 73a83 > textdisp.c \ 184,185c194,195 < ftsbit.exe: ftsbit.obj common.obj $(LIBDIR)\libttf.lib < $(CC) $(LDFLAGS) ftsbit.obj common.obj $(LIBDIR)\libttf.lib --- > ftsbit.exe: $(TDOBJ) ftsbit.obj common.obj $(LIBDIR)\libttf.lib > $(CC) $(LDFLAGS) ftsbit.obj textdisp.obj common.obj $(LIBDIR)\libttf.lib 187,188c197,198 < ftmetric.exe: ftmetric.obj common.obj $(LIBDIR)\libttf.lib < $(CC) $(LDFLAGS) ftmetric.obj common.obj $(LIBDIR)\libttf.lib --- > ftmetric.exe: $(TDOBJ) ftmetric.obj common.obj $(LIBDIR)\libttf.lib > $(CC) $(LDFLAGS) ftmetric.obj textdisp.obj common.obj $(LIBDIR)\libttf.lib Index: freetype/test/arch/win16/Makefile.MS =================================================================== RCS file: /cvs/freetype/freetype/test/arch/win16/Makefile.MS,v retrieving revision 1.4 retrieving revision 1.6 diff -r1.4 -r1.6 18a19,28 > # > # > # Copyright 1996-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. 48d57 < 50a60 > textdisp.c \ 122,123c132,133 < ftsbit.exe: ftsbit.obj common.obj $(LIBDIR)\libttf.lib < ftmetric.exe: ftmetric.obj common.obj $(LIBDIR)\libttf.lib --- > ftsbit.exe: ftsbit.obj common.obj textdisp.obj $(LIBDIR)\libttf.lib > ftmetric.exe: ftmetric.obj common.obj textdisp.obj $(LIBDIR)\libttf.lib Index: freetype/test/arch/win16/Makefile.VC =================================================================== RCS file: /cvs/freetype/freetype/test/arch/win16/Makefile.VC,v retrieving revision 1.5 retrieving revision 1.8 diff -r1.5 -r1.8 28a29,38 > # > # > # Copyright 1996-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. 33c43 < FT_DLL = ft14_16.dll --- > FT_DLL = ft15_16.dll 65d74 < 67a77 > textdisp.c \ 162,163c172,173 < ftsbit.exe: ftsbit.obj common.obj $(LIBDIR)\libttf.lib < ftmetric.exe: ftmetric.obj common.obj $(LIBDIR)\libttf.lib --- > ftsbit.exe: ftsbit.obj common.obj textdisp.obj $(LIBDIR)\libttf.lib > ftmetric.exe: ftmetric.obj common.obj textdisp.obj $(LIBDIR)\libttf.lib Index: freetype/test/arch/win16/depend.win =================================================================== RCS file: /cvs/freetype/freetype/test/arch/win16/depend.win,v retrieving revision 1.3 retrieving revision 1.5 diff -r1.3 -r1.5 0a1,4 > # This file is part of the FreeType project. > # Automatically generated, but you can customize to fit your needs. > # However, changes will be erased if not made in `makedep'... > # 3c7 < # 07-Mar-2000. --- > # 2002-02-19. 5,6c9,11 < arabic.obj: arabic.c arabic.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h ..\lib\extend\ftxopen.h ..\lib\extend\ftxgdef.h \ --- > arabic.obj: arabic.c arabic.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h \ > ..\lib\extend\ftxopen.h ..\lib\extend\ftxgdef.h \ 8,19c13,27 < blitter.obj: blitter.c blitter.h < common.obj: common.c common.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h < display.obj: display.c display.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h gmain.h < fdebug.obj: fdebug.c ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h ..\lib\tttypes.h ..\lib\ttconfig.h \ < ..\lib\arch\win16\ft_conf.h ..\lib\ttdebug.h ..\lib\ttobjs.h \ < ..\lib\ttengine.h ..\lib\ttmutex.h ..\lib\ttcache.h ..\lib\tttables.h \ < ..\lib\ttcmap.h < ftdump.obj: ftdump.c common.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h ..\lib\extend\ftxcmap.h ..\lib\extend\ftxopen.h \ --- > blitter.obj: blitter.c blitter.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h > common.obj: common.c common.h > display.obj: display.c display.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h gmain.h > fdebug.obj: fdebug.c ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h \ > ..\lib\tttypes.h ..\lib\ttconfig.h \ > ..\lib\arch\win16\ft_conf.h ..\lib\ttdebug.h \ > ..\lib\ttobjs.h ..\lib\ttengine.h \ > ..\lib\ttmutex.h ..\lib\ttcache.h \ > ..\lib\tttables.h ..\lib\ttcmap.h > ftdump.obj: ftdump.c common.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h \ > ..\lib\extend\ftxcmap.h ..\lib\extend\ftxopen.h \ 21,26c29,37 < ..\lib\extend\ftxgpos.h ..\lib\extend\ftxsbit.h ..\lib\ttobjs.h \ < ..\lib\ttconfig.h ..\lib\arch\win16\ft_conf.h ..\lib\ttengine.h \ < ..\lib\tttypes.h ..\lib\ttmutex.h ..\lib\ttcache.h ..\lib\tttables.h \ < ..\lib\ttcmap.h < fterror.obj: fterror.c ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h ..\lib\extend\ftxerr18.h \ --- > ..\lib\extend\ftxgpos.h ..\lib\extend\ftxsbit.h \ > ..\lib\ttobjs.h ..\lib\ttconfig.h \ > ..\lib\arch\win16\ft_conf.h ..\lib\ttengine.h \ > ..\lib\tttypes.h ..\lib\ttmutex.h \ > ..\lib\ttcache.h ..\lib\tttables.h \ > ..\lib\ttcmap.h ..\lib\ttmemory.h > fterror.obj: fterror.c ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h \ > ..\lib\extend\ftxerr18.h \ 28,41c39,64 < ftlint.obj: ftlint.c common.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h ..\lib\arch\win16\ft_conf.h < ftmetric.obj: ftmetric.c common.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h ..\lib\extend\ftxsbit.h ..\lib\arch\win16\ft_conf.h < ftsbit.obj: ftsbit.c common.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h ..\lib\extend\ftxsbit.h ..\lib\arch\win16\ft_conf.h < ftstring.obj: ftstring.c common.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h display.h gevents.h gdriver.h gmain.h < ftstrpnm.obj: ftstrpnm.c common.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h < ftstrtto.obj: ftstrtto.c arabic.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h ..\lib\extend\ftxopen.h ..\lib\extend\ftxgdef.h \ < ..\lib\extend\ftxgsub.h ..\lib\extend\ftxgpos.h blitter.h common.h \ < display.h ..\lib\extend\ftxkern.h ..\lib\extend\ftxsbit.h gdriver.h \ --- > ftlint.obj: ftlint.c common.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h \ > ..\lib\arch\win16\ft_conf.h > ftmetric.obj: ftmetric.c common.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h \ > ..\lib\extend\ftxsbit.h textdisp.h \ > ..\lib\arch\win16\ft_conf.h > ftsbit.obj: ftsbit.c common.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h \ > ..\lib\extend\ftxsbit.h textdisp.h \ > ..\lib\arch\win16\ft_conf.h > ftstring.obj: ftstring.c common.h display.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h gevents.h \ > gdriver.h gmain.h > ftstrpnm.obj: ftstrpnm.c common.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h > ftstrtto.obj: ftstrtto.c arabic.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h \ > ..\lib\extend\ftxopen.h ..\lib\extend\ftxgdef.h \ > ..\lib\extend\ftxgsub.h ..\lib\extend\ftxgpos.h \ > blitter.h common.h display.h ..\lib\extend\ftxkern.h \ > ..\lib\extend\ftxsbit.h gdriver.h gevents.h gmain.h \ > ..\lib\ttmemory.h ..\lib\ttconfig.h \ > ..\lib\arch\win16\ft_conf.h ..\lib\tttypes.h > fttimer.obj: fttimer.c common.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h gdriver.h \ 43,48c66,72 < fttimer.obj: fttimer.c common.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h gdriver.h gevents.h gmain.h < ftview.obj: ftview.c blitter.h common.h display.h \ < ..\lib\extend\ftxsbit.h gdriver.h gevents.h gmain.h < ftzoom.obj: ftzoom.c common.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h ..\lib\extend\ftxpost.h gdriver.h gevents.h gmain.h --- > ftview.obj: ftview.c blitter.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h common.h \ > display.h ..\lib\extend\ftxsbit.h gdriver.h gevents.h \ > gmain.h > ftzoom.obj: ftzoom.c common.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h \ > ..\lib\extend\ftxpost.h gdriver.h gevents.h gmain.h 49a74,75 > textdisp.obj: textdisp.c textdisp.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h Index: freetype/test/arch/win16/gw_win16.c =================================================================== RCS file: /cvs/freetype/freetype/test/arch/win16/gw_win16.c,v retrieving revision 1.4 retrieving revision 1.6 diff -r1.4 -r1.6 10c10 < * Copyright 1999-2000 Antoine Leca, --- > * Copyright 1999-2001 by Antoine Leca, 22a23,25 > #include /* should be #included before everything else */ > /* because it #defines NULL in a peculiar way */ > 26,27d28 < < #include Index: freetype/test/arch/win16/makedep =================================================================== RCS file: /cvs/freetype/freetype/test/arch/win16/makedep,v retrieving revision 1.2 retrieving revision 1.4 diff -r1.2 -r1.4 7a8,16 > # > # Copyright 1996-2002 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. 9a19,22 > # This file is part of the FreeType project. > # Automatically generated, but you can customize to fit your needs. > # However, changes will be erased if not made in \`makedep'... > # 12c25 < # `date +%d-%b-%Y`. --- > # `date +%Y-%m-%d`. Index: freetype/test/arch/win32/Makefile.BC =================================================================== RCS file: /cvs/freetype/freetype/test/arch/win32/Makefile.BC,v retrieving revision 1.5 retrieving revision 1.8 diff -r1.5 -r1.8 23a24,33 > # > # > # Copyright 1996-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. 27c37 < FT_DLL = ft14_32.dll --- > FT_DLL = ft15_32.dll 59d68 < 61a71 > textdisp.c \ 168,169c178,179 < ftsbit.exe: ftsbit.obj common.obj $(LIBDIR)\libttf.lib < $(CC) $(LDFLAGS) ftsbit.obj common.obj $(LIBDIR)\libttf.lib --- > ftsbit.exe: $(TDOBJ) ftsbit.obj common.obj $(LIBDIR)\libttf.lib > $(CC) $(LDFLAGS) ftsbit.obj textdisp.obj common.obj $(LIBDIR)\libttf.lib 171,172c181,182 < ftmetric.exe: ftmetric.obj common.obj $(LIBDIR)\libttf.lib < $(CC) $(LDFLAGS) ftmetric.obj common.obj $(LIBDIR)\libttf.lib --- > ftmetric.exe: $(TDOBJ) ftmetric.obj common.obj $(LIBDIR)\libttf.lib > $(CC) $(LDFLAGS) ftmetric.obj textdisp.obj common.obj $(LIBDIR)\libttf.lib Index: freetype/test/arch/win32/Makefile.CL =================================================================== RCS file: /cvs/freetype/freetype/test/arch/win32/Makefile.CL,v retrieving revision 1.3 retrieving revision 1.6 diff -r1.3 -r1.6 21a22,31 > # > # > # Copyright 1996-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. 26c36 < FT_DLL = ft14_32.dll --- > FT_DLL = ft15_32.dll 54d63 < 56a66 > textdisp.c \ 147,148c157,158 < ftsbit.exe: ftsbit.obj common.obj $(LIBDIR)\libttf.lib < ftmetric.exe: ftmetric.obj common.obj $(LIBDIR)\libttf.lib --- > ftsbit.exe: ftsbit.obj common.obj textdisp.obj $(LIBDIR)\libttf.lib > ftmetric.exe: ftmetric.obj common.obj textdisp.obj $(LIBDIR)\libttf.lib Index: freetype/test/arch/win32/Makefile.Min =================================================================== RCS file: /cvs/freetype/freetype/test/arch/win32/Makefile.Min,v retrieving revision 1.1 retrieving revision 1.4 diff -r1.1 -r1.4 7c7 < # Use this file while in the 'test' directory with the following statement: --- > # Use this file while in the 'test' directory with the following statements: 8a9 > # make -f arch/win32/Makefile.min depend 9a11,20 > # > # > # Copyright 1996-2002 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. 36a48 > textdisp.c \ 95,96c107,108 < ftsbit.exe: ftsbit.o common.o $(LIBDIR)/libttf.a < ftmetric.exe: ftmetric.o common.o $(LIBDIR)/libttf.a --- > ftsbit.exe: ftsbit.o common.o textdisp.o $(LIBDIR)/libttf.a > ftmetric.exe: ftmetric.o common.o textdisp.o $(LIBDIR)/libttf.a 116c128 < $(CC) -E -M $(INCDIRS) $^ > dep.end --- > $(CC) -E -MM $(INCDIRS) $^ > dep.end Index: freetype/test/arch/win32/Makefile.gcc =================================================================== RCS file: /cvs/freetype/freetype/test/arch/win32/Makefile.gcc,v retrieving revision 1.2 retrieving revision 1.5 diff -r1.2 -r1.5 7c7 < # Use this file while in the 'test' directory with the following statement: --- > # Use this file while in the 'test' directory with the following statements: 8a9 > # make -f arch/win32/Makefile.gcc depend 14a16,25 > # > # > # Copyright 1996-2002 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. 37a49 > textdisp.c \ 104,105c116,117 < ftsbit.exe: ftsbit.o common.o $(LIBDIR)/libttf.a < ftmetric.exe: ftmetric.o common.o $(LIBDIR)/libttf.a --- > ftsbit.exe: ftsbit.o common.o textdisp.o $(LIBDIR)/libttf.a > ftmetric.exe: ftmetric.o common.o textdisp.o $(LIBDIR)/libttf.a 125c137 < $(CC) -E -M $(INCDIRS) $^ > dep.end --- > $(CC) -E -MM $(INCDIRS) $^ > dep.end Index: freetype/test/arch/win32/depend.win =================================================================== RCS file: /cvs/freetype/freetype/test/arch/win32/depend.win,v retrieving revision 1.3 retrieving revision 1.5 diff -r1.3 -r1.5 0a1,4 > # This file is part of the FreeType project. > # Automatically generated, but you can customize to fit your needs. > # However, changes will be erased if not made in `makedep'... > # 3c7 < # 07-Mar-2000. --- > # 2002-02-19. 5,6c9,11 < arabic.obj: arabic.c arabic.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h ..\lib\extend\ftxopen.h ..\lib\extend\ftxgdef.h \ --- > arabic.obj: arabic.c arabic.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h \ > ..\lib\extend\ftxopen.h ..\lib\extend\ftxgdef.h \ 8,19c13,27 < blitter.obj: blitter.c blitter.h < common.obj: common.c common.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h < display.obj: display.c display.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h gmain.h < fdebug.obj: fdebug.c ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h ..\lib\tttypes.h ..\lib\ttconfig.h \ < ..\lib\arch\win32\ft_conf.h ..\lib\ttdebug.h ..\lib\ttobjs.h \ < ..\lib\ttengine.h ..\lib\ttmutex.h ..\lib\ttcache.h ..\lib\tttables.h \ < ..\lib\ttcmap.h < ftdump.obj: ftdump.c common.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h ..\lib\extend\ftxcmap.h ..\lib\extend\ftxopen.h \ --- > blitter.obj: blitter.c blitter.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h > common.obj: common.c common.h > display.obj: display.c display.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h gmain.h > fdebug.obj: fdebug.c ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h \ > ..\lib\tttypes.h ..\lib\ttconfig.h \ > ..\lib\arch\win32\ft_conf.h ..\lib\ttdebug.h \ > ..\lib\ttobjs.h ..\lib\ttengine.h \ > ..\lib\ttmutex.h ..\lib\ttcache.h \ > ..\lib\tttables.h ..\lib\ttcmap.h > ftdump.obj: ftdump.c common.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h \ > ..\lib\extend\ftxcmap.h ..\lib\extend\ftxopen.h \ 21,26c29,37 < ..\lib\extend\ftxgpos.h ..\lib\extend\ftxsbit.h ..\lib\ttobjs.h \ < ..\lib\ttconfig.h ..\lib\arch\win32\ft_conf.h ..\lib\ttengine.h \ < ..\lib\tttypes.h ..\lib\ttmutex.h ..\lib\ttcache.h ..\lib\tttables.h \ < ..\lib\ttcmap.h < fterror.obj: fterror.c ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h ..\lib\extend\ftxerr18.h \ --- > ..\lib\extend\ftxgpos.h ..\lib\extend\ftxsbit.h \ > ..\lib\ttobjs.h ..\lib\ttconfig.h \ > ..\lib\arch\win32\ft_conf.h ..\lib\ttengine.h \ > ..\lib\tttypes.h ..\lib\ttmutex.h \ > ..\lib\ttcache.h ..\lib\tttables.h \ > ..\lib\ttcmap.h ..\lib\ttmemory.h > fterror.obj: fterror.c ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h \ > ..\lib\extend\ftxerr18.h \ 28,41c39,64 < ftlint.obj: ftlint.c common.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h ..\lib\arch\win32\ft_conf.h < ftmetric.obj: ftmetric.c common.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h ..\lib\extend\ftxsbit.h ..\lib\arch\win32\ft_conf.h < ftsbit.obj: ftsbit.c common.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h ..\lib\extend\ftxsbit.h ..\lib\arch\win32\ft_conf.h < ftstring.obj: ftstring.c common.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h display.h gevents.h gdriver.h gmain.h < ftstrpnm.obj: ftstrpnm.c common.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h < ftstrtto.obj: ftstrtto.c arabic.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h ..\lib\extend\ftxopen.h ..\lib\extend\ftxgdef.h \ < ..\lib\extend\ftxgsub.h ..\lib\extend\ftxgpos.h blitter.h common.h \ < display.h ..\lib\extend\ftxkern.h ..\lib\extend\ftxsbit.h gdriver.h \ --- > ftlint.obj: ftlint.c common.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h \ > ..\lib\arch\win32\ft_conf.h > ftmetric.obj: ftmetric.c common.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h \ > ..\lib\extend\ftxsbit.h textdisp.h \ > ..\lib\arch\win32\ft_conf.h > ftsbit.obj: ftsbit.c common.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h \ > ..\lib\extend\ftxsbit.h textdisp.h \ > ..\lib\arch\win32\ft_conf.h > ftstring.obj: ftstring.c common.h display.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h gevents.h \ > gdriver.h gmain.h > ftstrpnm.obj: ftstrpnm.c common.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h > ftstrtto.obj: ftstrtto.c arabic.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h \ > ..\lib\extend\ftxopen.h ..\lib\extend\ftxgdef.h \ > ..\lib\extend\ftxgsub.h ..\lib\extend\ftxgpos.h \ > blitter.h common.h display.h ..\lib\extend\ftxkern.h \ > ..\lib\extend\ftxsbit.h gdriver.h gevents.h gmain.h \ > ..\lib\ttmemory.h ..\lib\ttconfig.h \ > ..\lib\arch\win32\ft_conf.h ..\lib\tttypes.h > fttimer.obj: fttimer.c common.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h gdriver.h \ 43,48c66,72 < fttimer.obj: fttimer.c common.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h gdriver.h gevents.h gmain.h < ftview.obj: ftview.c blitter.h common.h display.h \ < ..\lib\extend\ftxsbit.h gdriver.h gevents.h gmain.h < ftzoom.obj: ftzoom.c common.h ..\lib\freetype.h ..\lib\fterrid.h \ < ..\lib\ftnameid.h ..\lib\extend\ftxpost.h gdriver.h gevents.h gmain.h --- > ftview.obj: ftview.c blitter.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h common.h \ > display.h ..\lib\extend\ftxsbit.h gdriver.h gevents.h \ > gmain.h > ftzoom.obj: ftzoom.c common.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h \ > ..\lib\extend\ftxpost.h gdriver.h gevents.h gmain.h 49a74,75 > textdisp.obj: textdisp.c textdisp.h ..\lib\freetype.h \ > ..\lib\fterrid.h ..\lib\ftnameid.h Index: freetype/test/arch/win32/makedep =================================================================== RCS file: /cvs/freetype/freetype/test/arch/win32/makedep,v retrieving revision 1.2 retrieving revision 1.4 diff -r1.2 -r1.4 7a8,16 > # > # Copyright 1996-2002 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. 9a19,22 > # This file is part of the FreeType project. > # Automatically generated, but you can customize to fit your needs. > # However, changes will be erased if not made in \`makedep'... > # 12c25 < # `date +%d-%b-%Y`. --- > # `date +%Y-%m-%d`.