Commit e3c11d7f004b906bebf610cc8bdb5320494fd157
2000-06-16T06:49:56
A new round of formatting, adding/fixing documentation etc.
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 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 2823 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 3106 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 3190 3191 3192 3193 3194 3195 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 3220 3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 3247 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 3280 3281 3282 3283 3284 3285 3286 3287 3288 3289 3290 3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 3310 3311 3312 3313 3314 3315 3316 3317 3318 3319 3320 3321 3322 3323 3324 3325 3326 3327 3328 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353 3354 3355 3356 3357 3358 3359 3360 3361 3362 3363 3364 3365 3366 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 3378 3379 3380 3381 3382 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456 3457 3458 3459 3460 3461 3462 3463 3464 3465 3466 3467 3468 3469 3470 3471 3472 3473 3474 3475 3476 3477 3478 3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 3495 3496 3497 3498 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 3548 3549 3550 3551 3552 3553 3554 3555 3556 3557 3558 3559 3560 3561 3562 3563 3564 3565 3566 3567 3568 3569 3570 3571 3572 3573 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 3594 3595 3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 3627 3628 3629 3630 3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641 3642 3643 3644 3645 3646 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659 3660 3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 3682 3683 3684 3685 3686 3687 3688 3689 3690 3691 3692 3693 3694 3695 3696 3697 3698 3699 3700 3701 3702 3703 3704 3705 3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731 3732 3733 3734 3735 3736 3737 3738 3739 3740 3741 3742 3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 3768 3769 3770 3771 3772 3773 3774 3775 3776 3777 3778 3779 3780 3781 3782 3783 3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807 3808 3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845 3846 3847 3848 3849 3850 3851 3852 3853 3854 3855 3856 3857 3858 3859 3860 3861 3862 3863 3864 3865 3866 3867 3868 3869 3870 3871 3872 3873 3874 3875 3876 3877 3878 3879 3880 3881 3882 3883 3884 3885 3886 3887 3888 3889 3890 3891 3892 3893 3894 3895 3896 3897 3898 3899 3900 3901 3902 3903 3904 3905 3906 3907 3908 3909 3910 3911 3912 3913 3914 3915 3916 3917 3918 3919 3920 3921 3922 3923 3924 3925 3926 3927 3928 3929 3930 3931 3932 3933 3934 3935 3936 3937 3938 3939 3940 3941 3942 3943 3944 3945 3946 3947 3948 3949 3950 3951 3952 3953 3954 3955 3956 3957 3958 3959 3960 3961 3962 3963 3964 3965 3966 3967 3968 3969 3970 3971 3972 3973 3974 3975 3976 3977 3978 3979 3980 3981 3982 3983 3984 3985 3986 3987 3988 3989 3990 3991 3992 3993 3994 3995 3996 3997 3998 3999 4000 4001 4002 4003 4004 4005 4006 4007 4008 4009 4010 4011 4012 4013 4014 4015 4016 4017 4018 4019 4020 4021 4022 4023 4024 4025 4026 4027 4028 4029 4030 4031 4032 4033 4034 4035 4036 4037 4038 4039 4040 4041 4042 4043 4044 4045 4046 4047 4048 4049 4050 4051 4052 4053 4054 4055 4056 4057 4058 4059 4060 4061 4062 4063 4064 4065 4066 4067 4068 4069 4070 4071 4072 4073 4074 4075 4076 4077 4078 4079 4080 4081 4082 4083 4084 4085 4086 4087 4088 4089 4090 4091 4092 4093 4094 4095 4096 4097 4098 4099 4100 4101 4102 4103 4104 4105 4106 4107 4108 4109 4110 4111 4112 4113 4114 4115 4116 4117 4118 4119 4120 4121 4122 4123 4124 4125 4126 4127 4128 4129 4130 4131 4132 4133 4134 4135 4136 4137 4138 4139 4140 4141 4142 4143 4144 4145 4146 4147 4148 4149 4150 4151 4152 4153 4154 4155 4156 4157 4158 4159 4160 4161 4162 4163 4164 4165 4166 4167 4168 4169 4170 4171 4172 4173 4174 4175 4176 4177 4178 4179 4180 4181 4182 4183 4184 4185 4186 4187 4188 4189 4190 4191 4192 4193 4194 4195 4196 4197 4198 4199 4200 4201 4202 4203 4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 4236 4237 4238 4239 4240 4241 4242 4243 4244 4245 4246 4247 4248 4249 4250 4251 4252 4253 4254 4255 4256 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 4268 4269 4270 4271 4272 4273 4274 4275 4276 4277 4278 4279 4280 4281 4282 4283 4284 4285 4286 4287 4288 4289 4290 4291 4292 4293 4294 4295 4296 4297 4298 4299 4300 4301 4302 4303 4304 4305 4306 4307 4308 4309 4310 4311 4312 4313 4314 4315 4316 4317 4318 4319 4320 4321 4322 4323 4324 4325 4326 4327 4328 4329 4330 4331 4332 4333 4334 4335 4336 4337 4338 4339 4340 4341 4342 4343 4344 4345 4346 4347 4348 4349 4350 4351 4352 4353 4354 4355 4356 4357 4358 4359 4360 4361 4362 4363 4364 4365 4366 4367 4368 4369 4370 4371 4372 4373 4374 4375 4376 4377 4378 4379 4380 4381 4382 4383 4384 4385 4386 4387 4388 4389 4390 4391 4392 4393 4394 4395 4396 4397 4398 4399 4400 4401 4402 4403 4404 4405 4406 4407 4408 4409 4410 4411 4412 4413 4414 4415 4416 4417 4418 4419 4420 4421 4422 4423 4424 4425 4426 4427 4428 4429 4430 4431 4432 4433 4434 4435 4436 4437 4438 4439 4440 4441 4442 4443 4444 4445 4446 4447 4448 4449 4450 4451 4452 4453 4454 4455 4456 4457 4458 4459 4460 4461 4462 4463 4464 4465 4466 4467 4468 4469 4470 4471 4472 4473 4474 4475 4476 4477 4478 4479 4480 4481 4482 4483 4484 4485 4486 4487 4488 4489 4490 4491 4492 4493 4494 4495 4496 4497 4498 4499 4500 4501 4502 4503 4504 4505 4506 4507 4508 4509 4510 4511 4512 4513 4514 4515 4516 4517 4518 4519 4520 4521 4522 4523 4524 4525 4526 4527 4528 4529 4530 4531 4532 4533 4534 4535 4536 4537 4538 4539 4540 4541 4542 4543 4544 4545 4546 4547 4548 4549 4550 4551 4552 4553 4554 4555 4556 4557 4558 4559 4560 4561 4562 4563 4564 4565 4566 4567 4568 4569 4570 4571 4572 4573 4574 4575 4576 4577 4578 4579 4580 4581 4582 4583 4584 4585 4586 4587 4588 4589 4590 4591 4592 4593 4594 4595 4596 4597 4598 4599 4600 4601 4602 4603 4604 4605 4606 4607 4608 4609 4610 4611 4612 4613 4614 4615 4616 4617 4618 4619 4620 4621 4622 4623 4624 4625 4626 4627 4628 4629 4630 4631 4632 4633 4634 4635 4636 4637 4638 4639 4640 4641 4642 4643 4644 4645 4646 4647 4648 4649 4650 4651 4652 4653 4654 4655 4656 4657 4658 4659 4660 4661 4662 4663 4664 4665 4666 4667 4668 4669 4670 4671 4672 4673 4674 4675 4676 4677 4678 4679 4680 4681 4682 4683 4684 4685 4686 4687 4688 4689 4690 4691 4692 4693 4694 4695 4696 4697 4698 4699 4700 4701 4702 4703 4704 4705 4706 4707 4708 4709 4710 4711 4712 4713 4714 4715 4716 4717 4718 4719 4720 4721 4722 4723 4724 4725 4726 4727 4728 4729 4730 4731 4732 4733 4734 4735 4736 4737 4738 4739 4740 4741 4742 4743 4744 4745 4746 4747 4748 4749 4750 4751 4752 4753 4754 4755 4756 4757 4758 4759 4760 4761 4762 4763 4764 4765 4766 4767 4768 4769 4770 4771 4772 4773 4774 4775 4776 4777 4778 4779 4780 4781 4782 4783 4784 4785 4786 4787 4788 4789 4790 4791 4792 4793 4794 4795 4796 4797 4798 4799 4800 4801 4802 4803 4804 4805 4806 4807 4808 4809 4810 4811 4812 4813 4814 4815 4816 4817 4818 4819 4820 4821 4822 4823 4824 4825 4826 4827 4828 4829 4830 4831 4832 4833 4834 4835 4836 4837 4838 4839 4840 4841 4842 4843 4844 4845 4846 4847 4848 4849 4850 4851 4852 4853 4854 4855 4856 4857 4858 4859 4860 4861 4862 4863 4864 4865 4866 4867 4868 4869 4870 4871 4872 4873 4874 4875 4876 4877 4878 4879 4880 4881 4882 4883 4884 4885 4886 4887 4888 4889 4890 4891 4892 4893 4894 4895 4896 4897 4898 4899 4900 4901 4902 4903 4904 4905 4906 4907 4908 4909 4910 4911 4912 4913 4914 4915 4916 4917 4918 4919 4920 4921 4922 4923 4924 4925 4926 4927 4928 4929 4930 4931 4932 4933 4934 4935 4936 4937 4938 4939 4940 4941 4942 4943 4944 4945 4946 4947 4948 4949 4950 4951 4952 4953 4954 4955 4956 4957 4958 4959 4960 4961 4962 4963 4964 4965 4966 4967 4968 4969 4970 4971 4972 4973 4974 4975 4976 4977 4978 4979 4980 4981 4982 4983 4984 4985 4986 4987 4988 4989 4990 4991 4992 4993 4994 4995 4996 4997 4998 4999 5000 5001 5002 5003 5004 5005 5006 5007 5008 5009 5010 5011 5012 5013 5014 5015 5016 5017 5018 5019 5020 5021 5022 5023 5024 5025 5026 5027 5028 5029 5030 5031 5032 5033 5034 5035 5036 5037 5038 5039 5040 5041 5042 5043 5044 5045 5046 5047 5048 5049 5050 5051 5052 5053 5054 5055 5056 5057 5058 5059 5060 5061 5062 5063 5064 5065 5066 5067 5068 5069 5070 5071 5072 5073 5074 5075 5076 5077 5078 5079 5080 5081 5082 5083 5084 5085 5086 5087 5088 5089 5090 5091 5092 5093 5094 5095 5096 5097 5098 5099 5100 5101 5102 5103 5104 5105 5106 5107 5108 5109 5110 5111 5112 5113 5114 5115 5116 5117 5118 5119 5120 5121 5122 5123 5124 5125 5126 5127 5128 5129 5130 5131 5132 5133 5134 5135 5136 5137 5138 5139 5140 5141 5142 5143 5144 5145 5146 5147 5148 5149 5150 5151 5152 5153 5154 5155 5156 5157 5158 5159 5160 5161 5162 5163 5164 5165 5166 5167 5168 5169 5170 5171 5172 5173 5174 5175 5176 5177 5178 5179 5180 5181 5182 5183 5184 5185 5186 5187 5188 5189 5190 5191 5192 5193 5194 5195 5196 5197 5198 5199 5200 5201 5202 5203 5204 5205 5206 5207 5208 5209 5210 5211 5212 5213 5214 5215 5216 5217 5218 5219 5220 5221 5222 5223 5224 5225 5226 5227 5228 5229 5230 5231 5232 5233 5234 5235 5236 5237 5238 5239 5240 5241 5242 5243 5244 5245 5246 5247 5248 5249 5250 5251 5252 5253 5254 5255 5256 5257 5258 5259 5260 5261 5262 5263 5264 5265 5266 5267 5268 5269 5270 5271 5272 5273 5274 5275 5276 5277 5278 5279 5280 5281 5282 5283 5284 5285 5286 5287 5288 5289 5290 5291 5292 5293 5294 5295 5296 5297 5298 5299 5300 5301 5302 5303 5304 5305 5306 5307 5308 5309 5310 5311 5312 5313 5314 5315 5316 5317 5318 5319 5320 5321 5322 5323 5324 5325 5326 5327 5328 5329 5330 5331 5332 5333 5334 5335 5336 5337 5338 5339 5340 5341 5342 5343 5344 5345 5346 5347 5348 5349 5350 5351 5352 5353 5354 5355 5356 5357 5358 5359 5360 5361 5362 5363 5364 5365 5366 5367 5368 5369 5370 5371 5372 5373 5374 5375 5376 5377 5378 5379 5380 5381 5382 5383 5384 5385 5386 5387 5388 5389 5390 5391 5392 5393 5394 5395 5396 5397 5398 5399 5400 5401 5402 5403 5404 5405 5406 5407 5408 5409 5410 5411 5412 5413 5414 5415 5416 5417 5418 5419 5420 5421 5422 5423 5424 5425 5426 5427 5428 5429 5430 5431 5432 5433 5434 5435 5436 5437 5438 5439 5440 5441 5442 5443 5444 5445 5446 5447 5448 5449 5450 5451 5452 5453 5454 5455 5456 5457 5458 5459 5460 5461 5462 5463 5464 5465 5466 5467 5468 5469 5470 5471 5472 5473 5474 5475 5476 5477 5478 5479 5480 5481 5482 5483 5484 5485 5486 5487 5488 5489 5490 5491 5492 5493 5494 5495 5496 5497 5498 5499 5500 5501 5502 5503 5504 5505 5506 5507 5508 5509 5510 5511 5512 5513 5514 5515 5516 5517 5518 5519 5520 5521 5522 5523 5524 5525 5526 5527 5528 5529 5530 5531 5532 5533 5534 5535 5536 5537 5538 5539 5540 5541 5542 5543 5544 5545 5546 5547 5548 5549 5550 5551 5552 5553 5554 5555 5556 5557 5558 5559 5560 5561 5562 5563 5564 5565 5566 5567 5568 5569 5570 5571 5572 5573 5574 5575 5576 5577 5578 5579 5580 5581 5582 5583 5584 5585 5586 5587 5588 5589 5590 5591 5592 5593 5594 5595 5596 5597 5598 5599 5600 5601 5602 5603 5604 5605 5606 5607 5608 5609 5610 5611 5612 5613 5614 5615 5616 5617 5618 5619 5620 5621 5622 5623 5624 5625 5626 5627 5628 5629 5630 5631 5632 5633 5634 5635 5636 5637 5638 5639 5640 5641 5642 5643 5644 5645 5646 5647 5648 5649 5650 5651 5652 5653 5654 5655 5656 5657 5658 5659 5660 5661 5662 5663 5664 5665 5666 5667 5668 5669 5670 5671 5672 5673 5674 5675 5676 5677 5678 5679 5680 5681 5682 5683 5684 5685 5686 5687 5688 5689 5690 5691 5692 5693 5694 5695 5696 5697 5698 5699 5700 5701 5702 5703 5704 5705 5706 5707 5708 5709 5710 5711 5712 5713 5714 5715 5716 5717 5718 5719 5720 5721 5722 5723 5724 5725 5726 5727 5728 5729 5730 5731 5732 5733 5734 5735 5736 5737 5738 5739 5740 5741 5742 5743 5744 5745 5746 5747 5748 5749 5750 5751 5752 5753 5754 5755 5756 5757 5758 5759 5760 5761 5762 5763 5764 5765 5766 5767 5768 5769 5770 5771 5772 5773 5774 5775 5776 5777 5778 5779 5780 5781 5782 5783 5784 5785 5786 5787 5788 5789 5790 5791 5792 5793 5794 5795 5796 5797 5798 5799 5800 5801 5802 5803 5804 5805 5806 5807 5808 5809 5810 5811 5812 5813 5814 5815 5816 5817 5818 5819 5820 5821 5822 5823 5824 5825 5826 5827 5828 5829 5830 5831 5832 5833 5834 5835 5836 5837 5838 5839 5840 5841 5842 5843 5844 5845 5846 5847 5848 5849 5850 5851 5852 5853 5854 5855 5856 5857 5858 5859 5860 5861 5862 5863 5864 5865 5866 5867 5868 5869 5870 5871 5872 5873 5874 5875 5876 5877 5878 5879 5880 5881 5882 5883 5884 5885 5886 5887 5888 5889 5890 5891 5892 5893 5894 5895 5896 5897 5898 5899 5900 5901 5902 5903 5904 5905 5906 5907 5908 5909 5910 5911 5912 5913 5914 5915 5916 5917 5918 5919 5920 5921 5922 5923 5924 5925 5926 5927 5928 5929 5930 5931 5932 5933 5934 5935 5936 5937 5938 5939 5940 5941 5942 5943 5944 5945 5946 5947 5948 5949 5950 5951 5952 5953 5954 5955 5956 5957 5958 5959 5960 5961 5962 5963 5964 5965 5966 5967 5968 5969 5970 5971 5972 5973 5974 5975 5976 5977 5978 5979 5980 5981 5982 5983 5984 5985 5986 5987 5988 5989 5990 5991 5992 5993 5994 5995 5996 5997 5998 5999 6000 6001 6002 6003 6004 6005 6006 6007 6008 6009 6010 6011 6012 6013 6014 6015 6016 6017 6018 6019 6020 6021 6022 6023 6024 6025 6026 6027 6028 6029 6030 6031 6032 6033 6034 6035 6036 6037 6038 6039 6040 6041 6042 6043 6044 6045 6046 6047 6048 6049 6050 6051 6052 6053 6054 6055 6056 6057 6058 6059 6060 6061 6062 6063 6064 6065 6066 6067 6068 6069 6070 6071 6072 6073 6074 6075 6076 6077 6078 6079 6080 6081 6082 6083 6084 6085 6086 6087 6088 6089 6090 6091 6092 6093 6094 6095 6096 6097 6098 6099 6100 6101 6102 6103 6104 6105 6106 6107 6108 6109 6110 6111 6112 6113 6114 6115 6116 6117 6118 6119 6120 6121 6122 6123 6124 6125 6126 6127 6128 6129 6130 6131 6132 6133 6134 6135 6136 6137 6138 6139 6140 6141 6142 6143 6144 6145 6146 6147 6148 6149 6150 6151 6152 6153 6154 6155 6156 6157 6158 6159 6160 6161 6162 6163 6164 6165 6166 6167 6168 6169 6170 6171 6172 6173 6174 6175 6176 6177 6178 6179 6180 6181 6182 6183 6184 6185 6186 6187 6188 6189 6190 6191 6192 6193 6194 6195 6196 6197 6198 6199 6200 6201 6202 6203 6204 6205 6206 6207 6208 6209 6210 6211 6212 6213 6214 6215 6216 6217 6218 6219 6220 6221 6222 6223 6224 6225 6226 6227 6228 6229 6230 6231 6232 6233 6234 6235 6236 6237 6238 6239 6240 6241 6242 6243 6244 6245 6246 6247 6248 6249 6250 6251 6252 6253 6254 6255 6256 6257 6258 6259 6260 6261 6262 6263 6264 6265 6266 6267 6268 6269 6270 6271 6272 6273 6274 6275 6276 6277 6278 6279 6280 6281 6282 6283 6284 6285 6286 6287 6288 6289 6290 6291 6292 6293 6294 6295 6296 6297 6298 6299 6300 6301 6302 6303 6304 6305 6306 6307 6308 6309 6310 6311 6312 6313 6314 6315 6316 6317 6318 6319 6320 6321 6322 6323 6324 6325 6326 6327 6328 6329 6330 6331 6332 6333 6334 6335 6336 6337 6338 6339 6340 6341 6342 6343 6344 6345 6346 6347 6348 6349 6350 6351 6352 6353 6354 6355 6356 6357 6358 6359 6360 6361 6362 6363 6364 6365 6366 6367 6368 6369 6370 6371 6372 6373 6374 6375 6376 6377 6378 6379 6380 6381 6382 6383 6384 6385 6386 6387 6388 6389 6390 6391 6392 6393 6394 6395 6396 6397 6398 6399 6400 6401 6402 6403 6404 6405 6406 6407 6408 6409 6410 6411 6412 6413 6414 6415 6416 6417 6418 6419 6420 6421 6422 6423 6424 6425 6426 6427 6428 6429 6430 6431 6432 6433 6434 6435 6436 6437 6438 6439 6440 6441 6442 6443 6444 6445 6446 6447 6448 6449 6450 6451 6452 6453 6454 6455 6456 6457 6458 6459 6460 6461 6462 6463 6464 6465 6466 6467 6468 6469 6470 6471 6472 6473 6474 6475 6476 6477 6478 6479 6480 6481 6482 6483 6484 6485 6486 6487 6488 6489 6490 6491 6492 6493 6494 6495 6496 6497 6498 6499 6500 6501 6502 6503 6504 6505 6506 6507 6508 6509 6510 6511 6512 6513 6514 6515 6516 6517 6518 6519 6520 6521 6522 6523 6524 6525 6526 6527 6528 6529 6530 6531 6532 6533 6534 6535 6536 6537 6538 6539 6540 6541 6542 6543 6544 6545 6546 6547 6548 6549 6550 6551 6552 6553 6554 6555 6556 6557 6558 6559 6560 6561 6562 6563 6564 6565 6566 6567 6568 6569 6570 6571 6572 6573 6574 6575 6576 6577 6578 6579 6580 6581 6582 6583 6584 6585 6586 6587 6588 6589 6590 6591 6592 6593 6594 6595 6596 6597 6598 6599 6600 6601 6602 6603 6604 6605 6606 6607 6608 6609 6610 6611 6612 6613 6614 6615 6616 6617 6618 6619 6620 6621 6622 6623 6624 6625 6626 6627 6628 6629 6630 6631 6632 6633 6634 6635 6636 6637 6638 6639 6640 6641 6642 6643 6644 6645 6646 6647 6648 6649 6650 6651 6652 6653 6654 6655 6656 6657 6658 6659 6660 6661 6662 6663 6664 6665 6666 6667 6668 6669 6670 6671 6672 6673 6674 6675 6676 6677 6678 6679 6680 6681 6682 6683 6684 6685 6686 6687 6688 6689 6690 6691 6692 6693 6694 6695 6696 6697 6698 6699 6700 6701 6702 6703 6704 6705 6706 6707 6708 6709 6710 6711 6712 6713 6714 6715 6716 6717 6718 6719 6720 6721 6722 6723 6724 6725 6726 6727 6728 6729 6730 6731 6732 6733 6734 6735 6736 6737 6738 6739 6740 6741 6742 6743 6744 6745 6746 6747 6748 6749 6750 6751 6752 6753 6754 6755 6756 6757 6758 6759 6760 6761 6762 6763 6764 6765 6766 6767 6768 6769 6770 6771 6772 6773 6774 6775 6776 6777 6778 6779 6780 6781 6782 6783 6784 6785 6786 6787 6788 6789 6790 6791 6792 6793 6794 6795 6796 6797 6798 6799 6800 6801 6802 6803 6804 6805 6806 6807 6808 6809 6810 6811 6812 6813 6814 6815 6816 6817 6818 6819 6820 6821 6822 6823 6824 6825 6826 6827 6828 6829 6830 6831 6832 6833 6834 6835 6836 6837 6838 6839 6840 6841 6842 6843 6844 6845 6846 6847 6848 6849 6850 6851 6852 6853 6854 6855 6856 6857 6858 6859 6860 6861 6862 6863 6864 6865 6866 6867 6868 6869 6870 6871 6872 6873 6874 6875 6876 6877 6878 6879 6880 6881 6882 6883 6884 6885 6886 6887 6888 6889 6890 6891 6892 6893 6894 6895 6896 6897 6898 6899 6900 6901 6902 6903 6904 6905 6906 6907 6908 6909 6910 6911 6912 6913 6914 6915 6916 6917 6918 6919 6920 6921 6922 6923 6924 6925 6926 6927 6928 6929 6930 6931 6932 6933 6934 6935 6936 6937 6938 6939 6940 6941 6942 6943 6944 6945 6946 6947 6948 6949 6950 6951 6952 6953 6954 6955 6956 6957 6958 6959 6960 6961 6962 6963 6964 6965 6966 6967 6968 6969 6970 6971 6972 6973 6974 6975 6976 6977 6978 6979 6980 6981 6982 6983 6984 6985 6986 6987 6988 6989 6990 6991 6992 6993 6994 6995 6996 6997 6998 6999 7000 7001 7002 7003 7004 7005 7006 7007 7008 7009 7010 7011 7012 7013 7014 7015 7016 7017 7018 7019 7020 7021 7022 7023 7024 7025 7026 7027 7028 7029 7030 7031 7032 7033 7034 7035 7036 7037 7038 7039 7040 7041 7042 7043 7044 7045 7046 7047 7048 7049 7050 7051 7052 7053 7054 7055 7056 7057 7058 7059 7060 7061 7062 7063 7064 7065 7066 7067 7068 7069 7070 7071 7072 7073 7074 7075 7076 7077 7078 7079 7080 7081 7082 7083 7084 7085 7086 7087 7088 7089 7090 7091 7092 7093 7094 7095 7096 7097 7098 7099 7100 7101 7102 7103 7104 7105 7106 7107 7108 7109 7110 7111 7112 7113 7114 7115 7116 7117 7118 7119 7120 7121 7122 7123 7124 7125 7126 7127 7128 7129 7130 7131 7132 7133 7134 7135 7136 7137 7138 7139 7140 7141 7142 7143 7144 7145 7146 7147 7148 7149 7150 7151 7152 7153 7154 7155 7156 7157 7158 7159 7160 7161 7162 7163 7164 7165 7166 7167 7168 7169 7170 7171 7172 7173 7174 7175 7176 7177 7178 7179 7180 7181 7182 7183 7184 7185 7186 7187 7188 7189 7190 7191 7192 7193 7194 7195 7196 7197 7198 7199 7200 7201 7202 7203 7204 7205 7206 7207 7208 7209 7210 7211 7212 7213 7214 7215 7216 7217 7218 7219 7220 7221 7222 7223 7224 7225 7226 7227 7228 7229 7230 7231 7232 7233 7234 7235 7236 7237 7238 7239 7240 7241 7242 7243 7244 7245 7246 7247 7248 7249 7250 7251 7252 7253 7254 7255 7256 7257 7258 7259 7260 7261 7262 7263 7264 7265 7266 7267 7268 7269 7270 7271 7272 7273 7274 7275 7276 7277 7278 7279 7280 7281 7282 7283 7284 7285 7286 7287 7288 7289 7290 7291 7292 7293 7294 7295 7296 7297 7298 7299 7300 7301 7302 7303 7304 7305 7306 7307 7308 7309 7310 7311 7312 7313 7314 7315 7316 7317 7318 7319 7320 7321 7322 7323 7324 7325 7326 7327 7328 7329 7330 7331 7332 7333 7334 7335 7336 7337 7338 7339 7340 7341 7342 7343 7344 7345 7346 7347 7348 7349 7350 7351 7352 7353 7354 7355 7356 7357 7358 7359 7360 7361 7362 7363 7364 7365 7366 7367 7368 7369 7370 7371 7372 7373 7374 7375 7376 7377 7378 7379 7380 7381 7382 7383 7384 7385 7386 7387 7388 7389 7390 7391 7392 7393 7394 7395 7396 7397 7398 7399 7400 7401 7402 7403 7404 7405 7406 7407 7408 7409 7410
diff --git a/include/freetype/internal/ftdebug.h b/include/freetype/internal/ftdebug.h
index 0864e3f..25fb673 100644
--- a/include/freetype/internal/ftdebug.h
+++ b/include/freetype/internal/ftdebug.h
@@ -91,6 +91,14 @@
trace_t2objs,
trace_t2parse,
+ /* CID driver components */
+ trace_cidafm,
+ trace_ciddriver,
+ trace_cidgload,
+ trace_cidload,
+ trace_cidobjs,
+ trace_cidparse,
+
/* other trace levels */
/* the last level must always be `trace_max' */
diff --git a/src/base/ftmm.c b/src/base/ftmm.c
index ea4aaee..09bc88e 100644
--- a/src/base/ftmm.c
+++ b/src/base/ftmm.c
@@ -104,6 +104,7 @@
FT_Driver driver = face->driver;
FT_Set_MM_Blend_Func func;
+
func = (FT_Set_MM_Blend_Func)driver->interface.get_interface(
driver, "set_mm_blend" );
if ( func )
diff --git a/src/cff/t2gload.c b/src/cff/t2gload.c
index d93c6b9..f42a5b6 100644
--- a/src/cff/t2gload.c
+++ b/src/cff/t2gload.c
@@ -405,7 +405,7 @@
}
- /* add a new point, do not check room */
+ /* add a new point, do not check space */
static
void add_point( T2_Builder* builder,
TT_Pos x,
@@ -528,7 +528,9 @@
}
-#define USE_ARGS(n) top -= n; if (top < decoder->stack) goto Stack_Underflow
+#define USE_ARGS( n ) top -= n; \
+ if ( top < decoder->stack ) \
+ goto Stack_Underflow
/*************************************************************************/
@@ -578,7 +580,7 @@
if ( seed == 0 )
seed = 0x7384;
- /* First of all, initialize the decoder */
+ /* initialize the decoder */
decoder->top = decoder->stack;
decoder->zone = decoder->zones;
zone = decoder->zones;
@@ -608,7 +610,6 @@
/* */
/* Decode operator or operand */
/* */
- /* */
v = *ip++;
if ( v >= 32 || v == 28 )
{
@@ -1692,8 +1693,8 @@
glyph->root.format = ft_glyph_format_none;
{
- FT_Byte* charstring;
- FT_ULong charstring_len;
+ TT_Byte* charstring;
+ TT_ULong charstring_len;
T2_Init_Decoder( &decoder, face, size, glyph );
@@ -1804,8 +1805,8 @@
{
cbox.xMin &= -64;
cbox.yMin &= -64;
- cbox.xMax = ( cbox.xMax+63 ) & -64;
- cbox.yMax = ( cbox.yMax+63 ) & -64;
+ cbox.xMax = ( cbox.xMax + 63 ) & -64;
+ cbox.yMax = ( cbox.yMax + 63 ) & -64;
}
metrics->width = cbox.xMax - cbox.xMin;
diff --git a/src/cff/t2objs.c b/src/cff/t2objs.c
index ffab17e..b85619f 100644
--- a/src/cff/t2objs.c
+++ b/src/cff/t2objs.c
@@ -42,7 +42,7 @@
/*************************************************************************/
/* */
- /* GLYPH ZONE FUNCTIONS */
+ /* FACE FUNCTIONS */
/* */
/*************************************************************************/
@@ -246,12 +246,14 @@
/* <Input> */
/* size :: A handle to the target size object. */
/* */
+ /* <Output> */
+ /* TrueType error code. 0 means success. */
+ /* */
LOCAL_DEF
TT_Error T2_Reset_Size( T2_Size size )
{
T2_Face face = (T2_Face)size->face;
FT_Size_Metrics* metrics = &size->metrics;
- TT_Error error = T2_Err_Ok;
if ( metrics->x_ppem < 1 || metrics->y_ppem < 1 )
@@ -270,7 +272,7 @@
metrics->max_advance = ( FT_MulFix( face->root.max_advance_width,
metrics->x_scale ) + 32 ) & -64;
- return error;
+ return T2_Err_Ok;
}
diff --git a/src/cid/cidafm.c b/src/cid/cidafm.c
index 1bd2788..7a4145f 100644
--- a/src/cid/cidafm.c
+++ b/src/cid/cidafm.c
@@ -26,6 +26,16 @@
#include <ctype.h> /* for isalnum() */
+ /*************************************************************************/
+ /* */
+ /* The macro FT_COMPONENT is used in trace mode. It is an implicit */
+ /* parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log */
+ /* messages during execution. */
+ /* */
+#undef FT_COMPONENT
+#define FT_COMPONENT trace_cidafm
+
+
LOCAL_FUNC
void CID_Done_AFM( FT_Memory memory,
T1_AFM* afm )
diff --git a/src/cid/cidafm.h b/src/cid/cidafm.h
index 4bc7c85..9c79578 100644
--- a/src/cid/cidafm.h
+++ b/src/cid/cidafm.h
@@ -16,8 +16,8 @@
/***************************************************************************/
-#ifndef T1AFM_H
-#define T1AFM_H
+#ifndef CIDAFM_H
+#define CIDAFM_H
#include <cidobjs.h>
@@ -55,7 +55,7 @@ void CID_Get_Kerning( T1_AFM* afm,
#endif
-#endif /* T1AFM_H */
+#endif /* CIDAFM_H */
/* END */
diff --git a/src/cid/cidgload.c b/src/cid/cidgload.c
index 8911c14..981937b 100644
--- a/src/cid/cidgload.c
+++ b/src/cid/cidgload.c
@@ -1,19 +1,19 @@
-/*******************************************************************
- *
- * cidgload.c 1.0
- *
- * CID-Keyed Type1 Glyph Loader.
- *
- * Copyright 1996-1999 by
- * David Turner, Robert Wilhelm, and Werner Lemberg.
- *
- * This file is part of the FreeType project, and may only be used
- * modified and distributed under the terms of the FreeType project
- * license, LICENSE.TXT. By continuing to use, modify, or distribute
- * this file you indicate that you have read the license and
- * understand and accept it fully.
- *
- ******************************************************************/
+/***************************************************************************/
+/* */
+/* cidgload.c */
+/* */
+/* CID-keyed Type1 Glyph Loader (body). */
+/* */
+/* 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 */
+/* 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. */
+/* */
+/***************************************************************************/
#include <cidload.h>
@@ -21,22 +21,33 @@
#include <freetype/internal/ftdebug.h>
#include <freetype/internal/ftstream.h>
+
+ /*************************************************************************/
+ /* */
+ /* The macro FT_COMPONENT is used in trace mode. It is an implicit */
+ /* parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log */
+ /* messages during execution. */
+ /* */
#undef FT_COMPONENT
-#define FT_COMPONENT trace_t1gload
+#define FT_COMPONENT trace_cidgload
+
- /* forward */
+ /* forward */
static
- FT_Error cid_load_glyph( CID_Decoder* decoder, FT_UInt glyph_index );
+ T1_Error cid_load_glyph( CID_Decoder* decoder,
+ T1_UInt glyph_index );
- typedef enum T1_Operator_
+ typedef enum T1_Operator_
{
op_none = 0,
+
op_endchar,
op_hsbw,
op_seac,
op_sbw,
op_closepath,
+
op_hlineto,
op_hmoveto,
op_hvcurveto,
@@ -46,11 +57,14 @@
op_vhcurveto,
op_vlineto,
op_vmoveto,
+
op_dotsection,
+
op_hstem,
op_hstem3,
op_vstem,
op_vstem3,
+
op_div,
op_callothersubr,
op_callsubr,
@@ -62,7 +76,7 @@
} T1_Operator;
- static const FT_Int t1_args_count[ op_max ] =
+ static const T1_Int t1_args_count[op_max] =
{
0, /* none */
0, /* endchar */
@@ -70,6 +84,7 @@
5, /* seac */
4, /* sbw */
0, /* closepath */
+
1, /* hlineto */
1, /* hmoveto */
4, /* hvcurveto */
@@ -79,11 +94,14 @@
4, /* vhcurveto */
1, /* vlineto */
1, /* vmoveto */
+
0, /* dotsection */
+
2, /* hstem */
6, /* hstem3 */
2, /* vstem */
6, /* vstem3 */
+
2, /* div */
-1, /* callothersubr */
1, /* callsubr */
@@ -93,39 +111,42 @@
};
- /**********************************************************************/
- /**********************************************************************/
- /**********************************************************************/
- /********** *********/
- /********** *********/
- /********** GENERIC CHARSTRINGS PARSING *********/
- /********** *********/
- /********** *********/
- /**********************************************************************/
- /**********************************************************************/
- /**********************************************************************/
-
-/*********************************************************************
- *
- * <Function>
- * CID_Init_Builder
- *
- * <Description>
- * Initialise a given glyph builder.
- *
- * <Input>
- * builder :: glyph builder to initialise
- * face :: current face object
- * size :: current size object
- * glyph :: current glyph object
- *
- *********************************************************************/
-
+ /*************************************************************************/
+ /*************************************************************************/
+ /*************************************************************************/
+ /********** *********/
+ /********** *********/
+ /********** GENERIC CHARSTRING PARSING *********/
+ /********** *********/
+ /********** *********/
+ /*************************************************************************/
+ /*************************************************************************/
+ /*************************************************************************/
+
+
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* CID_Init_Builder */
+ /* */
+ /* <Description> */
+ /* Initializes a given glyph builder. */
+ /* */
+ /* <InOut> */
+ /* builder :: A pointer to the glyph builder to initialize. */
+ /* */
+ /* <Input> */
+ /* face :: The current face object. */
+ /* */
+ /* size :: The current size object. */
+ /* */
+ /* glyph :: The current glyph object. */
+ /* */
LOCAL_FUNC
- void CID_Init_Builder( CID_Builder* builder,
- CID_Face face,
- T1_Size size,
- T1_GlyphSlot glyph )
+ void CID_Init_Builder( CID_Builder* builder,
+ CID_Face face,
+ T1_Size size,
+ T1_GlyphSlot glyph )
{
builder->path_begun = 0;
builder->load_points = 1;
@@ -134,14 +155,14 @@
builder->glyph = glyph;
builder->memory = face->root.memory;
- if (glyph)
+ if ( glyph )
{
builder->base = glyph->root.outline;
builder->max_points = glyph->max_points;
builder->max_contours = glyph->max_contours;
}
- if (size)
+ if ( size )
{
builder->scale_x = size->root.metrics.x_scale;
builder->scale_y = size->root.metrics.y_scale;
@@ -161,27 +182,26 @@
}
-/*********************************************************************
- *
- * <Function>
- * CID_Done_Builder
- *
- * <Description>
- * Finalise a given glyph builder. Its content can still be
- * used after the call, but the function saves important information
- * within the corresponding glyph slot.
- *
- * <Input>
- * builder :: glyph builder to initialise
- *
- *********************************************************************/
-
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* CID_Done_Builder */
+ /* */
+ /* <Description> */
+ /* Finalizes a given glyph builder. Its contents can still be used */
+ /* after the call, but the function saves important information */
+ /* within the corresponding glyph slot. */
+ /* */
+ /* <Input> */
+ /* builder :: A pointer to the glyph builder to finalize. */
+ /* */
LOCAL_FUNC
- void CID_Done_Builder( CID_Builder* builder )
+ void CID_Done_Builder( CID_Builder* builder )
{
T1_GlyphSlot glyph = builder->glyph;
- if (glyph)
+
+ if ( glyph )
{
glyph->root.outline = builder->base;
glyph->max_points = builder->max_points;
@@ -190,40 +210,37 @@
}
-
-/*********************************************************************
- *
- * <Function>
- * CID_Init_Decoder
- *
- * <Description>
- * Initialise a given Type 1 decoder for parsing
- *
- * <Input>
- * decoder :: Type 1 decoder to initialise
- * funcs :: hinter functions interface
- *
- *********************************************************************/
-
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* CID_Init_Decoder */
+ /* */
+ /* <Description> */
+ /* Initializes a given glyph decoder. */
+ /* */
+ /* <InOut> */
+ /* decoder :: A pointer to the glyph builder to initialize. */
+ /* */
LOCAL_FUNC
void CID_Init_Decoder( CID_Decoder* decoder )
{
- MEM_Set( decoder, 0, sizeof(*decoder) );
- decoder->font_matrix.xx = 0x10000;
- decoder->font_matrix.yy = 0x10000;
- }
+ MEM_Set( decoder, 0, sizeof ( *decoder ) );
+ decoder->font_matrix.xx = 0x10000L;
+ decoder->font_matrix.yy = 0x10000L;
+ }
- /* check that there is enough room for "count" more points */
+ /* check that there is enough room for `count' more points */
static
- FT_Error check_points( CID_Builder* builder,
- FT_Int count )
+ T1_Error check_points( CID_Builder* builder,
+ T1_Int count )
{
FT_Outline* base = &builder->base;
FT_Outline* outline = &builder->current;
- if (!builder->load_points)
+
+ if ( !builder->load_points )
return T1_Err_Ok;
count += base->n_points + outline->n_points;
@@ -231,10 +248,11 @@
/* realloc points table if necessary */
if ( count >= builder->max_points )
{
- FT_Error error;
+ T1_Error error;
FT_Memory memory = builder->memory;
- FT_Int increment = outline->points - base->points;
- FT_Int current = builder->max_points;
+ T1_Int increment = outline->points - base->points;
+ T1_Int current = builder->max_points;
+
while ( builder->max_points < count )
builder->max_points += 8;
@@ -243,7 +261,7 @@
builder->max_points, T1_Vector ) ||
REALLOC_ARRAY( base->tags, current,
- builder->max_points, FT_Byte ) )
+ builder->max_points, T1_Byte ) )
{
builder->error = error;
return error;
@@ -252,27 +270,30 @@
outline->points = base->points + increment;
outline->tags = base->tags + increment;
}
+
return T1_Err_Ok;
}
- /* add a new point, do not check room */
+ /* add a new point, do not check space */
static
void add_point( CID_Builder* builder,
- FT_Pos x,
- FT_Pos y,
- FT_Byte flag )
+ T1_Pos x,
+ T1_Pos y,
+ T1_Byte flag )
{
FT_Outline* outline = &builder->current;
- if (builder->load_points)
+
+ if ( builder->load_points )
{
- FT_Vector* point = outline->points + outline->n_points;
- FT_Byte* control = (FT_Byte*)outline->tags + outline->n_points;
+ T1_Vector* point = outline->points + outline->n_points;
+ T1_Byte* control = (FT_Byte*)outline->tags + outline->n_points;
+
point->x = x;
point->y = y;
- *control = ( flag ? FT_Curve_Tag_On : FT_Curve_Tag_Cubic );
+ *control = flag ? FT_Curve_Tag_On : FT_Curve_Tag_Cubic;
builder->last = *point;
}
@@ -283,14 +304,15 @@
/* check room for a new on-curve point, then add it */
static
- FT_Error add_point1( CID_Builder* builder,
- FT_Pos x,
- FT_Pos y )
+ T1_Error add_point1( CID_Builder* builder,
+ T1_Pos x,
+ T1_Pos y )
{
- FT_Error error;
+ T1_Error error;
+
- error = check_points(builder,1);
- if (!error)
+ error = check_points( builder, 1 );
+ if ( !error )
add_point( builder, x, y, 1 );
return error;
@@ -299,12 +321,13 @@
/* check room for a new contour, then add it */
static
- FT_Error add_contour( CID_Builder* builder )
+ T1_Error add_contour( CID_Builder* builder )
{
FT_Outline* base = &builder->base;
FT_Outline* outline = &builder->current;
- if (!builder->load_points)
+
+ if ( !builder->load_points )
{
outline->n_contours++;
return T1_Err_Ok;
@@ -314,15 +337,16 @@
if ( base->n_contours + outline->n_contours >= builder->max_contours &&
builder->load_points )
{
- FT_Error error;
- FT_Memory memory = builder->memory;
- FT_Int increment = outline->contours - base->contours;
- FT_Int current = builder->max_contours;
+ T1_Error error;
+ FT_Memory memory = builder->memory;
+ T1_Int increment = outline->contours - base->contours;
+ T1_Int current = builder->max_contours;
+
builder->max_contours += 4;
if ( REALLOC_ARRAY( base->contours,
- current, builder->max_contours, FT_Short ) )
+ current, builder->max_contours, T1_Short ) )
{
builder->error = error;
return error;
@@ -331,28 +355,33 @@
outline->contours = base->contours + increment;
}
- if (outline->n_contours > 0)
- outline->contours[ outline->n_contours-1 ] = outline->n_points-1;
+ if ( outline->n_contours > 0 )
+ outline->contours[outline->n_contours - 1] = outline->n_points - 1;
outline->n_contours++;
+
return T1_Err_Ok;
}
+
/* if a path was begun, add its first on-curve point */
static
- FT_Error start_point( CID_Builder* builder,
- T1_Pos x,
- T1_Pos y )
+ T1_Error start_point( CID_Builder* builder,
+ T1_Pos x,
+ T1_Pos y )
{
- /* test wether we're building a new contour */
- if (!builder->path_begun)
+ /* test whether we are building a new contour */
+ if ( !builder->path_begun )
{
- FT_Error error;
+ T1_Error error;
+
builder->path_begun = 1;
error = add_contour( builder );
- if (error) return error;
+ if ( error )
+ return error;
}
+
return add_point1( builder, x, y );
}
@@ -363,127 +392,142 @@
{
FT_Outline* outline = &builder->current;
+
if ( outline->n_contours > 0 )
- outline->contours[outline->n_contours-1] = outline->n_points-1;
+ outline->contours[outline->n_contours - 1] = outline->n_points - 1;
}
+
#if 0
-/*********************************************************************
- *
- * <Function>
- * lookup_glyph_by_stdcharcode
- *
- * <Description>
- * Lookup a given glyph by its StandardEncoding charcode. Used
- * to implement the SEAC Type 1 operator.
- *
- * <Input>
- * face :: current face object
- * charcode :: charcode to look for
- *
- * <Return>
- * glyph index in font face. Returns -1 if the corresponding
- * glyph wasn't found.
- *
- *********************************************************************/
+
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* lookup_glyph_by_stdcharcode */
+ /* */
+ /* <Description> */
+ /* Looks up a given glyph by its StandardEncoding charcode. Used */
+ /* to implement the SEAC Type 1 operator. */
+ /* */
+ /* <Input> */
+ /* face :: The current face object. */
+ /* */
+ /* charcode :: The character code to look for. */
+ /* */
+ /* <Return> */
+ /* A glyph index in the font face. Returns -1 if the corresponding */
+ /* glyph wasn't found. */
+ /* */
static
- FT_Int lookup_glyph_by_stdcharcode( CID_Face face,
- FT_Int charcode )
+ T1_Int lookup_glyph_by_stdcharcode( CID_Face face,
+ T1_Int charcode )
{
- FT_Int n;
- const FT_String* glyph_name;
+ T1_Int n;
+ const T1_String* glyph_name;
PSNames_Interface* psnames = (PSNames_Interface*)face->psnames;
+
/* check range of standard char code */
- if (charcode < 0 || charcode > 255)
+ if ( charcode < 0 || charcode > 255 )
return -1;
glyph_name = psnames->adobe_std_strings(
- psnames->adobe_std_encoding[charcode]);
+ psnames->adobe_std_encoding[charcode]);
for ( n = 0; n < face->cid.cid_count; n++ )
{
T1_String* name = (T1_String*)face->type1.glyph_names[n];
- if ( name && strcmp(name,glyph_name) == 0 )
+
+ if ( name && strcmp( name, glyph_name ) == 0 )
return n;
}
return -1;
}
-#endif
-
-/*********************************************************************
- *
- * <Function>
- * t1operator_seac
- *
- * <Description>
- * Implements the "seac" Type 1 operator for a Type 1 decoder
- *
- * <Input>
- * decoder :: current Type 1 decoder
- * asb :: accent's side bearing
- * adx :: horizontal position of accent
- * ady :: vertical position of accent
- * bchar :: base character's StandardEncoding charcode
- * achar :: accent character's StandardEncoding charcode
- *
- * <Return>
- * Error code. 0 means success.
- *
- *********************************************************************/
+#endif /* 0 */
+
+
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* t1operator_seac */
+ /* */
+ /* <Description> */
+ /* Implements the `seac' Type 1 operator for a Type 1 decoder. */
+ /* */
+ /* <Input> */
+ /* decoder :: The current CID decoder. */
+ /* */
+ /* asb :: The accent's side bearing. */
+ /* */
+ /* adx :: The horizontal offset of the accent. */
+ /* */
+ /* ady :: The vertical offset of the accent. */
+ /* */
+ /* bchar :: The base character's StandardEncoding charcode. */
+ /* */
+ /* achar :: The accent character's StandardEncoding charcode. */
+ /* */
+ /* <Return> */
+ /* Type 1 error code. 0 means success. */
+ /* */
static
FT_Error t1operator_seac( CID_Decoder* decoder,
- FT_Pos asb,
- FT_Pos adx,
- FT_Pos ady,
- FT_Int bchar,
- FT_Int achar )
+ T1_Pos asb,
+ T1_Pos adx,
+ T1_Pos ady,
+ T1_Int bchar,
+ T1_Int achar )
{
- FT_Error error;
- FT_Int bchar_index, achar_index, n_base_points;
+ T1_Error error;
+ T1_Int bchar_index, achar_index, n_base_points;
FT_Outline* cur = &decoder->builder.current;
FT_Outline* base = &decoder->builder.base;
- FT_Vector left_bearing, advance;
+ T1_Vector left_bearing, advance;
+
bchar_index = bchar;
achar_index = achar;
- if (bchar_index < 0 || achar_index < 0)
+ if ( bchar_index < 0 || achar_index < 0 )
{
- FT_ERROR(( "T1.Parse_Seac : invalid seac character code arguments\n" ));
+ FT_ERROR(( "t1operator_seac: invalid seac character code arguments\n" ));
return T1_Err_Syntax_Error;
}
- /* First load "bchar" in builder */
+ /* First load `bchar' in builder */
/* now load the unscaled outline */
cur->n_points = 0;
cur->n_contours = 0;
cur->points = base->points + base->n_points;
- cur->tags = base->tags + base->n_points;
+ cur->tags = base->tags + base->n_points;
cur->contours = base->contours + base->n_contours;
error = cid_load_glyph( decoder, bchar_index );
- if (error) return error;
+ if ( error )
+ return error;
- n_base_points = cur->n_points;
+ n_base_points = cur->n_points;
if ( decoder->builder.no_recurse )
{
- /* if we're trying to load a composite glyph, do not load the */
- /* accent character and return the array of subglyphs.. */
+ /* if we are trying to load a composite glyph, do not load the */
+ /* accent character and return the array of subglyphs. */
+
FT_GlyphSlot glyph = (FT_GlyphSlot)decoder->builder.glyph;
FT_SubGlyph* subg;
+
/* reallocate subglyph array if necessary */
- if (glyph->max_subglyphs < 2)
+ if ( glyph->max_subglyphs < 2 )
{
FT_Memory memory = decoder->builder.face->root.memory;
+
if ( REALLOC_ARRAY( glyph->subglyphs, glyph->max_subglyphs,
2, FT_SubGlyph ) )
return error;
@@ -514,29 +558,32 @@
else
{
/* save the left bearing and width of the base character */
- /* as they will be erase by the next load.. */
+ /* as they will be erased by the next load. */
+
left_bearing = decoder->builder.left_bearing;
advance = decoder->builder.advance;
decoder->builder.left_bearing.x = 0;
decoder->builder.left_bearing.y = 0;
- /* Now load "achar" on top of */
+ /* Now load `achar' on top of */
/* the base outline */
- /* */
+
cur->n_points = 0;
cur->n_contours = 0;
cur->points = base->points + base->n_points;
- cur->tags = base->tags + base->n_points;
+ cur->tags = base->tags + base->n_points;
cur->contours = base->contours + base->n_contours;
error = cid_load_glyph( decoder, achar_index );
- if (error) return error;
+ if ( error )
+ return error;
/* adjust contours in accented character outline */
- if (decoder->builder.load_points)
+ if ( decoder->builder.load_points )
{
- FT_Int n;
+ T1_Int n;
+
for ( n = 0; n < cur->n_contours; n++ )
cur->contours[n] += n_base_points;
@@ -544,53 +591,58 @@
/* restore the left side bearing and */
/* advance width of the base character */
+
decoder->builder.left_bearing = left_bearing;
decoder->builder.advance = advance;
/* Finally, move the accent */
- if (decoder->builder.load_points)
+ if ( decoder->builder.load_points )
FT_Outline_Translate( cur, adx - asb, ady );
}
+
return T1_Err_Ok;
}
-/*********************************************************************
- *
- * <Function>
- * CID_Parse_CharStrings
- *
- * <Description>
- * Parses a given Type 1 charstrings program
- *
- * <Input>
- * decoder :: current Type 1 decoder
- * charstring_base :: base of the charstring stream
- * charstring_len :: length in bytes of the charstring stream
- * num_subrs :: number of sub-routines
- * subrs_base :: array of sub-routines addresses
- * subrs_len :: array of sub-routines lengths
- *
- * <Return>
- * Error code. 0 means success.
- *
- *********************************************************************/
-
-#define USE_ARGS(n) top -= n; if (top < decoder->stack) goto Stack_Underflow
+#define USE_ARGS( n ) top -= n; \
+ if ( top < decoder->stack ) \
+ goto Stack_Underflow
+
+
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* CID_Parse_CharStrings */
+ /* */
+ /* <Description> */
+ /* Parses a given CID charstrings program. */
+ /* */
+ /* <InOut> */
+ /* decoder :: The current CID decoder. */
+ /* */
+ /* <Input> */
+ /* charstring_base :: The base of the charstring stream. */
+ /* */
+ /* charstring_len :: The length in bytes of the charstring stream. */
+ /* */
+ /* <Return> */
+ /* Type1 error code. 0 means success. */
+ /* */
LOCAL_FUNC
- FT_Error CID_Parse_CharStrings( CID_Decoder* decoder,
- FT_Byte* charstring_base,
- FT_Int charstring_len )
+ T1_Error CID_Parse_CharStrings( CID_Decoder* decoder,
+ T1_Byte* charstring_base,
+ T1_Int charstring_len )
{
- FT_Error error;
- CID_Decoder_Zone* zone;
- FT_Byte* ip;
- FT_Byte* limit;
- CID_Builder* builder = &decoder->builder;
- FT_Outline* outline;
- T1_Pos x, y;
-
- /* First of all, initialise the decoder */
+ T1_Error error;
+ CID_Decoder_Zone* zone;
+ T1_Byte* ip;
+ T1_Byte* limit;
+ CID_Builder* builder = &decoder->builder;
+ FT_Outline* outline;
+ T1_Pos x, y;
+
+
+ /* First of all, initialize the decoder */
decoder->top = decoder->stack;
decoder->zone = decoder->zones;
zone = decoder->zones;
@@ -610,121 +662,166 @@
/* now, execute loop */
while ( ip < limit )
{
- FT_Int* top = decoder->top;
- T1_Operator op = op_none;
- FT_Long value = 0;
+ T1_Int* top = decoder->top;
+ T1_Operator op = op_none;
+ T1_Long value = 0;
+
/********************************************************************/
/* */
/* Decode operator or operand */
/* */
- /* */
/* First of all, decompress operator or value */
- switch (*ip++)
+ switch ( *ip++ )
{
- case 1: op = op_hstem; break;
-
- case 3: op = op_vstem; break;
- case 4: op = op_vmoveto; break;
- case 5: op = op_rlineto; break;
- case 6: op = op_hlineto; break;
- case 7: op = op_vlineto; break;
- case 8: op = op_rrcurveto; break;
- case 9: op = op_closepath; break;
- case 10: op = op_callsubr; break;
- case 11: op = op_return; break;
-
- case 13: op = op_hsbw; break;
- case 14: op = op_endchar; break;
+ case 1:
+ op = op_hstem;
+ break;
+
+ case 3:
+ op = op_vstem;
+ break;
+ case 4:
+ op = op_vmoveto;
+ break;
+ case 5:
+ op = op_rlineto;
+ break;
+ case 6:
+ op = op_hlineto;
+ break;
+ case 7:
+ op = op_vlineto;
+ break;
+ case 8:
+ op = op_rrcurveto;
+ break;
+ case 9:
+ op = op_closepath;
+ break;
+ case 10:
+ op = op_callsubr;
+ break;
+ case 11:
+ op = op_return;
+ break;
+
+ case 13:
+ op = op_hsbw;
+ break;
+ case 14:
+ op = op_endchar;
+ break;
+
+ case 21:
+ op = op_rmoveto;
+ break;
+ case 22:
+ op = op_hmoveto;
+ break;
+
+ case 30:
+ op = op_vhcurveto;
+ break;
+ case 31:
+ op = op_hvcurveto;
+ break;
+
+ case 12:
+ if ( ip > limit )
+ {
+ FT_ERROR(( "CID_Parse_CharStrings: invalid escape (12+EOF)\n" ));
+ goto Syntax_Error;
+ }
- case 21: op = op_rmoveto; break;
- case 22: op = op_hmoveto; break;
+ switch ( *ip++ )
+ {
+ case 0:
+ op = op_dotsection;
+ break;
+ case 1:
+ op = op_vstem3;
+ break;
+ case 2:
+ op = op_hstem3;
+ break;
+ case 6:
+ op = op_seac;
+ break;
+ case 7:
+ op = op_sbw;
+ break;
+ case 12:
+ op = op_div;
+ break;
+ case 16:
+ op = op_callothersubr;
+ break;
+ case 17:
+ op = op_pop;
+ break;
+ case 33:
+ op = op_setcurrentpoint;
+ break;
- case 30: op = op_vhcurveto; break;
- case 31: op = op_hvcurveto; break;
+ default:
+ FT_ERROR(( "CID_Parse_CharStrings: invalid escape (12+%d)\n",
+ ip[-1] ));
+ goto Syntax_Error;
+ }
+ break;
- case 12:
- {
- if (ip > limit)
- {
- FT_ERROR(( "T1.Parse_CharStrings : invalid escape (12+EOF)\n" ));
- goto Syntax_Error;
- }
+ case 255: /* four bytes integer */
+ if ( ip + 4 > limit )
+ {
+ FT_ERROR(( "CID_Parse_CharStrings: unexpected EOF in integer\n" ));
+ goto Syntax_Error;
+ }
- switch (*ip++)
- {
- case 0: op = op_dotsection; break;
- case 1: op = op_vstem3; break;
- case 2: op = op_hstem3; break;
- case 6: op = op_seac; break;
- case 7: op = op_sbw; break;
- case 12: op = op_div; break;
- case 16: op = op_callothersubr; break;
- case 17: op = op_pop; break;
- case 33: op = op_setcurrentpoint; break;
-
- default:
- FT_ERROR(( "T1.Parse_CharStrings : invalid escape (12+%d)\n",
- ip[-1] ));
- goto Syntax_Error;
- }
- }
- break;
+ value = ( (long)ip[0] << 24 ) |
+ ( (long)ip[1] << 16 ) |
+ ( (long)ip[2] << 8 ) |
+ ip[3];
+ ip += 4;
+ break;
- case 255: /* four bytes integer */
+ default:
+ if ( ip[-1] >= 32 )
+ {
+ if ( ip[-1] < 247 )
+ value = (long)ip[-1] - 139;
+ else
{
- if (ip+4 > limit)
+ if ( ++ip > limit )
{
- FT_ERROR(( "T1.Parse_CharStrings : unexpected EOF in integer\n" ));
+ FT_ERROR(( "CID_Parse_CharStrings: unexpected EOF in integer\n" ));
goto Syntax_Error;
}
- value = ((long)ip[0] << 24) |
- ((long)ip[1] << 16) |
- ((long)ip[2] << 8) |
- ip[3];
- ip += 4;
- }
- break;
-
- default:
- if (ip[-1] >= 32)
- {
- if (ip[-1] < 247)
- value = (long)ip[-1] - 139;
+ if ( ip[-2] < 251 )
+ value = ( (long)( ip[-2] - 247 ) << 8 ) + ip[-1] + 108;
else
- {
- if (++ip > limit)
- {
- FT_ERROR(( "T1.Parse_CharStrings : unexpected EOF in integer\n" ));
- goto Syntax_Error;
- }
-
- if (ip[-2] < 251)
- value = ((long)(ip[-2]-247) << 8) + ip[-1] + 108;
- else
- value = -((((long)ip[-2]-251) << 8) + ip[-1] + 108 );
- }
+ value = -( ( ( (long)ip[-2] - 251 ) << 8 ) + ip[-1] + 108 );
}
- else
- {
- FT_ERROR(( "T1.Parse_CharStrings : invalid byte (%d)\n",
+ }
+ else
+ {
+ FT_ERROR(( "CID_Parse_CharStrings: invalid byte (%d)\n",
ip[-1] ));
- goto Syntax_Error;
- }
+ goto Syntax_Error;
+ }
}
/********************************************************************/
/* */
/* Push value on stack, or process operator */
/* */
- /* */
if ( op == op_none )
{
if ( top - decoder->stack >= T1_MAX_CHARSTRINGS_OPERANDS )
{
- FT_ERROR(( "T1.Parse_CharStrings : Stack overflow !!\n" ));
+ FT_ERROR(( "CID_Parse_CharStrings: Stack overflow!\n" ));
goto Syntax_Error;
}
@@ -741,476 +838,462 @@
top -= 2;
switch ( top[1] )
{
- case 1: /* start flex feature ---------------------- */
- {
- if ( top[0] != 0 ) goto Unexpected_OtherSubr;
+ case 1: /* start flex feature ---------------------- */
+ if ( top[0] != 0 )
+ goto Unexpected_OtherSubr;
+
+ decoder->flex_state = 1;
+ decoder->num_flex_vectors = 0;
+ if ( start_point( builder, x, y ) ||
+ check_points( builder, 6 ) )
+ goto Memory_Error;
+ break;
- decoder->flex_state = 1;
- decoder->num_flex_vectors = 0;
- if ( start_point(builder, x, y) ||
- check_points(builder,6) ) goto Memory_Error;
- }
- break;
+ case 2: /* add flex vectors ------------------------ */
+ {
+ T1_Int index;
- case 2: /* add flex vectors ------------------------ */
- {
- FT_Int index;
-
- if ( top[0] != 0 ) goto Unexpected_OtherSubr;
-
- /* note that we should not add a point for index 0 */
- /* this will move our current position to the flex */
- /* point without adding any point to the outline */
- index = decoder->num_flex_vectors++;
- if (index > 0 && index < 7)
- add_point( builder,
- x,
- y,
- (FT_Byte)( index==3 || index==6 ) );
- }
- break;
- case 0: /* end flex feature ------------------------- */
- {
- if ( top[0] != 3 ) goto Unexpected_OtherSubr;
-
- if ( decoder->flex_state == 0 ||
- decoder->num_flex_vectors != 7 )
- {
- FT_ERROR(( "T1.Parse_CharStrings: unexpected flex end\n" ));
- goto Syntax_Error;
- }
-
- /* now consume the remaining "pop pop setcurpoint" */
- if ( ip+6 > limit ||
- ip[0] != 12 || ip[1] != 17 || /* pop */
- ip[2] != 12 || ip[3] != 17 || /* pop */
- ip[4] != 12 || ip[5] != 33 ) /* setcurpoint */
- {
- FT_ERROR(( "T1.Parse_CharStrings: invalid flex charstring\n" ));
- goto Syntax_Error;
- }
-
- ip += 6;
- decoder->flex_state = 0;
- break;
- }
+ if ( top[0] != 0 )
+ goto Unexpected_OtherSubr;
+
+ /* note that we should not add a point for index 0. */
+ /* this will move our current position to the flex */
+ /* point without adding any point to the outline */
+ index = decoder->num_flex_vectors++;
+ if ( index > 0 && index < 7 )
+ add_point( builder,
+ x,
+ y,
+ (T1_Byte)( index==3 || index==6 ) );
+ }
+ break;
+
+ case 0: /* end flex feature ------------------------- */
+ if ( top[0] != 3 )
+ goto Unexpected_OtherSubr;
+
+ if ( decoder->flex_state == 0 ||
+ decoder->num_flex_vectors != 7 )
+ {
+ FT_ERROR(( "CID)Parse_CharStrings: unexpected flex end\n" ));
+ goto Syntax_Error;
+ }
+
+ /* now consume the remaining `pop pop setcurpoint' */
+ if ( ip + 6 > limit ||
+ ip[0] != 12 || ip[1] != 17 || /* pop */
+ ip[2] != 12 || ip[3] != 17 || /* pop */
+ ip[4] != 12 || ip[5] != 33 ) /* setcurpoint */
+ {
+ FT_ERROR(( "CID_Parse_CharStrings: invalid flex charstring\n" ));
+ goto Syntax_Error;
+ }
+
+ ip += 6;
+ decoder->flex_state = 0;
+ break;
+
+ case 3: /* change hints ---------------------------- */
+ if ( top[0] != 1 )
+ goto Unexpected_OtherSubr;
+
+ /* eat the following `pop' */
+ if ( ip + 2 > limit )
+ {
+ FT_ERROR(( "CID_Parse_CharStrings: invalid escape (12+%d)\n",
+ ip[-1] ));
+ goto Syntax_Error;
+ }
+
+ if ( ip[0] != 12 || ip[1] != 17 )
+ {
+ FT_ERROR(( "CID_Parse_CharStrings: `pop' expected, found (%d %d)\n",
+ ip[0], ip[1] ));
+ goto Syntax_Error;
+ }
+ ip += 2;
+ break;
+
+ case 12:
+ case 13:
+ /* counter control hints, clear stack */
+ top = decoder->stack;
+ break;
- case 3: /* change hints ---------------------------- */
+#if 0
+
+ case 14:
+ case 15:
+ case 16:
+ case 17:
+ case 18: /* multiple masters */
+ {
+ T1_Blend* blend = decoder->blend;
+ T1_UInt num_points, nn, mm;
+ T1_Int* delta;
+ T1_Int* values;
+
+ if ( !blend )
{
- if ( top[0] != 1 ) goto Unexpected_OtherSubr;
-
- /* eat the following "pop" */
- if (ip+2 > limit)
- {
- FT_ERROR(( "T1.Parse_CharStrings: invalid escape (12+%d)\n",
- ip[-1] ));
- goto Syntax_Error;
- }
-
- if (ip[0] != 12 || ip[1] != 17)
- {
- FT_ERROR(( "T1.Parse_CharStrings: 'pop' expected, found (%d %d)\n",
- ip[0], ip[1] ));
- goto Syntax_Error;
- }
- ip += 2;
- break;;
+ FT_ERROR(( "CID_Parse_CharStrings: unexpected multiple masters operator!\n" ));
+ goto Syntax_Error;
}
- case 12:
- case 13:
+ num_points = top[1] - 13 + ( top[1] == 18 );
+ if ( top[0] != num_points * blend->num_designs )
{
- /* counter control hints, clear stack */
- top = decoder->stack;
- break;
+ FT_ERROR(( "CID_Parse_CharStrings: incorrect number of mm arguments\n" ));
+ goto Syntax_Error;
}
-#if 0
- case 14:
- case 15:
- case 16:
- case 17:
- case 18: /* multiple masters */
+
+ top -= blend->num_designs * num_points;
+ if ( top < decoder->stack )
+ goto Stack_Underflow;
+
+ /* we want to compute: */
+ /* */
+ /* a0*w0 + a1*w1 + ... + ak*wk */
+ /* */
+ /* but we only have the a0, a1-a0, a2-a0, .. ak-a0 */
+ /* however, given that w0 + w1 + ... + wk == 1, we can */
+ /* rewrite it easily as: */
+ /* */
+ /* a0 + (a1-a0)*w1 + (a2-a0)*w2 + .. + (ak-a0)*wk */
+ /* */
+ /* where k == num_designs-1 */
+ /* */
+ /* I guess that's why it's written in this `compact' */
+ /* form... */
+ /* */
+ /* */
+ delta = top + num_points;
+ values = top;
+ for ( nn = 0; nn < num_points; nn++ )
{
- T1_Blend* blend = decoder->blend;
- FT_UInt num_points, nn, mm;
- FT_Int* delta;
- FT_Int* values;
-
- if (!blend)
- {
- FT_ERROR(( "T1.Parse_CharStrings: unexpected multiple masters operator !!\n" ));
- goto Syntax_Error;
- }
-
- num_points = top[1] - 13 + (top[1] == 18);
- if (top[0] != num_points*blend->num_designs)
- {
- FT_ERROR(( "T1.Parse_CharStrings: incorrect number of mm arguments\n" ));
- goto Syntax_Error;
- }
-
- top -= blend->num_designs*num_points;
- if (top < decoder->stack)
- goto Stack_Underflow;
-
- /* we want to compute: */
- /* */
- /* a0*w0 + a1*w1 + ... + ak*wk */
- /* */
- /* but we only have the a0, a1-a0, a2-a0, .. ak-a0 */
- /* however, given that w0 + w1 + ... + wk == 1, we can */
- /* rewrite it easily as: */
- /* */
- /* a0 + (a1-a0)*w1 + (a2-a0)*w2 + .. + (ak-a0)*wk */
- /* */
- /* where k == num_designs-1 */
- /* */
- /* I guess that's why it's written in this "compact" */
- /* form.. */
- /* */
- /* */
- delta = top + num_points;
- values = top;
- for ( nn = 0; nn < num_points; nn++ )
- {
- FT_Int x = values[0];
- for ( mm = 1; mm < blend->num_designs; mm++ )
- x += FT_MulFix( *delta++, blend->weight_vector[mm] );
-
- *values++ = x;
- }
- /* note that "top" will be incremented later by calls to "pop" */
- break;
+ T1_Int x = values[0];
+
+
+ for ( mm = 1; mm < blend->num_designs; mm++ )
+ x += FT_MulFix( *delta++, blend->weight_vector[mm] );
+
+ *values++ = x;
}
-#endif
- default:
- Unexpected_OtherSubr:
- FT_ERROR(( "T1.Parse_CharStrings: invalid othersubr [%d %d]!!\n",
- top[0], top[1] ));
- goto Syntax_Error;
+ /* note that `top' will be incremented later by calls to `pop' */
+ }
+ break;
+
+#endif
+
+ default:
+ Unexpected_OtherSubr:
+ FT_ERROR(( "CID_Parse_CharStrings: invalid othersubr [%d %d]!\n",
+ top[0], top[1] ));
+ goto Syntax_Error;
}
decoder->top = top;
}
else /* general operator */
{
- FT_Int num_args = t1_args_count[op];
+ T1_Int num_args = t1_args_count[op];
+
if ( top - decoder->stack < num_args )
goto Stack_Underflow;
top -= num_args;
- switch (op)
+ switch ( op )
{
- case op_endchar: /*************************************************/
- {
- FT_TRACE4(( " endchar" ));
- close_contour( builder );
+ case op_endchar:
+ FT_TRACE4(( " endchar" ));
+
+ close_contour( builder );
+
+ /* add current outline to the glyph slot */
+ builder->base.n_points += builder->current.n_points;
+ builder->base.n_contours += builder->current.n_contours;
+
+ /* return now! */
+ FT_TRACE4(( "\n\n" ));
+ return T1_Err_Ok;
+
+ case op_hsbw:
+ FT_TRACE4(( " hsbw" ));
+
+ builder->left_bearing.x += top[0];
+ builder->advance.x = top[1];
+ builder->advance.y = 0;
- /* add current outline to the glyph slot */
- builder->base.n_points += builder->current.n_points;
- builder->base.n_contours += builder->current.n_contours;
+ builder->last.x = x = top[0];
+ builder->last.y = y = 0;
- /* return now !! */
- FT_TRACE4(( "\n\n" ));
+ /* the `metrics_only' indicates that we only want to compute */
+ /* the glyph's metrics (lsb + advance width), not load the */
+ /* rest of it. So exit immediately. */
+ if ( builder->metrics_only )
return T1_Err_Ok;
- }
+ break;
- case op_hsbw: /****************************************************/
- {
- FT_TRACE4(( " hsbw" ));
- builder->left_bearing.x += top[0];
- builder->advance.x = top[1];
- builder->advance.y = 0;
+ case op_seac:
+ /* return immediately after the processing */
+ return t1operator_seac( decoder, top[0], top[1],
+ top[2], top[3], top[4] );
- builder->last.x = x = top[0];
- builder->last.y = y = 0;
+ case op_sbw:
+ FT_TRACE4(( " sbw" ));
- /* the "metrics_only" indicates that we only want to compute */
- /* the glyph's metrics (lsb + advance width), not load the */
- /* rest of it.. so exit immediately */
- if (builder->metrics_only)
- return T1_Err_Ok;
+ builder->left_bearing.x += top[0];
+ builder->left_bearing.y += top[1];
+ builder->advance.x = top[2];
+ builder->advance.y = top[3];
- break;
- }
+ builder->last.x = x = top[0];
+ builder->last.y = y = top[1];
+ /* the `metrics_only' indicates that we only want to compute */
+ /* the glyph's metrics (lsb + advance width), not load the */
+ /* rest of it. So exit immediately. */
+ if ( builder->metrics_only )
+ return T1_Err_Ok;
- case op_seac: /****************************************************/
- /* return immediately after the processing */
- return t1operator_seac( decoder, top[0], top[1],
- top[2], top[3], top[4] );
+ break;
- case op_sbw: /****************************************************/
- {
- FT_TRACE4(( " sbw" ));
- builder->left_bearing.x += top[0];
- builder->left_bearing.y += top[1];
- builder->advance.x = top[2];
- builder->advance.y = top[3];
-
- builder->last.x = x = top[0];
- builder->last.y = y = top[1];
-
- /* the "metrics_only" indicates that we only want to compute */
- /* the glyph's metrics (lsb + advance width), not load the */
- /* rest of it.. so exit immediately */
- if (builder->metrics_only)
- return T1_Err_Ok;
-
- break;
- }
+ case op_closepath:
+ FT_TRACE4(( " closepath" ));
+
+ close_contour( builder );
+ builder->path_begun = 0;
+ break;
+ case op_hlineto:
+ FT_TRACE4(( " hlineto" ));
- case op_closepath: /**********************************************/
- {
- FT_TRACE4(( " closepath" ));
- close_contour( builder );
- builder->path_begun = 0;
- }
+ if ( start_point( builder, x, y ) )
+ goto Memory_Error;
+
+ x += top[0];
+ goto Add_Line;
+
+ case op_hmoveto:
+ FT_TRACE4(( " hmoveto" ));
+
+ x += top[0];
break;
+ case op_hvcurveto:
+ FT_TRACE4(( " hvcurveto" ));
- case op_hlineto: /************************************************/
- {
- FT_TRACE4(( " hlineto" ));
- if ( start_point( builder, x, y ) ) goto Memory_Error;
+ if ( start_point( builder, x, y ) ||
+ check_points( builder, 3 ) )
+ goto Memory_Error;
- x += top[0];
- goto Add_Line;
- }
+ x += top[0];
+ add_point( builder, x, y, 0 );
+ x += top[1];
+ y += top[2];
+ add_point( builder, x, y, 0 );
- case op_hmoveto: /************************************************/
- {
- FT_TRACE4(( " hmoveto" ));
- x += top[0];
- break;
- }
+ y += top[3];
+ add_point( builder, x, y, 1 );
+ break;
- case op_hvcurveto: /**********************************************/
- {
- FT_TRACE4(( " hvcurveto" ));
- if ( start_point( builder, x, y ) ||
- check_points( builder, 3 ) ) goto Memory_Error;
-
- x += top[0];
- add_point( builder, x, y, 0 );
- x += top[1];
- y += top[2];
- add_point( builder, x, y, 0 );
- y += top[3];
- add_point( builder, x, y, 1 );
- break;
- }
+ case op_rlineto:
+ FT_TRACE4(( " rlineto" ));
+ if ( start_point( builder, x, y ) )
+ goto Memory_Error;
- case op_rlineto: /*************************************************/
- {
- FT_TRACE4(( " rlineto" ));
- if ( start_point( builder, x, y ) ) goto Memory_Error;
-
- x += top[0];
- y += top[1];
- Add_Line:
- if (add_point1( builder, x, y )) goto Memory_Error;
- break;
- }
+ x += top[0];
+ y += top[1];
+ Add_Line:
+ if ( add_point1( builder, x, y ) )
+ goto Memory_Error;
+ break;
- case op_rmoveto: /*************************************************/
- {
- FT_TRACE4(( " rmoveto" ));
- x += top[0];
- y += top[1];
- break;
- }
+ case op_rmoveto:
+ FT_TRACE4(( " rmoveto" ));
- case op_rrcurveto: /***********************************************/
- {
- FT_TRACE4(( " rcurveto" ));
- if ( start_point( builder, x, y ) ||
- check_points( builder, 3 ) ) goto Memory_Error;
-
- x += top[0];
- y += top[1];
- add_point( builder, x, y, 0 );
-
- x += top[2];
- y += top[3];
- add_point( builder, x, y, 0 );
-
- x += top[4];
- y += top[5];
- add_point( builder, x, y, 1 );
- break;
- }
+ x += top[0];
+ y += top[1];
+ break;
+ case op_rrcurveto:
+ FT_TRACE4(( " rcurveto" ));
- case op_vhcurveto: /**********************************************/
- {
- FT_TRACE4(( " vhcurveto" ));
- if ( start_point( builder, x, y ) ||
- check_points( builder, 3 ) ) goto Memory_Error;
-
- y += top[0];
- add_point( builder, x, y, 0 );
- x += top[1];
- y += top[2];
- add_point( builder, x, y, 0 );
- x += top[3];
- add_point( builder, x, y, 1 );
- break;
- }
+ if ( start_point( builder, x, y ) ||
+ check_points( builder, 3 ) )
+ goto Memory_Error;
+ x += top[0];
+ y += top[1];
+ add_point( builder, x, y, 0 );
- case op_vlineto: /************************************************/
- {
- FT_TRACE4(( " vlineto" ));
- if ( start_point( builder, x, y ) ) goto Memory_Error;
+ x += top[2];
+ y += top[3];
+ add_point( builder, x, y, 0 );
- y += top[0];
- goto Add_Line;
- }
+ x += top[4];
+ y += top[5];
+ add_point( builder, x, y, 1 );
+ break;
- case op_vmoveto: /************************************************/
- {
- FT_TRACE4(( " vmoveto" ));
- y += top[0];
- break;
- }
+ case op_vhcurveto:
+ FT_TRACE4(( " vhcurveto" ));
+ if ( start_point( builder, x, y ) ||
+ check_points( builder, 3 ) )
+ goto Memory_Error;
+
+ y += top[0];
+ add_point( builder, x, y, 0 );
+
+ x += top[1];
+ y += top[2];
+ add_point( builder, x, y, 0 );
+
+ x += top[3];
+ add_point( builder, x, y, 1 );
+
+ break;
+
+ case op_vlineto:
+ FT_TRACE4(( " vlineto" ));
+
+ if ( start_point( builder, x, y ) )
+ goto Memory_Error;
+
+ y += top[0];
+ goto Add_Line;
+ case op_vmoveto:
+ FT_TRACE4(( " vmoveto" ));
- case op_div: /****************************************************/
+ y += top[0];
+ break;
+
+ case op_div:
+ FT_TRACE4(( " div" ));
+
+ if ( top[1] )
+ *top++ = top[0] / top[1];
+ else
{
- FT_TRACE4(( " div" ));
- if (top[1])
- *top++ = top[0] / top[1];
- else
- {
- FT_ERROR(( "T1.Parse_CharStrings : division by 0\n" ));
- goto Syntax_Error;
- }
- break;
+ FT_ERROR(( "CID_Parse_CharStrings: division by 0\n" ));
+ goto Syntax_Error;
}
+ break;
-
- case op_callsubr: /***********************************************/
+ case op_callsubr:
{
- FT_Int index;
+ T1_Int index;
+
FT_TRACE4(( " callsubr" ));
+
index = top[0];
if ( index < 0 || index >= decoder->subrs->num_subrs )
{
- FT_ERROR(( "T1.Parse_CharStrings : invalid subrs index\n" ));
+ FT_ERROR(( "CID_Parse_CharStrings: invalid subrs index\n" ));
goto Syntax_Error;
}
if ( zone - decoder->zones >= T1_MAX_SUBRS_CALLS )
{
- FT_ERROR(( "T1.Parse_CharStrings : too many nested subrs\n" ));
+ FT_ERROR(( "CID_Parse_CharStrings: too many nested subrs\n" ));
goto Syntax_Error;
}
zone->cursor = ip; /* save current instruction pointer */
zone++;
- zone->base = decoder->subrs->code[index] + decoder->lenIV;
- zone->limit = decoder->subrs->code[index+1];
- zone->cursor = zone->base;
+ zone->base = decoder->subrs->code[index] + decoder->lenIV;
+ zone->limit = decoder->subrs->code[index + 1];
+ zone->cursor = zone->base;
- if (!zone->base)
+ if ( !zone->base )
{
- FT_ERROR(( "T1.Parse_CharStrings : invoking empty subrs !!\n" ));
+ FT_ERROR(( "CID_Parse_CharStrings: invoking empty subrs!\n" ));
goto Syntax_Error;
}
decoder->zone = zone;
ip = zone->base;
limit = zone->limit;
- break;
}
+ break;
+ case op_pop:
+ FT_TRACE4(( " pop" ));
- case op_pop: /****************************************************/
+ /* theorically, the arguments are already on the stack */
+ top++;
+ break;
+
+ case op_return:
+ FT_TRACE4(( " return" ));
+
+ if ( zone <= decoder->zones )
{
- FT_TRACE4(( " pop" ));
- /* theorically, the arguments are already on the stack */
- top++;
- break;
+ FT_ERROR(( "CID_Parse_CharStrings: unexpected return\n" ));
+ goto Syntax_Error;
}
+ zone--;
+ ip = zone->cursor;
+ limit = zone->limit;
+ decoder->zone = zone;
- case op_return: /************************************************/
- {
- FT_TRACE4(( " return" ));
- if ( zone <= decoder->zones )
- {
- FT_ERROR(( "T1.Parse_CharStrings : unexpected return\n" ));
- goto Syntax_Error;
- }
+ break;
- zone--;
- ip = zone->cursor;
- limit = zone->limit;
- decoder->zone = zone;
- break;
- }
+ case op_dotsection:
+ FT_TRACE4(( " dotsection" ));
- case op_dotsection: /*********************************************/
- {
- FT_TRACE4(( " dotsection" ));
- break;
- }
+ break;
- case op_hstem: /**************************************************/
- {
- FT_TRACE4(( " hstem" ));
- break;
- }
+ case op_hstem:
+ FT_TRACE4(( " hstem" ));
- case op_hstem3: /*************************************************/
- {
- FT_TRACE4(( " hstem3" ));
- break;
- }
+ break;
- case op_vstem: /**************************************************/
- {
- FT_TRACE4(( " vstem" ));
- break;
- }
+ case op_hstem3:
+ FT_TRACE4(( " hstem3" ));
- case op_vstem3: /*************************************************/
- {
- FT_TRACE4(( " vstem3" ));
- break;
- }
+ break;
- case op_setcurrentpoint: /*****************************************/
- {
- FT_TRACE4(( " setcurrentpoint" ));
- FT_ERROR(( "T1.Parse_CharStrings : unexpected SETCURRENTPOINT\n" ));
- goto Syntax_Error;
- }
+ case op_vstem:
+ FT_TRACE4(( " vstem" ));
- default:
- FT_ERROR(( "T1.Parse_CharStrings : unhandled opcode %d\n", op ));
- goto Syntax_Error;
+ break;
+
+ case op_vstem3:
+ FT_TRACE4(( " vstem3" ));
+
+ break;
+
+ case op_setcurrentpoint:
+ FT_TRACE4(( " setcurrentpoint" ));
+
+ FT_ERROR(( "CID_Parse_CharStrings: unexpected `setcurrentpoint'\n" ));
+ goto Syntax_Error;
+
+ default:
+ FT_ERROR(( "CID_Parse_CharStrings: unhandled opcode %d\n", op ));
+ goto Syntax_Error;
}
decoder->top = top;
} /* general operator processing */
-
} /* while ip < limit */
+
FT_TRACE4(( "..end..\n\n" ));
+
return error;
Syntax_Error:
@@ -1224,36 +1307,39 @@
}
+ /*************************************************************************/
+ /*************************************************************************/
+ /*************************************************************************/
+ /********** *********/
+ /********** *********/
+ /********** COMPUTE THE MAXIMUM ADVANCE WIDTH *********/
+ /********** *********/
+ /********** The following code is in charge of computing *********/
+ /********** the maximum advance width of the font. It *********/
+ /********** quickly processes each glyph charstring to *********/
+ /********** extract the value from either a `sbw' or `seac' *********/
+ /********** operator. *********/
+ /********** *********/
+ /*************************************************************************/
+ /*************************************************************************/
+ /*************************************************************************/
- /**********************************************************************/
- /**********************************************************************/
- /**********************************************************************/
- /********** *********/
- /********** *********/
- /********** COMPUTE THE MAXIMUM ADVANCE WIDTH *********/
- /********** *********/
- /********** The following code is in charge of computing *********/
- /********** the maximum advance width of the font. It *********/
- /********** quickly process each glyph charstring to *********/
- /********** extract the value from either a "sbw" or "seac" *********/
- /********** operator. *********/
- /********** *********/
- /**********************************************************************/
- /**********************************************************************/
- /**********************************************************************/
#if 0
+
+
LOCAL_FUNC
- FT_Error CID_Compute_Max_Advance( CID_Face face,
- FT_Int *max_advance )
+ T1_Error CID_Compute_Max_Advance( CID_Face face,
+ T1_Int* max_advance )
{
- FT_Error error;
+ T1_Error error;
CID_Decoder decoder;
- FT_Int glyph_index;
+ T1_Int glyph_index;
+
*max_advance = 0;
- /* Initialise load decoder */
+ /* Initialize load decoder */
CID_Init_Decoder( &decoder );
CID_Init_Builder( &decoder.builder, face, 0, 0 );
@@ -1261,8 +1347,9 @@
decoder.builder.load_points = 0;
/* For each glyph, parse the glyph charstring and extract */
- /* the advance width.. */
- for ( glyph_index = 0; glyph_index < face->root.num_glyphs; glyph_index++ )
+ /* the advance width. */
+ for ( glyph_index = 0; glyph_index < face->root.num_glyphs;
+ glyph_index++ )
{
/* now get load the unscaled outline */
error = cid_load_glyph( &decoder, glyph_index );
@@ -1270,46 +1357,53 @@
}
*max_advance = decoder.builder.advance.x;
+
return T1_Err_Ok;
}
-#endif
- /**********************************************************************/
- /**********************************************************************/
- /**********************************************************************/
- /********** *********/
- /********** *********/
- /********** UNHINTED GLYPH LOADER *********/
- /********** *********/
- /********** The following code is in charge of loading a *********/
- /********** single outline. It completely ignores hinting *********/
- /********** and is used when FT_LOAD_NO_HINTING is set. *********/
- /********** *********/
- /**********************************************************************/
- /**********************************************************************/
- /**********************************************************************/
+
+#endif /* 0 */
+
+
+ /*************************************************************************/
+ /*************************************************************************/
+ /*************************************************************************/
+ /********** *********/
+ /********** *********/
+ /********** UNHINTED GLYPH LOADER *********/
+ /********** *********/
+ /********** The following code is in charge of loading a *********/
+ /********** single outline. It completely ignores hinting *********/
+ /********** and is used when FT_LOAD_NO_HINTING is set. *********/
+ /********** *********/
+ /*************************************************************************/
+ /*************************************************************************/
+ /*************************************************************************/
+
static
- FT_Error cid_load_glyph( CID_Decoder* decoder, FT_UInt glyph_index )
+ T1_Error cid_load_glyph( CID_Decoder* decoder,
+ T1_UInt glyph_index )
{
- CID_Face face = decoder->builder.face;
- CID_Info* cid = &face->cid;
- FT_Byte* p;
- FT_UInt entry_len = cid->fd_bytes + cid->gd_bytes;
- FT_UInt fd_select;
- FT_ULong off1, glyph_len;
- FT_Stream stream = face->root.stream;
- FT_Error error = 0;
+ CID_Face face = decoder->builder.face;
+ CID_Info* cid = &face->cid;
+ T1_Byte* p;
+ T1_UInt entry_len = cid->fd_bytes + cid->gd_bytes;
+ T1_UInt fd_select;
+ T1_ULong off1, glyph_len;
+ FT_Stream stream = face->root.stream;
+ T1_Error error = 0;
+
/* read the CID font dict index and charstring offset from the CIDMap */
if ( FILE_Seek( cid->data_offset + cid->cidmap_offset +
glyph_index * entry_len) ||
- ACCESS_Frame( 2*entry_len ) )
- goto Exit;
+ ACCESS_Frame( 2 * entry_len ) )
+ goto Exit;
- p = (FT_Byte*)stream->cursor;
- fd_select = (FT_UInt) cid_get_offset( &p, cid->fd_bytes );
- off1 = (FT_ULong)cid_get_offset( &p, cid->gd_bytes );
+ p = (T1_Byte*)stream->cursor;
+ fd_select = (T1_UInt) cid_get_offset( &p, cid->fd_bytes );
+ off1 = (T1_ULong)cid_get_offset( &p, cid->gd_bytes );
p += cid->fd_bytes;
glyph_len = cid_get_offset( &p, cid->gd_bytes ) - off1;
@@ -1317,28 +1411,29 @@
/* now, if the glyph is not empty, set up the subrs array, and parse */
/* the charstrings */
- if (glyph_len > 0)
+ if ( glyph_len > 0 )
{
- CID_FontDict* dict;
- FT_Byte* charstring;
- FT_UInt lenIV;
- FT_Memory memory = face->root.memory;
+ CID_FontDict* dict;
+ T1_Byte* charstring;
+ T1_UInt lenIV;
+ FT_Memory memory = face->root.memory;
+
/* setup subrs */
decoder->subrs = face->subrs + fd_select;
- /* setup font matrix */
+ /* setup font matrix */
dict = cid->font_dicts + fd_select;
decoder->font_matrix = dict->font_matrix;
lenIV = dict->private_dict.lenIV;
decoder->lenIV = lenIV;
-
- /* the charstrings are encoded (stupid !!) */
- /* load the charstrings, then execute it */
-
+
+ /* the charstrings are encoded (stupid!) */
+ /* load the charstrings, then execute it */
+
if ( ALLOC( charstring, glyph_len ) )
goto Exit;
-
+
if ( !FILE_Read_At( cid->data_offset + off1, charstring, glyph_len ) )
{
cid_decrypt( charstring, glyph_len, 4330 );
@@ -1352,22 +1447,23 @@
Exit:
return error;
- }
-
-
+ }
+
+
LOCAL_FUNC
- FT_Error CID_Load_Glyph( T1_GlyphSlot glyph,
+ T1_Error CID_Load_Glyph( T1_GlyphSlot glyph,
T1_Size size,
- FT_Int glyph_index,
- FT_Int load_flags )
+ T1_Int glyph_index,
+ T1_Int load_flags )
{
- FT_Error error;
- CID_Decoder decoder;
- CID_Face face = (CID_Face)glyph->root.face;
- T1_Bool hinting;
+ T1_Error error;
+ CID_Decoder decoder;
+ CID_Face face = (CID_Face)glyph->root.face;
+ T1_Bool hinting;
+
- if (load_flags & FT_LOAD_NO_RECURSE)
+ if ( load_flags & FT_LOAD_NO_RECURSE )
load_flags |= FT_LOAD_NO_SCALE | FT_LOAD_NO_HINTING;
glyph->x_scale = size->root.metrics.x_scale;
@@ -1386,7 +1482,8 @@
CID_Init_Builder( &decoder.builder, face, size, glyph );
/* set up the decoder */
- decoder.builder.no_recurse = (FT_Bool)!!(load_flags & FT_LOAD_NO_RECURSE);
+ decoder.builder.no_recurse =
+ (FT_Bool)( load_flags & FT_LOAD_NO_RECURSE );
error = cid_load_glyph( &decoder, glyph_index );
@@ -1394,10 +1491,10 @@
CID_Done_Builder( &decoder.builder );
}
- /* Now, set the metrics.. - this is rather simple, as : */
- /* the left side bearing is the xMin, and the top side */
- /* bearing the yMax.. */
- if (!error)
+ /* Now, set the metrics - this is rather simple, as */
+ /* the left side bearing is the xMin, and the top side */
+ /* bearing the yMax. */
+ if ( !error )
{
/* for composite glyphs, return only the left side bearing and the */
/* advance width.. */
@@ -1408,8 +1505,9 @@
}
else
{
- FT_BBox cbox;
- FT_Glyph_Metrics* metrics = &glyph->root.metrics;
+ FT_BBox cbox;
+ FT_Glyph_Metrics* metrics = &glyph->root.metrics;
+
/* copy the _unscaled_ advance width */
metrics->horiAdvance = decoder.builder.advance.x;
@@ -1427,21 +1525,22 @@
glyph->root.outline.flags |= ft_outline_reverse_fill;
- /*
+#if 0
glyph->root.outline.second_pass = TRUE;
- glyph->root.outline.high_precision = ( size->root.metrics.y_ppem < 24 );
+ glyph->root.outline.high_precision = size->root.metrics.y_ppem < 24;
glyph->root.outline.dropout_mode = 2;
- */
+#endif
- if ( (load_flags & FT_LOAD_NO_SCALE) == 0 )
+ if ( ( load_flags & FT_LOAD_NO_SCALE ) == 0 )
{
/* scale the outline and the metrics */
- FT_Int n;
- FT_Outline* cur = &decoder.builder.base;
- T1_Vector* vec = cur->points;
+ T1_Int n;
+ FT_Outline* cur = &decoder.builder.base;
+ T1_Vector* vec = cur->points;
T1_Fixed x_scale = glyph->x_scale;
T1_Fixed y_scale = glyph->y_scale;
+
/* First of all, scale the points */
for ( n = cur->n_points; n > 0; n--, vec++ )
{
@@ -1466,12 +1565,12 @@
FT_Outline_Get_CBox( &glyph->root.outline, &cbox );
/* grid fit the bounding box if necessary */
- if (hinting)
+ if ( hinting )
{
cbox.xMin &= -64;
cbox.yMin &= -64;
- cbox.xMax = ( cbox.xMax+63 ) & -64;
- cbox.yMax = ( cbox.yMax+63 ) & -64;
+ cbox.xMax = ( cbox.xMax + 63 ) & -64;
+ cbox.yMax = ( cbox.yMax + 63 ) & -64;
}
metrics->width = cbox.xMax - cbox.xMin;
@@ -1481,6 +1580,9 @@
metrics->horiBearingY = cbox.yMax;
}
}
+
return error;
}
+
+/* END */
diff --git a/src/cid/cidgload.h b/src/cid/cidgload.h
index ac6ab0b..7bf44eb 100644
--- a/src/cid/cidgload.h
+++ b/src/cid/cidgload.h
@@ -1,36 +1,20 @@
-/*******************************************************************
- *
- * cidgload.h 1.0
- *
- * CID-Keyed Type1 Glyph Loader.
- *
- * Copyright 1996-1998 by
- * David Turner, Robert Wilhelm, and Werner Lemberg.
- *
- * This file is part of the FreeType project, and may only be used
- * modified and distributed under the terms of the FreeType project
- * license, LICENSE.TXT. By continuing to use, modify, or distribute
- * this file you indicate that you have read the license and
- * understand and accept it fully.
- *
- *
- * The Type 1 glyph loader uses three distinct objects to build
- * scaled and hinted outlines from a charstrings program. These are :
- *
- * - a glyph builder, CID_Builder, used to store the built outline
- *
- * - a glyph hinter, T1_Hinter, used to record and apply the stem
- * hints
- *
- * - a charstrings interpreter, CID_Decoder, used to parse the
- * Type 1 charstrings stream, manage a stack and call the builder
- * and/or hinter depending on the opcodes.
- *
- * Ideally, a Type 2 glyph loader would only need to have its own
- * T2_Decoder object (assuming the hinter is able to manage all
- * kinds of hints).
- *
- ******************************************************************/
+/***************************************************************************/
+/* */
+/* cidgload.h */
+/* */
+/* OpenType Glyph Loader (specification). */
+/* */
+/* 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 */
+/* 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 CIDGLOAD_H
#define CIDGLOAD_H
@@ -42,46 +26,59 @@
#endif
-/*************************************************************************/
-/* */
-/* <Structure> CID_Builder */
-/* */
-/* <Description> */
-/* a structure used during glyph loading to store its outline. */
-/* */
-/* <Fields> */
-/* system :: current system object */
-/* face :: current face object */
-/* glyph :: current glyph slot */
-/* */
-/* current :: current glyph outline */
-/* base :: base glyph outline */
-/* */
-/* max_points :: maximum points in builder outline */
-/* max_contours :: maximum contours in builder outline */
-/* */
-/* last :: last point position */
-/* */
-/* scale_x :: horizontal scale ( FUnits to sub-pixels ) */
-/* scale_y :: vertical scale ( FUnits to sub-pixels ) */
-/* pos_x :: horizontal translation (composite glyphs) */
-/* pos_y :: vertical translation (composite glyph) */
-/* */
-/* left_bearing :: left side bearing point */
-/* advance :: horizontal advance vector */
-/* */
-/* path_begun :: flag, indicates that a new path has begun */
-/* load_points :: flag, if not set, no points are loaded */
-/* */
-/* error :: an error code that is only used to report */
-/* memory allocation problems.. */
-/* */
-/* metrics_only :: a boolean indicating that we only want to */
-/* compute the metrics of a given glyph, not load */
-/* all of its points.. */
-/* */
-
- typedef struct CID_Builder_
+ /*************************************************************************/
+ /* */
+ /* <Structure> */
+ /* CID_Builder */
+ /* */
+ /* <Description> */
+ /* A structure used during glyph loading to store its outline. */
+ /* */
+ /* <Fields> */
+ /* memory :: The current memory object. */
+ /* */
+ /* face :: The current face object. */
+ /* */
+ /* glyph :: The current glyph slot. */
+ /* */
+ /* current :: The current glyph outline. */
+ /* */
+ /* base :: The base glyph outline. */
+ /* */
+ /* max_points :: maximum points in builder outline */
+ /* */
+ /* max_contours :: Maximal number of contours in builder outline. */
+ /* */
+ /* last :: The last point position. */
+ /* */
+ /* scale_x :: The horizontal scale (FUnits to sub-pixels). */
+ /* */
+ /* scale_y :: The vertical scale (FUnits to sub-pixels). */
+ /* */
+ /* pos_x :: The horizontal translation (if composite glyph). */
+ /* */
+ /* pos_y :: The vertical translation (if composite glyph). */
+ /* */
+ /* left_bearing :: The left side bearing point. */
+ /* */
+ /* advance :: The horizontal advance vector. */
+ /* */
+ /* bbox :: Unused. */
+ /* */
+ /* path_begun :: A flag which indicates that a new path has begun. */
+ /* */
+ /* load_points :: If this flag is not set, no points are loaded. */
+ /* */
+ /* no_recurse :: Set but not used. */
+ /* */
+ /* error :: An error code that is only used to report memory */
+ /* allocation problems. */
+ /* */
+ /* metrics_only :: A boolean indicating that we only want to compute */
+ /* the metrics of a given glyph, not load all of its */
+ /* points. */
+ /* */
+ typedef struct CID_Builder_
{
FT_Memory memory;
CID_Face face;
@@ -90,8 +87,8 @@
FT_Outline current; /* the current glyph outline */
FT_Outline base; /* the composite glyph outline */
- FT_Int max_points; /* capacity of base outline in points */
- FT_Int max_contours; /* capacity of base outline in contours */
+ T1_Int max_points; /* capacity of base outline in points */
+ T1_Int max_contours; /* capacity of base outline in contours */
T1_Vector last;
@@ -109,80 +106,86 @@
T1_Bool load_points;
T1_Bool no_recurse;
- FT_Error error; /* only used for memory errors */
+ T1_Error error; /* only used for memory errors */
T1_Bool metrics_only;
} CID_Builder;
/* execution context charstring zone */
- typedef struct CID_Decoder_Zone_
+
+ typedef struct CID_Decoder_Zone_
{
- FT_Byte* base;
- FT_Byte* limit;
- FT_Byte* cursor;
+ T1_Byte* base;
+ T1_Byte* limit;
+ T1_Byte* cursor;
} CID_Decoder_Zone;
- typedef struct CID_Decoder_
+ typedef struct CID_Decoder_
{
CID_Builder builder;
- FT_Int stack[ T1_MAX_CHARSTRINGS_OPERANDS ];
- FT_Int* top;
+ T1_Int stack[T1_MAX_CHARSTRINGS_OPERANDS];
+ T1_Int* top;
- CID_Decoder_Zone zones[ T1_MAX_SUBRS_CALLS+1 ];
+ CID_Decoder_Zone zones[T1_MAX_SUBRS_CALLS + 1];
CID_Decoder_Zone* zone;
- FT_Matrix font_matrix;
+ T1_Matrix font_matrix;
CID_Subrs* subrs;
- FT_UInt lenIV;
+ T1_UInt lenIV;
- FT_Int flex_state;
- FT_Int num_flex_vectors;
- FT_Vector flex_vectors[7];
+ T1_Int flex_state;
+ T1_Int num_flex_vectors;
+ T1_Vector flex_vectors[7];
} CID_Decoder;
-
LOCAL_DEF
- void CID_Init_Builder( CID_Builder* builder,
- CID_Face face,
- T1_Size size,
- T1_GlyphSlot glyph );
+ void CID_Init_Builder( CID_Builder* builder,
+ CID_Face face,
+ T1_Size size,
+ T1_GlyphSlot glyph );
LOCAL_DEF
void CID_Done_Builder( CID_Builder* builder );
LOCAL_DEF
- void CID_Init_Decoder( CID_Decoder* decoder );
+ void CID_Init_Decoder( CID_Decoder* decoder );
#if 0
+
/* Compute the maximum advance width of a font through quick parsing */
LOCAL_DEF
- FT_Error CID_Compute_Max_Advance( CID_Face face,
- FT_Int *max_advance );
+ T1_Error CID_Compute_Max_Advance( CID_Face face,
+ T1_Int* max_advance );
+
#endif
/* This function is exported, because it is used by the T1Dump utility */
LOCAL_DEF
- FT_Error CID_Parse_CharStrings( CID_Decoder* decoder,
- FT_Byte* charstring_base,
- FT_Int charstring_len );
+ T1_Error CID_Parse_CharStrings( CID_Decoder* decoder,
+ T1_Byte* charstring_base,
+ T1_Int charstring_len );
LOCAL_DEF
- FT_Error CID_Load_Glyph( T1_GlyphSlot glyph,
+ T1_Error CID_Load_Glyph( T1_GlyphSlot glyph,
T1_Size size,
- FT_Int glyph_index,
- FT_Int load_flags );
+ T1_Int glyph_index,
+ T1_Int load_flags );
#ifdef __cplusplus
}
#endif
-#endif /* T1GLOAD_H */
+
+#endif /* CIDGLOAD_H */
+
+
+/* END */
diff --git a/src/cid/cidload.c b/src/cid/cidload.c
index 40df463..9dc6f4a 100644
--- a/src/cid/cidload.c
+++ b/src/cid/cidload.c
@@ -1,59 +1,20 @@
-/*******************************************************************
- *
- * cidload.h 2.0
- *
- * CID-keyed foint loader
- *
- * 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
- * license, LICENSE.TXT. By continuing to use, modify, or distribute
- * this file you indicate that you have read the license and
- * understand and accept it fully.
- *
- *
- * This is the new and improved Type 1 data loader for FreeType 2.
- * The old loader has several problems: it is slow, complex, difficult
- * to maintain, and contains incredible hacks to make it accept some
- * ill-formed Type 1 fonts without hiccup-ing. Moreover, about 5%
- * of the Type 1 fonts on my machine still aren't loaded correctly
- * with it.
- *
- * This version is much simpler, much faster and also easier to
- * read and maintain by a great order of magnitude. The idea behind
- * it is to _not_ try to read the Type 1 token stream with a state
- * machine (i.e. a Postscript-like interpreter) but rather to perform
- * simple pattern-matching.
- *
- * Indeed, nearly all data definitions follow a simple pattern
- * like :
- *
- * ..... /Field <data> ....
- *
- * where <data> can be a number, a boolean, a string, or an
- * array of numbers. There are a few exceptions, namely the
- * encoding, font name, charstrings and subrs and they are
- * handled with a special pattern-matching routine.
- *
- * All other common cases are handled very simply. The matching
- * rules are defined in the file "t1tokens.h" through the use
- * of several macros calls T1_FIELD_XXX
- *
- * The function "parse_dict" simply scans *linearly* a given
- * dictionary (either the top-level or private one) and calls
- * the appropriate callback when it encounters an immediate
- * keyword.
- *
- * This is by far the fastest way one can find to parse and read
- * all data :-)
- *
- * This led to tremendous code size reduction. Note that later,
- * the glyph loader will also be _greatly_ simplified, and the
- * automatic hinter will replace the clumsy "t1hinter"..
- *
- ******************************************************************/
+/***************************************************************************/
+/* */
+/* cidload.c */
+/* */
+/* CID-keyed Type1 font loader (body). */
+/* */
+/* 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 */
+/* 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. */
+/* */
+/***************************************************************************/
+
#include <freetype/internal/ftdebug.h>
#include <freetype/config/ftconfig.h>
@@ -62,290 +23,322 @@
#include <freetype/internal/t1types.h>
#include <freetype/internal/t1errors.h>
#include <cidload.h>
+
#include <stdio.h>
+#include <ctype.h> /* for isspace(), isalnum() */
+
+ /*************************************************************************/
+ /* */
+ /* The macro FT_COMPONENT is used in trace mode. It is an implicit */
+ /* parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log */
+ /* messages during execution. */
+ /* */
#undef FT_COMPONENT
-#define FT_COMPONENT trace_t1load
+#define FT_COMPONENT trace_cidload
- /* reads a single offset */
+
+ /* read a single offset */
LOCAL_FUNC
- FT_Long cid_get_offset( FT_Byte** start, FT_Byte offsize )
+ T1_Long cid_get_offset( T1_Byte** start,
+ T1_Byte offsize )
{
- FT_Long result;
- FT_Byte* p = *start;
-
+ T1_Long result;
+ T1_Byte* p = *start;
+
+
for ( result = 0; offsize > 0; offsize-- )
- result = (result << 8) | *p++;
-
+ result = ( result << 8 ) | *p++;
+
*start = p;
return result;
}
LOCAL_FUNC
- void cid_decrypt( FT_Byte* buffer,
- FT_Int length,
- FT_UShort seed )
+ void cid_decrypt( T1_Byte* buffer,
+ T1_Int length,
+ T1_UShort seed )
{
while ( length > 0 )
{
- FT_Byte plain;
+ T1_Byte plain;
+
- plain = (*buffer ^ (seed >> 8));
- seed = (*buffer+seed)*52845+22719;
+ plain = ( *buffer ^ ( seed >> 8 ) );
+ seed = ( *buffer + seed ) * 52845 + 22719;
*buffer++ = plain;
length--;
}
}
-
- /***************************************************************************/
- /***************************************************************************/
- /***** *****/
- /***** TYPE 1 SYMBOL PARSING *****/
- /***** *****/
- /***************************************************************************/
- /***************************************************************************/
+ /*************************************************************************/
+ /*************************************************************************/
+ /***** *****/
+ /***** TYPE 1 SYMBOL PARSING *****/
+ /***** *****/
+ /*************************************************************************/
+ /*************************************************************************/
- static FT_Error cid_load_keyword( CID_Face face,
- CID_Loader* loader,
- const T1_Field_Rec* keyword )
+ static
+ T1_Error cid_load_keyword( CID_Face face,
+ CID_Loader* loader,
+ const T1_Field_Rec* keyword )
{
- FT_Error error;
+ T1_Error error;
CID_Parser* parser = &loader->parser;
- FT_Byte* object;
+ T1_Byte* object;
CID_Info* cid = &face->cid;
+
/* if the keyword has a dedicated callback, call it */
- if (keyword->type == t1_field_callback)
+ if ( keyword->type == t1_field_callback )
{
error = keyword->reader( face, parser );
goto Exit;
}
/* we must now compute the address of our target object */
- switch (keyword->location)
+ switch ( keyword->location )
{
- case t1_field_cid_info:
- object = (FT_Byte*)cid;
- break;
-
- case t1_field_font_info:
- object = (FT_Byte*)&cid->font_info;
- break;
-
- default:
+ case t1_field_cid_info:
+ object = (T1_Byte*)cid;
+ break;
+
+ case t1_field_font_info:
+ object = (T1_Byte*)&cid->font_info;
+ break;
+
+ default:
+ {
+ CID_FontDict* dict;
+
+
+ if ( parser->num_dict < 0 )
{
- CID_FontDict* dict;
-
- if ( parser->num_dict < 0 )
- {
- FT_ERROR(( "CID.Load_Keyword: invalid use of '%s' !!\n", keyword->ident ));
- error = T1_Err_Syntax_Error;
- goto Exit;
- }
-
- dict = cid->font_dicts + parser->num_dict;
- switch (keyword->location)
- {
- case t1_field_private:
- object = (FT_Byte*)&dict->private_dict;
- break;
-
- default:
- object = (FT_Byte*)dict;
- }
+ FT_ERROR(( "cid_load_keyword: invalid use of `%s'!\n",
+ keyword->ident ));
+ error = T1_Err_Syntax_Error;
+ goto Exit;
}
+
+ dict = cid->font_dicts + parser->num_dict;
+ switch ( keyword->location )
+ {
+ case t1_field_private:
+ object = (T1_Byte*)&dict->private_dict;
+ break;
+
+ default:
+ object = (T1_Byte*)dict;
+ }
+ }
}
-
+
/* now, load the keyword data in the object's field(s) */
if ( keyword->type == t1_field_integer_array ||
keyword->type == t1_field_fixed_array )
error = CID_Load_Field_Table( parser, keyword, object );
else
error = CID_Load_Field( parser, keyword, object );
-
+
Exit:
return error;
- }
+ }
static
- FT_Error parse_font_bbox( CID_Face face, CID_Parser* parser )
+ T1_Error parse_font_bbox( CID_Face face,
+ CID_Parser* parser )
{
- FT_Short temp[4];
- T1_BBox* bbox = &face->cid.font_bbox;
+ T1_Short temp[4];
+ T1_BBox* bbox = &face->cid.font_bbox;
+
(void)CID_ToCoordArray( parser, 4, temp );
bbox->xMin = temp[0];
bbox->yMin = temp[1];
bbox->xMax = temp[2];
bbox->yMax = temp[3];
-
- return 0;
+
+ return T1_Err_Ok; /* this is a callback function; */
+ /* we must return an error code */
}
+
static
- FT_Error parse_font_matrix( CID_Face face, CID_Parser* parser )
+ T1_Error parse_font_matrix( CID_Face face,
+ CID_Parser* parser )
{
- FT_Matrix* matrix;
+ T1_Matrix* matrix;
CID_FontDict* dict;
T1_Fixed temp[4];
- if (parser->num_dict >= 0)
+
+ if ( parser->num_dict >= 0 )
{
dict = face->cid.font_dicts + parser->num_dict;
matrix = &dict->font_matrix;
-
+
(void)CID_ToFixedArray( parser, 4, temp, 3 );
matrix->xx = temp[0];
matrix->yx = temp[1];
matrix->xy = temp[2];
matrix->yy = temp[3];
}
- return 0;
+
+ return T1_Err_Ok; /* this is a callback function; */
+ /* we must return an error code */
}
+
static
- FT_Error parse_fd_array( CID_Face face, CID_Parser* parser )
+ T1_Error parse_fd_array( CID_Face face,
+ CID_Parser* parser )
{
CID_Info* cid = &face->cid;
FT_Memory memory = face->root.memory;
- FT_Error error;
- FT_Long num_dicts;
-
- num_dicts = CID_ToInt(parser);
+ T1_Error error = T1_Err_Ok;
+ T1_Long num_dicts;
+
+
+ num_dicts = CID_ToInt( parser );
+
if ( !cid->font_dicts )
{
- FT_Int n;
-
+ T1_Int n;
+
+
if ( ALLOC_ARRAY( cid->font_dicts, num_dicts, CID_FontDict ) )
goto Exit;
-
- cid->num_dicts = (FT_UInt)num_dicts;
-
- /* don't forget to set a few defauts !! */
+
+ cid->num_dicts = (T1_UInt)num_dicts;
+
+ /* don't forget to set a few defaults */
for ( n = 0; n < cid->num_dicts; n++ )
{
CID_FontDict* dict = cid->font_dicts + n;
-
- /* default value for lenIV !! */
+
+
+ /* default value for lenIV */
dict->private_dict.lenIV = 4;
}
}
-
+
Exit:
return error;
}
-
static
- const T1_Field_Rec t1_field_records[] =
+ const T1_Field_Rec t1_field_records[] =
{
- #include <cidtokens.h>
+#include <cidtokens.h>
{ 0, 0, 0, 0, 0, 0 }
};
static
- int is_space( char c )
+ int is_alpha( char c )
{
- return ( c == ' ' || c == '\t' || c == '\r' || c == '\n' );
+ return ( isalnum( c ) ||
+ c == '.' ||
+ c == '_' );
}
- static
- int is_alpha( char c )
- {
- return ( (c >= 'A' && c <= 'Z') ||
- (c >= 'a' && c <= 'z') ||
- (c >= '0' && c <= '9') ||
- (c == '.') ||
- (c == '_') );
- }
static
- void skip_whitespace( CID_Parser* parser )
+ void skip_whitespace( CID_Parser* parser )
{
- FT_Byte* cur = parser->cursor;
+ T1_Byte* cur = parser->cursor;
+
- while ( cur < parser->limit && is_space(*cur) )
+ while ( cur < parser->limit && isspace( *cur ) )
cur++;
parser->cursor = cur;
}
-
static
- FT_Error parse_dict( CID_Face face,
+ T1_Error parse_dict( CID_Face face,
CID_Loader* loader,
- FT_Byte* base,
- FT_Long size )
+ T1_Byte* base,
+ T1_Long size )
{
- CID_Parser* parser = &loader->parser;
+ CID_Parser* parser = &loader->parser;
+
parser->cursor = base;
parser->limit = base + size;
parser->error = 0;
{
- FT_Byte* cur = base;
- FT_Byte* limit = cur + size;
+ T1_Byte* cur = base;
+ T1_Byte* limit = cur + size;
+
for ( ;cur < limit; cur++ )
{
- /* look for %ADOBegin... */
+ /* look for `%ADOBeginFontDict' */
if ( *cur == '%' && cur + 20 < limit &&
strncmp( (char*)cur, "%ADOBeginFontDict", 17 ) == 0 )
{
cur += 17;
-
+
/* if /FDArray was found, then cid->num_dicts is > 0, and */
/* we can start increasing parser->num_dict */
if ( face->cid.num_dicts > 0 )
parser->num_dict++;
}
/* look for immediates */
- else if (*cur == '/' && cur+2 < limit)
+ else if ( *cur == '/' && cur + 2 < limit )
{
- FT_Byte* cur2;
- FT_Int len;
+ T1_Byte* cur2;
+ T1_Int len;
+
+
+ cur++;
- cur ++;
cur2 = cur;
- while (cur2 < limit && is_alpha(*cur2)) cur2++;
- len = cur2-cur;
+ while ( cur2 < limit && is_alpha( *cur2 ) )
+ cur2++;
- if (len > 0 && len < 22)
+ len = cur2 - cur;
+ if ( len > 0 && len < 22 )
{
/* now, compare the immediate name to the keyword table */
const T1_Field_Rec* keyword = t1_field_records;
+
for (;;)
{
- FT_Byte* name;
+ T1_Byte* name;
+
- name = (FT_Byte*)keyword->ident;
- if (!name) break;
+ name = (T1_Byte*)keyword->ident;
+ if ( !name )
+ break;
- if ( cur[0] == name[0] &&
- len == (FT_Int)strlen((const char*)name) )
+ if ( cur[0] == name[0] &&
+ len == (T1_Int)strlen( (const char*)name ) )
{
- FT_Int n;
+ T1_Int n;
+
+
for ( n = 1; n < len; n++ )
- if (cur[n] != name[n])
+ if ( cur[n] != name[n] )
break;
- if (n >= len)
+ if ( n >= len )
{
- /* we found it - run the parsing callback !! */
+ /* we found it - run the parsing callback */
parser->cursor = cur2;
skip_whitespace( parser );
parser->error = cid_load_keyword( face, loader, keyword );
- if (parser->error)
+ if ( parser->error )
return parser->error;
cur = parser->cursor;
@@ -362,56 +355,60 @@
}
-
/* read the subrmap and the subrs of each font dict */
static
- FT_Error cid_read_subrs( CID_Face face )
+ T1_Error cid_read_subrs( CID_Face face )
{
CID_Info* cid = &face->cid;
FT_Memory memory = face->root.memory;
FT_Stream stream = face->root.stream;
- FT_Error error;
- FT_UInt n;
+ T1_Error error;
+ T1_UInt n;
CID_Subrs* subr;
- FT_UInt max_offsets = 0;
- FT_ULong* offsets = 0;
-
+ T1_UInt max_offsets = 0;
+ T1_ULong* offsets = 0;
+
+
if ( ALLOC_ARRAY( face->subrs, cid->num_dicts, CID_Subrs ) )
goto Exit;
-
+
subr = face->subrs;
for ( n = 0; n < cid->num_dicts; n++, subr++ )
{
- CID_FontDict* dict = cid->font_dicts + n;
- FT_UInt count, num_subrs = dict->num_subrs;
- FT_ULong data_len;
- FT_Byte* p;
-
+ CID_FontDict* dict = cid->font_dicts + n;
+ T1_UInt count, num_subrs = dict->num_subrs;
+ T1_ULong data_len;
+ T1_Byte* p;
+
+
/* reallocate offsets array if needed */
- if ( num_subrs+1 > max_offsets )
+ if ( num_subrs + 1 > max_offsets )
{
- FT_UInt new_max = (num_subrs+1+3) & -4;
- if ( REALLOC_ARRAY( offsets, max_offsets, new_max, FT_ULong ) )
+ T1_UInt new_max = ( num_subrs + 1 + 3 ) & -4;
+
+
+ if ( REALLOC_ARRAY( offsets, max_offsets, new_max, T1_ULong ) )
goto Fail;
-
+
max_offsets = new_max;
}
-
+
/* read the subrmap's offsets */
if ( FILE_Seek( cid->data_offset + dict->subrmap_offset ) ||
- ACCESS_Frame( (num_subrs+1) * dict->sd_bytes ) )
+ ACCESS_Frame( ( num_subrs + 1 ) * dict->sd_bytes ) )
goto Fail;
-
+
p = (FT_Byte*)stream->cursor;
for ( count = 0; count <= num_subrs; count++ )
offsets[count] = cid_get_offset( &p, dict->sd_bytes );
-
+
FORGET_Frame();
-
- /* now, compute the size of subrs charstrings, allocate and read them */
+
+ /* now, compute the size of subrs charstrings, */
+ /* allocate, and read them */
data_len = offsets[num_subrs] - offsets[0];
-
- if ( ALLOC_ARRAY( subr->code, num_subrs+1, FT_Byte* ) ||
+
+ if ( ALLOC_ARRAY( subr->code, num_subrs+1, T1_Byte* ) ||
ALLOC( subr->code[0], data_len ) )
goto Fail;
@@ -422,18 +419,20 @@
/* set up pointers */
for ( count = 1; count <= num_subrs; count++ )
{
- FT_UInt len;
-
- len = offsets[count] - offsets[count-1];
- subr->code[count] = subr->code[count-1] + len;
+ T1_UInt len;
+
+
+ len = offsets[count] - offsets[count - 1];
+ subr->code[count] = subr->code[count - 1] + len;
}
- /* decrypt subroutines */
+ /* decrypt subroutines */
for ( count = 0; count < num_subrs; count++ )
{
- FT_UInt len;
-
- len = offsets[count+1] - offsets[count];
+ T1_UInt len;
+
+
+ len = offsets[count + 1] - offsets[count];
cid_decrypt( subr->code[count], len, 4330 );
}
@@ -443,15 +442,15 @@
Exit:
FREE( offsets );
return error;
-
+
Fail:
- if (face->subrs)
+ if ( face->subrs )
{
for ( n = 0; n < cid->num_dicts; n++ )
{
- if (face->subrs[n].code)
+ if ( face->subrs[n].code )
FREE( face->subrs[n].code[0] );
-
+
FREE( face->subrs[n].code );
}
FREE( face->subrs );
@@ -459,45 +458,56 @@
goto Exit;
}
+
static
- void t1_init_loader( CID_Loader* loader, CID_Face face )
+ void t1_init_loader( CID_Loader* loader,
+ CID_Face face )
{
UNUSED(face);
- MEM_Set( loader, 0, sizeof(*loader) );
+ MEM_Set( loader, 0, sizeof ( *loader ) );
}
+
static
- void t1_done_loader( CID_Loader* loader )
+ void t1_done_loader( CID_Loader* loader )
{
CID_Parser* parser = &loader->parser;
+
/* finalize parser */
CID_Done_Parser( parser );
}
+
LOCAL_FUNC
- FT_Error CID_Open_Face( CID_Face face )
+ T1_Error CID_Open_Face( CID_Face face )
{
CID_Loader loader;
CID_Parser* parser;
- FT_Error error;
+ T1_Error error;
+
t1_init_loader( &loader, face );
parser = &loader.parser;
error = CID_New_Parser( parser, face->root.stream, face->root.memory );
- if (error) goto Exit;
+ if ( error )
+ goto Exit;
error = parse_dict( face, &loader,
parser->postscript,
parser->postscript_len );
- if (error) goto Exit;
+ if ( error )
+ goto Exit;
face->cid.data_offset = loader.parser.data_offset;
error = cid_read_subrs( face );
-
+
Exit:
t1_done_loader( &loader );
return error;
}
+
+
+/* END */
diff --git a/src/cid/cidload.h b/src/cid/cidload.h
index 53ae503..b90bb86 100644
--- a/src/cid/cidload.h
+++ b/src/cid/cidload.h
@@ -1,22 +1,23 @@
-/*******************************************************************
- *
- * t1load.h 2.0
- *
- * Type1 Loader.
- *
- * 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
- * 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 T1LOAD_H
-#define T1LOAD_H
+/***************************************************************************/
+/* */
+/* cidload.h */
+/* */
+/* CID-keyed Type1 font loader (specification). */
+/* */
+/* 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 */
+/* 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 CIDLOAD_H
+#define CIDLOAD_H
#include <freetype/internal/ftstream.h>
#include <cidparse.h>
@@ -25,30 +26,34 @@
extern "C" {
#endif
- typedef struct CID_Loader_
- {
- CID_Parser parser; /* parser used to read the stream */
- FT_Int num_chars; /* number of characters in encoding */
+ typedef struct CID_Loader_
+ {
+ CID_Parser parser; /* parser used to read the stream */
+ T1_Int num_chars; /* number of characters in encoding */
} CID_Loader;
+
LOCAL_DEF
- FT_Long cid_get_offset( FT_Byte** start, FT_Byte offsize );
+ T1_Long cid_get_offset( T1_Byte** start,
+ T1_Byte offsize );
LOCAL_DEF
- void cid_decrypt( FT_Byte* buffer,
- FT_Int length,
- FT_UShort seed );
+ void cid_decrypt( T1_Byte* buffer,
+ T1_Int length,
+ T1_UShort seed );
LOCAL_DEF
- FT_Error CID_Open_Face( CID_Face face );
+ T1_Error CID_Open_Face( CID_Face face );
+
#ifdef __cplusplus
}
#endif
-#endif /* T1LOAD_H */
+
+#endif /* CIDLOAD_H */
/* END */
diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c
index d22d7fc..0fa535c 100644
--- a/src/cid/cidobjs.c
+++ b/src/cid/cidobjs.c
@@ -1,19 +1,20 @@
-/*******************************************************************
- *
- * t1objs.c 1.0
- *
- * Type1 Objects manager.
- *
- * Copyright 1996-1998 by
- * David Turner, Robert Wilhelm, and Werner Lemberg.
- *
- * This file is part of the FreeType project, and may only be used
- * modified and distributed under the terms of the FreeType project
- * license, LICENSE.TXT. By continuing to use, modify, or distribute
- * this file you indicate that you have read the license and
- * understand and accept it fully.
- *
- ******************************************************************/
+/***************************************************************************/
+/* */
+/* cidobjs.c */
+/* */
+/* CID objects manager (body). */
+/* */
+/* 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 */
+/* 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. */
+/* */
+/***************************************************************************/
+
#include <freetype/internal/ftdebug.h>
#include <freetype/internal/ftstream.h>
@@ -23,90 +24,90 @@
#include <freetype/internal/psnames.h>
#include <cidafm.h>
-/* Required by tracing mode */
-#undef FT_COMPONENT
-#define FT_COMPONENT trace_t1objs
-
-/*******************************************************************
- * *
- * SIZE FUNCTIONS *
- * *
- * *
- *******************************************************************/
-
-/*******************************************************************
- *
- * <Function> T1_Done_Size
- *
- * <Description>
- * The TrueDoc instance object destructor. Used to discard
- * a given instance object..
- *
- * <Input>
- * instance :: handle to the target instance object
- *
- * <Return>
- * TrueDoc error code. 0 means success
- *
- ******************************************************************/
+ /*************************************************************************/
+ /* */
+ /* The macro FT_COMPONENT is used in trace mode. It is an implicit */
+ /* parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log */
+ /* messages during execution. */
+ /* */
+#undef FT_COMPONENT
+#define FT_COMPONENT trace_cidobjs
+
+
+ /*************************************************************************/
+ /* */
+ /* SIZE FUNCTIONS */
+ /* */
+ /*************************************************************************/
+
+
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* CID_Done_Size */
+ /* */
+ /* <Description> */
+ /* The CID size object finalizer. */
+ /* */
+ /* <Input> */
+ /* size :: A handle to the target size object. */
+ /* */
LOCAL_FUNC
- void T1_Done_Size( T1_Size size )
+ void CID_Done_Size( T1_Size size )
{
- UNUSED(size);
+ UNUSED( size );
}
-/*******************************************************************
- *
- * <Function> T1_Init_Size
- *
- * <Description>
- * The instance object constructor
- *
- * <Input>
- * instance : handle to new instance object
- * face : pointer to parent face object
- *
- * <Return>
- * TrueDoc error code. 0 means success.
- *
- ******************************************************************/
-
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* CID_Init_Size */
+ /* */
+ /* <Description> */
+ /* Initializes a new CID size object. */
+ /* */
+ /* <InOut> */
+ /* size :: A handle to the size object. */
+ /* */
+ /* <Return> */
+ /* Type1 error code. 0 means success. */
+ /* */
LOCAL_DEF
- FT_Error T1_Init_Size( T1_Size size )
+ T1_Error CID_Init_Size( T1_Size size )
{
size->valid = 0;
+
return T1_Err_Ok;
}
-/*******************************************************************
- *
- * <Function> T1_Reset_Size
- *
- * <Description>
- * Resets an instance to a new pointsize/transform.
- * This function is in charge of resetting the blue zones,
- * As well as the stem snap tables for a given size..
- *
- * <Input>
- * instance the instance object to destroy
- *
- * <Output>
- * Error code.
- *
- ******************************************************************/
-
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* CID_Reset_Size */
+ /* */
+ /* <Description> */
+ /* Resets a OpenType size when resolutions and character dimensions */
+ /* have been changed. */
+ /* */
+ /* <Input> */
+ /* size :: A handle to the target size object. */
+ /* */
+ /* <Output> */
+ /* Type1 error code. 0 means success. */
+ /* */
LOCAL_FUNC
- FT_Error T1_Reset_Size( T1_Size size )
+ T1_Error CID_Reset_Size( T1_Size size )
{
- /* recompute ascender, descender, etc.. */
+ /* recompute ascender, descender, etc. */
CID_Face face = (CID_Face)size->root.face;
FT_Size_Metrics* metrics = &size->root.metrics;
+
if ( metrics->x_ppem < 1 || metrics->y_ppem < 1 )
- return FT_Err_Invalid_Argument;
+ return T1_Err_Invalid_Argument;
/* Compute root ascender, descender, test height, and max_advance */
metrics->ascender = ( FT_MulFix( face->root.ascender,
@@ -120,125 +121,135 @@
metrics->max_advance = ( FT_MulFix( face->root.max_advance_width,
metrics->x_scale ) + 32 ) & -64;
- return 0;
- }
+ return T1_Err_Ok;
+ }
-/*******************************************************************
- * *
- * FACE FUNCTIONS *
- * *
- * *
- *******************************************************************/
-
-/*******************************************************************
- *
- * <Function> T1_Done_Face
- *
- * <Description>
- * The face object destructor.
- *
- * <Input>
- * face :: typeless pointer to the face object to destroy
- *
- * <Return>
- * Error code.
- *
- ******************************************************************/
+ /*************************************************************************/
+ /* */
+ /* FACE FUNCTIONS */
+ /* */
+ /*************************************************************************/
+
+
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* CID_Done_Face */
+ /* */
+ /* <Description> */
+ /* Finalizes a given face object. */
+ /* */
+ /* <Input> */
+ /* face :: A pointer to the face object to destroy. */
+ /* */
LOCAL_FUNC
- void T1_Done_Face( CID_Face face )
+ void CID_Done_Face( CID_Face face )
{
FT_Memory memory;
- if (face)
+
+ if ( face )
{
- CID_Info* cid = &face->cid;
- T1_FontInfo* info = &cid->font_info;
+ CID_Info* cid = &face->cid;
+ T1_FontInfo* info = &cid->font_info;
+
memory = face->root.memory;
-
+
/* release FontInfo strings */
FREE( info->version );
FREE( info->notice );
FREE( info->full_name );
FREE( info->family_name );
FREE( info->weight );
-
+
/* release font dictionaries */
FREE( cid->font_dicts );
cid->num_dicts = 0;
-
+
/* release other strings */
FREE( cid->cid_font_name );
FREE( cid->registry );
FREE( cid->ordering );
-
+
face->root.family_name = 0;
face->root.style_name = 0;
}
}
-/*******************************************************************
- *
- * <Function> T1_Init_Face
- *
- * <Description>
- * The face object constructor.
- *
- * <Input>
- * face :: face record to build
- * Input :: input stream where to load font data
- *
- * <Return>
- * Error code.
- *
- ******************************************************************/
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* CID_Init_Face */
+ /* */
+ /* <Description> */
+ /* Initializes a given CID face object. */
+ /* */
+ /* <Input> */
+ /* stream :: The source font stream. */
+ /* */
+ /* face_index :: The index of the font face in the resource. */
+ /* */
+ /* num_params :: Number of additional generic parameters. Ignored. */
+ /* */
+ /* params :: Additional generic parameters. Ignored. */
+ /* */
+ /* <InOut> */
+ /* face :: The newly built face object. */
+ /* */
+ /* <Return> */
+ /* Type1 error code. 0 means success. */
+ /* */
LOCAL_FUNC
- FT_Error T1_Init_Face( FT_Stream stream,
- CID_Face face,
- FT_Int face_index,
- FT_Int num_params,
- FT_Parameter* params )
+ T1_Error CID_Init_Face( FT_Stream stream,
+ CID_Face face,
+ T1_Int face_index,
+ T1_Int num_params,
+ FT_Parameter* params )
{
- FT_Error error;
+ T1_Error error;
PSNames_Interface* psnames;
- UNUSED(num_params);
- UNUSED(params);
- UNUSED(face_index);
- UNUSED(stream);
+ UNUSED( num_params );
+ UNUSED( params );
+ UNUSED( face_index );
+ UNUSED( stream );
+
face->root.num_faces = 1;
psnames = (PSNames_Interface*)face->psnames;
- if (!psnames)
+ if ( !psnames )
{
/* look-up the PSNames driver */
FT_Driver psnames_driver;
+
psnames_driver = FT_Get_Driver( face->root.driver->library, "psnames" );
- if (psnames_driver)
+ if ( psnames_driver )
face->psnames = (PSNames_Interface*)
- (psnames_driver->interface.format_interface);
+ (psnames_driver->interface.format_interface);
}
- /* open the tokenizer, this will also check the font format */
- if ( FILE_Seek(0) )
+ /* open the tokenizer; this will also check the font format */
+ if ( FILE_Seek( 0 ) )
goto Exit;
-
+
error = CID_Open_Face( face );
- if (error) goto Exit;
+ if ( error )
+ goto Exit;
/* if we just wanted to check the format, leave successfully now */
- if (face_index < 0)
+ if ( face_index < 0 )
goto Exit;
/* check the face index */
if ( face_index != 0 )
{
- FT_ERROR(( "T1.Init_Face : invalid face index\n" ));
+ FT_ERROR(( "CID_Init_Face: invalid face index\n" ));
error = T1_Err_Invalid_Argument;
goto Exit;
}
@@ -250,6 +261,7 @@
{
FT_Face root = (FT_Face)&face->root;
+
root->num_glyphs = face->cid.cid_count;
root->num_charmaps = 0;
@@ -261,12 +273,12 @@
if ( face->cid.font_info.is_fixed_pitch )
root->face_flags |= FT_FACE_FLAG_FIXED_WIDTH;
- /* XXX : TO DO - add kerning with .afm support */
+ /* XXX: TO DO - add kerning with .afm support */
/* get style name - be careful, some broken fonts only */
- /* have a /FontName dictionary entry .. !! */
+ /* have a /FontName dictionary entry! */
root->family_name = face->cid.font_info.family_name;
- if (root->family_name)
+ if ( root->family_name )
{
char* full = face->cid.font_info.full_name;
char* family = root->family_name;
@@ -277,12 +289,13 @@
full++;
}
- root->style_name = ( *full == ' ' ? full+1 : "Regular" );
+ root->style_name = ( *full == ' ' ) ? full + 1
+ : "Regular";
}
else
{
- /* do we have a /FontName ?? */
- if (face->cid.cid_font_name)
+ /* do we have a `/FontName'? */
+ if ( face->cid.cid_font_name )
{
root->family_name = face->cid.cid_font_name;
root->style_name = "Regular";
@@ -297,29 +310,35 @@
root->units_per_EM = 1000;
root->ascender = (FT_Short)face->cid.font_bbox.yMax;
root->descender = -(FT_Short)face->cid.font_bbox.yMin;
- root->height = ((root->ascender + root->descender)*12)/10;
+ root->height = ( ( root->ascender + root->descender ) * 12 )
+ / 10;
+
#if 0
+
/* now compute the maximum advance width */
root->max_advance_width = face->type1.private_dict.standard_width[0];
/* compute max advance width for proportional fonts */
- if (!face->type1.font_info.is_fixed_pitch)
+ if ( !face->type1.font_info.is_fixed_pitch )
{
- FT_Int max_advance;
+ T1_Int max_advance;
+
error = T1_Compute_Max_Advance( face, &max_advance );
/* in case of error, keep the standard width */
- if (!error)
+ if ( !error )
root->max_advance_width = max_advance;
else
error = 0; /* clear error */
}
root->max_advance_height = root->height;
-#endif
+
+#endif /* 0 */
+
root->underline_position = face->cid.font_info.underline_position;
root->underline_thickness = face->cid.font_info.underline_thickness;
@@ -329,23 +348,28 @@
}
#if 0
+
/* charmap support - synthetize unicode charmap when possible */
{
FT_Face root = &face->root;
FT_CharMap charmap = face->charmaprecs;
+
/* synthesize a Unicode charmap if there is support in the "psnames" */
- /* module.. */
- if (face->psnames)
+ /* module */
+ if ( face->psnames )
{
PSNames_Interface* psnames = (PSNames_Interface*)face->psnames;
- if (psnames->unicode_value)
+
+
+ if ( psnames->unicode_value )
{
- error = psnames->build_unicodes( root->memory,
- face->type1.num_glyphs,
- (const char**)face->type1.glyph_names,
- &face->unicode_map );
- if (!error)
+ error = psnames->build_unicodes(
+ root->memory,
+ face->type1.num_glyphs,
+ (const char**)face->type1.glyph_names,
+ &face->unicode_map );
+ if ( !error )
{
root->charmap = charmap;
charmap->face = (FT_Face)face;
@@ -355,88 +379,93 @@
charmap++;
}
- /* simply clear the error in case of failure (which really) */
- /* means that out of memory or no unicode glyph names */
+ /* simply clear the error in case of failure (which really */
+ /* means that out of memory or no unicode glyph names) */
error = 0;
}
}
/* now, support either the standard, expert, or custom encodings */
charmap->face = (FT_Face)face;
- charmap->platform_id = 7; /* a new platform id for Adobe fonts ?? */
+ charmap->platform_id = 7; /* a new platform id for Adobe fonts? */
- switch (face->type1.encoding_type)
+ switch ( face->type1.encoding_type )
{
- case t1_encoding_standard:
- charmap->encoding = ft_encoding_adobe_standard;
- charmap->encoding_id = 0;
- break;
-
- case t1_encoding_expert:
- charmap->encoding = ft_encoding_adobe_expert;
- charmap->encoding_id = 1;
- break;
-
- default:
- charmap->encoding = ft_encoding_adobe_custom;
- charmap->encoding_id = 2;
- break;
+ case t1_encoding_standard:
+ charmap->encoding = ft_encoding_adobe_standard;
+ charmap->encoding_id = 0;
+ break;
+
+ case t1_encoding_expert:
+ charmap->encoding = ft_encoding_adobe_expert;
+ charmap->encoding_id = 1;
+ break;
+
+ default:
+ charmap->encoding = ft_encoding_adobe_custom;
+ charmap->encoding_id = 2;
+ break;
}
- root->charmaps = face->charmaps;
+ root->charmaps = face->charmaps;
root->num_charmaps = charmap - face->charmaprecs + 1;
- face->charmaps[0] = &face->charmaprecs[0];
- face->charmaps[1] = &face->charmaprecs[1];
+ face->charmaps[0] = &face->charmaprecs[0];
+ face->charmaps[1] = &face->charmaprecs[1];
}
-#endif
+
+#endif /* 0 */
+
Exit:
return error;
}
-/*******************************************************************
- *
- * Function : Glyph_Destroy
- *
- * Description : The glyph object destructor.
- *
- * Input : _glyph typeless pointer to the glyph record to destroy
- *
- * Output : Error code.
- *
- ******************************************************************/
-
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* CID_Done_GlyphSlot */
+ /* */
+ /* <Description> */
+ /* The CID glyph slot finalizer. */
+ /* */
+ /* <Input> */
+ /* slot :: A handle to the glyph slot object. */
+ /* */
LOCAL_FUNC
- void T1_Done_GlyphSlot( T1_GlyphSlot glyph )
+ void CID_Done_GlyphSlot( T1_GlyphSlot glyph )
{
FT_Memory memory = glyph->root.face->memory;
FT_Library library = glyph->root.face->driver->library;
+
/* the bitmaps are created on demand */
FREE( glyph->root.bitmap.buffer );
FT_Outline_Done( library, &glyph->root.outline );
+
return;
}
-/*******************************************************************
- *
- * Function : Glyph_Create
- *
- * Description : The glyph object constructor.
- *
- * Input : glyph glyph record to build.
- * face the glyph's parent face.
- *
- * Output : Error code.
- *
- ******************************************************************/
-
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* CID_Init_GlyphSlot */
+ /* */
+ /* <Description> */
+ /* The CID glyph slot initializer. */
+ /* */
+ /* <Input> */
+ /* slot :: The glyph record to build. */
+ /* */
+ /* <Output> */
+ /* Type1 error code. 0 means success. */
+ /* */
LOCAL_FUNC
- FT_Error T1_Init_GlyphSlot( T1_GlyphSlot glyph )
+ T1_Error CID_Init_GlyphSlot( T1_GlyphSlot glyph )
{
FT_Library library = glyph->root.face->driver->library;
+
glyph->max_points = 0;
glyph->max_contours = 0;
glyph->root.bitmap.buffer = 0;
@@ -445,46 +474,44 @@
}
-/*******************************************************************
- *
- * <Function> T1_Init_Driver
- *
- * <Description>
- * Initialise a given Type 1 driver object
- *
- * <Input>
- * driver :: handle to target driver object
- *
- * <Return>
- * Error code.
- *
- ******************************************************************/
-
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* CID_Init_Driver */
+ /* */
+ /* <Description> */
+ /* Initializes a given CID driver object. */
+ /* */
+ /* <Input> */
+ /* driver :: A handle to the target driver object. */
+ /* */
+ /* <Return> */
+ /* Type1 error code. 0 means success. */
+ /* */
LOCAL_FUNC
- FT_Error T1_Init_Driver( T1_Driver driver )
+ T1_Error CID_Init_Driver( T1_Driver driver )
{
- UNUSED(driver);
+ UNUSED( driver );
+
return T1_Err_Ok;
}
-
-/*******************************************************************
- *
- * <Function> T1_Done_Driver
- *
- * <Description>
- * finalise a given Type 1 driver
- *
- * <Input>
- * driver :: handle to target Type 1 driver
- *
- ******************************************************************/
-
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* CID_Done_Driver */
+ /* */
+ /* <Description> */
+ /* Finalizes a given CID driver. */
+ /* */
+ /* <Input> */
+ /* driver :: A handle to the target CID driver. */
+ /* */
LOCAL_DEF
- void T1_Done_Driver( T1_Driver driver )
+ void CID_Done_Driver( T1_Driver driver )
{
- UNUSED(driver);
+ UNUSED( driver );
}
diff --git a/src/cid/cidobjs.h b/src/cid/cidobjs.h
index 464cd2b..a0c4746 100644
--- a/src/cid/cidobjs.h
+++ b/src/cid/cidobjs.h
@@ -1,304 +1,167 @@
-/*******************************************************************
- *
- * t1objs.h 1.0
- *
- * Type1 objects definition.
- *
- * Copyright 1996-1999 by
- * David Turner, Robert Wilhelm, and Werner Lemberg.
- *
- * This file is part of the FreeType project, and may only be used
- * modified and distributed under the terms of the FreeType project
- * license, LICENSE.TXT. By continuing to use, modify, or distribute
- * this file you indicate that you have read the license and
- * understand and accept it fully.
- *
- ******************************************************************/
-
-#ifndef T1OBJS_H
-#define T1OBJS_H
+/***************************************************************************/
+/* */
+/* cidobjs.h */
+/* */
+/* CID objects manager (specification). */
+/* */
+/* 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 */
+/* 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 CIDOBJS_H
+#define CIDOBJS_H
#include <freetype/internal/ftobjs.h>
#include <freetype/config/ftconfig.h>
#include <freetype/internal/t1errors.h>
#include <freetype/internal/t1types.h>
+
#ifdef __cplusplus
extern "C" {
#endif
+
/* The following structures must be defined by the hinter */
typedef struct T1_Size_Hints_ T1_Size_Hints;
typedef struct T1_Glyph_Hints_ T1_Glyph_Hints;
- /***********************************************************************/
- /* */
- /* <Type> T1_Driver */
- /* */
- /* <Description> */
- /* A handle to a Type 1 driver object. */
- /* */
- typedef struct T1_DriverRec_ *T1_Driver;
-
-
- /***********************************************************************/
- /* */
- /* <Type> T1_Size */
- /* */
- /* <Description> */
- /* A handle to a Type 1 size object. */
- /* */
+
+ /*************************************************************************/
+ /* */
+ /* <Type> */
+ /* T1_Driver */
+ /* */
+ /* <Description> */
+ /* A handle to a Type 1 driver object. */
+ /* */
+ typedef struct T1_DriverRec_* T1_Driver;
+
+
+ /*************************************************************************/
+ /* */
+ /* <Type> */
+ /* T1_Size */
+ /* */
+ /* <Description> */
+ /* A handle to a Type 1 size object. */
+ /* */
typedef struct T1_SizeRec_* T1_Size;
- /***********************************************************************/
- /* */
- /* <Type> T1_GlyphSlot */
- /* */
- /* <Description> */
- /* A handle to a Type 1 glyph slot object. */
- /* */
+ /*************************************************************************/
+ /* */
+ /* <Type> */
+ /* T1_GlyphSlot */
+ /* */
+ /* <Description> */
+ /* A handle to a Type 1 glyph slot object. */
+ /* */
typedef struct T1_GlyphSlotRec_* T1_GlyphSlot;
- /***********************************************************************/
- /* */
- /* <Type> T1_CharMap */
- /* */
- /* <Description> */
- /* A handle to a Type 1 character mapping object. */
- /* */
- /* <Note> */
- /* The Type 1 format doesn't use a charmap but an encoding table. */
- /* The driver is responsible for making up charmap objects */
- /* corresponding to these tables.. */
- /* */
+ /*************************************************************************/
+ /* */
+ /* <Type> */
+ /* T1_CharMap */
+ /* */
+ /* <Description> */
+ /* A handle to a Type 1 character mapping object. */
+ /* */
+ /* <Note> */
+ /* The Type 1 format doesn't use a charmap but an encoding table. */
+ /* The driver is responsible for making up charmap objects */
+ /* corresponding to these tables. */
+ /* */
typedef struct T1_CharMapRec_* T1_CharMap;
+ /*************************************************************************/
+ /* */
+ /* HERE BEGINS THE TYPE1 SPECIFIC STUFF */
+ /* */
+ /*************************************************************************/
- /**************************************************************************/
- /* */
- /* NOW BEGINS THE TYPE1 SPECIFIC STUFF .............................. */
- /* */
- /**************************************************************************/
-
-
- /***************************************************/
- /* */
- /* T1_Size : */
- /* */
- /* Type 1 size record.. */
- /* */
typedef struct T1_SizeRec_
{
FT_SizeRec root;
T1_Bool valid;
- T1_Size_Hints* hints; /* defined in the hinter. This allows */
- /* us to experiment with different */
- /* hinting schemes without having to */
- /* change 't1objs' each time.. */
+ T1_Size_Hints* hints; /* defined in the hinter. This allows */
+ /* us to experiment with different */
+ /* hinting schemes without having to */
+ /* change `cidobjs' each time. */
} T1_SizeRec;
- /***************************************************/
- /* */
- /* T1_GlyphSlot : */
- /* */
- /* TrueDoc glyph record.. */
- /* */
-
- typedef struct T1_GlyphSlotRec_
+ typedef struct T1_GlyphSlotRec_
{
FT_GlyphSlotRec root;
T1_Bool hint;
T1_Bool scaled;
- FT_Int max_points;
- FT_Int max_contours;
+ T1_Int max_points;
+ T1_Int max_contours;
- FT_Fixed x_scale;
- FT_Fixed y_scale;
+ T1_Fixed x_scale;
+ T1_Fixed y_scale;
T1_Glyph_Hints* hints; /* defined in the hinter */
} T1_GlyphSlotRec;
-/*******************************************************************
- *
- * <Function> T1_Init_Face
- *
- * <Description>
- * Initialise a given Type 1 face object
- *
- * <Input>
- * face_index :: index of font face in resource
- * resource :: source font resource
- * face :: face record to build
- *
- * <Return>
- * Error code.
- *
- ******************************************************************/
-
LOCAL_DEF
- FT_Error T1_Init_Face( FT_Stream stream,
- CID_Face face,
- FT_Int face_index,
- FT_Int num_params,
- FT_Parameter* params );
-
-
-
-/*******************************************************************
- *
- * <Function> T1_Done_Face
- *
- * <Description>
- * Finalise a given face object
- *
- * <Input>
- * face :: handle to the face object to destroy
- *
- ******************************************************************/
+ T1_Error CID_Init_Face( FT_Stream stream,
+ CID_Face face,
+ T1_Int face_index,
+ T1_Int num_params,
+ FT_Parameter* params );
LOCAL_DEF
- void T1_Done_Face( CID_Face face );
-
-
+ void CID_Done_Face( CID_Face face );
-/*******************************************************************
- *
- * <Function> T1_Init_Size
- *
- * <Description>
- * Initialise a new Type 1 size object
- *
- * <Input>
- * size :: handle to size object
- *
- * <Return>
- * Type 1 error code. 0 means success.
- *
- ******************************************************************/
LOCAL_DEF
- FT_Error T1_Init_Size( T1_Size size );
-
-
-
-/*******************************************************************
- *
- * <Function> T1_Done_Size
- *
- * <Description>
- * The Type 1 size object finaliser.
- *
- * <Input>
- * size :: handle to the target size object.
- *
- ******************************************************************/
+ T1_Error CID_Init_Size( T1_Size size );
LOCAL_DEF
- void T1_Done_Size( T1_Size size );
-
-
-/*******************************************************************
- *
- * <Function> T1_Reset_Size
- *
- * <Description>
- * Reset a Type 1 size when resolutions and character dimensions
- * have been changed..
- *
- * <Input>
- * size :: handle to the target size object.
- *
- ******************************************************************/
+ void CID_Done_Size( T1_Size size );
LOCAL_DEF
- FT_Error T1_Reset_Size( T1_Size size );
+ T1_Error CID_Reset_Size( T1_Size size );
-
-/*******************************************************************
- *
- * <Function> T1_Init_GlyphSlot
- *
- * <Description> The TrueType glyph slot initialiser
- *
- * <Input> glyph :: glyph record to build.
- *
- * <Output> Error code.
- *
- ******************************************************************/
-
LOCAL_DEF
- FT_Error T1_Init_GlyphSlot( T1_GlyphSlot slot );
-
-
-
-/*******************************************************************
- *
- * <Function> T1_Done_GlyphSlot
- *
- * <Description> The Type 1 glyph slot finaliser
- *
- * <Input> glyph :: handle to glyph slot object
- *
- * <Output> Error code.
- *
- ******************************************************************/
+ T1_Error CID_Init_GlyphSlot( T1_GlyphSlot slot );
LOCAL_DEF
- void T1_Done_GlyphSlot( T1_GlyphSlot slot );
-
+ void CID_Done_GlyphSlot( T1_GlyphSlot slot );
-/*******************************************************************
- *
- * <Function> T1_Init_Driver
- *
- * <Description>
- * Initialise a given Type 1 driver object
- *
- * <Input>
- * driver :: handle to target driver object
- *
- * <Return>
- * Error code.
- *
- ******************************************************************/
-
LOCAL_DEF
- FT_Error T1_Init_Driver( T1_Driver driver );
-
-
-
-/*******************************************************************
- *
- * <Function> T1_Done_Driver
- *
- * <Description>
- * finalise a given Type 1 driver
- *
- * <Input>
- * driver :: handle to target Type 1 driver
- *
- ******************************************************************/
+ T1_Error CID_Init_Driver( T1_Driver driver );
LOCAL_DEF
- void T1_Done_Driver( T1_Driver driver );
+ void CID_Done_Driver( T1_Driver driver );
+
#ifdef __cplusplus
}
#endif
-#endif /* T1OBJS_H */
+
+#endif /* CIDOBJS_H */
/* END */
diff --git a/src/cid/cidparse.c b/src/cid/cidparse.c
index 54e8805..89a7ffa 100644
--- a/src/cid/cidparse.c
+++ b/src/cid/cidparse.c
@@ -1,32 +1,20 @@
-/*******************************************************************
- *
- * cidparse.c 2.0
- *
- * CID-keyed Type1 parser.
- *
- * Copyright 1996-1998 by
- * David Turner, Robert Wilhelm, and Werner Lemberg.
- *
- * This file is part of the FreeType project, and may only be used
- * modified and distributed under the terms of the FreeType project
- * license, LICENSE.TXT. By continuing to use, modify, or distribute
- * this file you indicate that you have read the license and
- * understand and accept it fully.
- *
- * The Type 1 parser is in charge of the following:
- *
- * - provide an implementation of a growing sequence of
- * objects called a T1_Table (used to build various tables
- * needed by the loader).
- *
- * - opening .pfb and .pfa files to extract their top-level
- * and private dictionaries
- *
- * - read numbers, arrays & strings from any dictionary
- *
- * See "t1load.c" to see how data is loaded from the font file
- *
- ******************************************************************/
+/***************************************************************************/
+/* */
+/* cidparse.c */
+/* */
+/* CID-keyed Type1 parser (body). */
+/* */
+/* 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 */
+/* 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. */
+/* */
+/***************************************************************************/
+
#include <freetype/internal/ftdebug.h>
#include <freetype/internal/ftcalc.h>
@@ -35,197 +23,225 @@
#include <freetype/internal/t1errors.h>
#include <cidparse.h>
+#include <string.h> /* for strncmp() */
+
+
+ /*************************************************************************/
+ /* */
+ /* The macro FT_COMPONENT is used in trace mode. It is an implicit */
+ /* parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log */
+ /* messages during execution. */
+ /* */
#undef FT_COMPONENT
-#define FT_COMPONENT trace_t1load
+#define FT_COMPONENT trace_cidparse
+
#if 0
-/*************************************************************************/
-/*************************************************************************/
-/*************************************************************************/
-/***** *****/
-/***** IMPLEMENTATION OF T1_TABLE OBJECT *****/
-/***** *****/
-/***** *****/
-/*************************************************************************/
-/*************************************************************************/
-/*************************************************************************/
-
-
-/*************************************************************************/
-/* */
-/* <Function> T1_New_Table */
-/* */
-/* <Description> */
-/* Initialise a T1_Table. */
-/* */
-/* <Input> */
-/* table :: address of target table */
-/* count :: table size = maximum number of elements */
-/* memory :: memory object to use for all subsequent reallocations */
-/* */
-/* <Return> */
-/* Error code. 0 means success */
-/* */
+ /*************************************************************************/
+ /*************************************************************************/
+ /*************************************************************************/
+ /***** *****/
+ /***** IMPLEMENTATION OF T1_TABLE OBJECT *****/
+ /***** *****/
+ /*************************************************************************/
+ /*************************************************************************/
+ /*************************************************************************/
+
+
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* T1_New_Table */
+ /* */
+ /* <Description> */
+ /* Initializes a T1_Table. */
+ /* */
+ /* <InOut> */
+ /* table :: The address of the target table. */
+ /* */
+ /* <Input> */
+ /* count :: The table size, i.e., the maximal number of elements. */
+ /* */
+ /* memory :: The memory object to be used for all subsequent */
+ /* reallocations. */
+ /* */
+ /* <Return> */
+ /* Type1 error code. 0 means success. */
+ /* */
LOCAL_FUNC
- FT_Error T1_New_Table( T1_Table* table,
- FT_Int count,
+ T1_Error T1_New_Table( T1_Table* table,
+ T1_Int count,
FT_Memory memory )
{
- FT_Error error;
+ T1_Error error;
- table->memory = memory;
- if ( ALLOC_ARRAY( table->elements, count, FT_Byte* ) ||
- ALLOC_ARRAY( table->lengths, count, FT_Byte* ) )
- goto Exit;
- table->max_elems = count;
- table->init = 0xdeadbeef;
- table->num_elems = 0;
- table->block = 0;
- table->capacity = 0;
- table->cursor = 0;
+ table->memory = memory;
+ if ( ALLOC_ARRAY( table->elements, count, T1_Byte* ) ||
+ ALLOC_ARRAY( table->lengths, count, T1_Byte* ) )
+ goto Exit;
+
+ table->max_elems = count;
+ table->init = 0xDEADBEEFL;
+ table->num_elems = 0;
+ table->block = 0;
+ table->capacity = 0;
+ table->cursor = 0;
Exit:
- if (error) FREE(table->elements);
+ if ( error )
+ FREE( table->elements );
- return error;
+ return error;
}
-
-/*************************************************************************/
-/* */
-/* <Function> T1_Add_Table */
-/* */
-/* <Description> */
-/* Adds an object to a T1_Table, possibly growing its memory block */
-/* */
-/* <Input> */
-/* table :: target table */
-/* index :: index of object in table */
-/* object :: address of object to copy in memory */
-/* length :: length in bytes of source object */
-/* */
-/* <Return> */
-/* Error code. 0 means success. An error is returned when a */
-/* realloc failed.. */
-/* */
+ static
+ void shift_elements( T1_Table* table,
+ T1_Byte* old_base )
+ {
+ T1_Long delta = table->block - old_base;
+ T1_Byte** offset = table->elements;
+ T1_Byte** limit = offset + table->max_elems;
- static void shift_elements( T1_Table* table, FT_Byte* old_base )
+ if ( delta )
+ for ( ; offset < limit; offset++ )
{
- FT_Long delta = table->block - old_base;
- FT_Byte** offset = table->elements;
- FT_Byte** limit = offset + table->max_elems;
-
- if (delta)
- for ( ; offset < limit; offset++ )
- {
- if (offset[0])
- offset[0] += delta;
- }
+ if ( offset[0] )
+ offset[0] += delta;
}
+ }
- static
- FT_Error reallocate_t1_table( T1_Table* table,
- FT_Int new_size )
- {
- FT_Memory memory = table->memory;
- FT_Byte* old_base = table->block;
- FT_Error error;
- /* realloc the base block */
- if ( REALLOC( table->block, table->capacity, new_size ) )
- return error;
+ static
+ T1_Error reallocate_t1_table( T1_Table* table,
+ T1_Int new_size )
+ {
+ FT_Memory memory = table->memory;
+ T1_Byte* old_base = table->block;
+ T1_Error error;
- table->capacity = new_size;
- /* shift all offsets when needed */
- if (old_base)
- shift_elements( table, old_base );
+ /* realloc the base block */
+ if ( REALLOC( table->block, table->capacity, new_size ) )
+ return error;
- return T1_Err_Ok;
- }
+ table->capacity = new_size;
+
+ /* shift all offsets when needed */
+ if ( old_base )
+ shift_elements( table, old_base );
+ return T1_Err_Ok;
+ }
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* T1_Add_Table */
+ /* */
+ /* <Description> */
+ /* Adds an object to a T1_Table, possibly growing its memory block. */
+ /* */
+ /* <InOut> */
+ /* table :: The target table. */
+ /* */
+ /* <Input> */
+ /* index :: The index of the object in the table. */
+ /* */
+ /* object :: The address of the object to copy in the memory. */
+ /* */
+ /* length :: The length in bytes of the source object. */
+ /* */
+ /* <Return> */
+ /* Type1 error code. 0 means success. An error is returned if */
+ /* reallocation fails. */
+ /* */
LOCAL_FUNC
- FT_Error T1_Add_Table( T1_Table* table,
- FT_Int index,
+ T1_Error T1_Add_Table( T1_Table* table,
+ T1_Int index,
void* object,
- FT_Int length )
+ T1_Int length )
{
- if (index < 0 || index > table->max_elems)
+ if ( index < 0 || index > table->max_elems )
{
- FT_ERROR(( "T1.Add_Table: invalid index\n" ));
- return T1_Err_Syntax_Error;
+ FT_ERROR(( "T1_Add_Table: invalid index\n" ));
+ return T1_Err_Syntax_Error;
}
/* grow the base block if needed */
if ( table->cursor + length > table->capacity )
{
- FT_Error error;
- FT_Int new_size = table->capacity;
+ T1_Error error;
+ T1_Int new_size = table->capacity;
+
- while ( new_size < table->cursor+length )
+ while ( new_size < table->cursor + length )
new_size += 1024;
error = reallocate_t1_table( table, new_size );
- if (error) return error;
+ if ( error )
+ return error;
}
/* add the object to the base block and adjust offset */
- table->elements[ index ] = table->block + table->cursor;
- table->lengths [ index ] = length;
+ table->elements[index] = table->block + table->cursor;
+ table->lengths [index] = length;
+
MEM_Copy( table->block + table->cursor, object, length );
table->cursor += length;
+
return T1_Err_Ok;
}
-/*************************************************************************/
-/* */
-/* <Function> T1_Done_Table */
-/* */
-/* <Description> */
-/* Finalise a T1_Table. (realloc it to its current cursor). */
-/* */
-/* <Input> */
-/* table :: target table */
-/* */
-/* <Note> */
-/* This function does NOT release the heap's memory block. It is up */
-/* to the caller to clean it, or reference it in its own structures. */
-/* */
-#if 0
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* T1_Done_Table */
+ /* */
+ /* <Description> */
+ /* Finalizes a T1_Table (reallocate it to its current cursor). */
+ /* */
+ /* <InOut> */
+ /* table :: The target table. */
+ /* */
+ /* <Note> */
+ /* This function does NOT release the heap's memory block. It is up */
+ /* to the caller to clean it, or reference it in its own structures. */
+ /* */
LOCAL_FUNC
void T1_Done_Table( T1_Table* table )
{
FT_Memory memory = table->memory;
- FT_Error error;
- FT_Byte* old_base;
+ T1_Error error;
+ T1_Byte* old_base;
+
/* should never fail, as rec.cursor <= rec.size */
old_base = table->block;
- if (!old_base)
+ if ( !old_base )
return;
(void)REALLOC( table->block, table->capacity, table->cursor );
table->capacity = table->cursor;
- if (old_base != table->block)
+ if ( old_base != table->block )
shift_elements( table, old_base );
}
-#endif
+
LOCAL_FUNC
void T1_Release_Table( T1_Table* table )
{
FT_Memory memory = table->memory;
- if (table->init == (FT_Long)0xdeadbeef)
+
+ if ( table->init == 0xDEADBEEFL )
{
FREE( table->block );
FREE( table->elements );
@@ -234,112 +250,121 @@
}
}
-#endif
+#endif /* 0 */
+
+
+ /*************************************************************************/
+ /*************************************************************************/
+ /*************************************************************************/
+ /***** *****/
+ /***** INPUT STREAM PARSER *****/
+ /***** *****/
+ /*************************************************************************/
+ /*************************************************************************/
+ /*************************************************************************/
-/*************************************************************************/
-/*************************************************************************/
-/*************************************************************************/
-/***** *****/
-/***** INPUT STREAM PARSER *****/
-/***** *****/
-/***** *****/
-/*************************************************************************/
-/*************************************************************************/
-/*************************************************************************/
- #define IS_T1_WHITESPACE(c) ( (c) == ' ' || (c) == '\t' )
- #define IS_T1_LINESPACE(c) ( (c) == '\r' || (c) == '\n' )
+#define IS_T1_WHITESPACE( c ) ( (c) == ' ' || (c) == '\t' )
+#define IS_T1_LINESPACE( c ) ( (c) == '\r' || (c) == '\n' )
+
+#define IS_T1_SPACE( c ) ( IS_T1_WHITESPACE( c ) || IS_T1_LINESPACE( c ) )
- #define IS_T1_SPACE(c) ( IS_T1_WHITESPACE(c) || IS_T1_LINESPACE(c) )
LOCAL_FUNC
- void CID_Skip_Spaces( CID_Parser* parser )
+ void CID_Skip_Spaces( CID_Parser* parser )
{
- FT_Byte* cur = parser->cursor;
- FT_Byte* limit = parser->limit;
+ T1_Byte* cur = parser->cursor;
+ T1_Byte* limit = parser->limit;
+
- while (cur < limit)
+ while ( cur < limit )
{
- FT_Byte c = *cur;
- if (!IS_T1_SPACE(c))
+ T1_Byte c = *cur;
+
+
+ if ( !IS_T1_SPACE( c ) )
break;
cur++;
}
+
parser->cursor = cur;
}
+
LOCAL_FUNC
void CID_ToToken( CID_Parser* parser,
T1_Token_Rec* token )
{
- FT_Byte* cur;
- FT_Byte* limit;
- FT_Byte starter, ender;
- FT_Int embed;
+ T1_Byte* cur;
+ T1_Byte* limit;
+ T1_Byte starter, ender;
+ T1_Int embed;
+
token->type = t1_token_none;
token->start = 0;
token->limit = 0;
/* first of all, skip space */
- CID_Skip_Spaces(parser);
+ CID_Skip_Spaces( parser );
cur = parser->cursor;
limit = parser->limit;
if ( cur < limit )
{
- switch (*cur)
+ switch ( *cur )
{
/************* check for strings ***********************/
- case '(':
- token->type = t1_token_string;
- ender = ')';
- goto Lookup_Ender;
+ case '(':
+ token->type = t1_token_string;
+ ender = ')';
+ goto Lookup_Ender;
/************* check for programs/array ****************/
- case '{':
- token->type = t1_token_array;
- ender = '}';
- goto Lookup_Ender;
+ case '{':
+ token->type = t1_token_array;
+ ender = '}';
+ goto Lookup_Ender;
/************* check for table/array ******************/
- case '[':
- token->type = t1_token_array;
- ender = ']';
-
- Lookup_Ender:
- embed = 1;
- starter = *cur++;
- token->start = cur;
- while (cur < limit)
+ case '[':
+ token->type = t1_token_array;
+ ender = ']';
+
+ Lookup_Ender:
+ embed = 1;
+ starter = *cur++;
+ token->start = cur;
+
+ while ( cur < limit )
+ {
+ if ( *cur == starter )
+ embed++;
+ else if ( *cur == ender )
{
- if (*cur == starter)
- embed++;
- else if (*cur == ender)
+ embed--;
+ if ( embed <= 0 )
{
- embed--;
- if (embed <= 0)
- {
- token->limit = cur++;
- break;
- }
+ token->limit = cur++;
+ break;
}
- cur++;
}
- break;
+ cur++;
+ }
+ break;
/* **************** otherwise, it's any token **********/
- default:
- token->start = cur++;
- token->type = t1_token_any;
- while (cur < limit && !IS_T1_SPACE(*cur))
- cur++;
+ default:
+ token->start = cur++;
+ token->type = t1_token_any;
+ while ( cur < limit && !IS_T1_SPACE( *cur ) )
+ cur++;
- token->limit = cur;
+ token->limit = cur;
}
- if (!token->limit)
+ if ( !token->limit )
{
token->start = 0;
token->type = t1_token_none;
@@ -353,35 +378,39 @@
LOCAL_FUNC
void CID_ToTokenArray( CID_Parser* parser,
T1_Token_Rec* tokens,
- FT_UInt max_tokens,
- FT_Int *pnum_tokens )
+ T1_UInt max_tokens,
+ T1_Int* pnum_tokens )
{
T1_Token_Rec master;
+
*pnum_tokens = -1;
CID_ToToken( parser, &master );
- if (master.type == t1_token_array)
+
+ if ( master.type == t1_token_array )
{
- FT_Byte* old_cursor = parser->cursor;
- FT_Byte* old_limit = parser->limit;
+ T1_Byte* old_cursor = parser->cursor;
+ T1_Byte* old_limit = parser->limit;
T1_Token_Rec* cur = tokens;
T1_Token_Rec* limit = cur + max_tokens;
+
parser->cursor = master.start;
parser->limit = master.limit;
- while (parser->cursor < parser->limit)
+ while ( parser->cursor < parser->limit )
{
T1_Token_Rec token;
-
+
+
CID_ToToken( parser, &token );
- if (!token.type)
+ if ( !token.type )
break;
-
- if (cur < limit)
+
+ if ( cur < limit )
*cur = token;
-
+
cur++;
}
@@ -394,94 +423,103 @@
static
- FT_Long t1_toint( FT_Byte* *cursor,
- FT_Byte* limit )
+ T1_Long t1_toint( T1_Byte** cursor,
+ T1_Byte* limit )
{
- FT_Long result = 0;
- FT_Byte* cur = *cursor;
- FT_Byte c, d;
+ T1_Long result = 0;
+ T1_Byte* cur = *cursor;
+ T1_Byte c, d;
- for (; cur < limit; cur++)
+
+ for ( ; cur < limit; cur++ )
{
c = *cur;
- d = (FT_Byte)(c - '0');
- if (d < 10) break;
+ d = (T1_Byte)( c - '0' );
+ if ( d < 10 )
+ break;
- if ( c=='-' )
+ if ( c == '-' )
{
cur++;
break;
}
}
- if (cur < limit)
+ if ( cur < limit )
{
do
{
- d = (FT_Byte)(cur[0] - '0');
- if (d >= 10)
+ d = (T1_Byte)( cur[0] - '0' );
+ if ( d >= 10 )
break;
- result = result*10 + d;
+ result = result * 10 + d;
cur++;
- } while (cur < limit);
+ } while ( cur < limit );
- if (c == '-')
+ if ( c == '-' )
result = -result;
}
*cursor = cur;
+
return result;
}
static
- FT_Long t1_tofixed( FT_Byte* *cursor,
- FT_Byte* limit,
- FT_Long power_ten )
+ T1_Long t1_tofixed( T1_Byte** cursor,
+ T1_Byte* limit,
+ T1_Long power_ten )
{
- FT_Byte* cur = *cursor;
- FT_Long num, divider, result;
- FT_Int sign = 0;
- FT_Byte d;
+ T1_Byte* cur = *cursor;
+ T1_Long num, divider, result;
+ T1_Int sign = 0;
+ T1_Byte d;
- if (cur >= limit) return 0;
+
+ if ( cur >= limit )
+ return 0;
/* first of all, read the integer part */
result = t1_toint( &cur, limit ) << 16;
num = 0;
divider = 1;
- if (result < 0)
+ if ( result < 0 )
{
sign = 1;
result = -result;
}
- if (cur >= limit) goto Exit;
+
+ if ( cur >= limit )
+ goto Exit;
/* read decimal part, if any */
- if (*cur == '.' && cur+1 < limit)
+ if ( *cur == '.' && cur + 1 < limit )
{
cur++;
for (;;)
{
- d = (FT_Byte)(*cur - '0');
- if (d >= 10) break;
+ d = (T1_Byte)( *cur - '0' );
+ if ( d >= 10 ) break;
- if (divider < 10000000L)
+ if ( divider < 10000000L )
{
- num = num*10 + d;
+ num = num * 10 + d;
divider *= 10;
}
+
cur++;
- if (cur >= limit) break;
+ if ( cur >= limit )
+ break;
}
}
/* read exponent, if any */
- if ( cur+1 < limit && (*cur == 'e' || *cur == 'E'))
+ if ( cur + 1 < limit && ( *cur == 'e' || *cur == 'E' ) )
{
cur++;
power_ten += t1_toint( &cur, limit );
@@ -489,53 +527,56 @@
Exit:
/* raise to power of ten if needed */
- while (power_ten > 0)
+ while ( power_ten > 0 )
{
- result = result*10;
- num = num*10;
+ result = result * 10;
+ num = num * 10;
power_ten--;
}
- while (power_ten < 0)
+ while ( power_ten < 0 )
{
- result = result/10;
- divider = divider*10;
+ result = result / 10;
+ divider = divider * 10;
power_ten++;
}
- if (num)
+ if ( num )
result += FT_DivFix( num, divider );
- if (sign)
+ if ( sign )
result = -result;
*cursor = cur;
+
return result;
}
static
- int t1_tobool( FT_Byte* *cursor, FT_Byte* limit )
+ int t1_tobool( T1_Byte** cursor,
+ T1_Byte* limit )
{
- FT_Byte* cur = *cursor;
+ T1_Byte* cur = *cursor;
T1_Bool result = 0;
+
/* return 1 if we find a "true", 0 otherwise */
- if ( cur+3 < limit &&
- cur[0] == 't' &&
- cur[1] == 'r' &&
- cur[2] == 'u' &&
- cur[3] == 'e' )
+ if ( cur + 3 < limit &&
+ cur[0] == 't' &&
+ cur[1] == 'r' &&
+ cur[2] == 'u' &&
+ cur[3] == 'e' )
{
result = 1;
cur += 5;
}
- else if ( cur+4 < limit &&
- cur[0] == 'f' &&
- cur[1] == 'a' &&
- cur[2] == 'l' &&
- cur[3] == 's' &&
- cur[4] == 'e' )
+ else if ( cur + 4 < limit &&
+ cur[0] == 'f' &&
+ cur[1] == 'a' &&
+ cur[2] == 'l' &&
+ cur[3] == 's' &&
+ cur[4] == 'e' )
{
result = 0;
cur += 6;
@@ -546,28 +587,31 @@
static
- FT_Int t1_tocoordarray( FT_Byte* *cursor,
- FT_Byte* limit,
- FT_Int max_coords,
- FT_Short* coords )
+ T1_Int t1_tocoordarray( T1_Byte** cursor,
+ T1_Byte* limit,
+ T1_Int max_coords,
+ T1_Short* coords )
{
- FT_Byte* cur = *cursor;
- FT_Int count = 0;
- FT_Byte c, ender;
+ T1_Byte* cur = *cursor;
+ T1_Int count = 0;
+ T1_Byte c, ender;
+
- if (cur >= limit) goto Exit;
+ if ( cur >= limit )
+ goto Exit;
- /* check for the beginning of an array. If not, only one number will be read */
+ /* check for the beginning of an array. */
+ /* If not, only one number will be read */
c = *cur;
ender = 0;
- if (c == '[')
+ if ( c == '[' )
ender = ']';
- if (c == '{')
+ if ( c == '{' )
ender = '}';
- if (ender)
+ if ( ender )
cur++;
/* now, read the coordinates */
@@ -577,19 +621,21 @@
for (;;)
{
c = *cur;
- if ( c != ' ' && c != '\t' ) break;
+ if ( c != ' ' && c != '\t' )
+ break;
cur++;
- if (cur >= limit) goto Exit;
+ if ( cur >= limit )
+ goto Exit;
}
- if (count >= max_coords || c == ender)
+ if ( count >= max_coords || c == ender )
break;
- coords[count] = (T1_Short)(t1_tofixed(&cur,limit,0) >> 16);
+ coords[count] = (T1_Short)( t1_tofixed( &cur, limit, 0 ) >> 16 );
count++;
- if (!ender)
+ if ( !ender )
break;
}
@@ -599,31 +645,33 @@
}
-
static
- FT_Int t1_tofixedarray( FT_Byte* *cursor,
- FT_Byte* limit,
- FT_Int max_values,
- FT_Fixed* values,
- FT_Int power_ten )
+ T1_Int t1_tofixedarray( T1_Byte** cursor,
+ T1_Byte* limit,
+ T1_Int max_values,
+ T1_Fixed* values,
+ T1_Int power_ten )
{
- FT_Byte* cur = *cursor;
- FT_Int count = 0;
- FT_Byte c, ender;
+ T1_Byte* cur = *cursor;
+ T1_Int count = 0;
+ T1_Byte c, ender;
+
- if (cur >= limit) goto Exit;
+ if ( cur >= limit )
+ goto Exit;
- /* check for the beginning of an array. If not, only one number will be read */
+ /* check for the beginning of an array. */
+ /* If not, only one number will be read */
c = *cur;
ender = 0;
- if (c == '[')
+ if ( c == '[' )
ender = ']';
- if (c == '{')
+ if ( c == '{' )
ender = '}';
- if (ender)
+ if ( ender )
cur++;
/* now, read the values */
@@ -633,44 +681,49 @@
for (;;)
{
c = *cur;
- if ( c != ' ' && c != '\t' ) break;
+ if ( c != ' ' && c != '\t' )
+ break;
cur++;
- if (cur >= limit) goto Exit;
+ if ( cur >= limit )
+ goto Exit;
}
- if (count >= max_values || c == ender)
+ if ( count >= max_values || c == ender )
break;
- values[count] = t1_tofixed(&cur,limit,power_ten);
+ values[count] = t1_tofixed( &cur, limit, power_ten );
count++;
- if (!ender)
+ if ( !ender )
break;
}
Exit:
*cursor = cur;
+
return count;
}
- /* Loads a simple field (i.e. non-table) into the current list of objects */
+ /* Loads a simple field (i.e. non-table) into the current */
+ /* list of objects */
LOCAL_FUNC
- FT_Error CID_Load_Field( CID_Parser* parser,
+ T1_Error CID_Load_Field( CID_Parser* parser,
const T1_Field_Rec* field,
void* object )
{
T1_Token_Rec token;
- FT_Byte* cur;
- FT_Byte* limit;
- FT_UInt count;
- FT_UInt index;
- FT_Error error;
+ T1_Byte* cur;
+ T1_Byte* limit;
+ T1_UInt count;
+ T1_UInt index;
+ T1_Error error;
+
CID_ToToken( parser, &token );
- if (!token.type)
+ if ( !token.type )
goto Fail;
count = 1;
@@ -679,61 +732,67 @@
limit = token.limit;
{
- FT_Byte* q = (FT_Byte*)object + field->offset;
- FT_Long val;
+ T1_Byte* q = (T1_Byte*)object + field->offset;
+ T1_Long val;
T1_String* string;
- switch (field->type)
+
+ switch ( field->type )
{
- case t1_field_bool:
- {
- val = t1_tobool( &cur, limit );
- goto Store_Integer;
- }
+ case t1_field_bool:
+ val = t1_tobool( &cur, limit );
+ goto Store_Integer;
- case t1_field_fixed:
- {
- val = t1_tofixed( &cur, limit, 0 );
- goto Store_Integer;
- }
+ case t1_field_fixed:
+ val = t1_tofixed( &cur, limit, 0 );
+ goto Store_Integer;
- case t1_field_integer:
- {
- val = t1_toint( &cur, limit );
- Store_Integer:
- switch (field->size)
- {
- case 1: *(FT_Byte*) q = (FT_Byte)val; break;
- case 2: *(FT_UShort*)q = (FT_UShort)val; break;
- default: *(FT_Long*) q = val;
- }
- }
- break;
+ case t1_field_integer:
+ val = t1_toint( &cur, limit );
- case t1_field_string:
- {
- FT_Memory memory = parser->memory;
- FT_UInt len = limit-cur;
-
- if ( ALLOC( string, len+1 ) )
- goto Exit;
-
- MEM_Copy( string, cur, len );
- string[len] = 0;
-
- *(T1_String**)q = string;
- }
- break;
-
- default:
- /* an error occured */
- goto Fail;
+ Store_Integer:
+ switch ( field->size )
+ {
+ case 1:
+ *(T1_Byte*)q = (T1_Byte)val;
+ break;
+
+ case 2:
+ *(T1_UShort*)q = (T1_UShort)val;
+ break;
+
+ default:
+ *(T1_Long*)q = val;
+ }
+ break;
+
+ case t1_field_string:
+ {
+ FT_Memory memory = parser->memory;
+ T1_UInt len = limit-cur;
+
+
+ if ( ALLOC( string, len + 1 ) )
+ goto Exit;
+
+ MEM_Copy( string, cur, len );
+ string[len] = 0;
+
+ *(T1_String**)q = string;
+ }
+ break;
+
+ default:
+ /* an error occured */
+ goto Fail;
}
}
- error = 0;
+
+ error = 0;
Exit:
return error;
+
Fail:
error = T1_Err_Invalid_File_Format;
goto Exit;
@@ -742,36 +801,38 @@
#define CID_MAX_TABLE_ELEMENTS 32
+
LOCAL_FUNC
- FT_Error CID_Load_Field_Table( CID_Parser* parser,
+ T1_Error CID_Load_Field_Table( CID_Parser* parser,
const T1_Field_Rec* field,
void* object )
{
- T1_Token_Rec elements[CID_MAX_TABLE_ELEMENTS];
- T1_Token_Rec* token;
- FT_Int num_elements;
- FT_Error error = 0;
- FT_Byte* old_cursor;
- FT_Byte* old_limit;
- T1_Field_Rec fieldrec = *(T1_Field_Rec*)field;
+ T1_Token_Rec elements[CID_MAX_TABLE_ELEMENTS];
+ T1_Token_Rec* token;
+ T1_Int num_elements;
+ T1_Error error = 0;
+ T1_Byte* old_cursor;
+ T1_Byte* old_limit;
+ T1_Field_Rec fieldrec = *(T1_Field_Rec*)field;
+
fieldrec.type = t1_field_integer;
- if (field->type == t1_field_fixed_array )
- fieldrec.type = t1_field_fixed;
-
+ if ( field->type == t1_field_fixed_array )
+ fieldrec.type = t1_field_fixed;
+
CID_ToTokenArray( parser, elements, 32, &num_elements );
- if (num_elements < 0)
+ if ( num_elements < 0 )
goto Fail;
- if (num_elements > CID_MAX_TABLE_ELEMENTS)
+ if ( num_elements > CID_MAX_TABLE_ELEMENTS )
num_elements = CID_MAX_TABLE_ELEMENTS;
old_cursor = parser->cursor;
old_limit = parser->limit;
/* we store the elements count */
- if (field->count_offset)
- *(FT_Byte*)((FT_Byte*)object + field->count_offset) = num_elements;
+ if ( field->count_offset )
+ *(T1_Byte*)( (T1_Byte*)object + field->count_offset ) = num_elements;
/* we now load each element, adjusting the field.offset on each one */
token = elements;
@@ -788,62 +849,66 @@
Exit:
return error;
+
Fail:
error = T1_Err_Invalid_File_Format;
goto Exit;
}
-
-
-
-
-
LOCAL_FUNC
- FT_Long CID_ToInt ( CID_Parser* parser )
+ T1_Long CID_ToInt( CID_Parser* parser )
{
return t1_toint( &parser->cursor, parser->limit );
}
LOCAL_FUNC
- FT_Int CID_ToCoordArray( CID_Parser* parser,
- FT_Int max_coords,
- FT_Short* coords )
+ T1_Int CID_ToCoordArray( CID_Parser* parser,
+ T1_Int max_coords,
+ T1_Short* coords )
{
- return t1_tocoordarray( &parser->cursor, parser->limit, max_coords, coords );
+ return t1_tocoordarray( &parser->cursor, parser->limit,
+ max_coords, coords );
}
LOCAL_FUNC
- FT_Int CID_ToFixedArray( CID_Parser* parser,
- FT_Int max_values,
- FT_Fixed* values,
- FT_Int power_ten )
+ T1_Int CID_ToFixedArray( CID_Parser* parser,
+ T1_Int max_values,
+ T1_Fixed* values,
+ T1_Int power_ten )
{
- return t1_tofixedarray( &parser->cursor, parser->limit, max_values, values, power_ten );
+ return t1_tofixedarray( &parser->cursor, parser->limit,
+ max_values, values, power_ten );
}
#if 0
- /* return the value of an hexadecimal digit */
- static
- int hexa_value( char c )
- {
- unsigned int d;
- d = (unsigned int)(c-'0');
- if ( d <= 9 ) return (int)d;
+ /* return the value of an hexadecimal digit */
+ static
+ int hexa_value( char c )
+ {
+ unsigned int d;
+
+
+ d = (unsigned int)( c - '0' );
+ if ( d <= 9 )
+ return (int)d;
- d = (unsigned int)(c-'a');
- if ( d <= 5 ) return (int)(d+10);
+ d = (unsigned int)( c - 'a' );
+ if ( d <= 5 )
+ return (int)( d + 10 );
- d = (unsigned int)(c-'A');
- if ( d <= 5 ) return (int)(d+10);
+ d = (unsigned int)( c - 'A' );
+ if ( d <= 5 )
+ return (int)( d + 10 );
+
+ return -1;
+ }
- return -1;
- }
-#endif
+#endif /* 0 */
LOCAL_FUNC
@@ -851,19 +916,20 @@
FT_Stream stream,
FT_Memory memory )
{
- FT_Error error;
- FT_ULong base_offset, offset, ps_len;
- FT_Byte buffer[ 256 + 10 ];
- FT_Int buff_len;
+ T1_Error error;
+ T1_ULong base_offset, offset, ps_len;
+ T1_Byte buffer[256 + 10];
+ T1_Int buff_len;
- MEM_Set( parser, 0, sizeof(*parser ) );
+
+ MEM_Set( parser, 0, sizeof ( *parser ) );
parser->stream = stream;
parser->memory = memory;
base_offset = FILE_Pos();
/* first of all, check the font format in the header */
- if ( ACCESS_Frame(31) )
+ if ( ACCESS_Frame( 31 ) )
goto Exit;
if ( strncmp( stream->cursor, "%!PS-Adobe-3.0 Resource-CIDFont", 31 ) )
@@ -873,39 +939,42 @@
}
FORGET_Frame();
- if (error) goto Exit;
+ if ( error )
+ goto Exit;
- /* now, read the rest of the file, until we find a "StartData" */
+ /* now, read the rest of the file, until we find a `StartData' */
buff_len = 256;
for (;;)
{
- FT_Byte *p, *limit = buffer + 256;
-
+ T1_Byte *p, *limit = buffer + 256;
+
/* fill input buffer */
buff_len -= 256;
- if (buff_len > 0)
+ if ( buff_len > 0 )
MEM_Move( buffer, limit, buff_len );
-
- if ( FILE_Read( buffer, 256+10-buff_len ) )
+
+ if ( FILE_Read( buffer, 256 + 10 - buff_len ) )
goto Exit;
-
- buff_len = 256+10;
-
+
+ buff_len = 256 + 10;
+
/* look for "StartData" */
for ( p = buffer; p < limit; p++ )
{
if ( p[0] == 'S' && strncmp( (char*)p, "StartData", 9 ) == 0 )
{
/* save offset of binary data after "StartData" */
- offset = FILE_Pos() - ( limit-p ) + 10;
+ offset = FILE_Pos() - ( limit - p ) + 10;
goto Found;
}
}
}
-
+
Found:
- /* all right, we found the start of the binary data. We will now rewind */
- /* and extract the frame of corresponding to the Postscript section */
+ /* all right, we found the start of the binary data. We will now */
+ /* rewind and extract the frame of corresponding to the Postscript */
+ /* section */
+
ps_len = offset - base_offset;
if ( FILE_Seek( base_offset ) ||
EXTRACT_Frame( ps_len, parser->postscript ) )
@@ -918,19 +987,22 @@
parser->num_dict = -1;
Exit:
- return error;
+ return error;
}
-
LOCAL_FUNC
void CID_Done_Parser( CID_Parser* parser )
{
/* always free the private dictionary */
- if (parser->postscript)
+ if ( parser->postscript )
{
FT_Stream stream = parser->stream;
+
+
RELEASE_Frame( parser->postscript );
}
}
+
+/* END */
diff --git a/src/cid/cidparse.h b/src/cid/cidparse.h
index b249fe9..cd94204 100644
--- a/src/cid/cidparse.h
+++ b/src/cid/cidparse.h
@@ -1,75 +1,68 @@
-/*******************************************************************
- *
- * cidparse.h 2.0
- *
- * CID-Keyed Type1 parser.
- *
- * Copyright 1996-1998 by
- * David Turner, Robert Wilhelm, and Werner Lemberg.
- *
- * This file is part of the FreeType project, and may only be used
- * modified and distributed under the terms of the FreeType project
- * license, LICENSE.TXT. By continuing to use, modify, or distribute
- * this file you indicate that you have read the license and
- * understand and accept it fully.
- *
- * The Type 1 parser is in charge of the following:
- *
- * - provide an implementation of a growing sequence of
- * objects called a T1_Table (used to build various tables
- * needed by the loader).
- *
- * - opening .pfb and .pfa files to extract their top-level
- * and private dictionaries
- *
- * - read numbers, arrays & strings from any dictionary
- *
- * See "t1load.c" to see how data is loaded from the font file
- *
- ******************************************************************/
+/***************************************************************************/
+/* */
+/* cidparse.h */
+/* */
+/* CID-keyed Type1 parser (specification). */
+/* */
+/* 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 */
+/* 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 CIDPARSE_H
#define CIDPARSE_H
#include <freetype/internal/t1types.h>
+
#ifdef __cplusplus
extern "C" {
#endif
-
#if 0
-/*************************************************************************
- *
- * <Struct> T1_Table
- *
- * <Description>
- * A T1_Table is a simple object used to store an array of objects
- * in a single memory block.
- *
- * <Fields>
- * block :: address in memory of the growheap's block. This
- * can change between two object adds, due to the use
- * of 'realloc'.
- *
- * cursor :: current top of the grow heap within its block
- *
- * capacity :: current size of the heap block. Increments by 1 Kb
- *
- * init :: boolean. set when the table has been initialized
- * (the table user should set this field)
- *
- * max_elems :: maximum number of elements in table
- * num_elems :: current number of elements in table
- *
- * elements :: table of element addresses within the block
- * lengths :: table of element sizes within the block
- *
- * memory :: memory object used for memory operations (alloc/realloc)
- */
-
- typedef struct T1_Table_
+
+ /*************************************************************************/
+ /* */
+ /* <Struct> */
+ /* T1_Table */
+ /* */
+ /* <Description> */
+ /* A T1_Table is a simple object used to store an array of objects */
+ /* in a single memory block. */
+ /* */
+ /* <Fields> */
+ /* block :: The address in memory of the growheap's block. This */
+ /* can change between two object adds, due to the use */
+ /* of `realloc()'. */
+ /* */
+ /* cursor :: The current top of the growheap within its block. */
+ /* */
+ /* capacity :: The current size of the heap block. Increments by */
+ /* blocks of 1 kByte. */
+ /* */
+ /* init :: A boolean. Set when the table has been initialized */
+ /* (the table user should set this field). */
+ /* */
+ /* max_elems :: The maximal number of elements in the table. */
+ /* */
+ /* num_elems :: The current number of elements (in use) in the table. */
+ /* */
+ /* elements :: A table of element addresses within the block. */
+ /* */
+ /* lengths :: A table of element sizes within the block. */
+ /* */
+ /* memory :: The memory object used for memory operations */
+ /* (allocation resp. reallocation). */
+ /* */
+ typedef struct T1_Table_
{
FT_Byte* block; /* current memory block */
FT_Int cursor; /* current cursor in memory block */
@@ -87,73 +80,77 @@
LOCAL_DEF
- FT_Error T1_New_Table( T1_Table* table,
- FT_Int count,
- FT_Memory memory );
-
+ T1_Error T1_New_Table( T1_Table* table,
+ T1_Int count,
+ T1_Memory memory );
LOCAL_DEF
- FT_Error T1_Add_Table( T1_Table* table,
- FT_Int index,
+ T1_Error T1_Add_Table( T1_Table* table,
+ T1_Int index,
void* object,
- FT_Int length );
+ T1_Int length );
LOCAL_DEF
void T1_Release_Table( T1_Table* table );
-#endif
-
-/*************************************************************************
- *
- * <Struct> CID_Parser
- *
- * <Description>
- * A CID_Parser is an object used to parse a Type 1 fonts very
- * quickly.
- *
- * <Fields>
- * stream :: current input stream
- * memory :: current memory object
- *
- * base_dict :: pointer to top-level dictionary
- * base_len :: length in bytes of top dict
- *
- * private_dict :: pointer to private dictionary
- * private_len :: length in bytes of private dict
- *
- * in_pfb :: boolean. Indicates that we're in a .pfb file
- * in_memory :: boolean. Indicates a memory-based stream
- * single_block :: boolean. Indicates that the private dict
- * is stored in lieu of the base dict
- *
- * cursor :: current parser cursor
- * limit :: current parser limit (first byte after current
- * dictionary).
- *
- * error :: current parsing error
- */
+#endif /* 0 */
+
+
+ /*************************************************************************/
+ /* */
+ /* <Struct> */
+ /* CID_Parser */
+ /* */
+ /* <Description> */
+ /* A CID_Parser is an object used to parse a Type 1 fonts very */
+ /* quickly. */
+ /* */
+ /* <Fields> */
+ /* stream :: The current input stream. */
+ /* */
+ /* memory :: The current memory object. */
+ /* */
+ /* postscript :: A pointer to the data to be parsed. */
+ /* */
+ /* postscript_len :: The length of the data to be parsed. */
+ /* */
+ /* data_offset :: The start position of the binary data (i.e., the */
+ /* end of the data to be parsed. */
+ /* */
+ /* cursor :: The current parser cursor. */
+ /* */
+ /* limit :: The current parser limit (i.e., the first byte */
+ /* after the current dictionary). */
+ /* */
+ /* error :: The current parsing error. */
+ /* */
+ /* cid :: A structure which holds the information about */
+ /* the current font. */
+ /* */
+ /* num_dict :: The number of font dictionaries. */
+ /* */
typedef struct CID_Parser_
{
FT_Stream stream;
FT_Memory memory;
- FT_Byte* postscript;
- FT_Int postscript_len;
+ T1_Byte* postscript;
+ T1_Int postscript_len;
- FT_ULong data_offset;
+ T1_ULong data_offset;
- FT_Byte* cursor;
- FT_Byte* limit;
- FT_Error error;
+ T1_Byte* cursor;
+ T1_Byte* limit;
+ T1_Error error;
CID_Info* cid;
- FT_Int num_dict;
+ T1_Int num_dict;
} CID_Parser;
LOCAL_DEF
- FT_Error CID_New_Parser( CID_Parser* parser,
+ T1_Error CID_New_Parser( CID_Parser* parser,
FT_Stream stream,
FT_Memory memory );
@@ -161,66 +158,61 @@
void CID_Done_Parser( CID_Parser* parser );
- /*************************************************************************
- *
- * PARSING ROUTINES
- *
- *************************************************************************/
+ /*************************************************************************/
+ /* */
+ /* PARSING ROUTINES */
+ /* */
+ /*************************************************************************/
LOCAL_DEF
- FT_Long CID_ToInt ( CID_Parser* parser );
+ T1_Long CID_ToInt( CID_Parser* parser );
LOCAL_DEF
- FT_Int CID_ToCoordArray( CID_Parser* parser,
- FT_Int max_coords,
- FT_Short* coords );
+ T1_Int CID_ToCoordArray( CID_Parser* parser,
+ T1_Int max_coords,
+ T1_Short* coords );
LOCAL_DEF
- FT_Int CID_ToFixedArray( CID_Parser* parser,
- FT_Int max_values,
- T1_Fixed* values,
- FT_Int power_ten );
+ T1_Int CID_ToFixedArray( CID_Parser* parser,
+ T1_Int max_values,
+ T1_Fixed* values,
+ T1_Int power_ten );
LOCAL_DEF
- void CID_Skip_Spaces( CID_Parser* parser );
-
+ void CID_Skip_Spaces( CID_Parser* parser );
/* simple enumeration type used to identify token types */
- typedef enum T1_Token_Type_
+ typedef enum T1_Token_Type_
{
t1_token_none = 0,
t1_token_any,
t1_token_string,
t1_token_array,
-
+
/* do not remove */
t1_token_max
-
+
} T1_Token_Type;
+
/* a simple structure used to identify tokens */
typedef struct T1_Token_Rec_
{
- FT_Byte* start; /* first character of token in input stream */
- FT_Byte* limit; /* first character after the token */
+ T1_Byte* start; /* first character of token in input stream */
+ T1_Byte* limit; /* first character after the token */
T1_Token_Type type; /* type of token.. */
-
- } T1_Token_Rec;
-
-
- LOCAL_DEF
- void CID_ToToken( CID_Parser* parser,
- T1_Token_Rec* token );
-
-
+ } T1_Token_Rec;
+ LOCAL_DEF
+ void CID_ToToken( CID_Parser* parser,
+ T1_Token_Rec* token );
/* enumeration type used to identify object fields */
- typedef enum T1_Field_Type_
+ typedef enum T1_Field_Type_
{
t1_field_none = 0,
t1_field_bool,
@@ -230,118 +222,132 @@
t1_field_integer_array,
t1_field_fixed_array,
t1_field_callback,
-
+
/* do not remove */
t1_field_max
-
+
} T1_Field_Type;
- typedef enum T1_Field_Location_
+ typedef enum T1_Field_Location_
{
t1_field_cid_info,
t1_field_font_dict,
t1_field_font_info,
t1_field_private,
-
+
/* do not remove */
t1_field_location_max
-
+
} T1_Field_Location;
- typedef FT_Error (*CID_Field_Parser)( CID_Face face,
+ typedef T1_Error (*CID_Field_Parser)( CID_Face face,
CID_Parser* parser );
/* structure type used to model object fields */
- typedef struct T1_Field_Rec_
+ typedef struct T1_Field_Rec_
{
- const char* ident; /* field identifier */
+ const char* ident; /* field identifier */
T1_Field_Location location;
- T1_Field_Type type; /* type of field */
+ T1_Field_Type type; /* type of field */
CID_Field_Parser reader;
- T1_UInt offset; /* offset of field in object */
- FT_UInt size; /* size of field in bytes */
- FT_UInt array_max; /* maximum number of elements for array */
- FT_UInt count_offset; /* offset of element count for arrays */
-
+ T1_UInt offset; /* offset of field in object */
+ T1_UInt size; /* size of field in bytes */
+ T1_UInt array_max; /* maximal number of elements for */
+ /* array */
+ T1_UInt count_offset; /* offset of element count for */
+ /* arrays */
} T1_Field_Rec;
-#define T1_FIELD_REF(s,f) (((s*)0)->f)
-#define T1_NEW_SIMPLE_FIELD( _ident, _type, _fname ) \
- { _ident, T1CODE, _type, \
- 0, \
- (FT_UInt)(char*)&T1_FIELD_REF(T1TYPE,_fname), \
- sizeof(T1_FIELD_REF(T1TYPE,_fname)), \
- 0, 0 },
+#define T1_FIELD_REF( s, f ) ( ((s*)0)->f )
+
+#define T1_NEW_SIMPLE_FIELD( _ident, _type, _fname ) \
+ { \
+ _ident, T1CODE, _type, \
+ 0, \
+ (T1_UInt)(char*)&T1_FIELD_REF( T1TYPE, _fname ), \
+ sizeof ( T1_FIELD_REF( T1TYPE, _fname ) ), \
+ 0, 0 \
+ },
+
+#define T1_NEW_CALLBACK_FIELD( _ident, _reader ) \
+ { \
+ _ident, T1CODE, t1_field_callback, \
+ _reader, \
+ 0, 0, \
+ 0, 0 \
+ },
+
+#define T1_NEW_TABLE_FIELD( _ident, _type, _fname, _max ) \
+ { \
+ _ident, T1CODE, _type, \
+ 0, \
+ (T1_UInt)(char*)&T1_FIELD_REF( T1TYPE, _fname ), \
+ sizeof ( T1_FIELD_REF( T1TYPE, _fname )[0] ), \
+ _max, \
+ (T1_UInt)(char*)&T1_FIELD_REF( T1TYPE, num_ ## _fname ) \
+ },
-#define T1_NEW_CALLBACK_FIELD( _ident, _reader ) \
- { _ident, T1CODE, t1_field_callback, \
- _reader, \
- 0, 0, 0, 0 },
+#define T1_NEW_TABLE_FIELD2( _ident, _type, _fname, _max ) \
+ { \
+ _ident, T1CODE, _type, \
+ 0, \
+ (T1_UInt)(char*)&T1_FIELD_REF( T1TYPE, _fname ), \
+ sizeof ( T1_FIELD_REF( T1TYPE, _fname )[0] ), \
+ _max, 0 \
+ },
-#define T1_NEW_TABLE_FIELD( _ident, _type, _fname, _max ) \
- { _ident, T1CODE, _type, \
- 0, \
- (FT_UInt)(char*)&T1_FIELD_REF(T1TYPE,_fname), \
- sizeof(T1_FIELD_REF(T1TYPE,_fname)[0]), \
- _max, \
- (FT_UInt)(char*)&T1_FIELD_REF(T1TYPE,num_ ## _fname) },
-#define T1_NEW_TABLE_FIELD2( _ident, _type, _fname, _max ) \
- { _ident, T1CODE, _type, \
- 0, \
- (FT_UInt)(char*)&T1_FIELD_REF(T1TYPE,_fname), \
- sizeof(T1_FIELD_REF(T1TYPE,_fname)[0]), \
- _max, 0 },
+#define T1_FIELD_BOOL( _ident, _fname ) \
+ T1_NEW_SIMPLE_FIELD( _ident, t1_field_bool, _fname )
+#define T1_FIELD_NUM( _ident, _fname ) \
+ T1_NEW_SIMPLE_FIELD( _ident, t1_field_integer, _fname )
-#define T1_FIELD_BOOL( _ident, _fname ) \
- T1_NEW_SIMPLE_FIELD( _ident, t1_field_bool, _fname )
+#define T1_FIELD_FIXED( _ident, _fname ) \
+ T1_NEW_SIMPLE_FIELD( _ident, t1_field_fixed, _fname )
-#define T1_FIELD_NUM( _ident, _fname ) \
- T1_NEW_SIMPLE_FIELD( _ident, t1_field_integer, _fname )
+#define T1_FIELD_STRING( _ident, _fname ) \
+ T1_NEW_SIMPLE_FIELD( _ident, t1_field_string, _fname )
-#define T1_FIELD_FIXED( _ident, _fname ) \
- T1_NEW_SIMPLE_FIELD( _ident, t1_field_fixed, _fname )
+#define T1_FIELD_NUM_TABLE( _ident, _fname, _fmax ) \
+ T1_NEW_TABLE_FIELD( _ident, t1_field_integer_array, \
+ _fname, _fmax )
-#define T1_FIELD_STRING( _ident, _fname ) \
- T1_NEW_SIMPLE_FIELD( _ident, t1_field_string, _fname )
+#define T1_FIELD_FIXED_TABLE( _ident, _fname, _fmax ) \
+ T1_NEW_TABLE_FIELD( _ident, t1_field_fixed_array, \
+ _fname, _fmax )
-#define T1_FIELD_NUM_TABLE( _ident, _fname, _fmax ) \
- T1_NEW_TABLE_FIELD( _ident, t1_field_integer_array, _fname, _fmax )
-
-#define T1_FIELD_FIXED_TABLE( _ident, _fname, _fmax ) \
- T1_NEW_TABLE_FIELD( _ident, t1_field_fixed_array, _fname, _fmax )
+#define T1_FIELD_NUM_TABLE2( _ident, _fname, _fmax ) \
+ T1_NEW_TABLE_FIELD2( _ident, t1_field_integer_array, \
+ _fname, _fmax )
-#define T1_FIELD_NUM_TABLE2( _ident, _fname, _fmax ) \
- T1_NEW_TABLE_FIELD2( _ident, t1_field_integer_array, _fname, _fmax )
+#define T1_FIELD_FIXED_TABLE2( _ident, _fname, _fmax ) \
+ T1_NEW_TABLE_FIELD2( _ident, t1_field_fixed_array, \
+ _fname, _fmax )
-#define T1_FIELD_FIXED_TABLE2( _ident, _fname, _fmax ) \
- T1_NEW_TABLE_FIELD2( _ident, t1_field_fixed_array, _fname, _fmax )
+#define T1_FIELD_CALLBACK( _ident, _name ) \
+ T1_NEW_CALLBACK_FIELD( _ident, parse_ ## _name )
-#define T1_FIELD_CALLBACK( _ident, _name ) \
- T1_NEW_CALLBACK_FIELD( _ident, parse_ ## _name )
LOCAL_DEF
- FT_Error CID_Load_Field( CID_Parser* parser,
+ T1_Error CID_Load_Field( CID_Parser* parser,
const T1_Field_Rec* field,
void* object );
LOCAL_DEF
- FT_Error CID_Load_Field_Table( CID_Parser* parser,
+ T1_Error CID_Load_Field_Table( CID_Parser* parser,
const T1_Field_Rec* field,
void* object );
-
-
#ifdef __cplusplus
}
#endif
+
#endif /* CIDPARSE_H */
/* END */
-
diff --git a/src/cid/cidriver.c b/src/cid/cidriver.c
index 5bbd260..407f542 100644
--- a/src/cid/cidriver.c
+++ b/src/cid/cidriver.c
@@ -1,19 +1,20 @@
-/*******************************************************************
- *
- * t1driver.c
- *
- * High-level Type1 driver interface for FreeType 2.0
- *
- * Copyright 1996-1998 by
- * David Turner, Robert Wilhelm, and Werner Lemberg.
- *
- * This file is part of the FreeType project, and may only be used,
- * modified, and distributed under the terms of the FreeType project
- * license, LICENSE.TXT. By continuing to use, modify, or distribute
- * this file you indicate that you have read the license and
- * understand and accept it fully.
- *
- ******************************************************************/
+/***************************************************************************/
+/* */
+/* cidriver.c */
+/* */
+/* CID driver interface (body). */
+/* */
+/* 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 */
+/* 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. */
+/* */
+/***************************************************************************/
+
#include <cidriver.h>
#include <cidgload.h>
@@ -23,8 +24,18 @@
#include <freetype/internal/ftstream.h>
#include <freetype/internal/psnames.h>
+#include <string.h> /* for strcmp() */
+
+
+ /*************************************************************************/
+ /* */
+ /* The macro FT_COMPONENT is used in trace mode. It is an implicit */
+ /* parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log */
+ /* messages during execution. */
+ /* */
#undef FT_COMPONENT
-#define FT_COMPONENT trace_t1driver
+#define FT_COMPONENT trace_ciddriver
+
/*************************************************************************/
/* */
@@ -55,16 +66,18 @@
/* */
static
FTDriver_Interface Get_Interface( FT_Driver driver,
- const FT_String* interface )
+ const T1_String* interface )
{
- UNUSED(driver);
- UNUSED(interface);
-
+ UNUSED( driver );
+ UNUSED( interface );
+
return 0;
}
#ifdef xxxT1_CONFIG_OPTION_NO_AFM
+
+
/*************************************************************************/
/* */
/* <Function> */
@@ -98,94 +111,104 @@
/* They can be implemented by format-specific interfaces. */
/* */
static
- FT_Error Get_Kerning( T1_Face face,
- FT_UInt left_glyph,
- FT_UInt right_glyph,
+ T1_Error Get_Kerning( T1_Face face,
+ T1_UInt left_glyph,
+ T1_UInt right_glyph,
T1_Vector* kerning )
{
T1_AFM* afm;
+
kerning->x = 0;
kerning->y = 0;
afm = (T1_AFM*)face->afm_data;
- if (afm)
+ if ( afm )
CID_Get_Kerning( afm, left_glyph, right_glyph, kerning );
return T1_Err_Ok;
}
-#endif
- /******************************************************************/
- /* */
- /* <Function> Set_Char_Sizes */
- /* */
- /* <Description> */
- /* A driver method used to reset a size's character sizes */
- /* (horizontal and vertical) expressed in fractional points. */
- /* */
- /* <Input> */
- /* size :: handle to target size object */
- /* char_width :: character width expressed in 26.6 points */
- /* char_height :: character height expressed in 26.6 points */
- /* */
- /* <Return> */
- /* FreeType error code. 0 means success */
- /* */
+
+#endif /* xxxT1_CONFIG_OPTION_NO_AFM */
+
+
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* Set_Char_Sizes */
+ /* */
+ /* <Description> */
+ /* A driver method used to reset a size's character sizes (horizontal */
+ /* and vertical) expressed in fractional points. */
+ /* */
+ /* <Input> */
+ /* char_width :: The character width expressed in 26.6 */
+ /* fractional points. */
+ /* */
+ /* char_height :: The character height expressed in 26.6 */
+ /* fractional points. */
+ /* */
+ /* horz_resolution :: The horizontal resolution of the output device. */
+ /* */
+ /* vert_resolution :: The vertical resolution of the output device. */
+ /* */
+ /* <InOut> */
+ /* size :: A handle to the target size object. */
+ /* */
+ /* <Return> */
+ /* Type1 error code. 0 means success. */
+ /* */
static
- FT_Error Set_Char_Sizes( T1_Size size,
- T1_F26Dot6 char_width,
- T1_F26Dot6 char_height,
- FT_UInt horz_resolution,
- FT_UInt vert_resolution )
+ T1_Error Set_Char_Sizes( T1_Size size,
+ T1_F26Dot6 char_width,
+ T1_F26Dot6 char_height,
+ T1_UInt horz_resolution,
+ T1_UInt vert_resolution )
{
- UNUSED(char_width);
- UNUSED(char_height);
- UNUSED(horz_resolution);
- UNUSED(vert_resolution);
+ UNUSED( char_width );
+ UNUSED( char_height );
+ UNUSED( horz_resolution );
+ UNUSED( vert_resolution );
size->valid = FALSE;
- return T1_Reset_Size( size );
+ return CID_Reset_Size( size );
}
- /******************************************************************/
- /* */
- /* <Function> Set_Pixel_Sizes */
- /* */
- /* <Description> */
- /* A driver method used to reset a size's character sizes */
- /* (horizontal and vertical) expressed in integer pixels. */
- /* */
- /* <Input> */
- /* size :: handle to target size object */
- /* */
- /* pixel_width :: character width expressed in 26.6 points */
- /* */
- /* pixel_height :: character height expressed in 26.6 points */
- /* */
- /* char_size :: the corresponding character size in points */
- /* This value is only sent to the TrueType */
- /* bytecode interpreter, even though 99% of */
- /* glyph programs will simply ignore it. A */
- /* safe value there is the maximum of the */
- /* pixel width and height (multiplied by */
- /* 64 to make it a 26.6 fixed float !) */
- /* <Return> */
- /* FreeType error code. 0 means success */
- /* */
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* Set_Pixel_Sizes */
+ /* */
+ /* <Description> */
+ /* A driver method used to reset a size's character sizes (horizontal */
+ /* and vertical) expressed in integer pixels. */
+ /* */
+ /* <Input> */
+ /* pixel_width :: The character width expressed in integer pixels. */
+ /* */
+ /* pixel_height :: The character height expressed in integer pixels. */
+ /* */
+ /* <InOut> */
+ /* size :: A handle to the target size object. */
+ /* */
+ /* <Return> */
+ /* Type1 error code. 0 means success. */
+ /* */
static
- FT_Error Set_Pixel_Sizes( T1_Size size,
- FT_Int pixel_width,
- FT_Int pixel_height )
+ T1_Error Set_Pixel_Sizes( T1_Size size,
+ T1_Int pixel_width,
+ T1_Int pixel_height )
{
- UNUSED(pixel_width);
- UNUSED(pixel_height);
+ UNUSED( pixel_width );
+ UNUSED( pixel_height );
size->valid = FALSE;
- return T1_Reset_Size(size);
+ return CID_Reset_Size( size );
}
+
/*************************************************************************/
/* */
/* <Function> */
@@ -202,227 +225,158 @@
/* Glyph index. 0 means `undefined character code'. */
/* */
static
- FT_UInt Get_Char_Index( FT_CharMap charmap,
- FT_Long charcode )
+ T1_UInt Get_Char_Index( FT_CharMap charmap,
+ T1_Long charcode )
{
T1_Face face;
- FT_UInt result = 0;
+ T1_UInt result = 0;
PSNames_Interface* psnames;
+
face = (T1_Face)charmap->face;
psnames = (PSNames_Interface*)face->psnames;
- if (psnames)
- switch (charmap->encoding)
+ if ( psnames )
+ switch ( charmap->encoding )
{
- /********************************************************************/
- /* */
- /* Unicode encoding support */
- /* */
- case ft_encoding_unicode:
+ /*******************************************************************/
+ /* */
+ /* Unicode encoding support */
+ /* */
+ case ft_encoding_unicode:
+ /* use the `PSNames' module to synthetize the Unicode charmap */
+ result = psnames->lookup_unicode( &face->unicode_map,
+ (T1_ULong)charcode );
+
+ /* the function returns 0xFFFF if the Unicode charcode has */
+ /* no corresponding glyph. */
+ if ( result == 0xFFFF )
+ result = 0;
+ goto Exit;
+
+ /*******************************************************************/
+ /* */
+ /* Custom Type 1 encoding */
+ /* */
+ case ft_encoding_adobe_custom:
+ {
+ T1_Encoding* encoding = &face->type1.encoding;
+
+
+ if ( charcode >= encoding->code_first &&
+ charcode <= encoding->code_last )
+ result = encoding->char_index[charcode];
+ goto Exit;
+ }
+
+ /*******************************************************************/
+ /* */
+ /* Adobe Standard & Expert encoding support */
+ /* */
+ default:
+ if ( charcode < 256 )
+ {
+ T1_UInt code;
+ T1_Int n;
+ const char* glyph_name;
+
+
+ code = psnames->adobe_std_encoding[charcode];
+ if ( charmap->encoding == ft_encoding_adobe_expert )
+ code = psnames->adobe_expert_encoding[charcode];
+
+ glyph_name = psnames->adobe_std_strings( code );
+ if ( !glyph_name )
+ break;
+
+ for ( n = 0; n < face->type1.num_glyphs; n++ )
{
- /* use the "psnames" module to synthetize the Unicode charmap */
- result = psnames->lookup_unicode( &face->unicode_map,
- (FT_ULong)charcode );
-
- /* the function returns 0xFFFF when the Unicode charcode has */
- /* no corresponding glyph.. */
- if (result == 0xFFFF)
- result = 0;
- goto Exit;
- }
+ const char* gname = face->type1.glyph_names[n];
- /********************************************************************/
- /* */
- /* Custom Type 1 encoding */
- /* */
- case ft_encoding_adobe_custom:
- {
- T1_Encoding* encoding = &face->type1.encoding;
- if (charcode >= encoding->code_first &&
- charcode <= encoding->code_last)
+
+ if ( gname && gname[0] == glyph_name[0] &&
+ strcmp( gname, glyph_name ) == 0 )
{
- result = encoding->char_index[charcode];
+ result = n;
+ break;
}
- goto Exit;
}
-
- /********************************************************************/
- /* */
- /* Adobe Standard & Expert encoding support */
- /* */
- default:
- if (charcode < 256)
- {
- FT_UInt code;
- FT_Int n;
- const char* glyph_name;
-
- code = psnames->adobe_std_encoding[charcode];
- if (charmap->encoding == ft_encoding_adobe_expert)
- code = psnames->adobe_expert_encoding[charcode];
-
- glyph_name = psnames->adobe_std_strings(code);
- if (!glyph_name) break;
-
- for ( n = 0; n < face->type1.num_glyphs; n++ )
- {
- const char* gname = face->type1.glyph_names[n];
-
- if ( gname && gname[0] == glyph_name[0] &&
- strcmp( gname, glyph_name ) == 0 )
- {
- result = n;
- break;
- }
- }
- }
+ }
}
+
Exit:
return result;
}
- /******************************************************************/
- /* */
- /* <Struct> FT_DriverInterface */
- /* */
- /* <Description> */
- /* A structure used to hold a font driver's basic interface */
- /* used by the high-level parts of FreeType (or other apps) */
- /* */
- /* Most scalable drivers provide a specialized interface to */
- /* access format-specific features. It can be retrieved with */
- /* a call to the "get_format_interface", and should be defined */
- /* in each font driver header (e.g. ttdriver.h, t1driver.h,..) */
- /* */
- /* All fields are function pointers .. */
- /* */
- /* */
- /* <Fields> */
- /* */
- /* new_engine :: */
- /* used to create and initialise a new driver object */
- /* */
- /* done_engine :: */
- /* used to finalise and destroy a given driver object */
- /* */
- /* get_format_interface :: */
- /* return a typeless pointer to the format-specific */
- /* driver interface. */
- /* */
- /* new_face :: */
- /* create a new face object from a resource */
- /* */
- /* done_face :: */
- /* discards a face object, as well as all child objects */
- /* ( sizes, charmaps, glyph slots ) */
- /* */
- /* get_face_properties :: */
- /* return generic face properties */
- /* */
- /* get_kerning :: */
- /* return the kerning vector corresponding to a pair */
- /* of glyphs, expressed in unscaled font units. */
- /* */
- /* new_size :: */
- /* create and initialise a new scalable size object. */
- /* */
- /* new_fixed_size :: */
- /* create and initialise a new fixed-size object. */
- /* */
- /* done_size :: */
- /* finalize a given face size object. */
- /* */
- /* set_size_resolutions :: */
- /* reset a scalable size object's output resolutions */
- /* */
- /* set_size_char_sizes :: */
- /* reset a scalable size object's character size */
- /* */
- /* set_pixel_sizes :: */
- /* reset a face size object's pixel dimensions. Applies */
- /* to both scalable and fixed faces. */
- /* */
- /* new_glyph_slot :: */
- /* create and initialise a new glyph slot */
- /* */
- /* done_glyph_slot :: */
- /* discard a given glyph slot */
- /* */
- /* load_glyph :: */
- /* load a given glyph into a given slot */
- /* */
- /* get_glyph_metrics :: */
- /* return a loaded glyph's metrics. */
- /* */
-
- const FT_DriverInterface t1cid_driver_interface =
+ const FT_DriverInterface t1cid_driver_interface =
{
sizeof( FT_DriverRec ),
sizeof( CID_FaceRec ),
sizeof( T1_SizeRec ),
sizeof( T1_GlyphSlotRec ),
- "type1",
+ "t1cid",
100,
200,
0, /* format interface */
- (FTDriver_initDriver) T1_Init_Driver,
- (FTDriver_doneDriver) T1_Done_Driver,
+ (FTDriver_initDriver) CID_Init_Driver,
+ (FTDriver_doneDriver) CID_Done_Driver,
- (FTDriver_getInterface) Get_Interface,
+ (FTDriver_getInterface) Get_Interface,
- (FTDriver_initFace) T1_Init_Face,
- (FTDriver_doneFace) T1_Done_Face,
+ (FTDriver_initFace) CID_Init_Face,
+ (FTDriver_doneFace) CID_Done_Face,
#ifndef xxxxT1_CONFIG_OPTION_NO_AFM
- (FTDriver_getKerning) 0,
+ (FTDriver_getKerning) 0,
#else
- (FTDriver_getKerning) Get_Kerning,
+ (FTDriver_getKerning) Get_Kerning,
#endif
- (FTDriver_initSize) T1_Init_Size,
- (FTDriver_doneSize) T1_Done_Size,
- (FTDriver_setCharSizes) Set_Char_Sizes,
- (FTDriver_setPixelSizes) Set_Pixel_Sizes,
+ (FTDriver_initSize) CID_Init_Size,
+ (FTDriver_doneSize) CID_Done_Size,
+ (FTDriver_setCharSizes) Set_Char_Sizes,
+ (FTDriver_setPixelSizes)Set_Pixel_Sizes,
- (FTDriver_initGlyphSlot) T1_Init_GlyphSlot,
- (FTDriver_doneGlyphSlot) T1_Done_GlyphSlot,
- (FTDriver_loadGlyph) CID_Load_Glyph,
+ (FTDriver_initGlyphSlot)CID_Init_GlyphSlot,
+ (FTDriver_doneGlyphSlot)CID_Done_GlyphSlot,
+ (FTDriver_loadGlyph) CID_Load_Glyph,
- (FTDriver_getCharIndex) Get_Char_Index,
+ (FTDriver_getCharIndex) Get_Char_Index,
};
- /******************************************************************/
- /* */
- /* <Function> Get_FreeType_Driver_Interface */
- /* */
- /* <Description> */
- /* This function is used when compiling the TrueType driver */
- /* as a shared library (.DLL or .so). It will be used by the */
- /* high-level library of FreeType to retrieve the address of */
- /* the driver's generic interface. */
- /* */
- /* It shouldn't be implemented in a static build, as each */
- /* driver must have the same function as an exported entry */
- /* point. */
- /* */
- /* <Return> */
- /* address of TrueType's driver generic interface. The */
- /* forma-specific interface can then be retrieved through */
- /* the method interface->get_format_interface.. */
- /* */
-
#ifdef FT_CONFIG_OPTION_DYNAMIC_DRIVERS
- EXPORT_FUNC(FT_DriverInterface*) getDriverInterface( void )
+
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* getDriverInterface */
+ /* */
+ /* <Description> */
+ /* This function is used when compiling the CID driver as a shared */
+ /* library (`.DLL' or `.so'). It will be used by the high-level */
+ /* library of FreeType to retrieve the address of the driver's */
+ /* generic interface. */
+ /* */
+ /* It shouldn't be implemented in a static build, as each driver must */
+ /* have the same function as an exported entry point. */
+ /* */
+ /* <Return> */
+ /* The address of the CID's driver generic interface. The */
+ /* format-specific interface can then be retrieved through the method */
+ /* interface->get_format_interface. */
+ /* */
+ EXPORT_FUNC( FT_DriverInterface* ) getDriverInterface( void )
{
return &t1cid_driver_interface;
}
+
#endif /* FT_CONFIG_OPTION_DYNAMIC_DRIVERS */
+/* END */
diff --git a/src/cid/cidriver.h b/src/cid/cidriver.h
index 25651a0..75c8730 100644
--- a/src/cid/cidriver.h
+++ b/src/cid/cidriver.h
@@ -1,27 +1,30 @@
-/*******************************************************************
- *
- * t1driver.h
- *
- * High-level Type1 driver interface for FreeType 2.0
- *
- * Copyright 1996-1998 by
- * David Turner, Robert Wilhelm, and Werner Lemberg.
- *
- * This file is part of the FreeType project, and may only be used,
- * modified, and distributed under the terms of the FreeType project
- * license, LICENSE.TXT. By continuing to use, modify, or distribute
- * this file you indicate that you have read the license and
- * understand and accept it fully.
- *
- ******************************************************************/
+/***************************************************************************/
+/* */
+/* cidriver.h */
+/* */
+/* High-level CID driver interface (specification). */
+/* */
+/* 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 */
+/* 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 T1DRIVER_H
-#define T1DRIVER_H
+
+#ifndef CIDRIVER_H
+#define CIDRIVER_H
#include <cidobjs.h>
#include <freetype/internal/t1errors.h>
- FT_EXPORT_VAR(const FT_DriverInterface) t1cid_driver_interface;
+ FT_EXPORT_VAR( const FT_DriverInterface ) t1cid_driver_interface;
+
+#endif /* CIDRIVER_H */
-#endif /* T1DRIVER_H */
+/* END */
diff --git a/src/cid/cidtokens.h b/src/cid/cidtokens.h
index 65d5752..551f2a9 100644
--- a/src/cid/cidtokens.h
+++ b/src/cid/cidtokens.h
@@ -1,22 +1,23 @@
-/*******************************************************************
- *
- * t1tokens.h
- *
- * Type 1 tokens definition
- *
- * Copyright 2000 David Turner, Robert Wilhelm and Werner Lemberg.
- *
- * This file is part of the FreeType project, and may only be used
- * modified and distributed under the terms of the FreeType project
- * license, LICENSE.TXT. By continuing to use, modify or distribute
- * this file you indicate that you have read the license and
- * understand and accept it fully.
- *
- * This file only contains macros that are expanded when compiling
- * the "t1load.c" source file.
- *
- ******************************************************************/
+/***************************************************************************/
+/* */
+/* cidtokens.h */
+/* */
+/* CID token definitions (specification only). */
+/* */
+/* 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 */
+/* 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. */
+/* */
+/***************************************************************************/
+
+#undef T1TYPE
+#undef T1CODE
#define T1TYPE CID_Info
#define T1CODE t1_field_cid_info
@@ -33,7 +34,8 @@
T1_FIELD_NUM ( "FDBytes", fd_bytes )
T1_FIELD_NUM ( "GDBytes", gd_bytes )
T1_FIELD_NUM ( "CIDCount", cid_count )
-
+
+
#undef T1TYPE
#undef T1CODE
#define T1TYPE T1_FontInfo
@@ -49,6 +51,7 @@
T1_FIELD_NUM ( "UnderlinePosition", underline_position )
T1_FIELD_NUM ( "UnderlineThickness", underline_thickness )
+
#undef T1TYPE
#undef T1CODE
#define T1TYPE CID_FontDict
@@ -64,21 +67,22 @@
T1_FIELD_FIXED ( "ForceBoldThreshold", forcebold_threshold )
T1_FIELD_FIXED ( "ExpansionFactor", expansion_factor )
T1_FIELD_NUM ( "StrokeWidth", stroke_width )
-
+
+
#undef T1TYPE
#undef T1CODE
#define T1TYPE T1_Private
#define T1CODE t1_field_private
- T1_FIELD_NUM ( "UniqueID", unique_id )
- T1_FIELD_NUM ( "lenIV", lenIV )
- T1_FIELD_NUM ( "LanguageGroup", language_group )
- T1_FIELD_NUM ( "password", password )
-
- T1_FIELD_FIXED( "BlueScale", blue_scale )
- T1_FIELD_NUM ( "BlueShift", blue_shift )
- T1_FIELD_NUM ( "BlueFuzz", blue_fuzz )
-
+ T1_FIELD_NUM ( "UniqueID", unique_id )
+ T1_FIELD_NUM ( "lenIV", lenIV )
+ T1_FIELD_NUM ( "LanguageGroup", language_group )
+ T1_FIELD_NUM ( "password", password )
+
+ T1_FIELD_FIXED ( "BlueScale", blue_scale )
+ T1_FIELD_NUM ( "BlueShift", blue_shift )
+ T1_FIELD_NUM ( "BlueFuzz", blue_fuzz )
+
T1_FIELD_NUM_TABLE( "BlueValues", blue_values, 14 )
T1_FIELD_NUM_TABLE( "OtherBlues", other_blues, 10 )
T1_FIELD_NUM_TABLE( "FamilyBlues", family_blues, 14 )
@@ -87,8 +91,9 @@
T1_FIELD_NUM_TABLE2( "StdHW", standard_width, 1 )
T1_FIELD_NUM_TABLE2( "StdVW", standard_height, 1 )
T1_FIELD_NUM_TABLE2( "MinFeature", min_feature, 2 )
-
+
T1_FIELD_NUM_TABLE ( "StemSnapH", snap_widths, 12 )
T1_FIELD_NUM_TABLE ( "StemSnapV", snap_heights, 12 )
+/* END */
diff --git a/src/cid/type1cid.c b/src/cid/type1cid.c
index 371830f..855f564 100644
--- a/src/cid/type1cid.c
+++ b/src/cid/type1cid.c
@@ -1,32 +1,21 @@
/***************************************************************************/
/* */
-/* type1.c */
+/* cff.c */
/* */
-/* FreeType Type 1 driver component */
+/* FreeType OpenType driver component (body only). */
/* */
-/* Copyright 1996-1998 by */
+/* 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. */
/* */
-/* */
-/* This file is used to compile the FreeType Type 1 font driver. */
-/* It relies on all components included in the "base" layer (see */
-/* the file "ftbase.c"). Source code is located in "freetype/ttlib" */
-/* and contains : */
-/* */
-/* - a driver interface */
-/* - an object manager */
-/* - a table loader */
-/* - a glyph loader */
-/* - a glyph hinter */
-/* */
/***************************************************************************/
+
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <cidparse.c>
@@ -39,3 +28,5 @@
#include <cidafm.c>
#endif
+
+/* END */
diff --git a/src/truetype/ttdriver.c b/src/truetype/ttdriver.c
index 6a0dd49..55ef702 100644
--- a/src/truetype/ttdriver.c
+++ b/src/truetype/ttdriver.c
@@ -175,7 +175,7 @@
/* vert_resolution :: The vertical resolution of the output device. */
/* */
/* <InOut> */
- /* size :: A handle to the target size object. */
+ /* size :: A handle to the target size object. */
/* */
/* <Return> */
/* TrueType error code. 0 means success. */