Commit 435046b54b46969d37a4fd0fb01a106892212b7b
2006-01-11T10:57:42
Formatting, improving comments.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164
diff --git a/ChangeLog b/ChangeLog
index f720b4e..47fb0a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1173,7 +1173,7 @@
----------------------------------------------------------------------------
-Copyright 2005 by
+Copyright 2005, 2006 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used, modified,
diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac
index a1dab41..e0a70fe 100644
--- a/builds/unix/configure.ac
+++ b/builds/unix/configure.ac
@@ -2,7 +2,7 @@
#
# Process this file with autoconf to produce a configure script.
#
-# Copyright 2001, 2002, 2003, 2004, 2005 by
+# Copyright 2001, 2002, 2003, 2004, 2005, 2006 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -133,7 +133,7 @@ if test x$with_zlib != xno && test -n "$LIBZ"; then
fi
-# Whether to use Mac OS resource-based fonts or not
+# Whether to use Mac OS resource-based fonts.
AC_ARG_WITH([old-mac-fonts],
dnl don't quote AS_HELP_STRING!
@@ -147,7 +147,7 @@ else
fi
-# Whether to use FileManager which is deprecated since Mac OS X 10.4
+# Whether to use FileManager which is deprecated since Mac OS X 10.4.
AC_ARG_WITH([fsspec],
AS_HELP_STRING([--with-fsspec],
@@ -157,6 +157,7 @@ if test x$with_fsspec = xno; then
elif test x$with_old_mac_fonts = xyes; then
AC_MSG_CHECKING([FSSpec-based FileManager])
AC_TRY_LINK([
+
#if defined(__GNUC__) && defined(__APPLE_CC__)
# include <Carbon/Carbon.h>
# include <ApplicationServices/ApplicationServices.h>
@@ -164,27 +165,30 @@ elif test x$with_old_mac_fonts = xyes; then
# include <ConditionalMacros.h>
# include <Files.h>
#endif
- ], [
- FCBPBPtr paramBlock;
- short vRefNum;
- long dirID;
- ConstStr255Param fileName;
- FSSpec* spec;
+
+ ],
+ [
+
+ FCBPBPtr paramBlock;
+ short vRefNum;
+ long dirID;
+ ConstStr255Param fileName;
+ FSSpec* spec;
+
/* FSSpec functions: deprecated sicne Mac OS X 10.4 */
PBGetFCBInfoSync( paramBlock );
FSMakeFSSpec( vRefNum, dirID, fileName, spec );
- ], [
- AC_MSG_RESULT([ok])
- CFLAGS="$CFLAGS -DHAVE_FSSPEC=1"
- ], [
- AC_MSG_RESULT([not found])
- CFLAGS="$CFLAGS -DHAVE_FSSPEC=0"
- ])
+ ],
+ [AC_MSG_RESULT([ok])
+ CFLAGS="$CFLAGS -DHAVE_FSSPEC=1"],
+ [AC_MSG_RESULT([not found])
+ CFLAGS="$CFLAGS -DHAVE_FSSPEC=0"])
fi
-# Whether to use FileManager in Carbon since MacOS 9.x
+
+# Whether to use FileManager in Carbon since MacOS 9.x.
AC_ARG_WITH([fsref],
AS_HELP_STRING([--with-fsref],
@@ -199,6 +203,7 @@ if test x$with_fsref = xno; then
elif test x$with_old_mac_fonts = xyes; then
AC_MSG_CHECKING([FSRef-based FileManager])
AC_TRY_LINK([
+
#if defined(__GNUC__) && defined(__APPLE_CC__)
# include <Carbon/Carbon.h>
# include <ApplicationServices/ApplicationServices.h>
@@ -206,7 +211,10 @@ elif test x$with_old_mac_fonts = xyes; then
# include <ConditionalMacros.h>
# include <Files.h>
#endif
- ], [
+
+ ],
+ [
+
FCBPBPtr paramBlock;
short vRefNum;
long dirID;
@@ -235,16 +243,15 @@ elif test x$with_old_mac_fonts = xyes; then
outForkName, spec, ref );
FSPathMakeRef( path, ref, isDirectory );
- ], [
- AC_MSG_RESULT([ok])
- CFLAGS="$CFLAGS -DHAVE_FSREF=1"
- ], [
- AC_MSG_RESULT([not found])
- CFLAGS="$CFLAGS -DHAVE_FSREF=0"
- ])
+ ],
+ [AC_MSG_RESULT([ok])
+ CFLAGS="$CFLAGS -DHAVE_FSREF=1"],
+ [AC_MSG_RESULT([not found])
+ CFLAGS="$CFLAGS -DHAVE_FSREF=0"])
fi
-# Whether to use QuickDraw API in ToolBox which is deprecated since Mac OS X 10.4
+
+# Whether to use QuickDraw API in ToolBox which is deprecated since Mac OS X 10.4.
AC_ARG_WITH([quickdraw-toolbox],
AS_HELP_STRING([--with-quickdraw-toolbox],
@@ -254,6 +261,7 @@ if test x$with_quickdraw_toolbox = xno; then
elif test x$with_old_mac_fonts = xyes; then
AC_MSG_CHECKING([QuickDraw FontManager functions in ToolBox])
AC_TRY_LINK([
+
#if defined(__GNUC__) && defined(__APPLE_CC__)
# include <Carbon/Carbon.h>
# include <ApplicationServices/ApplicationServices.h>
@@ -261,7 +269,10 @@ elif test x$with_old_mac_fonts = xyes; then
# include <ConditionalMacros.h>
# include <Fonts.h>
#endif
- ], [
+
+ ],
+ [
+
Str255 familyName;
SInt16 familyID = 0;
FMInput* fmIn = NULL;
@@ -272,17 +283,15 @@ elif test x$with_old_mac_fonts = xyes; then
GetFNum( familyName, &familyID );
fmOut = FMSwapFont( fmIn );
- ], [
- AC_MSG_RESULT([ok])
- CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_TOOLBOX=1"
- ], [
- AC_MSG_RESULT([not found])
- CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_TOOLBOX=0"
- ])
+ ],
+ [AC_MSG_RESULT([ok])
+ CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_TOOLBOX=1"],
+ [AC_MSG_RESULT([not found])
+ CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_TOOLBOX=0"])
fi
-# Whether to use QuickDraw API in Carbon which is deprecated since Mac OS X 10.4
+# Whether to use QuickDraw API in Carbon which is deprecated since Mac OS X 10.4.
AC_ARG_WITH([quickdraw-carbon],
AS_HELP_STRING([--with-quickdraw-carbon],
@@ -292,6 +301,7 @@ if test x$with_quickdraw_carbon = xno; then
elif test x$with_old_mac_fonts = xyes; then
AC_MSG_CHECKING([QuickDraw FontManager functions in Carbon])
AC_TRY_LINK([
+
#if defined(__GNUC__) && defined(__APPLE_CC__)
# include <Carbon/Carbon.h>
# include <ApplicationServices/ApplicationServices.h>
@@ -299,7 +309,10 @@ elif test x$with_old_mac_fonts = xyes; then
# include <ConditionalMacros.h>
# include <Fonts.h>
#endif
- ], [
+
+ ],
+ [
+
FMFontFamilyIterator famIter;
FMFontFamily family;
Str255 famNameStr;
@@ -318,17 +331,17 @@ elif test x$with_old_mac_fonts = xyes; then
FMDisposeFontFamilyInstanceIterator( &instIter );
FMDisposeFontFamilyIterator( &famIter );
FMGetFontContainer( font, pathSpec );
- ], [
- AC_MSG_RESULT([ok])
- CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_CARBON=1"
- ], [
- AC_MSG_RESULT([not found])
- CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_CARBON=0"
- ])
+
+ ],
+ [AC_MSG_RESULT([ok])
+ CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_CARBON=1"],
+ [AC_MSG_RESULT([not found])
+ CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_CARBON=0"])
fi
-# Whether to use AppleTypeService since Mac OS X
+# Whether to use AppleTypeService since Mac OS X.
+
AC_ARG_WITH([ats],
dnl don't quote AS_HELP_STRING!
AS_HELP_STRING([--with-ats],
@@ -338,22 +351,24 @@ if test x$with_ats = xno; then
elif test x$with_old_mac_fonts = xyes; then
AC_MSG_CHECKING([AppleTypeService functions])
AC_TRY_LINK([
+
#include <Carbon/Carbon.h>
- ], [
+
+ ],
+ [
+
FSSpec* pathSpec;
ATSFontFindFromName( NULL, kATSOptionFlagsUnRestrictedScope );
ATSFontGetFileSpecification( 0, pathSpec );
- ], [
- AC_MSG_RESULT([ok])
- CFLAGS="$CFLAGS -DHAVE_ATS=1"
- ], [
- AC_MSG_RESULT([not found])
- CFLAGS="$CFLAGS -DHAVE_ATS=0"
- ])
-fi
+ ],
+ [AC_MSG_RESULT([ok])
+ CFLAGS="$CFLAGS -DHAVE_ATS=1"],
+ [AC_MSG_RESULT([not found])
+ CFLAGS="$CFLAGS -DHAVE_ATS=0"])
+fi
AC_SUBST([LIBZ])
diff --git a/docs/CHANGES b/docs/CHANGES
index 7a55d77..fd63451 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -12,6 +12,7 @@ LATEST CHANGES BETWEEN 2.2.0 and 2.1.10
- If FreeType was compiled without hinters, all font formats based
on PS outlines weren't scaled correctly.
+
II. IMPORTANT CHANGES
- The LIGHT hinting algorithm produces more pleasant results.
@@ -45,11 +46,12 @@ LATEST CHANGES BETWEEN 2.2.0 and 2.1.10
Note that this doesn't affect binary backwards compatibility.
- - On MacOS, new APIs are added as replacements for legacy APIs:
- `FT_New_Face_From_FSRef' for FT_New_Face_From_FSSpec, and
- `FT_GetFile_From_Mac_ATS_Name' for FT_GetFile_From_Mac_Name.
- Legacy APIs are still available, if FreeType is built without
- disabling them.
+ - On MacOS, new APIs have been added as replacements for legacy
+ APIs: `FT_New_Face_From_FSRef' for `FT_New_Face_From_FSSpec',
+ and `FT_GetFile_From_Mac_ATS_Name' for
+ `FT_GetFile_From_Mac_Name'. Legacy APIs are still available, if
+ FreeType is built without disabling them.
+
III. MISCELLANEOUS
@@ -63,14 +65,16 @@ LATEST CHANGES BETWEEN 2.2.0 and 2.1.10
returns the number of available faces via face->num_faces.
Unsupported bitmap faces (fbit, NFNT) are ignored.
- - builds/unix/configure is improved for MacOS X. It automatically
- checks available functions in Carbon library, and prepare to use
- newest functions by default. Also options to specify dependency
- of each Carbon APIs (FSSpec, FSRef, old/new QuickDraw, ATS) are
- available. By manual disabling of all QuickDraw, FreeType can be
- built without "deprecated function" warning on MacOS 10.4.x, but
- FT_GetFile_Mac_Name in ftmac.c is changed to dummy function, and
- returns unimplemented error. For detail, see builds/mac/README.
+ - builds/unix/configure has been improved for MacOS X. It now
+ automatically checks available functions in Carbon library, and
+ prepare to use newest functions by default. Options to specify
+ the dependencies of each Carbon APIs (FSSpec, FSRef, old/new
+ QuickDraw, ATS) are available too. By manual disabling of all
+ QuickDraw functionality, FreeType can be built without
+ `deprecated function' warnings on MacOS 10.4.x, but
+ FT_GetFile_Mac_Name in ftmac.c then is changed to a dummy
+ function, and returns an `unimplemented' error. For details see
+ builds/mac/README.
- SFNT cmap handling has been improved, mainly to run faster.
diff --git a/src/base/ftmac.c b/src/base/ftmac.c
index 8506377..3be12cf 100644
--- a/src/base/ftmac.c
+++ b/src/base/ftmac.c
@@ -5,7 +5,7 @@
/* Mac FOND support. Written by just@letterror.com. */
/* Heavily Fixed by mpsuzuki, George Williams and Sean McBride */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004, 2005 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */
/* Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -24,35 +24,35 @@
support this I use the face_index argument of FT_(Open|New)_Face()
functions, and pretend the suitcase file is a collection.
- Warning: fbit and NFNT bitmap resources are not supported yet.
- In old sfnt fonts, bitmap glyph data for each size is stored in
- each NFNT resources, instead of bdat table in sfnt resource.
- Therefore, face->num_fixed_sizes is set to 0, because bitmap
- data in NFNT resource is unavailable at present.
+ Warning: fbit and NFNT bitmap resources are not supported yet. In old
+ sfnt fonts, bitmap glyph data for each size is stored in each `NFNT'
+ resources instead of the `bdat' table in the sfnt resource. Therefore,
+ face->num_fixed_sizes is set to 0, because bitmap data in `NFNT'
+ resource is unavailable at present.
The Mac FOND support works roughly like this:
- - Check whether the offered stream points to a Mac suitcase file.
- This is done by checking the file type: it has to be 'FFIL' or 'tfil'.
- The stream that gets passed to our init_face() routine is a stdio
- stream, which isn't usable for us, since the FOND resources live
- in the resource fork. So we just grab the stream->pathname field.
-
- - Read the FOND resource into memory, then check whether there is
- a TrueType font and/or(!) a Type 1 font available.
-
- - If there is a Type 1 font available (as a separate 'LWFN' file),
- read its data into memory, massage it slightly so it becomes
- PFB data, wrap it into a memory stream, load the Type 1 driver
- and delegate the rest of the work to it by calling FT_Open_Face().
- (XXX TODO: after this has been done, the kerning data from the FOND
- resource should be appended to the face: On the Mac there are usually
- no AFM files available. However, this is tricky since we need to map
- Mac char codes to ps glyph names to glyph ID's...)
-
- - If there is a TrueType font (an 'sfnt' resource), read it into
- memory, wrap it into a memory stream, load the TrueType driver
- and delegate the rest of the work to it, by calling FT_Open_Face().
+ - Check whether the offered stream points to a Mac suitcase file. This
+ is done by checking the file type: it has to be 'FFIL' or 'tfil'. The
+ stream that gets passed to our init_face() routine is a stdio stream,
+ which isn't usable for us, since the FOND resources live in the
+ resource fork. So we just grab the stream->pathname field.
+
+ - Read the FOND resource into memory, then check whether there is a
+ TrueType font and/or(!) a Type 1 font available.
+
+ - If there is a Type 1 font available (as a separate `LWFN' file), read
+ its data into memory, massage it slightly so it becomes PFB data, wrap
+ it into a memory stream, load the Type 1 driver and delegate the rest
+ of the work to it by calling FT_Open_Face(). (XXX TODO: after this
+ has been done, the kerning data from the FOND resource should be
+ appended to the face: On the Mac there are usually no AFM files
+ available. However, this is tricky since we need to map Mac char
+ codes to ps glyph names to glyph ID's...)
+
+ - If there is a TrueType font (an `sfnt' resource), read it into memory,
+ wrap it into a memory stream, load the TrueType driver and delegate
+ the rest of the work to it, by calling FT_Open_Face().
*/
@@ -64,7 +64,7 @@
/* This is for Mac OS X. Without redefinition, OS_INLINE */
/* expands to `static inline' which doesn't survive the */
/* -ansi compilation flag of GCC. */
-#define OS_INLINE static __inline__
+#define OS_INLINE static __inline__
#include <Carbon/Carbon.h>
#else
#include <Resources.h>
@@ -81,44 +81,44 @@
#include FT_MAC_H
- /* FSSpec functions are depricated since Mac OS X 10.4 */
+ /* FSSpec functions are deprecated since Mac OS X 10.4 */
#ifndef HAVE_FSSPEC
#if TARGET_API_MAC_OS8 || TARGET_API_MAC_CARBON
-#define HAVE_FSSPEC 1
+#define HAVE_FSSPEC 1
#else
-#define HAVE_FSSPEC 0
+#define HAVE_FSSPEC 0
#endif
#endif
/* most FSRef functions were introduced since Mac OS 9 */
#ifndef HAVE_FSREF
#if TARGET_API_MAC_OSX
-#define HAVE_FSREF 1
+#define HAVE_FSREF 1
#else
-#define HAVE_FSREF 0
+#define HAVE_FSREF 0
#endif
#endif
#ifndef HFS_MAXPATHLEN
-#define HFS_MAXPATHLEN 1024
+#define HFS_MAXPATHLEN 1024
#endif
- /* QuickDraw is depricated since Mac OS X 10.4 */
+ /* QuickDraw is deprecated since Mac OS X 10.4 */
#ifndef HAVE_QUICKDRAW_CARBON
#if TARGET_API_MAC_OS8 || TARGET_API_MAC_CARBON
-#define HAVE_QUICKDRAW_CARBON 1
+#define HAVE_QUICKDRAW_CARBON 1
#else
-#define HAVE_QUICKDRAW_CARBON 0
+#define HAVE_QUICKDRAW_CARBON 0
#endif
#endif
/* AppleTypeService is available since Mac OS X */
#ifndef HAVE_ATS
#if TARGET_API_MAC_OSX
-#define HAVE_ATS 1
+#define HAVE_ATS 1
#else
-#define HAVE_ATS 0
+#define HAVE_ATS 0
#endif
#endif
@@ -126,11 +126,12 @@
TrueType in case *both* are available (this is not common,
but it *is* possible). */
#ifndef PREFER_LWFN
-#define PREFER_LWFN 1
+#define PREFER_LWFN 1
#endif
#if !HAVE_QUICKDRAW_CARBON /* QuickDraw is deprecated since Mac OS X 10.4 */
+
FT_EXPORT_DEF( FT_Error )
FT_GetFile_From_Mac_Name( const char* fontName,
FSSpec* pathSpec,
@@ -138,7 +139,9 @@
{
return FT_Err_Unimplemented_Feature;
}
+
#else
+
FT_EXPORT_DEF( FT_Error )
FT_GetFile_From_Mac_Name( const char* fontName,
FSSpec* pathSpec,
@@ -174,7 +177,8 @@
FMCreateFontFamilyInstanceIterator( family, &instIter );
*face_index = 0;
- stat2 = 0;
+ stat2 = 0;
+
while ( stat2 == 0 && !the_font )
{
FMFontStyle style;
@@ -221,10 +225,12 @@
else
return FT_Err_Unknown_File_Format;
}
-#endif
+
+#endif /* HAVE_QUICKDRAW_CARBON */
#if !HAVE_ATS
+
FT_EXPORT_DEF( FT_Error )
FT_GetFile_From_Mac_ATS_Name( const char* fontName,
FSSpec* pathSpec,
@@ -232,7 +238,9 @@
{
return FT_Err_Unimplemented_Feature;
}
+
#else
+
FT_EXPORT_DEF( FT_Error )
FT_GetFile_From_Mac_ATS_Name( const char* fontName,
FSSpec* pathSpec,
@@ -240,24 +248,28 @@
{
CFStringRef cf_fontName;
ATSFontRef ats_font_id;
-
+
+
*face_index = 0;
-
- cf_fontName = CFStringCreateWithCString( NULL, fontName, kCFStringEncodingMacRoman );
- ats_font_id = ATSFontFindFromName( cf_fontName, kATSOptionFlagsUnRestrictedScope );
-
- if ( ats_font_id == 0 || ats_font_id == 0xFFFFFFFF )
+
+ cf_fontName = CFStringCreateWithCString( NULL, fontName,
+ kCFStringEncodingMacRoman );
+ ats_font_id = ATSFontFindFromName( cf_fontName,
+ kATSOptionFlagsUnRestrictedScope );
+
+ if ( ats_font_id == 0 || ats_font_id == 0xFFFFFFFFUL )
return FT_Err_Unknown_File_Format;
-
- if ( 0 != ATSFontGetFileSpecification( ats_font_id, pathSpec ))
+
+ if ( 0 != ATSFontGetFileSpecification( ats_font_id, pathSpec ) )
return FT_Err_Unknown_File_Format;
-
- /* face_index calculation by searching preceding fontIDs with same FSRef */
+
+ /* face_index calculation by searching preceding fontIDs */
+ /* with same FSRef */
{
int i;
FSSpec f;
-
-
+
+
for ( i = 1; i < ats_font_id; i++ )
{
if ( 0 != ATSFontGetFileSpecification( ats_font_id - i,
@@ -274,7 +286,8 @@
}
return FT_Err_Ok;
}
-#endif
+
+#endif /* HAVE_ATS */
#if defined( __MWERKS__ ) && !TARGET_RT_MAC_MACHO
@@ -313,10 +326,11 @@
#if HAVE_FSSPEC && !HAVE_FSREF
+
static OSErr
- FT_FSPathMakeSpec( const UInt8* pathname,
- FSSpec* spec_p,
- Boolean isDirectory )
+ FT_FSPathMakeSpec( const UInt8* pathname,
+ FSSpec* spec_p,
+ Boolean isDirectory )
{
const char *p, *q;
short vRefNum;
@@ -330,10 +344,10 @@
vRefNum = 0;
while ( 1 )
- {
+ {
q = p + FT_MIN( 255, ft_strlen( p ) );
- if ( q == p )
+ if ( q == p )
return 0;
if ( 255 < ft_strlen( (char *)pathname ) )
@@ -388,7 +402,7 @@
FT_MEM_MOVE( path + node_namelen + 1, path, child_namelen );
FT_MEM_COPY( path, node_name, node_namelen );
if ( child_namelen > 0 )
- path[ node_namelen ] = ':';
+ path[node_namelen] = ':';
vRefNum = spec.vRefNum;
dirID = spec.parID;
@@ -399,21 +413,25 @@
}
return noErr;
}
-#endif
+
+#endif /* HAVE_FSSPEC && !HAVE_FSREF */
static OSErr
FT_FSPathMakeRes( const UInt8* pathname,
short* res )
{
+
#if HAVE_FSREF
+
OSErr err;
FSRef ref;
+
if ( noErr != FSPathMakeRef( pathname, &ref, FALSE ) )
return FT_Err_Cannot_Open_Resource;
- /* at present, so support for dfont format */
+ /* at present, no support for dfont format */
err = FSOpenResourceFile( &ref, 0, NULL, fsRdPerm, res );
if ( noErr == err )
return err;
@@ -421,18 +439,23 @@
/* fallback to original resource-fork font */
*res = FSOpenResFile( &ref, fsRdPerm );
err = ResError();
+
#else
- OSErr err;
+
+ OSErr err;
FSSpec spec;
+
if ( noErr != FT_FSPathMakeSpec( pathname, &spec, FALSE ) )
return FT_Err_Cannot_Open_Resource;
- /* at present, so support for dfont format without FSRef */
- /* (see above), try original resource-fork font */
+ /* at present, no support for dfont format without FSRef */
+ /* (see above), try original resource-fork font */
*res = FSpOpenResFile( &spec, fsRdPerm );
err = ResError();
-#endif
+
+#endif /* HAVE_FSREF */
+
return err;
}
@@ -441,7 +464,9 @@
static OSType
get_file_type_from_path( const UInt8* pathname )
{
+
#if HAVE_FSREF
+
FSRef ref;
FSCatalogInfo info;
@@ -453,8 +478,10 @@
NULL, NULL, NULL ) )
return ( OSType ) 0;
- return ((FInfo *) (info.finderInfo))->fdType;
+ return ((FInfo *)(info.finderInfo))->fdType;
+
#else
+
FSSpec spec;
FInfo finfo;
@@ -466,7 +493,9 @@
return ( OSType ) 0;
return finfo.fdType;
-#endif
+
+#endif /* HAVE_FSREF */
+
}
@@ -519,10 +548,10 @@
short i, face, face_all;
- fond = (FamRec*)fond_data;
- face_all = *( (short *)( fond_data + sizeof ( FamRec ) ) ) + 1;
- assoc = (AsscEntry*)( fond_data + sizeof ( FamRec ) + 2 );
- face = 0;
+ fond = (FamRec*)fond_data;
+ face_all = *( (short *)( fond_data + sizeof ( FamRec ) ) ) + 1;
+ assoc = (AsscEntry*)( fond_data + sizeof ( FamRec ) + 2 );
+ face = 0;
for ( i = 0; i < face_all; i++ )
{
@@ -596,10 +625,10 @@
string_count = *(unsigned short*)(p);
p += sizeof ( short );
- for ( i = 0 ; i < string_count && i < 64; i++ )
+ for ( i = 0; i < string_count && i < 64; i++ )
{
names[i] = p;
- p += names[i][0];
+ p += names[i][0];
p++;
}
@@ -647,16 +676,18 @@
static FT_Error
lookup_lwfn_by_fond( const UInt8* path_fond,
const StringPtr base_lwfn,
- UInt8* path_lwfn,
+ UInt8* path_lwfn,
int path_size )
{
+
#if HAVE_FSREF
+
FSRef ref, par_ref;
int dirname_len;
- /* pathname for FSRef can be various format: HFS, HFS+ and POSIX. */
- /* we should not extract parent directory by string manipulation */
+ /* Pathname for FSRef can be in various formats: HFS, HFS+, and POSIX. */
+ /* We should not extract parent directory by string manipulation. */
if ( noErr != FSPathMakeRef( path_fond, &ref, FALSE ) )
return FT_Err_Invalid_Argument;
@@ -679,9 +710,8 @@
dirname_len = ft_strlen( (char *)path_lwfn );
ft_strcat( (char *)path_lwfn, (char *)base_lwfn + 1 );
- path_lwfn[ dirname_len + base_lwfn[0] ] = '\0';
+ path_lwfn[dirname_len + base_lwfn[0]] = '\0';
-
if ( noErr != FSPathMakeRef( path_lwfn, &ref, FALSE ) )
return FT_Err_Cannot_Open_Resource;
@@ -690,7 +720,9 @@
return FT_Err_Cannot_Open_Resource;
return FT_Err_Ok;
+
#else
+
int i;
FSSpec spec;
@@ -703,7 +735,7 @@
i = ft_strlen( (char *)path_lwfn ) - 1;
while ( i > 0 && ':' != path_lwfn[i] )
- i-- ;
+ i--;
if ( i + 1 + base_lwfn[0] > path_size )
return FT_Err_Invalid_Argument;
@@ -711,20 +743,21 @@
if ( ':' == path_lwfn[i] )
{
ft_strcpy( (char *)path_lwfn + i + 1, (char *)base_lwfn + 1 );
- path_lwfn[ i + 1 + base_lwfn[0] ] = '\0';
+ path_lwfn[i + 1 + base_lwfn[0]] = '\0';
}
else
{
ft_strcpy( (char *)path_lwfn, (char *)base_lwfn + 1 );
- path_lwfn[ base_lwfn[0] ] = '\0';
+ path_lwfn[base_lwfn[0]] = '\0';
}
-
if ( noErr != FT_FSPathMakeSpec( path_lwfn, &spec, FALSE ) )
return FT_Err_Cannot_Open_Resource;
return FT_Err_Ok;
-#endif
+
+#endif /* HAVE_FSREF */
+
}
@@ -734,9 +767,9 @@
{
short sfnt_id;
short have_sfnt, have_lwfn;
- Str255 lwfn_file_name;
+ Str255 lwfn_file_name;
UInt8 buff[HFS_MAXPATHLEN];
- FT_Error err;
+ FT_Error err;
have_sfnt = have_lwfn = 0;
@@ -748,7 +781,7 @@
if ( lwfn_file_name[0] )
{
err = lookup_lwfn_by_fond( pathname, lwfn_file_name,
- buff, sizeof( buff ) );
+ buff, sizeof ( buff ) );
if ( FT_Err_Ok == err )
have_lwfn = 1;
}
@@ -761,9 +794,9 @@
/* Read Type 1 data from the POST resources inside the LWFN file,
- return a PFB buffer. This is somewhat convoluted because the FT2
+ return a PFB buffer. This is somewhat convoluted because the FT2
PFB parser wants the ASCII header as one chunk, and the LWFN
- chunks are often not organized that way, so we'll glue chunks
+ chunks are often not organized that way, so we glue chunks
of the same type together. */
static FT_Error
read_lwfn( FT_Memory memory,
@@ -791,7 +824,7 @@
{
post_data = Get1Resource( 'POST', res_id++ );
if ( post_data == NULL )
- break; /* we're done */
+ break; /* we are done */
code = (*post_data)[0];
@@ -821,7 +854,7 @@
{
post_data = Get1Resource( 'POST', res_id++ );
if ( post_data == NULL )
- break; /* we're done */
+ break; /* we are done */
post_size = (FT_ULong)GetHandleSize( post_data ) - 2;
code = (*post_data)[0];
@@ -830,7 +863,7 @@
{
if ( last_code != -1 )
{
- /* we're done adding a chunk, fill in the size field */
+ /* we are done adding a chunk, fill in the size field */
if ( size_p != NULL )
{
*size_p++ = (FT_Byte)( pfb_chunk_size & 0xFF );
@@ -948,11 +981,11 @@
return error;
}
- args.flags = FT_OPEN_STREAM;
+ args.flags = FT_OPEN_STREAM;
args.stream = stream;
if ( driver_name )
{
- args.flags = args.flags | FT_OPEN_DRIVER;
+ args.flags = args.flags | FT_OPEN_DRIVER;
args.driver = FT_Get_Module( library, driver_name );
}
@@ -974,9 +1007,9 @@
/* Create a new FT_Face from a file spec to an LWFN file. */
static FT_Error
- FT_New_Face_From_LWFN( FT_Library library,
+ FT_New_Face_From_LWFN( FT_Library library,
const UInt8* pathname,
- FT_Long face_index,
+ FT_Long face_index,
FT_Face* aface )
{
FT_Byte* pfb_data;
@@ -1014,7 +1047,7 @@
Handle sfnt = NULL;
FT_Byte* sfnt_data;
size_t sfnt_size;
- FT_Error error = 0;
+ FT_Error error = FT_Err_Ok;
FT_Memory memory = library->memory;
int is_cff;
@@ -1051,9 +1084,9 @@
/* Create a new FT_Face from a file spec to a suitcase file. */
static FT_Error
- FT_New_Face_From_Suitcase( FT_Library library,
+ FT_New_Face_From_Suitcase( FT_Library library,
const UInt8* pathname,
- FT_Long face_index,
+ FT_Long face_index,
FT_Face* aface )
{
FT_Error error = FT_Err_Cannot_Open_Resource;
@@ -1081,7 +1114,7 @@
if ( 0 <= face_index && face_index < num_faces_in_fond && error )
error = FT_New_Face_From_FOND( library, fond, face_index, aface );
-
+
face_index -= num_faces_in_fond;
}
@@ -1100,10 +1133,10 @@
FT_Long face_index,
FT_Face* aface )
{
- short sfnt_id, have_sfnt, have_lwfn = 0;
- short fond_id;
- OSType fond_type;
- Str255 fond_name;
+ short sfnt_id, have_sfnt, have_lwfn = 0;
+ short fond_id;
+ OSType fond_type;
+ Str255 fond_name;
Str255 lwfn_file_name;
UInt8 path_lwfn[HFS_MAXPATHLEN];
OSErr err;
@@ -1128,34 +1161,39 @@
goto found_no_lwfn_file;
#if HAVE_FSREF
- {
+
+ {
UInt8 path_fond[HFS_MAXPATHLEN];
FSRef ref;
+
err = FSGetForkCBInfo( res, kFSInvalidVolumeRefNum,
NULL, NULL, NULL, &ref, NULL );
if ( noErr != err )
goto found_no_lwfn_file;
- err = FSRefMakePath( &ref, path_fond, sizeof( path_fond ) );
+ err = FSRefMakePath( &ref, path_fond, sizeof ( path_fond ) );
if ( noErr != err )
goto found_no_lwfn_file;
error = lookup_lwfn_by_fond( path_fond, lwfn_file_name,
- path_lwfn, sizeof( path_lwfn ) );
+ path_lwfn, sizeof ( path_lwfn ) );
if ( FT_Err_Ok == error )
have_lwfn = 1;
}
+
#elif HAVE_FSSPEC
- {
+
+ {
UInt8 path_fond[HFS_MAXPATHLEN];
FCBPBRec pb;
Str255 fond_file_name;
FSSpec spec;
- FT_MEM_SET( &spec, 0, sizeof( FSSpec ) );
- FT_MEM_SET( &pb, 0, sizeof( FCBPBRec ) );
+ FT_MEM_SET( &spec, 0, sizeof ( FSSpec ) );
+ FT_MEM_SET( &pb, 0, sizeof ( FCBPBRec ) );
+
pb.ioNamePtr = fond_file_name;
pb.ioVRefNum = 0;
pb.ioRefNum = res;
@@ -1165,21 +1203,24 @@
if ( noErr != err )
goto found_no_lwfn_file;
- err = FSMakeFSSpec( pb.ioFCBVRefNum, pb.ioFCBParID, fond_file_name, &spec );
+ err = FSMakeFSSpec( pb.ioFCBVRefNum, pb.ioFCBParID,
+ fond_file_name, &spec );
if ( noErr != err )
goto found_no_lwfn_file;
- err = FT_FSpMakePath( &spec, path_fond, sizeof( path_fond ) );
+ err = FT_FSpMakePath( &spec, path_fond, sizeof ( path_fond ) );
if ( noErr != err )
goto found_no_lwfn_file;
error = lookup_lwfn_by_fond( path_fond, lwfn_file_name,
- path_lwfn, sizeof( path_lwfn ) );
+ path_lwfn, sizeof ( path_lwfn ) );
if ( FT_Err_Ok == error )
have_lwfn = 1;
- }
-#endif
- }
+ }
+
+#endif /* HAVE_FSREF, HAVE_FSSPEC */
+
+ }
if ( have_lwfn && ( !have_sfnt || PREFER_LWFN ) )
return FT_New_Face_From_LWFN( library,
@@ -1187,40 +1228,40 @@
face_index,
aface );
-found_no_lwfn_file:
+ found_no_lwfn_file:
if ( have_sfnt )
return FT_New_Face_From_SFNT( library,
sfnt_id,
face_index,
aface );
- return FT_Err_Unknown_File_Format;
+ return FT_Err_Unknown_File_Format;
}
/* Common function to load a new FT_Face from a resource file. */
static FT_Error
- FT_New_Face_From_Resource( FT_Library library,
+ FT_New_Face_From_Resource( FT_Library library,
const UInt8* pathname,
- FT_Long face_index,
+ FT_Long face_index,
FT_Face* aface )
{
OSType file_type;
FT_Error error;
- /* LWFN is a (very) specific file format, check for it explicitly */
+ /* LWFN is a (very) specific file format, check for it explicitly */
file_type = get_file_type_from_path( pathname );
- if ( file_type == 'LWFN' )
+ if ( file_type == 'LWFN' )
return FT_New_Face_From_LWFN( library, pathname, face_index, aface );
-
- /* Otherwise the file type doesn't matter (there are more than */
- /* `FFIL' and `tfil'). Just try opening it as a font suitcase; */
- /* if it works, fine. */
+
+ /* Otherwise the file type doesn't matter (there are more than */
+ /* `FFIL' and `tfil'). Just try opening it as a font suitcase; */
+ /* if it works, fine. */
error = FT_New_Face_From_Suitcase( library, pathname, face_index, aface );
- if ( error == 0 )
- return error;
+ if ( error == 0 )
+ return error;
/* let it fall through to normal loader (.ttf, .otf, etc.); */
/* we signal this by returning no error and no FT_Face */
@@ -1254,11 +1295,12 @@ found_no_lwfn_file:
if ( !pathname )
return FT_Err_Invalid_Argument;
- error = 0;
+ error = FT_Err_Ok;
*aface = NULL;
/* try resourcefork based font: LWFN, FFIL */
- error = FT_New_Face_From_Resource( library, (UInt8 *)pathname, face_index, aface );
+ error = FT_New_Face_From_Resource( library, (UInt8 *)pathname,
+ face_index, aface );
if ( error != 0 || *aface != NULL )
return error;
@@ -1281,12 +1323,16 @@ found_no_lwfn_file:
FT_EXPORT_DEF( FT_Error )
FT_New_Face_From_FSRef( FT_Library library,
const FSRef* ref,
- FT_Long face_index,
+ FT_Long face_index,
FT_Face* aface )
{
+
#if !HAVE_FSREF
+
return FT_Err_Unimplemented_Feature;
+
#else
+
FT_Error error;
FT_Open_Args args;
OSErr err;
@@ -1308,7 +1354,9 @@ found_no_lwfn_file:
args.flags = FT_OPEN_PATHNAME;
args.pathname = (char*)pathname;
return FT_Open_Face( library, &args, face_index, aface );
-#endif
+
+#endif /* HAVE_FSREF */
+
}
@@ -1326,41 +1374,48 @@ found_no_lwfn_file:
const FSSpec* spec,
FT_Long face_index,
FT_Face* aface )
- {
+ {
+
#if HAVE_FSREF
- FSRef ref;
+
+ FSRef ref;
if ( !spec || FSpMakeFSRef( spec, &ref ) != noErr )
return FT_Err_Invalid_Argument;
else
return FT_New_Face_From_FSRef( library, &ref, face_index, aface );
+
#elif HAVE_FSSPEC
+
FT_Error error;
FT_Open_Args args;
- OSErr err;
- UInt8 pathname[HFS_MAXPATHLEN];
+ OSErr err;
+ UInt8 pathname[HFS_MAXPATHLEN];
if ( !spec )
return FT_Err_Invalid_Argument;
err = FT_FSpMakePath( spec, pathname, sizeof ( pathname ) );
- if ( err )
- error = FT_Err_Cannot_Open_Resource;
+ if ( err )
+ error = FT_Err_Cannot_Open_Resource;
error = FT_New_Face_From_Resource( library, pathname, face_index, aface );
if ( error != 0 || *aface != NULL )
- return error;
-
+ return error;
/* fallback to datafork font */
args.flags = FT_OPEN_PATHNAME;
args.pathname = (char*)pathname;
return FT_Open_Face( library, &args, face_index, aface );
+
#else
+
return FT_Err_Unimplemented_Feature;
-#endif
+
+#endif /* HAVE_FSREF, HAVE_FSSPEC */
+
}