Commit 93ac3e398587c1a1e728e960588bce4378833835
2000-07-10T21:41:32
Formatting. Synchronizing docs.
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
diff --git a/include/freetype/ftmm.h b/include/freetype/ftmm.h
index ae3d352..0dd1f5a 100644
--- a/include/freetype/ftmm.h
+++ b/include/freetype/ftmm.h
@@ -2,20 +2,20 @@
/* */
/* ftmm.h */
/* */
-/* FreeType Multiple-Master interface. */
-/* */
+/* FreeType Multiple Master font interface. */
/* */
/* 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. */
/* */
/***************************************************************************/
+
#ifndef FTMM_H
#define FTMM_H
@@ -25,22 +25,24 @@
extern "C" {
#endif
- /**********************************************************************
- *
- * <Struct>
- * FT_MM_Axis
- *
- * <Description>
- * A simple structure used to model a given axis in design space
- * for multiple masters fonts..
- *
- * <Fields>
- * name :: axis' name
- * minimum :: axis' minimum design coordinate
- * maximum :: axis's maximum design coordinate
- *
- */
- typedef struct FT_MM_Axis_
+
+ /*************************************************************************/
+ /* */
+ /* <Struct> */
+ /* FT_MM_Axis */
+ /* */
+ /* <Description> */
+ /* A simple structure used to model a given axis in design space for */
+ /* Multiple Masters fonts. */
+ /* */
+ /* <Fields> */
+ /* name :: The axis's name. */
+ /* */
+ /* minimum :: The axis's minimum design coordinate. */
+ /* */
+ /* maximum :: The axis's maximum design coordinate. */
+ /* */
+ typedef struct FT_MM_Axis_
{
FT_String* name;
FT_Long minimum;
@@ -48,116 +50,126 @@
} FT_MM_Axis;
- /**********************************************************************
- *
- * <Struct>
- * FT_Multi_Master
- *
- * <Description>
- * A structure used to model the axis and space of a multiple
- * masters font.
- *
- * <Fields>
- * num_axis :: number of axis. cannot exceed 4
- *
- * num_designs :: number of designs, should ne normally 2^num_axis
- * even though the Type 1 specification strangely
- * allows for intermediate designs to be present
- * this number cannot exceed 16
- *
- * axis :: an table of axis descriptors..
- *
- */
- typedef struct FT_Multi_Master_
+
+ /*************************************************************************/
+ /* */
+ /* <Struct> */
+ /* FT_Multi_Master */
+ /* */
+ /* <Description> */
+ /* A structure used to model the axes and space of a Multiple Masters */
+ /* font. */
+ /* */
+ /* <Fields> */
+ /* num_axis :: Number of axes. Cannot exceed 4. */
+ /* */
+ /* num_designs :: Number of designs; should ne normally 2^num_axis */
+ /* even though the Type 1 specification strangely */
+ /* allows for intermediate designs to be present. This */
+ /* number cannot exceed 16. */
+ /* */
+ /* axis :: A table of axis descriptors. */
+ /* */
+ typedef struct FT_Multi_Master_
{
FT_UInt num_axis;
FT_UInt num_designs;
- FT_MM_Axis axis[ T1_MAX_MM_AXIS ];
+ 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_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 );
-
- typedef FT_Error (*FT_Set_MM_Blend_Func)( FT_Face face,
+ typedef FT_Error (*FT_Set_MM_Design_Func)( FT_Face face,
FT_UInt num_coords,
FT_Long* coords );
- /*************************************************************************
- *
- * <Function>
- * FT_Get_Multi_Master
- *
- * <Description>
- * Retrieves the multiple master descriptor of a given font
- *
- * <Input>
- * face :: handle to source face
- *
- * <Output>
- * master :: multiple masters descriptor
- *
- * <Return>
- * Error code. 0 means success.
- *
- */
- FT_EXPORT_DEF(FT_Error) FT_Get_Multi_Master( FT_Face face,
- FT_Multi_Master* master );
-
-
- /*************************************************************************
- *
- * <Function>
- * FT_Set_MM_Design_Coordinates
- *
- * <Description>
- * For multiple masters fonts, choose an interpolated font design
- * through design coordinates
- *
- * <Input>
- * face :: handle to source face
- * num_coords :: number of design coordinates (must be equal to the
- * number of axis in the font).
- * coords :: design coordinates
- *
- * <Return>
- * Error code. 0 means success.
- *
- */
- FT_EXPORT_DEF(FT_Error) FT_Set_MM_Design_Coordinates( FT_Face face,
- FT_UInt num_coords,
- FT_Long* coords );
-
- /*************************************************************************
- *
- * <Function>
- * FT_Set_MM_Blend_Coordinates
- *
- * <Description>
- * For multiple masters fonts, choose an interpolated font design
- * through normalized blend coordinates
- *
- * <Input>
- * face :: handle to source face
- * num_coords :: number of design coordinates (must be equal to the
- * number of axis in the font).
- * coords :: design coordinates (each one must be between 0 and 1.0)
- *
- * <Return>
- * Error code. 0 means success.
- *
- */
- FT_EXPORT_DEF(FT_Error) FT_Set_MM_Blend_Coordinates( FT_Face face,
- FT_UInt num_coords,
- FT_Fixed* coords );
+ typedef FT_Error (*FT_Set_MM_Blend_Func)( FT_Face face,
+ FT_UInt num_coords,
+ FT_Long* coords );
+
+
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* FT_Get_Multi_Master */
+ /* */
+ /* <Description> */
+ /* Retrieves the Multiple Master descriptor of a given font. */
+ /* */
+ /* <Input> */
+ /* face :: A handle to the source face. */
+ /* */
+ /* <Output> */
+ /* master :: The Multiple Masters descriptor. */
+ /* */
+ /* <Return> */
+ /* FreeType error code. 0 means success. */
+ /* */
+ FT_EXPORT_DEF( FT_Error ) FT_Get_Multi_Master( FT_Face face,
+ FT_Multi_Master* master );
+
+
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* FT_Set_MM_Design_Coordinates */
+ /* */
+ /* <Description> */
+ /* For Multiple Masters fonts, choose an interpolated font design */
+ /* through design coordinates. */
+ /* */
+ /* <Input> */
+ /* face :: A handle to the source face. */
+ /* */
+ /* num_coords :: The number of design coordinates (must be equal to */
+ /* the number of axes in the font). */
+ /* */
+ /* coords :: The design coordinates. */
+ /* */
+ /* <Return> */
+ /* FreeType error code. 0 means success. */
+ /* */
+ FT_EXPORT_DEF( FT_Error ) FT_Set_MM_Design_Coordinates(
+ FT_Face face,
+ FT_UInt num_coords,
+ FT_Long* coords );
+
+
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* FT_Set_MM_Blend_Coordinates */
+ /* */
+ /* <Description> */
+ /* For Multiple Masters fonts, choose an interpolated font design */
+ /* through normalized blend coordinates. */
+ /* */
+ /* <Input> */
+ /* face :: A handle to the source face. */
+ /* */
+ /* num_coords :: The number of design coordinates (must be equal to */
+ /* the number of axes in the font). */
+ /* */
+ /* coords :: The design coordinates (each one must be between 0 */
+ /* and 1.0). */
+ /* */
+ /* <Return> */
+ /* FreeType error code. 0 means success. */
+ /* */
+ FT_EXPORT_DEF( FT_Error ) FT_Set_MM_Blend_Coordinates(
+ FT_Face face,
+ FT_UInt num_coords,
+ FT_Fixed* coords );
+
#ifdef __cplusplus
}
#endif
#endif /* FTMM_H */
+
+
/* END */
diff --git a/include/freetype/ftmodule.h b/include/freetype/ftmodule.h
index e1f6c5f..258bbf5 100644
--- a/include/freetype/ftmodule.h
+++ b/include/freetype/ftmodule.h
@@ -2,84 +2,90 @@
/* */
/* ftmodule.h */
/* */
-/* FreeType modules public interface. */
+/* FreeType modules public interface. */
/* */
/* 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. */
/* */
/***************************************************************************/
+
#ifndef FTMODULE_H
#define FTMODULE_H
#include <freetype/freetype.h>
+
#ifdef __cplusplus
extern "C" {
#endif
/* module bit flags */
- typedef enum FT_Module_Flags_
+ typedef enum FT_Module_Flags_
{
- ft_module_font_driver = 1, /* this module is a font driver */
- ft_module_renderer = 2, /* this module is a renderer */
- ft_module_hinter = 4, /* this module is a glyph hinter */
- ft_module_styler = 8, /* this module is a styler */
-
- ft_module_driver_scalable = 0x100, /* the driver supports scalable fonts */
- ft_module_driver_no_outlines = 0x200, /* the driver does not support vector outlines */
-
- ft_module_driver_has_hinter = 0x400 /* the driver provides its own hinter */
+ ft_module_font_driver = 1, /* this module is a font driver */
+ ft_module_renderer = 2, /* this module is a renderer */
+ ft_module_hinter = 4, /* this module is a glyph hinter */
+ ft_module_styler = 8, /* this module is a styler */
+
+ ft_module_driver_scalable = 0x100, /* the driver supports scalable */
+ /* fonts */
+ ft_module_driver_no_outlines = 0x200, /* the driver does not support */
+ /* vector outlines */
+ ft_module_driver_has_hinter = 0x400 /* the driver provides its own */
+ /* hinter */
} FT_Module_Flags;
-
typedef void (*FT_Module_Interface)( void );
-
typedef FT_Error (*FT_Module_Constructor)( FT_Module module );
- typedef void (*FT_Module_Destructor)( FT_Module module );
+ typedef void (*FT_Module_Destructor)( FT_Module module );
typedef FT_Module_Interface (*FT_Module_Requester)( FT_Module module,
const char* name );
- /*************************************************************************
- *
- * <Struct>
- * FT_Module_Class
- *
- * <Description>
- * The module class descriptor.
- *
- * <Fields>
- * module_flags :: bit flags describing the module
- * module_size :: size of one module object/instance in bytes
- * module_name :: name of the module
- * module_version :: version, as a 16.16 fixed number (major.minor)
- * module_requires :: the version of FreeType this module requires
- * (starts at 2.0, a.k.a. 0x20000)
- *
- * module_init :: a function used to initialise (not create) a
- * new module object
- *
- * module_done :: a function used to finalise (not destroy) a
- * given module object
- *
- * get_interface :: queries a given module for a specific interface
- * by name..
- *
- *************************************************************************/
-
+ /*************************************************************************/
+ /* */
+ /* <Struct> */
+ /* FT_Module_Class */
+ /* */
+ /* <Description> */
+ /* The module class descriptor. */
+ /* */
+ /* <Fields> */
+ /* module_flags :: Bit flags describing the module. */
+ /* */
+ /* module_size :: The size of one module object/instance in */
+ /* bytes. */
+ /* */
+ /* module_name :: The name of the module. */
+ /* */
+ /* module_version :: The version, as a 16.16 fixed number */
+ /* (major.minor). */
+ /* */
+ /* module_requires :: The version of FreeType this module requires */
+ /* (starts at version 2.0, i.e 0x20000) */
+ /* */
+ /* module_init :: A function used to initialize (not create) a */
+ /* new module object. */
+ /* */
+ /* module_done :: A function used to finalize (not destroy) a */
+ /* given module object */
+ /* */
+ /* get_interface :: Queries a given module for a specific */
+ /* interface by name. */
+ /* */
typedef struct FT_Module_Class_
{
FT_ULong module_flags;
@@ -97,173 +103,173 @@
} FT_Module_Class;
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* FT_Add_Module */
+ /* */
+ /* <Description> */
+ /* Adds a new module to a given library instance. */
+ /* */
+ /* <Input> */
+ /* library :: A handle to the library object. */
+ /* */
+ /* clazz :: A pointer to class descriptor for the module. */
+ /* */
+ /* <Return> */
+ /* FreeType error code. 0 means success. */
+ /* */
+ /* <Note> */
+ /* An error will be returned if a module already exists by that name, */
+ /* or if the module requires a version of FreeType that is too great. */
+ /* */
+ FT_EXPORT_DEF( FT_Error ) FT_Add_Module( FT_Library library,
+ const FT_Module_Class* clazz );
+
+
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* FT_Get_Module */
+ /* */
+ /* <Description> */
+ /* Finds a module by its name. */
+ /* */
+ /* <Input> */
+ /* library :: A handle to the library object. */
+ /* */
+ /* module_name :: The module's name (as an ASCII string). */
+ /* */
+ /* <Return> */
+ /* A module handle. 0 if none was found. */
+ /* */
+ /* <Note> */
+ /* You should better be familiar with FreeType internals to know */
+ /* which module to look for :-) */
+ /* */
+ FT_EXPORT_DEF( FT_Module ) FT_Get_Module( FT_Library library,
+ const char* module_name );
+
+
+ /*************************************************************************/
+ /* */
+ /* <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> */
+ /* Removes a given module from a library instance. */
+ /* */
+ /* <Input> */
+ /* library :: A handle to a library object. */
+ /* */
+ /* module :: A handle to a module object. */
+ /* */
+ /* <Return> */
+ /* FreeType error code. 0 means success. */
+ /* */
+ /* <Note> */
+ /* The module object is destroyed by the function in case of success. */
+ /* */
+ FT_EXPORT_DEF( FT_Error ) FT_Remove_Module( FT_Library library,
+ FT_Module module );
+
+
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* FT_New_Library */
+ /* */
+ /* <Description> */
+ /* This function is used to create a new FreeType library instance */
+ /* from a given memory object. It is thus possible to use libraries */
+ /* with distinct memory allocators within the same program. */
+ /* */
+ /* <Input> */
+ /* memory :: A handle to the original memory object. */
+ /* */
+ /* <Output> */
+ /* alibrary :: A pointer to handle of a new library object. */
+ /* */
+ /* <Return> */
+ /* FreeType error code. 0 means success. */
+ /* */
+ FT_EXPORT_DEF( FT_Error ) FT_New_Library( FT_Memory memory,
+ FT_Library* library );
+
+
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* FT_Done_Library */
+ /* */
+ /* <Description> */
+ /* Discards a given library object. This closes all drivers and */
+ /* discards all resource objects. */
+ /* */
+ /* <Input> */
+ /* library :: A handle to the target library. */
+ /* */
+ /* <Return> */
+ /* FreeType error code. 0 means success. */
+ /* */
+ FT_EXPORT_DEF( FT_Error ) FT_Done_Library( FT_Library library );
+
+
+
+ typedef void (*FT_DebugHook_Func)( void* arg );
- /*************************************************************************
- *
- * <Function>
- * FT_Add_Module
- *
- * <Description>
- * Add a new module to a given library instance.
- *
- * <Input>
- * library :: handle to library object
- * clazz :: pointer to class descriptor for the module
- *
- * <Return>
- * Error code. 0 means success
- *
- * <Note>
- * An error will be returned if a module already exists by that
- * name, or if the module requires a version of freetype that is
- * too great
- *
- *************************************************************************/
-
- FT_EXPORT_DEF(FT_Error) FT_Add_Module( FT_Library library,
- const FT_Module_Class* clazz );
-
-
- /*************************************************************************
- *
- * <Function>
- * FT_Get_Module
- *
- * <Description>
- * Find a module by its name.
- *
- * <Input>
- * library :: handle to library object
- * module_name :: the module's ASCII name.
- *
- * <Return>
- * Module handle, 0 if none was found.
- *
- * <Note>
- * You'd better be familiar with FreeType internals to know which
- * module to look for :-)
- *
- *************************************************************************/
-
- FT_EXPORT_DEF(FT_Module) FT_Get_Module( FT_Library library,
- const char* module_name );
-
-
- /*************************************************************************
- *
- * <Function>
- * FT_Get_Module_Interface
- *
- * <Description>
- * Find a module and returns it's specific interface as a void*
- *
- * <Input>
- * library :: handle to library object
- * module_name :: the module's ASCII name.
- *
- * <Return>
- * Module specific interface, if any
- *
- * <Note>
- * You'd better be familiar with FreeType internals to know which
- * module to look for, and what it's interface is :-)
- *
- *************************************************************************/
-
- FT_EXPORT_DEF(const void*) FT_Get_Module_Interface( FT_Library library,
- const char* mod_name );
-
- /*************************************************************************
- *
- * <Function>
- * FT_Remove_Module
- *
- * <Description>
- * Removes a given module from a library instance.
- *
- * <Input>
- * library :: handle to library object
- * module :: handle to module object
- *
- * <Return>
- * Error code (module not listed)
- *
- * <Note>
- * The module object is destroyed by the function in case of success
- *
- *************************************************************************/
-
- FT_EXPORT_DEF(FT_Error) FT_Remove_Module( FT_Library library,
- FT_Module module );
-
-
- /*************************************************************************
- *
- * <Function>
- * FT_New_Library
- *
- * <Description>
- * Creates a new "virgin" library that uses a custom memory manager.
- * The library has no registered driver, those can be added with a
- * call to FT_Add_Default_Modules
- *
- * <Input>
- * memory :: handle to custom memory manager
- *
- * <Output>
- * library :: handle to fresh new library object
- *
- * <Return>
- * Error code (module not listed)
- *
- *************************************************************************/
-
- FT_EXPORT_DEF(FT_Error) FT_New_Library( FT_Memory memory,
- FT_Library* library );
-
-
- /*************************************************************************
- *
- * <Function>
- * FT_Done_Library
- *
- * <Description>
- * Destroys a given library, and all child objects, except the
- * memory manager.
- *
- * <Input>
- * library :: handle to target library object
- *
- * <Return>
- * Error code (module not listed)
- *
- *************************************************************************/
-
- FT_EXPORT_DEF(FT_Error) FT_Done_Library( FT_Library library );
-
-
-
- /*************************************************************************
- *
- * <Function>
- * FT_Set_Debug_Hook
- *
- * <Description>
- * Used only by the TrueType debugger. This function is private and
- * should never be called by normal applications..
- *
- * <Input>
- * library :: handle to target library object
- * hook_index :: hook index
- * debug_hook :: debug hook functions
- *
- *************************************************************************/
-
- typedef void (*FT_DebugHook_Func)( void* arg );
- FT_EXPORT_DEF(void) FT_Set_Debug_Hook( FT_Library library,
- FT_UInt hook_index,
- FT_DebugHook_Func debug_hook );
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* FT_Set_Debug_Hook */
+ /* */
+ /* <Description> */
+ /* Sets a debug hook function for debugging the interpreter of a font */
+ /* format. */
+ /* */
+ /* <Input> */
+ /* library :: A handle to the library object. */
+ /* */
+ /* hook_index :: The index of the debug hook. You should use the */
+ /* values defined in ftobjs.h, e.g. */
+ /* FT_DEBUG_HOOK_TRUETYPE */
+ /* */
+ /* debug_hook :: The function used to debug the interpreter. */
+ /* */
+ /* <Note> */
+ /* Currently, four debug hook slots are available, but only two (for */
+ /* the TrueType and the Type 1 interpreter) are defined. */
+ /* */
+ FT_EXPORT_DEF( void ) FT_Set_Debug_Hook( FT_Library library,
+ FT_UInt hook_index,
+ FT_DebugHook_Func debug_hook );
@@ -273,14 +279,14 @@
/* FT_Add_Default_Modules */
/* */
/* <Description> */
- /* Adds the set of default modules to a given library object. */
+ /* Adds the set of default drivers to a given library object. */
/* This is only useful when you create a library object with */
- /* FT_New_Library (usually to plug a custom memory manager) */
+ /* FT_New_Library() (usually to plug a custom memory manager). */
/* */
- /* <Input> */
+ /* <InOut> */
/* library :: A handle to a new library object. */
/* */
- FT_EXPORT_DEF(void) FT_Add_Default_Modules( FT_Library library );
+ FT_EXPORT_DEF( void ) FT_Add_Default_Modules( FT_Library library );
#ifdef __cplusplus
diff --git a/src/base/ftinit.c b/src/base/ftinit.c
index 702f2c9..a42be8a 100644
--- a/src/base/ftinit.c
+++ b/src/base/ftinit.c
@@ -75,6 +75,8 @@ const FT_Module_Class* ft_default_modules[] =
/* */
/* <Description> */
/* Adds the set of default drivers to a given library object. */
+ /* This is only useful when you create a library object with */
+ /* FT_New_Library() (usually to plug a custom memory manager). */
/* */
/* <InOut> */
/* library :: A handle to a new library object. */
diff --git a/src/base/ftmm.c b/src/base/ftmm.c
index a8c6871..0f6fdde 100644
--- a/src/base/ftmm.c
+++ b/src/base/ftmm.c
@@ -30,6 +30,23 @@
#define FT_COMPONENT trace_mm
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* FT_Get_Multi_Master */
+ /* */
+ /* <Description> */
+ /* Retrieves the Multiple Master descriptor of a given font. */
+ /* */
+ /* <Input> */
+ /* face :: A handle to the source face. */
+ /* */
+ /* <Output> */
+ /* master :: The Multiple Masters descriptor. */
+ /* */
+ /* <Return> */
+ /* FreeType error code. 0 means success. */
+ /* */
FT_EXPORT_FUNC( FT_Error ) FT_Get_Multi_Master( FT_Face face,
FT_Multi_Master* master )
{
@@ -57,6 +74,26 @@
}
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* FT_Set_MM_Design_Coordinates */
+ /* */
+ /* <Description> */
+ /* For Multiple Masters fonts, choose an interpolated font design */
+ /* through design coordinates. */
+ /* */
+ /* <Input> */
+ /* face :: A handle to the source face. */
+ /* */
+ /* num_coords :: The number of design coordinates (must be equal to */
+ /* the number of axes in the font). */
+ /* */
+ /* coords :: The design coordinates. */
+ /* */
+ /* <Return> */
+ /* FreeType error code. 0 means success. */
+ /* */
FT_EXPORT_FUNC( FT_Error ) FT_Set_MM_Design_Coordinates(
FT_Face face,
FT_UInt num_coords,
@@ -86,6 +123,27 @@
}
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* FT_Set_MM_Blend_Coordinates */
+ /* */
+ /* <Description> */
+ /* For Multiple Masters fonts, choose an interpolated font design */
+ /* through normalized blend coordinates. */
+ /* */
+ /* <Input> */
+ /* face :: A handle to the source face. */
+ /* */
+ /* num_coords :: The number of design coordinates (must be equal to */
+ /* the number of axes in the font). */
+ /* */
+ /* coords :: The design coordinates (each one must be between 0 */
+ /* and 1.0). */
+ /* */
+ /* <Return> */
+ /* FreeType error code. 0 means success. */
+ /* */
FT_EXPORT_FUNC( FT_Error ) FT_Set_MM_Blend_Coordinates(
FT_Face face,
FT_UInt num_coords,
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index c3cf180..b42be17 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -2722,6 +2722,7 @@
/* */
/* <Input> */
/* library :: A handle to the library object. */
+ /* */
/* clazz :: A pointer to class descriptor for the module. */
/* */
/* <Return> */
diff --git a/src/type1z/z1load.c b/src/type1z/z1load.c
index e0e0eeb..f860306 100644
--- a/src/type1z/z1load.c
+++ b/src/type1z/z1load.c
@@ -131,6 +131,7 @@
{
FT_UInt nn;
+
/* allocate the blend `private' and `font_info' dictionaries */
if ( ALLOC_ARRAY( blend->font_infos[1], num_designs, T1_FontInfo ) ||
ALLOC_ARRAY( blend->privates[1], num_designs, T1_Private ) ||
@@ -144,8 +145,8 @@
for ( nn = 2; nn <= num_designs; nn++ )
{
- blend->privates[nn] = blend->privates[nn-1]+1;
- blend->font_infos[nn] = blend->font_infos[nn-1]+1;
+ blend->privates[nn] = blend->privates [nn - 1] + 1;
+ blend->font_infos[nn] = blend->font_infos[nn - 1] + 1;
}
blend->num_designs = num_designs;
@@ -1260,10 +1261,10 @@
index = Z1_ToInt( parser );
- /* make sure we get subr index and loop count in sync */
- /* in some cases, the dictionary count is simply the last */
- /* subr index + 1, with possible holes in the table.. */
- if (index > n)
+ /* make sure we get subr index and loop count in sync -- */
+ /* in some cases, the dictionary count is simply the last */
+ /* subr index + 1, with possible holes in the table */
+ if ( index > n )
n = index;
if ( !read_binary_data( parser, &size, &base ) )