Commit 5aa646c565b963d44e295162dbe27c039fdd2e1b
2000-07-14T06:16:47
Formatting. Fixing a bug in FT_Get_Kerning(). Moving FT_Get_Module_Interface() to ftoutln.c.
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
diff --git a/include/freetype/ftbbox.h b/include/freetype/ftbbox.h
index 2695cdd..e144664 100644
--- a/include/freetype/ftbbox.h
+++ b/include/freetype/ftbbox.h
@@ -7,8 +7,8 @@
/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
-/* This file is part of the FreeType project, and may only be used */
-/* modified and distributed under the terms of the FreeType project */
+/* 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. */
diff --git a/include/freetype/fterrors.h b/include/freetype/fterrors.h
index 0ae4b62..9fb8099 100644
--- a/include/freetype/fterrors.h
+++ b/include/freetype/fterrors.h
@@ -2,7 +2,7 @@
/* */
/* fterrors.h */
/* */
-/* FreeType error codes (specification). */
+/* FreeType error codes (specification). */
/* */
/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
diff --git a/include/freetype/ftglyph.h b/include/freetype/ftglyph.h
index 8b374a8..0647c88 100644
--- a/include/freetype/ftglyph.h
+++ b/include/freetype/ftglyph.h
@@ -2,7 +2,7 @@
/* */
/* ftglyph.h */
/* */
-/* FreeType convenience functions to handle glyphs.. */
+/* FreeType convenience functions to handle glyphs (specification). */
/* */
/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
diff --git a/include/freetype/ftimage.h b/include/freetype/ftimage.h
index e61443c..71d6ca8 100644
--- a/include/freetype/ftimage.h
+++ b/include/freetype/ftimage.h
@@ -2,10 +2,11 @@
/* */
/* ftimage.h */
/* */
-/* FreeType glyph image formats and default raster interface. */
+/* FreeType glyph image formats and default raster interface */
+/* (specification). */
/* */
/* Copyright 1996-2000 by */
-/* David Turner, Robert Wilhelm, and Werner Lemberg */
+/* 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 */
diff --git a/include/freetype/ftmm.h b/include/freetype/ftmm.h
index 0dd1f5a..db5db04 100644
--- a/include/freetype/ftmm.h
+++ b/include/freetype/ftmm.h
@@ -2,7 +2,7 @@
/* */
/* ftmm.h */
/* */
-/* FreeType Multiple Master font interface. */
+/* FreeType Multiple Master font interface (specification). */
/* */
/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
@@ -47,7 +47,7 @@
FT_String* name;
FT_Long minimum;
FT_Long maximum;
-
+
} FT_MM_Axis;
@@ -75,13 +75,13 @@
FT_UInt num_axis;
FT_UInt num_designs;
FT_MM_Axis axis[T1_MAX_MM_AXIS];
-
+
} FT_Multi_Master;
typedef FT_Error (*FT_Get_MM_Func)( FT_Face face,
FT_Multi_Master* master );
-
+
typedef FT_Error (*FT_Set_MM_Design_Func)( FT_Face face,
FT_UInt num_coords,
FT_Long* coords );
diff --git a/include/freetype/ftmodule.h b/include/freetype/ftmodule.h
index 258bbf5..3c09aa2 100644
--- a/include/freetype/ftmodule.h
+++ b/include/freetype/ftmodule.h
@@ -2,7 +2,7 @@
/* */
/* ftmodule.h */
/* */
-/* FreeType modules public interface. */
+/* FreeType modules public interface (specification). */
/* */
/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
@@ -99,7 +99,7 @@
FT_Module_Constructor module_init;
FT_Module_Destructor module_done;
FT_Module_Requester get_interface;
-
+
} FT_Module_Class;
@@ -154,32 +154,6 @@
/*************************************************************************/
/* */
/* <Function> */
- /* FT_Get_Module_Interface */
- /* */
- /* <Description> */
- /* Finds a module and returns its specific interface as a typeless */
- /* pointer. */
- /* */
- /* <Input> */
- /* library :: A handle to the library object. */
- /* */
- /* module_name :: The module's name (as an ASCII string). */
- /* */
- /* <Return> */
- /* A module-specific interface if available, 0 otherwise. */
- /* */
- /* <Note> */
- /* You should better be familiar with FreeType internals to know */
- /* which module to look for, and what its interface is :-) */
- /* */
- FT_EXPORT_DEF( const void* ) FT_Get_Module_Interface(
- FT_Library library,
- const char* mod_name );
-
-
- /*************************************************************************/
- /* */
- /* <Function> */
/* FT_Remove_Module */
/* */
/* <Description> */
@@ -244,7 +218,7 @@
typedef void (*FT_DebugHook_Func)( void* arg );
-
+
/*************************************************************************/
/* */
/* <Function> */
diff --git a/include/freetype/ftoutln.h b/include/freetype/ftoutln.h
index 523064e..1e448bd 100644
--- a/include/freetype/ftoutln.h
+++ b/include/freetype/ftoutln.h
@@ -2,8 +2,8 @@
/* */
/* ftoutln.h */
/* */
-/* Support for the FT_Outline type (used to store glyph shapes of */
-/* most scalable font formats) */
+/* Support for the FT_Outline type used to store glyph shapes of */
+/* most scalable font formats (specification). */
/* */
/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
diff --git a/include/freetype/ftrender.h b/include/freetype/ftrender.h
index a4b4777..fe5acd2 100644
--- a/include/freetype/ftrender.h
+++ b/include/freetype/ftrender.h
@@ -2,7 +2,7 @@
/* */
/* ftrender.h */
/* */
-/* FreeType renderer modules public interface */
+/* FreeType renderer modules public interface (specification). */
/* */
/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
diff --git a/include/freetype/ftsystem.h b/include/freetype/ftsystem.h
index f88c41e..bc74bce 100644
--- a/include/freetype/ftsystem.h
+++ b/include/freetype/ftsystem.h
@@ -2,7 +2,7 @@
/* */
/* ftsystem.h */
/* */
-/* FreeType low-level system interface definition */
+/* FreeType low-level system interface definition (specification). */
/* */
/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
diff --git a/include/freetype/fttypes.h b/include/freetype/fttypes.h
index 8889bb5..ec90906 100644
--- a/include/freetype/fttypes.h
+++ b/include/freetype/fttypes.h
@@ -2,7 +2,7 @@
/* */
/* fttypes.h */
/* */
-/* FreeType simple types definitions */
+/* FreeType simple types definitions (specification only). */
/* */
/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
diff --git a/include/freetype/internal/autohint.h b/include/freetype/internal/autohint.h
index b3409f5..5d35a5d 100644
--- a/include/freetype/internal/autohint.h
+++ b/include/freetype/internal/autohint.h
@@ -2,7 +2,7 @@
/* */
/* autohint.h */
/* */
-/* High-level `autohint" module-specific interface (specification) */
+/* High-level `autohint' module-specific interface (specification). */
/* */
/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
@@ -13,159 +13,172 @@
/* this file you indicate that you have read the license and */
/* understand and accept it fully. */
/* */
-/* */
-/* The auto-hinter is used to load and automatically hint glyphs */
-/* when a format-specific hinter isn't available.. */
-/* */
/***************************************************************************/
+
+ /*************************************************************************/
+ /* */
+ /* The auto-hinter is used to load and automatically hint glyphs if a */
+ /* format-specific hinter isn't available. */
+ /* */
+ /*************************************************************************/
+
+
#ifndef AUTOHINT_H
#define AUTOHINT_H
- /***************************************************************************
- *
- * A small technical note regarding automatic hinting in order to clarify
- * this module interface.
- *
- * An automatic hinter might compute two kinds of data for a given face:
- *
- * - global hints: usually some metrics that describe global properties
- * of the face. It is computed by scanning more or less
- * agressively the glyphs in the face, and thus can be
- * very slow to compute (even if the size of global hints
- * is really small)
- *
- * - glyph hints: these describe some important features of the glyph
- * outline, as well as how to align them. They are generally
- * much faster to compute than global hints.
- *
- * The current FreeType auto-hinter does a pretty good job while performing
- * fast computations for both global and glyph hints. However, we might be
- * interested in introducing more complex and powerful algorithms in the
- * future, like the one described in the John D. Hobby paper, which
- * unfortunately require a lot more horsepower.
- *
- * Because a sufficiently sophisticated font management system would
- * typically implement a LRU cache of opened face objects to reduce memory
- * usage, it is a good idea to be able to avoid recomputing global hints
- * every time the same face is re-opened.
- *
- * We thus provide the ability to cache global hints outside of the face
- * object, in order to speed up font re-opening time. Of course, this
- * feature is purely optional, so most client programs won't even notice
- * it :o)
- *
- * I initially though that it'd be a good idea to cache the glyph hints too,
- * however, if my general idea now is that if you really need to cache these
- * too, you're simply in need of a new font format, where all this information
- * could be stored within the font file and decoded on the fly :-)
- *
- */
+
+ /*************************************************************************/
+ /* */
+ /* A small technical note regarding automatic hinting in order to */
+ /* clarify this module interface. */
+ /* */
+ /* An automatic hinter might compute two kinds of data for a given face: */
+ /* */
+ /* - global hints: Usually some metrics that describe global properties */
+ /* of the face. It is computed by scanning more or less */
+ /* agressively the glyphs in the face, and thus can be */
+ /* very slow to compute (even if the size of global */
+ /* hints is really small). */
+ /* */
+ /* - glyph hints: These describe some important features of the glyph */
+ /* outline, as well as how to align them. They are */
+ /* generally much faster to compute than global hints. */
+ /* */
+ /* The current FreeType auto-hinter does a pretty good job while */
+ /* performing fast computations for both global and glyph hints. */
+ /* However, we might be interested in introducing more complex and */
+ /* powerful algorithms in the future, like the one described in the John */
+ /* D. Hobby paper, which unfortunately requires a lot more horsepower. */
+ /* */
+ /* Because a sufficiently sophisticated font management system would */
+ /* typically implement an LRU cache of opened face objects to reduce */
+ /* memory usage, it is a good idea to be able to avoid recomputing */
+ /* global hints every time the same face is re-opened. */
+ /* */
+ /* We thus provide the ability to cache global hints outside of the face */
+ /* object, in order to speed up font re-opening time. Of course, this */
+ /* feature is purely optional, so most client programs won't even notice */
+ /* it. */
+ /* */
+ /* I initially thought that it would be a good idea to cache the glyph */
+ /* hints too. However, my general idea now is that if you really need */
+ /* to cache these too, you are simply in need of a new font format, */
+ /* where all this information could be stored within the font file and */
+ /* decoded on the fly. */
+ /* */
+ /*************************************************************************/
+
#include <freetype/freetype.h>
+
typedef struct FT_AutoHinterRec_ *FT_AutoHinter;
- /***********************************************************************
- *
- * <FuncType>
- * FT_AutoHinter_Get_Global_Func
- *
- * <Description>
- * Retrieve the global hints computed for a given face object
- * the resulting data is dissociated from the face and will survive
- * a call to FT_Done_Face. It must be discarded through the API
- * FT_AutoHinter_Done_Global_Func.
- *
- * <Input>
- * hinter :: handle to source auto-hinter
- * face :: handle to source face object
- *
- * <Output>
- * global_hints :: typeless pointer to the global hints
- * global_len :: size in bytes of global hints
- *
- */
- typedef void (*FT_AutoHinter_Get_Global_Func)( FT_AutoHinter hinter,
- FT_Face face,
- void* *global_hints,
- long *global_len );
-
- /***********************************************************************
- *
- * <FuncType>
- * FT_AutoHinter_Done_Global_Func
- *
- * <Description>
- * Discards the global hints retrieved through
- * FT_AutoHinter_Get_Global_Func. This is the only way these hints
- * are freed from memory.
- *
- * <Input>
- * hinter :: handle to auto-hinter module
- * global :: pointer to retrieved global hints to discard
- */
- typedef void (*FT_AutoHinter_Done_Global_Func)( FT_AutoHinter hinter,
- void* global );
-
- /***********************************************************************
- *
- * <FuncType>
- * FT_AutoHinter_Reset_Func
- *
- * <Description>
- * This function is used to recompute the global metrics in a given
- * font. This is useful when global font data changes (e.g. multiple
- * masters fonts where blend coordinates change..)
- *
- * <Input>
- * hinter :: handle to source auto-hinter
- * face :: handle to the face.
- *
- *
- */
- typedef void (*FT_AutoHinter_Reset_Func)( FT_AutoHinter hinter,
- FT_Face face );
-
- /***********************************************************************
- *
- * <FuncType>
- * FT_AutoHinter_Load_Func
- *
- * <Description>
- * This function is used to load, scale and automatically hint a glyph
- * from a given face.
- *
- * <Input>
- * face :: handle to the face.
- * glyph_index :: glyph index
- * load_flags :: load flags
- *
- * <Note>
- * This function is capable of loading composite glyphs by hinting
- * each sub-glyph independently (which improves quality).
- *
- * It will call the font driver with FT_Load_Glyph, with FT_LOAD_NO_SCALE
- * set..
- *
- */
- typedef FT_Error (*FT_AutoHinter_Load_Func)(
- FT_AutoHinter hinter,
- FT_GlyphSlot slot,
- FT_Size size,
- FT_UInt glyph_index,
- FT_ULong load_flags );
-
- /***********************************************************************
- *
- * <Struct>
- * FT_AutoHinter_Interface
- *
- * <Description>
- * The auto-hinter module's interface.
- *
- */
- typedef struct FT_AutoHinter_Interface
+
+ /*************************************************************************/
+ /* */
+ /* <FuncType> */
+ /* FT_AutoHinter_Get_Global_Func */
+ /* */
+ /* <Description> */
+ /* Retrieves the global hints computed for a given face object the */
+ /* resulting data is dissociated from the face and will survive a */
+ /* call to FT_Done_Face(). It must be discarded through the API */
+ /* FT_AutoHinter_Done_Global_Func(). */
+ /* */
+ /* <Input> */
+ /* hinter :: A handle to the source auto-hinter. */
+ /* */
+ /* face :: A handle to the source face object. */
+ /* */
+ /* <Output> */
+ /* global_hints :: A typeless pointer to the global hints. */
+ /* */
+ /* global_len :: The size in bytes of the global hints. */
+ /* */
+ typedef void (*FT_AutoHinter_Get_Global_Func)(
+ FT_AutoHinter hinter,
+ FT_Face face,
+ void** global_hints,
+ long* global_len );
+
+
+ /*************************************************************************/
+ /* */
+ /* <FuncType> */
+ /* FT_AutoHinter_Done_Global_Func */
+ /* */
+ /* <Description> */
+ /* Discards the global hints retrieved through */
+ /* FT_AutoHinter_Get_Global_Func(). This is the only way these hints */
+ /* are freed from memory. */
+ /* */
+ /* <Input> */
+ /* hinter :: A handle to the auto-hinter module. */
+ /* */
+ /* global :: A pointer to retrieved global hints to discard. */
+ /* */
+ typedef void (*FT_AutoHinter_Done_Global_Func)( FT_AutoHinter hinter,
+ void* global );
+
+
+ /*************************************************************************/
+ /* */
+ /* <FuncType> */
+ /* FT_AutoHinter_Reset_Func */
+ /* */
+ /* <Description> */
+ /* This function is used to recompute the global metrics in a given */
+ /* font. This is useful when global font data changes (e.g. Multiple */
+ /* Masters fonts where blend coordinates change). */
+ /* */
+ /* <Input> */
+ /* hinter :: A handle to the source auto-hinter. */
+ /* */
+ /* face :: A handle to the face. */
+ /* */
+ typedef void (*FT_AutoHinter_Reset_Func)( FT_AutoHinter hinter,
+ FT_Face face );
+
+
+ /*************************************************************************/
+ /* */
+ /* <FuncType> */
+ /* FT_AutoHinter_Load_Func */
+ /* */
+ /* <Description> */
+ /* This function is used to load, scale, and automatically hint a */
+ /* glyph from a given face. */
+ /* */
+ /* <Input> */
+ /* face :: A handle to the face. */
+ /* glyph_index :: The glyph index. */
+ /* load_flags :: The load flags. */
+ /* */
+ /* <Note> */
+ /* This function is capable of loading composite glyphs by hinting */
+ /* each sub-glyph independently (which improves quality). */
+ /* */
+ /* It will call the font driver with FT_Load_Glyph(), with */
+ /* FT_LOAD_NO_SCALE set. */
+ /* */
+ typedef FT_Error (*FT_AutoHinter_Load_Func)( FT_AutoHinter hinter,
+ FT_GlyphSlot slot,
+ FT_Size size,
+ FT_UInt glyph_index,
+ FT_ULong load_flags );
+
+
+ /*************************************************************************/
+ /* */
+ /* <Struct> */
+ /* FT_AutoHinter_Interface */
+ /* */
+ /* <Description> */
+ /* The auto-hinter module's interface. */
+ /* */
+ typedef struct FT_AutoHinter_Interface
{
FT_AutoHinter_Reset_Func reset_face;
FT_AutoHinter_Load_Func load_glyph;
@@ -175,5 +188,8 @@
} FT_AutoHinter_Interface;
+
#endif /* AUTOHINT_H */
+
+/* END */
diff --git a/include/freetype/internal/ftobjs.h b/include/freetype/internal/ftobjs.h
index 3d17177..74f0810 100644
--- a/include/freetype/internal/ftobjs.h
+++ b/include/freetype/internal/ftobjs.h
@@ -5,10 +5,10 @@
/* The FreeType private base classes (specification). */
/* */
/* Copyright 1996-2000 by */
-/* David Turner, Robert Wilhelm, and Werner Lemberg */
+/* 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 */
+/* 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. */
@@ -142,6 +142,32 @@
#define FT_DRIVER_HAS_HINTER(x) (FT_MODULE_CLASS(x)->module_flags & \
ft_module_driver_has_hinter )
+
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* FT_Get_Module_Interface */
+ /* */
+ /* <Description> */
+ /* Finds a module and returns its specific interface as a typeless */
+ /* pointer. */
+ /* */
+ /* <Input> */
+ /* library :: A handle to the library object. */
+ /* */
+ /* module_name :: The module's name (as an ASCII string). */
+ /* */
+ /* <Return> */
+ /* A module-specific interface if available, 0 otherwise. */
+ /* */
+ /* <Note> */
+ /* You should better be familiar with FreeType internals to know */
+ /* which module to look for, and what its interface is :-) */
+ /* */
+ BASE_DEF( const void* ) FT_Get_Module_Interface( FT_Library library,
+ const char* mod_name );
+
+
/*************************************************************************/
/*************************************************************************/
/*************************************************************************/
diff --git a/include/freetype/t1tables.h b/include/freetype/t1tables.h
index e25c5d1..323e013 100644
--- a/include/freetype/t1tables.h
+++ b/include/freetype/t1tables.h
@@ -2,7 +2,8 @@
/* */
/* t1tables.h */
/* */
-/* Basic Type 1/Type 2 tables definitions and interface */
+/* Basic Type 1/Type 2 tables definitions and interface (specification */
+/* only). */
/* */
/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
@@ -139,7 +140,7 @@
/* maximum number of Multiple Masters designs, as defined in the spec */
#define T1_MAX_MM_DESIGNS 16
-
+
/* maximum number of Multiple Masters axes, as defined in the spec */
#define T1_MAX_MM_AXIS 4
@@ -153,7 +154,7 @@
FT_Byte num_points;
FT_Fixed* design_points;
FT_Fixed* blend_points;
-
+
} T1_DesignMap;
@@ -161,19 +162,19 @@
{
FT_UInt num_designs;
FT_UInt num_axis;
-
+
FT_String* axis_names[T1_MAX_MM_AXIS];
FT_Fixed* design_pos[T1_MAX_MM_DESIGNS];
T1_DesignMap design_map[T1_MAX_MM_AXIS];
-
+
FT_Fixed* weight_vector;
FT_Fixed* default_weight_vector;
-
+
T1_FontInfo* font_infos[T1_MAX_MM_DESIGNS + 1];
T1_Private* privates [T1_MAX_MM_DESIGNS + 1];
-
+
FT_ULong blend_bitflags;
-
+
} T1_Blend;
@@ -185,7 +186,7 @@
FT_Fixed forcebold_threshold;
FT_Pos stroke_width;
FT_Fixed expansion_factor;
-
+
FT_Byte paint_type;
FT_Byte font_type;
FT_Matrix font_matrix;
diff --git a/include/freetype/ttnameid.h b/include/freetype/ttnameid.h
index 681f1b1..4890242 100644
--- a/include/freetype/ttnameid.h
+++ b/include/freetype/ttnameid.h
@@ -2,7 +2,7 @@
/* */
/* ttmakeid.h */
/* */
-/* TrueType name ID definitions */
+/* TrueType name ID definitions (specification only). */
/* */
/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
diff --git a/include/freetype/tttables.h b/include/freetype/tttables.h
index cbdd9c7..27c46f3 100644
--- a/include/freetype/tttables.h
+++ b/include/freetype/tttables.h
@@ -3,6 +3,7 @@
/* tttables.h */
/* */
/* Basic SFNT/TrueType tables definitions and interface */
+/* (specification only). */
/* */
/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
@@ -428,7 +429,7 @@
FT_Char WidthType;
FT_Byte SerifStyle;
FT_Byte Reserved;
-
+
} TT_PCLT;
diff --git a/include/freetype/tttags.h b/include/freetype/tttags.h
index 7d9af15..9de9810 100644
--- a/include/freetype/tttags.h
+++ b/include/freetype/tttags.h
@@ -9,7 +9,7 @@
/* */
/* 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 */
+/* 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. */
/* */
diff --git a/src/base/ftbase.c b/src/base/ftbase.c
index 99a38e2..f9d9bbf 100644
--- a/src/base/ftbase.c
+++ b/src/base/ftbase.c
@@ -2,7 +2,7 @@
/* */
/* ftbase.c */
/* */
-/* Single object library component. */
+/* Single object library component (body only). */
/* */
/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
diff --git a/src/base/ftextend.c b/src/base/ftextend.c
index 782bb3e..f298b19 100644
--- a/src/base/ftextend.c
+++ b/src/base/ftextend.c
@@ -2,7 +2,7 @@
/* */
/* ftextend.h */
/* */
-/* FreeType extensions implementation (body). */
+/* FreeType extensions implementation (body). */
/* */
/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
diff --git a/src/base/ftinit.c b/src/base/ftinit.c
index a42be8a..c5d81db 100644
--- a/src/base/ftinit.c
+++ b/src/base/ftinit.c
@@ -2,7 +2,7 @@
/* */
/* ftinit.c */
/* */
-/* FreeType initialisation layer (body). */
+/* FreeType initialization layer (body). */
/* */
/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index b2be577..bbfb362 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -2,7 +2,7 @@
/* */
/* ftobjs.c */
/* */
-/* The FreeType private base classes (base). */
+/* The FreeType private base classes (body). */
/* */
/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
@@ -2088,32 +2088,30 @@
driver = face->driver;
memory = driver->root.memory;
+ kerning->x = 0;
+ kerning->y = 0;
+
if ( driver->clazz->get_kerning )
{
error = driver->clazz->get_kerning( face,
left_glyph,
right_glyph,
kerning );
- }
- if ( !error )
- {
- if ( kern_mode != ft_kerning_unscaled )
+ if ( !error )
{
- kerning->x = FT_MulFix( kerning->x, face->size->metrics.x_scale );
- kerning->y = FT_MulFix( kerning->y, face->size->metrics.y_scale );
-
- if ( kern_mode != ft_kerning_unfitted )
+ if ( kern_mode != ft_kerning_unscaled )
{
- kerning->x = ( kerning->x + 32 ) & -64;
- kerning->y = ( kerning->y + 32 ) & -64;
+ kerning->x = FT_MulFix( kerning->x, face->size->metrics.x_scale );
+ kerning->y = FT_MulFix( kerning->y, face->size->metrics.y_scale );
+
+ if ( kern_mode != ft_kerning_unfitted )
+ {
+ kerning->x = ( kerning->x + 32 ) & -64;
+ kerning->y = ( kerning->y + 32 ) & -64;
+ }
}
}
}
- else
- {
- kerning->x = 0;
- kerning->y = 0;
- }
return error;
}
@@ -2922,9 +2920,8 @@
/* You should better be familiar with FreeType internals to know */
/* which module to look for, and what its interface is :-) */
/* */
- FT_EXPORT_FUNC( const void* ) FT_Get_Module_Interface(
- FT_Library library,
- const char* mod_name )
+ BASE_FUNC( const void* ) FT_Get_Module_Interface( FT_Library library,
+ const char* mod_name )
{
FT_Module module;
diff --git a/src/cff/t2gload.c b/src/cff/t2gload.c
index 1a77935..1023e3c 100644
--- a/src/cff/t2gload.c
+++ b/src/cff/t2gload.c
@@ -1264,7 +1264,7 @@
args = stack;
- /* adding six more points; 4 control points, 2 on-curve point */
+ /* adding six more points; 4 control points, 2 on-curve points */
if ( start_point( builder, x, y ) ||
check_points ( builder, 6 ) )
goto Memory_Error;
@@ -1316,7 +1316,7 @@
FT_TRACE4(( " flex1" ));
- /* adding five more points; 4 control points, 1 on-curve point */
+ /* adding six more points; 4 control points, 2 on-curve points */
if ( start_point( builder, x, y ) ||
check_points( builder, 6 ) )
goto Memory_Error;
@@ -1355,7 +1355,7 @@
args += 2;
}
- /* is last operand a x or y delta ? */
+ /* is last operand an x- or y-delta? */
if ( horizontal )
{
x += args[0];
@@ -1389,7 +1389,8 @@
{
x += args[0];
y += args[1];
- add_point( builder, x, y, (FT_Bool)( count == 3 || count == 0) );
+ add_point( builder, x, y,
+ (FT_Bool)( count == 3 || count == 0 ) );
args += 2;
}