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 7411 7412 7413 7414 7415 7416 7417 7418 7419 7420 7421 7422 7423 7424 7425 7426 7427 7428 7429 7430 7431 7432 7433 7434 7435 7436 7437 7438 7439 7440 7441 7442 7443 7444 7445 7446 7447 7448 7449 7450 7451 7452 7453 7454 7455 7456 7457 7458 7459 7460 7461 7462 7463 7464 7465 7466 7467 7468 7469 7470 7471 7472 7473 7474 7475 7476 7477 7478 7479 7480 7481 7482 7483 7484 7485 7486 7487 7488 7489 7490 7491 7492 7493 7494 7495 7496 7497 7498 7499 7500 7501 7502 7503 7504 7505 7506 7507 7508 7509 7510 7511 7512 7513 7514 7515 7516 7517 7518 7519 7520 7521 7522 7523 7524 7525 7526 7527 7528 7529 7530 7531 7532 7533 7534 7535 7536 7537 7538 7539 7540 7541 7542 7543 7544 7545 7546 7547 7548 7549 7550 7551 7552 7553 7554 7555 7556 7557 7558 7559 7560 7561 7562 7563 7564 7565 7566 7567 7568 7569 7570 7571 7572 7573 7574 7575 7576 7577 7578 7579 7580 7581 7582 7583 7584 7585 7586 7587 7588 7589 7590 7591 7592 7593 7594 7595 7596 7597 7598 7599 7600 7601 7602 7603 7604 7605 7606 7607 7608 7609 7610 7611 7612 7613 7614 7615 7616 7617 7618 7619 7620 7621 7622 7623 7624 7625 7626 7627 7628 7629 7630 7631 7632 7633 7634 7635 7636 7637 7638 7639 7640 7641 7642 7643 7644 7645 7646 7647 7648 7649 7650 7651 7652 7653 7654 7655 7656 7657 7658 7659 7660 7661 7662 7663 7664 7665 7666 7667 7668 7669 7670 7671 7672 7673 7674 7675 7676 7677 7678 7679 7680 7681 7682 7683 7684 7685 7686 7687 7688 7689 7690 7691 7692 7693 7694 7695 7696 7697 7698 7699 7700 7701 7702 7703 7704 7705 7706 7707 7708 7709 7710 7711 7712 7713 7714 7715 7716 7717 7718 7719 7720 7721 7722 7723 7724 7725 7726 7727 7728 7729 7730 7731 7732 7733 7734 7735 7736 7737 7738 7739 7740 7741 7742 7743 7744 7745 7746 7747 7748 7749 7750 7751 7752 7753 7754 7755 7756 7757 7758 7759 7760 7761 7762 7763 7764 7765 7766 7767 7768 7769 7770 7771 7772 7773 7774 7775 7776 7777 7778 7779 7780 7781 7782 7783 7784 7785 7786 7787 7788 7789 7790 7791 7792 7793 7794 7795 7796 7797 7798 7799 7800 7801 7802 7803 7804 7805 7806 7807 7808 7809 7810 7811 7812 7813 7814 7815 7816 7817 7818 7819 7820 7821 7822 7823 7824 7825 7826 7827 7828 7829 7830 7831 7832 7833 7834 7835 7836 7837 7838 7839 7840 7841 7842 7843 7844 7845 7846 7847 7848 7849 7850 7851 7852 7853 7854 7855 7856 7857 7858 7859 7860 7861 7862 7863 7864 7865 7866 7867 7868 7869 7870 7871 7872 7873 7874 7875 7876 7877 7878 7879 7880 7881 7882 7883 7884 7885 7886 7887 7888 7889 7890 7891 7892 7893 7894 7895 7896 7897 7898 7899 7900 7901 7902 7903 7904 7905 7906 7907 7908 7909 7910 7911 7912 7913 7914 7915 7916 7917 7918 7919 7920 7921 7922 7923 7924 7925 7926 7927 7928 7929 7930 7931 7932 7933 7934 7935 7936 7937 7938 7939 7940 7941 7942 7943 7944 7945 7946 7947 7948 7949 7950 7951 7952 7953 7954 7955 7956 7957 7958 7959 7960 7961 7962 7963 7964 7965 7966 7967 7968 7969 7970 7971 7972 7973 7974 7975 7976 7977 7978 7979 7980 7981 7982 7983 7984 7985 7986 7987 7988 7989 7990 7991 7992 7993 7994 7995 7996 7997 7998 7999 8000 8001 8002 8003 8004 8005 8006 8007 8008 8009 8010 8011 8012 8013 8014 8015 8016 8017 8018 8019 8020 8021 8022 8023 8024 8025 8026 8027 8028 8029 8030 8031 8032 8033 8034 8035 8036 8037 8038 8039 8040 8041 8042 8043 8044 8045 8046 8047 8048 8049 8050 8051 8052 8053 8054 8055 8056 8057 8058 8059 8060 8061 8062 8063 8064 8065 8066 8067 8068 8069 8070 8071 8072 8073 8074 8075 8076 8077 8078 8079 8080 8081 8082 8083 8084 8085 8086 8087 8088 8089 8090 8091 8092 8093 8094 8095 8096 8097 8098 8099 8100 8101 8102 8103 8104 8105 8106 8107 8108 8109 8110 8111 8112 8113 8114 8115 8116 8117 8118 8119 8120 8121 8122 8123 8124 8125 8126 8127 8128 8129 8130 8131 8132 8133 8134 8135 8136 8137 8138 8139 8140 8141 8142 8143 8144 8145 8146 8147 8148 8149 8150 8151 8152 8153 8154 8155 8156 8157 8158 8159 8160 8161 8162 8163 8164 8165 8166 8167 8168 8169 8170 8171 8172 8173 8174 8175 8176 8177 8178 8179 8180 8181 8182 8183 8184 8185 8186 8187 8188 8189 8190 8191 8192 8193 8194 8195 8196 8197 8198 8199 8200 8201 8202 8203 8204 8205 8206 8207 8208 8209 8210 8211 8212 8213 8214 8215 8216 8217 8218 8219 8220 8221 8222 8223 8224 8225 8226 8227 8228 8229 8230 8231 8232 8233 8234 8235 8236 8237 8238 8239 8240 8241 8242 8243 8244 8245 8246 8247 8248 8249 8250 8251 8252 8253 8254 8255 8256 8257 8258 8259 8260 8261 8262 8263 8264 8265 8266 8267 8268 8269 8270 8271 8272 8273 8274 8275 8276 8277 8278 8279 8280 8281 8282 8283 8284 8285 8286 8287 8288 8289 8290 8291 8292 8293 8294 8295 8296 8297 8298 8299 8300 8301 8302 8303 8304 8305 8306 8307 8308 8309 8310 8311 8312 8313 8314 8315 8316 8317 8318 8319 8320 8321 8322 8323 8324 8325 8326 8327 8328 8329 8330 8331 8332 8333 8334 8335 8336 8337 8338 8339 8340 8341 8342 8343 8344 8345 8346 8347 8348 8349 8350 8351 8352 8353 8354 8355 8356 8357 8358 8359 8360 8361 8362 8363 8364 8365 8366 8367 8368 8369 8370 8371 8372 8373 8374 8375 8376 8377 8378 8379 8380 8381 8382 8383 8384 8385 8386 8387 8388 8389 8390 8391 8392 8393 8394 8395 8396 8397 8398 8399 8400 8401 8402 8403 8404 8405 8406 8407 8408 8409 8410 8411 8412 8413 8414 8415 8416 8417 8418 8419 8420 8421 8422 8423 8424 8425 8426 8427 8428 8429 8430 8431 8432 8433 8434 8435 8436 8437 8438 8439 8440 8441 8442 8443 8444 8445 8446 8447 8448 8449 8450 8451 8452 8453 8454 8455 8456 8457 8458 8459 8460 8461 8462 8463 8464 8465 8466 8467 8468 8469 8470 8471 8472 8473 8474 8475 8476 8477 8478 8479 8480 8481 8482 8483 8484 8485 8486 8487 8488 8489 8490 8491 8492 8493 8494 8495 8496 8497 8498 8499 8500 8501 8502 8503 8504 8505 8506 8507 8508 8509 8510 8511 8512 8513 8514 8515 8516 8517 8518 8519 8520 8521 8522 8523 8524 8525 8526 8527 8528 8529 8530 8531 8532 8533 8534 8535 8536 8537 8538 8539 8540 8541 8542 8543 8544 8545 8546 8547 8548 8549 8550 8551 8552 8553 8554 8555 8556 8557 8558 8559 8560 8561 8562 8563 8564 8565 8566 8567 8568 8569 8570 8571 8572 8573 8574 8575 8576 8577 8578 8579 8580 8581 8582 8583 8584 8585 8586 8587 8588 8589 8590 8591 8592 8593 8594 8595 8596 8597 8598 8599 8600 8601 8602 8603 8604 8605 8606 8607 8608 8609 8610 8611 8612 8613 8614 8615 8616 8617 8618 8619 8620 8621 8622 8623 8624 8625 8626 8627 8628 8629 8630 8631 8632 8633 8634 8635 8636 8637 8638 8639 8640 8641 8642 8643 8644 8645 8646 8647 8648 8649 8650 8651 8652 8653 8654 8655 8656 8657 8658 8659 8660 8661 8662 8663 8664 8665 8666 8667 8668 8669 8670 8671 8672 8673 8674 8675 8676 8677 8678 8679 8680 8681 8682 8683 8684 8685 8686 8687 8688 8689 8690 8691 8692 8693 8694 8695 8696 8697 8698 8699 8700 8701 8702 8703 8704 8705 8706 8707 8708 8709 8710 8711 8712 8713 8714 8715 8716 8717 8718 8719 8720 8721 8722 8723 8724 8725 8726 8727 8728 8729 8730 8731 8732 8733 8734 8735 8736 8737 8738 8739 8740 8741 8742 8743 8744 8745 8746 8747 8748 8749 8750 8751 8752 8753 8754 8755 8756 8757 8758 8759 8760 8761 8762 8763 8764 8765 8766 8767 8768 8769 8770 8771 8772 8773 8774 8775 8776 8777 8778 8779 8780 8781 8782 8783 8784 8785 8786 8787 8788 8789 8790 8791 8792 8793 8794 8795 8796 8797 8798 8799 8800 8801 8802 8803 8804 8805 8806 8807 8808 8809 8810 8811 8812 8813 8814 8815 8816 8817 8818 8819 8820 8821 8822 8823 8824 8825 8826 8827 8828 8829 8830 8831 8832 8833 8834 8835 8836 8837 8838 8839 8840 8841 8842 8843 8844 8845 8846 8847 8848 8849 8850 8851 8852 8853 8854 8855 8856 8857 8858 8859 8860 8861 8862 8863 8864 8865 8866 8867 8868 8869 8870 8871 8872 8873 8874 8875 8876 8877 8878 8879 8880 8881 8882 8883 8884 8885 8886 8887 8888 8889 8890 8891 8892 8893 8894 8895 8896 8897 8898 8899 8900 8901 8902 8903 8904 8905 8906 8907 8908 8909 8910 8911 8912 8913 8914 8915 8916 8917 8918 8919 8920 8921 8922 8923 8924 8925 8926 8927 8928 8929 8930 8931 8932 8933 8934 8935 8936 8937 8938 8939 8940 8941 8942 8943 8944 8945 8946 8947 8948 8949 8950 8951 8952 8953 8954 8955 8956 8957 8958 8959 8960 8961 8962 8963 8964 8965 8966 8967 8968 8969 8970 8971 8972 8973 8974 8975 8976 8977 8978 8979 8980 8981 8982 8983 8984 8985 8986 8987 8988 8989 8990 8991 8992 8993 8994 8995 8996 8997 8998 8999 9000 9001 9002 9003 9004 9005 9006 9007 9008 9009 9010 9011 9012 9013 9014 9015 9016 9017 9018 9019 9020 9021 9022 9023 9024 9025 9026 9027 9028 9029 9030 9031 9032 9033 9034 9035 9036 9037 9038 9039 9040 9041 9042 9043 9044 9045 9046 9047 9048 9049 9050 9051 9052 9053 9054 9055 9056 9057 9058 9059 9060 9061 9062 9063 9064 9065 9066 9067 9068 9069 9070 9071 9072 9073 9074 9075 9076 9077 9078 9079 9080 9081 9082 9083 9084 9085 9086 9087 9088 9089 9090 9091 9092 9093 9094 9095 9096 9097 9098 9099 9100 9101 9102 9103 9104 9105 9106 9107 9108 9109 9110 9111 9112 9113 9114 9115 9116 9117 9118 9119 9120 9121 9122 9123 9124 9125 9126 9127 9128 9129 9130 9131 9132 9133 9134 9135 9136 9137 9138 9139 9140 9141 9142 9143 9144 9145 9146 9147 9148 9149 9150 9151 9152 9153 9154 9155 9156 9157 9158 9159 9160 9161 9162 9163 9164 9165 9166 9167 9168 9169 9170 9171 9172 9173 9174 9175 9176 9177 9178 9179 9180 9181 9182 9183 9184 9185 9186 9187 9188 9189 9190 9191 9192 9193 9194 9195 9196 9197 9198 9199 9200 9201 9202 9203 9204 9205 9206 9207 9208 9209 9210 9211 9212 9213 9214 9215 9216 9217 9218 9219 9220 9221 9222 9223 9224 9225 9226 9227 9228 9229 9230 9231 9232 9233 9234 9235 9236 9237 9238 9239 9240 9241 9242 9243 9244 9245 9246 9247 9248 9249 9250 9251 9252 9253 9254 9255 9256 9257 9258 9259 9260 9261 9262 9263 9264 9265 9266 9267 9268 9269 9270 9271 9272 9273 9274 9275 9276 9277 9278 9279 9280 9281 9282 9283 9284 9285 9286 9287 9288 9289 9290 9291 9292 9293 9294 9295 9296 9297 9298 9299 9300 9301 9302 9303 9304 9305 9306 9307 9308 9309 9310 9311 9312 9313 9314 9315 9316 9317 9318 9319 9320 9321 9322 9323 9324 9325 9326 9327 9328 9329 9330 9331 9332 9333 9334 9335 9336 9337 9338 9339 9340 9341 9342 9343 9344 9345 9346 9347 9348 9349 9350 9351 9352 9353 9354 9355 9356 9357 9358 9359 9360 9361 9362 9363 9364 9365 9366 9367 9368 9369 9370 9371 9372 9373 9374 9375 9376 9377 9378 9379 9380 9381 9382 9383 9384 9385 9386 9387 9388 9389 9390 9391 9392 9393 9394 9395 9396 9397 9398 9399 9400 9401 9402 9403 9404 9405 9406 9407 9408 9409 9410 9411 9412 9413 9414 9415 9416 9417 9418 9419 9420 9421 9422 9423 9424 9425 9426 9427 9428 9429 9430 9431 9432 9433 9434 9435 9436 9437 9438 9439 9440 9441 9442 9443 9444 9445 9446 9447 9448 9449 9450 9451 9452 9453 9454 9455 9456 9457 9458 9459 9460 9461 9462 9463 9464 9465 9466 9467 9468 9469 9470 9471 9472 9473 9474 9475 9476 9477 9478 9479 9480 9481 9482 9483 9484 9485 9486 9487 9488 9489 9490 9491 9492 9493 9494 9495 9496 9497 9498 9499 9500 9501 9502 9503 9504 9505 9506 9507 9508 9509 9510 9511 9512 9513 9514 9515 9516 9517 9518 9519 9520 9521 9522 9523 9524 9525 9526 9527 9528 9529 9530 9531 9532 9533 9534 9535 9536 9537 9538 9539 9540 9541 9542 9543 9544 9545 9546 9547 9548 9549 9550 9551 9552 9553 9554 9555 9556 9557 9558 9559 9560 9561 9562 9563 9564 9565 9566 9567 9568 9569 9570 9571 9572 9573 9574 9575 9576 9577 9578 9579 9580 9581 9582 9583 9584 9585 9586 9587 9588 9589 9590 9591 9592 9593 9594 9595 9596 9597 9598 9599 9600 9601 9602 9603 9604 9605 9606 9607 9608 9609 9610 9611 9612 9613 9614 9615 9616 9617 9618 9619 9620 9621 9622 9623 9624 9625 9626 9627 9628 9629 9630 9631 9632 9633 9634 9635 9636 9637 9638 9639 9640 9641 9642 9643 9644 9645 9646 9647 9648 9649 9650 9651 9652 9653 9654 9655 9656 9657 9658 9659 9660 9661 9662 9663 9664 9665 9666 9667 9668 9669 9670 9671 9672 9673 9674 9675 9676 9677 9678 9679 9680 9681 9682 9683 9684 9685 9686 9687 9688 9689 9690 9691 9692 9693 9694 9695 9696 9697 9698 9699 9700 9701 9702 9703 9704 9705 9706 9707 9708 9709 9710 9711 9712 9713 9714 9715 9716 9717 9718 9719 9720 9721 9722 9723 9724 9725 9726 9727 9728 9729 9730 9731 9732 9733 9734 9735 9736 9737 9738 9739 9740 9741 9742 9743 9744 9745 9746 9747 9748 9749 9750 9751 9752 9753 9754 9755 9756 9757 9758 9759 9760 9761 9762 9763 9764 9765 9766 9767 9768 9769 9770 9771 9772 9773 9774 9775 9776 9777 9778 9779 9780 9781 9782 9783 9784 9785 9786 9787 9788 9789 9790 9791 9792 9793 9794 9795 9796 9797 9798 9799 9800 9801 9802 9803 9804 9805 9806 9807 9808 9809 9810 9811 9812 9813 9814 9815 9816 9817 9818 9819 9820 9821 9822 9823 9824 9825 9826 9827 9828 9829 9830 9831 9832 9833 9834 9835 9836 9837 9838 9839 9840 9841 9842 9843 9844 9845 9846 9847 9848 9849 9850 9851 9852 9853 9854 9855 9856 9857 9858 9859 9860 9861 9862 9863 9864 9865 9866 9867 9868 9869 9870 9871 9872 9873 9874 9875 9876 9877 9878 9879 9880 9881 9882 9883 9884 9885 9886 9887 9888 9889 9890 9891 9892 9893 9894 9895 9896 9897 9898 9899 9900 9901 9902 9903 9904 9905 9906 9907 9908 9909 9910 9911 9912 9913 9914 9915 9916 9917 9918 9919 9920 9921 9922 9923 9924 9925 9926 9927 9928 9929 9930 9931 9932 9933 9934 9935 9936 9937 9938 9939 9940 9941 9942 9943 9944 9945 9946 9947 9948 9949 9950 9951 9952 9953 9954 9955 9956 9957 9958 9959 9960 9961 9962 9963 9964 9965 9966 9967 9968 9969 9970 9971 9972 9973 9974 9975 9976 9977 9978 9979 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 9995 9996 9997 9998 9999 10000 10001 10002 10003 10004 10005 10006 10007 10008 10009 10010 10011 10012 10013 10014 10015 10016 10017 10018 10019 10020 10021 10022 10023 10024 10025 10026 10027 10028 10029 10030 10031 10032 10033 10034 10035 10036 10037 10038 10039 10040 10041 10042 10043 10044 10045 10046 10047 10048 10049 10050 10051 10052 10053 10054 10055 10056 10057 10058 10059 10060 10061 10062 10063 10064 10065 10066 10067 10068 10069 10070 10071 10072 10073 10074 10075 10076 10077 10078 10079 10080 10081 10082 10083 10084 10085 10086 10087 10088 10089 10090 10091 10092 10093 10094 10095 10096 10097 10098 10099 10100 10101 10102 10103 10104 10105 10106 10107 10108 10109 10110 10111 10112 10113 10114 10115 10116 10117 10118 10119 10120 10121 10122 10123 10124 10125 10126 10127 10128 10129 10130 10131 10132 10133 10134 10135 10136 10137 10138 10139 10140 10141 10142 10143 10144 10145 10146 10147 10148 10149 10150 10151 10152 10153 10154 10155 10156 10157 10158 10159 10160 10161 10162 10163 10164 10165 10166 10167 10168 10169 10170 10171 10172 10173 10174 10175 10176 10177 10178 10179 10180 10181 10182 10183 10184 10185 10186 10187 10188 10189 10190 10191 10192 10193 10194 10195 10196 10197 10198 10199 10200 10201 10202 10203 10204 10205 10206 10207 10208 10209 10210 10211 10212 10213 10214 10215 10216 10217 10218 10219 10220 10221 10222 10223 10224 10225 10226 10227 10228 10229 10230 10231 10232 10233 10234 10235 10236 10237 10238 10239 10240 10241 10242 10243 10244 10245 10246 10247 10248 10249 10250 10251 10252 10253 10254 10255 10256 10257 10258 10259 10260 10261 10262 10263 10264 10265 10266 10267 10268 10269 10270 10271 10272 10273 10274 10275 10276 10277 10278 10279 10280 10281 10282 10283 10284 10285 10286 10287 10288 10289 10290 10291 10292 10293 10294 10295 10296 10297 10298 10299 10300 10301 10302 10303 10304 10305 10306 10307 10308 10309 10310 10311 10312 10313 10314 10315 10316 10317 10318 10319 10320 10321 10322 10323 10324 10325 10326 10327 10328 10329 10330 10331 10332 10333 10334 10335 10336 10337 10338 10339 10340 10341 10342 10343 10344 10345 10346 10347 10348 10349 10350 10351 10352 10353 10354 10355 10356 10357 10358 10359 10360 10361 10362 10363 10364 10365 10366 10367 10368 10369 10370 10371 10372 10373 10374 10375 10376 10377 10378 10379 10380 10381 10382 10383 10384 10385 10386 10387 10388 10389 10390 10391 10392 10393 10394 10395 10396 10397 10398 10399 10400 10401 10402 10403 10404 10405 10406 10407 10408 10409 10410 10411 10412 10413 10414 10415 10416 10417 10418 10419 10420 10421 10422 10423 10424 10425 10426 10427 10428 10429 10430 10431 10432 10433 10434 10435 10436 10437 10438 10439 10440 10441 10442 10443 10444 10445 10446 10447 10448 10449 10450 10451 10452 10453 10454 10455 10456 10457 10458 10459 10460 10461 10462 10463 10464 10465 10466 10467 10468 10469 10470 10471 10472 10473 10474 10475 10476 10477 10478 10479 10480 10481 10482 10483 10484 10485 10486 10487 10488 10489 10490 10491 10492 10493 10494 10495 10496 10497 10498 10499 10500 10501 10502 10503 10504 10505 10506 10507 10508 10509 10510 10511 10512 10513 10514 10515 10516 10517 10518 10519 10520 10521 10522 10523 10524 10525 10526 10527 10528 10529 10530 10531 10532 10533 10534 10535 10536 10537 10538 10539 10540 10541 10542 10543 10544 10545 10546 10547 10548 10549 10550 10551 10552 10553 10554 10555 10556 10557 10558 10559 10560 10561 10562 10563 10564 10565 10566 10567 10568 10569 10570 10571 10572 10573 10574 10575 10576 10577 10578 10579 10580 10581 10582 10583 10584 10585 10586 10587 10588 10589 10590 10591 10592 10593 10594 10595 10596 10597 10598 10599 10600 10601 10602 10603 10604 10605 10606 10607 10608 10609 10610 10611 10612 10613 10614 10615 10616 10617 10618 10619 10620 10621 10622 10623 10624 10625 10626 10627 10628 10629 10630 10631 10632 10633 10634 10635 10636 10637 10638 10639 10640 10641 10642 10643 10644 10645 10646 10647 10648 10649 10650 10651 10652 10653 10654 10655 10656 10657 10658 10659 10660 10661 10662 10663 10664 10665 10666 10667 10668 10669 10670 10671 10672 10673 10674 10675 10676 10677 10678 10679 10680 10681 10682 10683 10684 10685 10686 10687 10688 10689 10690 10691 10692 10693 10694 10695 10696 10697 10698 10699 10700 10701 10702 10703 10704 10705 10706 10707 10708 10709 10710 10711 10712 10713 10714 10715 10716 10717 10718 10719 10720 10721 10722 10723 10724 10725 10726 10727 10728 10729 10730 10731 10732 10733 10734 10735 10736 10737 10738 10739 10740 10741 10742 10743 10744 10745 10746 10747 10748 10749 10750 10751 10752 10753 10754 10755 10756 10757 10758 10759 10760 10761 10762 10763 10764 10765 10766 10767 10768 10769 10770 10771 10772 10773 10774 10775 10776 10777 10778 10779 10780 10781 10782 10783 10784 10785 10786 10787 10788 10789 10790 10791 10792 10793 10794 10795 10796 10797 10798 10799 10800 10801 10802 10803 10804 10805 10806 10807 10808 10809 10810 10811 10812 10813 10814 10815 10816 10817 10818 10819 10820 10821 10822 10823 10824 10825 10826 10827 10828 10829 10830 10831 10832 10833 10834 10835 10836 10837 10838 10839 10840 10841 10842 10843 10844 10845 10846 10847 10848 10849 10850 10851 10852 10853 10854 10855 10856 10857 10858 10859 10860 10861 10862 10863 10864 10865 10866 10867 10868 10869 10870 10871 10872 10873 10874 10875 10876 10877 10878 10879 10880 10881 10882 10883 10884 10885 10886 10887 10888 10889 10890 10891 10892 10893 10894 10895 10896 10897 10898 10899 10900 10901 10902 10903 10904 10905 10906 10907 10908 10909 10910 10911 10912 10913 10914 10915 10916 10917 10918 10919 10920 10921 10922 10923 10924 10925 10926 10927 10928 10929 10930 10931 10932 10933 10934 10935 10936 10937 10938 10939 10940 10941 10942 10943 10944 10945 10946 10947 10948 10949 10950 10951 10952 10953 10954 10955 10956 10957 10958 10959 10960 10961 10962 10963 10964 10965 10966 10967 10968 10969 10970 10971 10972 10973 10974 10975 10976 10977 10978 10979 10980 10981 10982 10983 10984 10985 10986 10987 10988 10989 10990 10991 10992 10993 10994 10995 10996 10997 10998 10999 11000 11001 11002 11003 11004 11005 11006 11007 11008 11009 11010 11011 11012 11013 11014 11015 11016 11017 11018 11019 11020 11021 11022 11023 11024 11025 11026 11027 11028 11029 11030 11031 11032 11033 11034 11035 11036 11037 11038 11039 11040 11041 11042 11043 11044 11045 11046 11047 11048 11049 11050 11051 11052 11053 11054 11055 11056 11057 11058 11059 11060 11061 11062 11063 11064 11065 11066 11067 11068 11069 11070 11071 11072 11073 11074 11075 11076 11077 11078 11079 11080 11081 11082 11083 11084 11085 11086 11087 11088 11089 11090 11091 11092 11093 11094 11095 11096 11097 11098 11099 11100 11101 11102 11103 11104 11105 11106 11107 11108 11109 11110 11111 11112 11113 11114 11115 11116 11117 11118 11119 11120 11121 11122 11123 11124 11125 11126 11127 11128 11129 11130 11131 11132 11133 11134 11135 11136 11137 11138 11139 11140 11141 11142 11143 11144 11145 11146 11147 11148 11149 11150 11151 11152 11153 11154 11155 11156 11157 11158 11159 11160 11161 11162 11163 11164 11165 11166 11167 11168 11169 11170 11171 11172 11173 11174 11175 11176 11177 11178 11179 11180 11181 11182 11183 11184 11185 11186 11187 11188 11189 11190 11191 11192 11193 11194 11195 11196 11197 11198 11199 11200 11201 11202 11203 11204 11205 11206 11207 11208 11209 11210 11211 11212 11213 11214 11215 11216 11217 11218 11219 11220 11221 11222 11223 11224 11225 11226 11227 11228 11229 11230 11231 11232 11233 11234 11235 11236 11237 11238 11239 11240 11241 11242 11243 11244 11245 11246 11247 11248 11249 11250 11251 11252 11253 11254 11255 11256 11257 11258 11259 11260 11261 11262 11263 11264 11265 11266 11267 11268 11269 11270 11271 11272 11273 11274 11275 11276 11277 11278 11279 11280 11281 11282 11283 11284 11285 11286 11287 11288 11289 11290 11291 11292 11293 11294 11295 11296 11297 11298 11299 11300 11301 11302 11303 11304 11305 11306 11307 11308 11309 11310 11311 11312 11313 11314 11315 11316 11317 11318 11319 11320 11321 11322 11323 11324 11325 11326 11327 11328 11329 11330 11331 11332 11333 11334 11335 11336 11337 11338 11339 11340 11341 11342 11343 11344 11345 11346 11347 11348 11349 11350 11351 11352 11353 11354 11355 11356 11357 11358 11359 11360 11361 11362 11363 11364 11365 11366 11367 11368 11369 11370 11371 11372 11373 11374 11375 11376 11377 11378 11379 11380 11381 11382 11383 11384 11385 11386 11387 11388 11389 11390 11391 11392 11393 11394 11395 11396 11397 11398 11399 11400 11401 11402 11403 11404 11405 11406 11407 11408 11409 11410 11411 11412 11413 11414 11415 11416 11417 11418 11419 11420 11421 11422 11423 11424 11425 11426 11427 11428 11429 11430 11431 11432 11433 11434 11435 11436 11437 11438 11439 11440 11441 11442 11443 11444 11445 11446 11447 11448 11449 11450 11451 11452 11453 11454 11455 11456 11457 11458 11459 11460 11461 11462 11463 11464 11465 11466 11467 11468 11469 11470 11471 11472 11473 11474 11475 11476 11477 11478 11479 11480 11481 11482 11483 11484 11485 11486 11487 11488 11489 11490 11491 11492 11493 11494 11495 11496 11497 11498 11499 11500 11501 11502 11503 11504 11505 11506 11507 11508 11509 11510 11511 11512 11513 11514 11515 11516 11517 11518 11519 11520 11521 11522 11523 11524 11525 11526 11527 11528 11529 11530 11531 11532 11533 11534 11535 11536 11537 11538 11539 11540 11541 11542 11543 11544 11545 11546 11547 11548 11549 11550 11551 11552 11553 11554 11555 11556 11557 11558 11559 11560 11561 11562 11563 11564 11565 11566 11567 11568 11569 11570 11571 11572 11573 11574 11575 11576 11577 11578 11579 11580 11581 11582 11583 11584 11585 11586 11587 11588 11589 11590 11591 11592 11593 11594 11595 11596 11597 11598 11599 11600 11601 11602 11603 11604 11605 11606 11607 11608 11609 11610 11611 11612 11613 11614 11615 11616 11617 11618 11619 11620 11621 11622 11623 11624 11625 11626 11627 11628 11629 11630 11631 11632 11633 11634 11635 11636 11637 11638 11639 11640 11641 11642 11643 11644 11645 11646 11647 11648 11649 11650 11651 11652 11653 11654 11655 11656 11657 11658 11659 11660 11661 11662 11663 11664 11665 11666 11667 11668 11669 11670 11671 11672 11673 11674 11675 11676 11677 11678 11679 11680 11681 11682 11683 11684 11685 11686 11687 11688 11689 11690 11691 11692 11693 11694 11695 11696 11697 11698 11699 11700 11701 11702 11703 11704 11705 11706 11707 11708 11709 11710 11711 11712 11713 11714 11715 11716 11717 11718 11719 11720 11721 11722 11723 11724 11725 11726 11727 11728 11729 11730 11731 11732 11733 11734 11735 11736 11737 11738 11739 11740 11741 11742 11743 11744 11745 11746 11747 11748 11749 11750 11751 11752 11753 11754 11755 11756 11757 11758 11759 11760 11761 11762 11763 11764 11765 11766 11767 11768 11769 11770 11771 11772 11773 11774 11775 11776 11777 11778 11779 11780 11781 11782 11783 11784 11785 11786 11787 11788 11789 11790 11791 11792 11793 11794 11795 11796 11797 11798 11799 11800 11801 11802 11803 11804 11805 11806 11807 11808 11809 11810 11811 11812 11813 11814 11815 11816 11817 11818 11819 11820 11821 11822 11823 11824 11825 11826 11827 11828 11829 11830 11831 11832 11833 11834 11835 11836 11837 11838 11839 11840 11841 11842 11843 11844 11845 11846 11847 11848 11849 11850 11851 11852 11853 11854 11855 11856 11857 11858 11859 11860 11861 11862 11863 11864 11865 11866 11867 11868 11869 11870 11871 11872 11873 11874 11875 11876 11877 11878 11879 11880 11881 11882 11883 11884 11885 11886 11887 11888 11889 11890 11891 11892 11893 11894 11895 11896 11897 11898 11899 11900 11901 11902 11903 11904 11905 11906 11907 11908 11909 11910 11911 11912 11913 11914 11915 11916 11917 11918 11919 11920 11921 11922 11923 11924 11925 11926 11927 11928 11929 11930 11931 11932 11933 11934 11935 11936 11937 11938 11939 11940 11941 11942 11943 11944 11945 11946 11947 11948 11949 11950 11951 11952 11953 11954 11955 11956 11957 11958 11959 11960 11961 11962 11963 11964 11965 11966 11967 11968 11969 11970 11971 11972 11973 11974 11975 11976 11977 11978 11979 11980 11981 11982 11983 11984 11985 11986 11987 11988 11989 11990 11991 11992 11993 11994 11995 11996 11997 11998 11999 12000 12001 12002 12003 12004 12005 12006 12007 12008 12009 12010 12011 12012 12013 12014 12015 12016 12017 12018 12019 12020 12021 12022 12023 12024 12025 12026 12027 12028 12029 12030 12031 12032 12033 12034 12035 12036 12037 12038 12039 12040 12041 12042 12043 12044 12045 12046 12047 12048 12049 12050 12051 12052 12053 12054 12055 12056 12057 12058 12059 12060 12061 12062 12063 12064 12065 12066 12067 12068 12069 12070 12071 12072 12073 12074 12075 12076 12077 12078 12079 12080 12081 12082 12083 12084 12085 12086 12087 12088 12089 12090 12091 12092 12093 12094 12095 12096 12097 12098 12099 12100 12101 12102 12103 12104 12105 12106 12107 12108 12109 12110 12111 12112 12113 12114 12115 12116 12117 12118 12119 12120 12121 12122 12123 12124 12125 12126 12127 12128 12129 12130 12131 12132 12133 12134 12135 12136 12137 12138 12139 12140 12141 12142 12143 12144 12145 12146 12147 12148 12149 12150 12151 12152 12153 12154 12155 12156 12157 12158 12159 12160 12161 12162 12163 12164 12165 12166 12167 12168 12169 12170 12171 12172 12173 12174 12175 12176 12177 12178 12179 12180 12181 12182 12183 12184 12185 12186 12187 12188 12189 12190 12191 12192 12193 12194 12195 12196 12197 12198 12199 12200 12201 12202 12203 12204 12205 12206 12207 12208 12209 12210 12211 12212 12213 12214 12215 12216 12217 12218 12219 12220 12221 12222 12223 12224 12225 12226 12227 12228 12229 12230 12231 12232 12233 12234 12235 12236 12237 12238 12239 12240 12241 12242 12243 12244 12245 12246 12247 12248 12249 12250 12251 12252 12253 12254 12255 12256 12257 12258 12259 12260 12261 12262 12263 12264 12265 12266 12267 12268 12269 12270 12271 12272 12273 12274 12275 12276 12277 12278 12279 12280 12281 12282 12283 12284 12285 12286 12287 12288 12289 12290 12291 12292 12293 12294 12295 12296 12297 12298 12299 12300 12301 12302 12303 12304 12305 12306 12307 12308 12309 12310 12311 12312 12313 12314 12315 12316 12317 12318 12319 12320 12321 12322 12323 12324 12325 12326 12327 12328 12329 12330 12331 12332 12333 12334 12335 12336 12337 12338 12339 12340 12341 12342 12343 12344 12345 12346 12347 12348 12349 12350 12351 12352 12353 12354 12355 12356 12357 12358 12359 12360 12361 12362 12363 12364 12365 12366 12367 12368 12369 12370 12371 12372 12373 12374 12375 12376 12377 12378 12379 12380 12381 12382 12383 12384 12385 12386 12387 12388 12389 12390 12391 12392 12393 12394 12395 12396 12397 12398 12399 12400 12401 12402 12403 12404 12405 12406 12407 12408 12409 12410 12411 12412 12413 12414 12415 12416 12417 12418 12419 12420 12421 12422 12423 12424 12425 12426 12427 12428 12429 12430 12431 12432 12433 12434 12435 12436 12437 12438 12439 12440 12441 12442 12443 12444 12445 12446 12447 12448 12449 12450 12451 12452 12453 12454 12455 12456 12457 12458 12459 12460 12461 12462 12463 12464 12465 12466 12467 12468 12469 12470 12471 12472 12473 12474 12475 12476 12477 12478 12479 12480 12481 12482 12483 12484 12485 12486 12487 12488 12489 12490 12491 12492 12493 12494 12495 12496 12497 12498 12499 12500 12501 12502 12503 12504 12505 12506 12507 12508 12509 12510 12511 12512 12513 12514 12515 12516 12517 12518 12519 12520 12521 12522
|
Description: Apply several updates and fixes to T1lib
Incorporation of all patches and updates to T1lib as of Debian revision
5.1.2-4 (2014-01-20), including fixes for CVE-2010-2642, CVE-2011-1552,
-1553, and -1554.
Origin: vendor, http://snapshot.debian.org/archive/debian/20140121T035726Z/pool/main/t/t1lib/t1lib_5.1.2-4.diff.gz
Last-Update: 2014-03-27
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
diff -Nru t1lib-grace/T1lib/t1lib/.dependencies t1lib-deb/T1lib/t1lib/.dependencies
--- t1lib-grace/T1lib/t1lib/.dependencies 2002-01-03 13:15:14.000000000 -0800
+++ t1lib-deb/T1lib/t1lib/.dependencies 2007-12-23 07:49:42.000000000 -0800
@@ -1,33 +1,34 @@
-parseAFM.lo: parseAFM.c parseAFM.h
+parseAFM.lo: parseAFM.c parseAFM.h t1base.h t1misc.h
t1aaset.lo: t1aaset.c ../type1/ffilest.h ../type1/types.h \
../type1/Xstuff.h ../type1/fontmisc.h ../type1/fontstruct.h \
../type1/font.h ../type1/fsmasks.h ../type1/fontfile.h \
../type1/fontxlfd.h parseAFM.h ../type1/objects.h ../type1/spaces.h \
- ../type1/util.h ../type1/fontfcn.h ../type1/regions.h t1types.h \
- t1extern.h t1misc.h t1aaset.h t1set.h t1load.h t1finfo.h t1base.h \
- t1outline.h
+ ../type1/util.h ../type1/fontfcn.h ../type1/paths.h \
+ ../type1/regions.h t1types.h sysconf.h t1extern.h t1misc.h t1aaset.h \
+ t1set.h t1load.h t1finfo.h t1base.h t1outline.h
t1afmtool.lo: t1afmtool.c ../type1/ffilest.h ../type1/types.h \
../type1/Xstuff.h ../type1/fontmisc.h ../type1/fontstruct.h \
../type1/font.h ../type1/fsmasks.h ../type1/fontfile.h \
../type1/fontxlfd.h parseAFM.h ../type1/objects.h ../type1/spaces.h \
- ../type1/util.h ../type1/fontfcn.h ../type1/regions.h \
- ../type1/blues.h t1types.h t1extern.h t1misc.h t1finfo.h t1base.h \
- t1set.h t1load.h t1afmtool.h
+ ../type1/util.h ../type1/fontfcn.h ../type1/paths.h \
+ ../type1/regions.h ../type1/blues.h t1types.h sysconf.h t1extern.h \
+ t1misc.h t1finfo.h t1base.h t1set.h t1load.h t1afmtool.h
t1base.lo: t1base.c ../type1/ffilest.h ../type1/types.h \
../type1/Xstuff.h ../type1/fontmisc.h ../type1/fontstruct.h \
../type1/font.h ../type1/fsmasks.h ../type1/fontfile.h \
../type1/fontxlfd.h parseAFM.h ../type1/objects.h ../type1/spaces.h \
- ../type1/util.h ../type1/fontfcn.h ../type1/regions.h sysconf.h \
- t1base.h t1types.h t1global.h t1misc.h t1env.h t1delete.h
+ ../type1/util.h ../type1/fontfcn.h ../type1/paths.h \
+ ../type1/regions.h sysconf.h t1base.h t1types.h t1global.h t1misc.h \
+ t1env.h t1delete.h
t1delete.lo: t1delete.c ../type1/types.h parseAFM.h ../type1/objects.h \
../type1/spaces.h ../type1/util.h ../type1/fontfcn.h t1types.h \
- t1extern.h t1misc.h t1delete.h t1load.h t1finfo.h t1base.h
+ sysconf.h t1extern.h t1misc.h t1delete.h t1load.h t1finfo.h t1base.h
t1enc.lo: t1enc.c ../type1/ffilest.h ../type1/types.h ../type1/Xstuff.h \
../type1/fontmisc.h ../type1/fontstruct.h ../type1/font.h \
../type1/fsmasks.h ../type1/fontfile.h ../type1/fontxlfd.h parseAFM.h \
../type1/objects.h ../type1/spaces.h ../type1/util.h \
- ../type1/fontfcn.h ../type1/regions.h t1types.h t1extern.h t1misc.h \
- t1enc.h t1env.h t1base.h t1finfo.h
+ ../type1/fontfcn.h ../type1/paths.h ../type1/regions.h t1types.h \
+ sysconf.h t1extern.h t1misc.h t1enc.h t1env.h t1base.h t1finfo.h
t1env.lo: t1env.c ../type1/types.h parseAFM.h ../type1/objects.h \
../type1/spaces.h ../type1/util.h ../type1/fontfcn.h \
../type1/fontmisc.h sysconf.h t1types.h t1extern.h t1misc.h t1env.h \
@@ -36,41 +37,44 @@
../type1/Xstuff.h ../type1/fontmisc.h ../type1/fontstruct.h \
../type1/font.h ../type1/fsmasks.h ../type1/fontfile.h \
../type1/fontxlfd.h parseAFM.h ../type1/objects.h ../type1/spaces.h \
- ../type1/util.h ../type1/fontfcn.h ../type1/regions.h t1types.h \
- t1extern.h t1misc.h t1finfo.h t1base.h t1set.h t1load.h
+ ../type1/util.h ../type1/fontfcn.h ../type1/paths.h \
+ ../type1/regions.h t1types.h sysconf.h t1extern.h t1misc.h t1finfo.h \
+ t1base.h t1set.h t1load.h
t1load.lo: t1load.c ../type1/ffilest.h ../type1/types.h \
../type1/Xstuff.h ../type1/fontmisc.h ../type1/fontstruct.h \
../type1/font.h ../type1/fsmasks.h ../type1/fontfile.h \
../type1/fontxlfd.h parseAFM.h ../type1/objects.h ../type1/spaces.h \
- ../type1/util.h ../type1/fontfcn.h ../type1/blues.h \
- ../type1/regions.h t1types.h t1extern.h t1misc.h t1load.h t1env.h \
- t1set.h t1base.h t1finfo.h t1afmtool.h
+ ../type1/util.h ../type1/fontfcn.h ../type1/blues.h ../type1/paths.h \
+ ../type1/regions.h t1types.h sysconf.h t1extern.h t1misc.h t1load.h \
+ t1env.h t1set.h t1base.h t1finfo.h t1afmtool.h
t1outline.lo: t1outline.c ../type1/ffilest.h ../type1/types.h \
../type1/Xstuff.h ../type1/fontmisc.h ../type1/fontstruct.h \
../type1/font.h ../type1/fsmasks.h ../type1/fontfile.h \
../type1/fontxlfd.h parseAFM.h ../type1/objects.h ../type1/spaces.h \
- ../type1/util.h ../type1/fontfcn.h ../type1/regions.h \
- ../type1/paths.h t1types.h t1extern.h t1misc.h t1set.h t1load.h \
- t1finfo.h t1base.h t1outline.h
+ ../type1/util.h ../type1/fontfcn.h ../type1/paths.h \
+ ../type1/regions.h t1types.h sysconf.h t1extern.h t1misc.h t1set.h \
+ t1load.h t1finfo.h t1base.h t1outline.h
t1set.lo: t1set.c ../type1/ffilest.h ../type1/types.h ../type1/Xstuff.h \
../type1/fontmisc.h ../type1/fontstruct.h ../type1/font.h \
../type1/fsmasks.h ../type1/fontfile.h ../type1/fontxlfd.h parseAFM.h \
../type1/objects.h ../type1/spaces.h ../type1/util.h \
- ../type1/fontfcn.h ../type1/regions.h t1types.h t1extern.h t1misc.h \
- t1set.h t1load.h t1finfo.h t1base.h
+ ../type1/fontfcn.h ../type1/paths.h ../type1/regions.h t1types.h \
+ sysconf.h t1extern.h t1misc.h t1set.h t1load.h t1finfo.h t1base.h
t1subset.lo: t1subset.c ../type1/ffilest.h ../type1/types.h \
../type1/Xstuff.h ../type1/fontmisc.h ../type1/fontstruct.h \
../type1/font.h ../type1/fsmasks.h ../type1/fontfile.h \
../type1/fontxlfd.h parseAFM.h ../type1/objects.h ../type1/spaces.h \
- ../type1/util.h ../type1/fontfcn.h ../type1/regions.h t1types.h \
- t1extern.h t1misc.h t1finfo.h t1base.h t1subset.h
+ ../type1/util.h ../type1/fontfcn.h ../type1/paths.h \
+ ../type1/regions.h t1types.h sysconf.h t1extern.h t1misc.h t1finfo.h \
+ t1base.h t1delete.h t1subset.h
t1trans.lo: t1trans.c ../type1/ffilest.h ../type1/types.h \
../type1/Xstuff.h ../type1/fontmisc.h ../type1/fontstruct.h \
../type1/font.h ../type1/fsmasks.h ../type1/fontfile.h \
../type1/fontxlfd.h parseAFM.h ../type1/objects.h ../type1/spaces.h \
- ../type1/util.h ../type1/fontfcn.h ../type1/regions.h t1types.h \
- t1extern.h t1misc.h t1trans.h t1base.h
+ ../type1/util.h ../type1/fontfcn.h ../type1/paths.h \
+ ../type1/regions.h t1types.h sysconf.h t1extern.h t1misc.h t1trans.h \
+ t1base.h
t1x11.lo: t1x11.c ../type1/types.h parseAFM.h ../type1/objects.h \
- ../type1/spaces.h ../type1/util.h ../type1/fontfcn.h \
- ../type1/regions.h t1types.h t1extern.h t1misc.h t1set.h t1aaset.h \
- t1load.h t1finfo.h t1x11.h t1base.h
+ ../type1/spaces.h ../type1/util.h ../type1/fontfcn.h ../type1/paths.h \
+ ../type1/regions.h t1types.h sysconf.h t1extern.h t1misc.h t1set.h \
+ t1aaset.h t1load.h t1finfo.h t1x11.h t1base.h
diff -Nru t1lib-grace/T1lib/t1lib/parseAFM.c t1lib-deb/T1lib/t1lib/parseAFM.c
--- t1lib-grace/T1lib/t1lib/parseAFM.c 2003-02-15 15:06:53.000000000 -0800
+++ t1lib-deb/T1lib/t1lib/parseAFM.c 2014-03-27 20:23:42.318776037 -0700
@@ -199,7 +199,9 @@
idx = 0;
while (ch != EOF && ch != ' ' && ch != CR && ch != LF &&
- ch != CTRL_Z && ch != '\t' && ch != ':' && ch != ';'){
+ ch != CTRL_Z && ch != '\t' && ch != ':' && ch != ';'
+ && idx < (MAX_NAME -1))
+ {
ident[idx++] = ch;
ch = fgetc(stream);
} /* while */
@@ -235,7 +237,7 @@
while ((ch = fgetc(stream)) == ' ' || ch == '\t' );
idx = 0;
- while (ch != EOF && ch != CR && ch != LF && ch != CTRL_Z)
+ while (ch != EOF && ch != CR && ch != LF && ch != CTRL_Z && idx < (MAX_NAME - 1))
{
ident[idx++] = ch;
ch = fgetc(stream);
diff -Nru t1lib-grace/T1lib/t1lib/t1aaset.c t1lib-deb/T1lib/t1lib/t1aaset.c
--- t1lib-grace/T1lib/t1lib/t1aaset.c 2002-01-03 13:15:14.000000000 -0800
+++ t1lib-deb/T1lib/t1lib/t1aaset.c 2007-12-23 07:49:42.000000000 -0800
@@ -2,11 +2,11 @@
----- File: t1aaset.c
----- Author: Rainer Menzner (Rainer.Menzner@web.de)
Subsampling based on code by Raph Levien (raph@acm.org)
- ----- Date: 2001-04-01
+ ----- Date: 2007-12-21
----- Description: This file is part of the t1-library. It contains
functions for antialiased setting of characters
and strings of characters.
- ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2001.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2007.
As of version 0.5, t1lib is distributed under the
GNU General Public Library Lincense. The
conditions can be found in the files LICENSE and
@@ -52,6 +52,7 @@
#include "../type1/spaces.h"
#include "../type1/util.h"
#include "../type1/fontfcn.h"
+#include "../type1/paths.h"
#include "../type1/regions.h"
#include "t1types.h"
@@ -803,10 +804,10 @@
if ((pFontBase->t1lib_flags & T1_AA_CACHING)) {
if (transform==NULL){
/* if size/aa is not existent we create it */
- if ((font_ptr=QueryFontSize( FontID, size, T1aa_level))==NULL){
+ if ((font_ptr=T1int_QueryFontSize( FontID, size, T1aa_level))==NULL){
/* We create the required size struct and leave the rest
for T1_SetChar() */
- font_ptr=CreateNewFontSize( FontID, size, T1aa_level);
+ font_ptr=T1int_CreateNewFontSize( FontID, size, T1aa_level);
if (font_ptr==NULL){
T1_errno=T1ERR_ALLOC_MEM;
T1aa_level=savelevel;
@@ -962,11 +963,21 @@
offset=0;
target_ptr=aaglyph.bits;
- /* We must check for n_vert==1 because the computation above is not
- valid in this case */
- if (n_vert==1)
- v_start=v_start < v_end ? v_start : v_end;
+ /* We must check for n_vert==1 because then both v_start and v_end could / will
+ affect the same AA scan line. Because I'm forgetful, a reminder:
+ v_end | 000000000000000000000
+ | 111111111111111111111 ^
+ Y 111111111111111111111 |
+ 000000000000000000000 | v_start
+
+ In order to count the v_end from bottom to top, we express it as (T1aa_level-v_end).
+ The number of rows to take into account is then v_start-(T1aa_level-v_end).
+ */
+ if (n_vert==1) {
+ v_start=v_start - (T1aa_level - v_end);
+ }
+
ptr = glyph->bits;
for (i = 0; i < n_vert; i++) {
if (i==0)
@@ -1184,10 +1195,12 @@
offset=0;
target_ptr=aastring_glyph.bits;
- /* We must check for n_vert==1 because the computation above is not
- valid in this case */
- if (n_vert==1)
- v_start=v_start < v_end ? v_start : v_end;
+ /* We must check for n_vert==1 because then both v_start and v_end could / will
+ affect the same AA scan line.
+ */
+ if (n_vert==1) {
+ v_start=v_start - (T1aa_level - v_end);
+ }
ptr = glyph->bits;
for (i = 0; i < n_vert; i++) {
@@ -1219,6 +1232,220 @@
+/* T1_AASetRect(): Raster a rectangle, whose size is given in charspace units.
+ The resulting glyph does not cause any escapement. */
+GLYPH* T1_AASetRect( int FontID, float size,
+ float width, float height, T1_TMATRIX *transform)
+{
+ GLYPH *glyph; /* pointer to bitmap glyph */
+ static GLYPH aaglyph={NULL,{0,0,0,0,0,0},NULL,DEFAULTBPP};/* The anti-aliased glyph */
+ long asc, dsc, ht, wd;
+ long i;
+ long n_horz, n_horz_pad, n_vert, n_asc, n_dsc;
+ long v_start, v_end;
+ char *target_ptr;
+ long offset;
+ char *ptr;
+ int y;
+ long lsb, aalsb, aahstart;
+ int memsize;
+ LONG paddedW;
+ int savelevel;
+
+
+ /* Reset character glyph, if necessary */
+ if (aaglyph.bits!=NULL){
+ free(aaglyph.bits);
+ aaglyph.bits=NULL;
+ }
+ aaglyph.metrics.leftSideBearing=0;
+ aaglyph.metrics.rightSideBearing=0;
+ aaglyph.metrics.advanceX=0;
+ aaglyph.metrics.advanceY=0;
+ aaglyph.metrics.ascent=0;
+ aaglyph.metrics.descent=0;
+ aaglyph.pFontCacheInfo=NULL;
+ aaglyph.bpp=T1aa_bpp;
+
+
+ /* Check for smart antialiasing */
+ savelevel=T1aa_level;
+ if (T1aa_SmartOn){
+ if (size>=T1aa_smartlimit2) {
+ T1aa_level=T1_AA_NONE;
+ }
+ else if (size>=T1aa_smartlimit1) {
+ T1aa_level=T1_AA_LOW;
+ }
+ else {
+ T1aa_level=T1_AA_HIGH;
+ }
+ }
+
+
+ /* First, call routine to rasterize character, all error checking is
+ done in this function: */
+ if ((glyph=T1_SetRect( FontID, T1aa_level*size, width, height, transform))==NULL){
+ /* restore level */
+ T1aa_level=savelevel;
+ return(NULL); /* An error occured */
+ }
+
+ /* In case there are no black pixels, we simply set the dimensions and
+ then return */
+ if ( glyph->bits == NULL) {
+ aaglyph.bits=NULL;
+ aaglyph.metrics.leftSideBearing=0;
+ aaglyph.metrics.rightSideBearing=0;
+ aaglyph.metrics.advanceX=(int) floor(glyph->metrics.advanceX/(float)T1aa_level+0.5);
+ aaglyph.metrics.advanceY=(int) floor(glyph->metrics.advanceY/(float)T1aa_level+0.5);
+ aaglyph.metrics.ascent=0;
+ aaglyph.metrics.descent=0;
+ aaglyph.pFontCacheInfo=NULL;
+ /* restore level and return */
+ T1aa_level=savelevel;
+ return(&aaglyph);
+ }
+
+ /* Get dimensions of bitmap: */
+ asc=glyph->metrics.ascent;
+ dsc=glyph->metrics.descent;
+ lsb=glyph->metrics.leftSideBearing;
+ ht=asc-dsc;
+ wd=glyph->metrics.rightSideBearing-lsb;
+
+ if (T1aa_level==T1_AA_NONE){
+ /* we only convert bitmap to bytemap */
+ aaglyph=*glyph;
+ aaglyph.bpp=T1aa_bpp;
+ /* Compute scanline length and such */
+ n_horz_pad=PAD( wd*T1aa_bpp, pFontBase->bitmap_pad )>>3;
+ /* Allocate memory for glyph */
+ memsize = n_horz_pad*ht*8;
+ /* aaglyph.bits = (char *)malloc(memsize*sizeof( char)); */
+ aaglyph.bits = (char *)malloc(memsize*sizeof( char));
+ if (aaglyph.bits == NULL) {
+ T1_errno=T1ERR_ALLOC_MEM;
+ /* restore level */
+ T1aa_level=savelevel;
+ return(NULL);
+ }
+ paddedW=PAD(wd,pFontBase->bitmap_pad)>>3;
+ ptr=glyph->bits;
+ target_ptr=aaglyph.bits;
+ for (i = 0; i < ht; i++) {
+ T1_DoLine ( wd, paddedW, ptr, target_ptr );
+ ptr += paddedW;
+ target_ptr += n_horz_pad;
+ }
+ /* restore level */
+ T1aa_level=savelevel;
+ return(&aaglyph);
+ }
+
+
+ /* Set some looping parameters for subsampling */
+ if (lsb<0){
+ aalsb=lsb/T1aa_level-1;
+ aahstart=T1aa_level+(lsb%T1aa_level);
+ }
+ else{
+ aalsb=lsb/T1aa_level;
+ aahstart=lsb%T1aa_level;
+ }
+
+ /* The horizontal number of steps: */
+ n_horz=(wd+aahstart+T1aa_level-1)/T1aa_level;
+ /* And the padded value */
+ n_horz_pad=PAD( n_horz*T1aa_bpp, pFontBase->bitmap_pad )>>3;
+
+ /* vertical number of steps: */
+ if (asc % T1aa_level){ /* not aligned */
+ if ( asc > 0){
+ n_asc=asc/T1aa_level+1;
+ v_start=asc % T1aa_level;
+ }
+ else{
+ n_asc=asc/T1aa_level;
+ v_start=T1aa_level + (asc % T1aa_level);
+ }
+ }
+ else{
+ n_asc=asc/T1aa_level;
+ v_start=T1aa_level;
+ }
+ if (dsc % T1aa_level){ /* not aligned */
+ if ( dsc < 0){
+ n_dsc=dsc/T1aa_level-1;
+ v_end=-(dsc % T1aa_level);
+ }
+ else{
+ n_dsc=dsc/T1aa_level;
+ v_end=T1aa_level - (dsc % T1aa_level);
+ }
+ }
+ else{
+ n_dsc=dsc/T1aa_level;
+ v_end=T1aa_level;
+ }
+ /* the total number of lines: */
+ n_vert=n_asc-n_dsc;
+
+ /* Allocate memory for glyph */
+ memsize = n_horz_pad*n_vert;
+
+ /* Note: we allocate 12 bytes more than necessary */
+ aaglyph.bits = (char *)malloc(memsize*sizeof( char) +12);
+ if (aaglyph.bits == NULL) {
+ T1_errno=T1ERR_ALLOC_MEM;
+ /* restore level */
+ T1aa_level=savelevel;
+ return(NULL);
+ }
+
+
+ paddedW=PAD(wd,pFontBase->bitmap_pad)/8;
+ offset=0;
+ target_ptr=aaglyph.bits;
+
+ /* We must check for n_vert==1 because then both v_start and v_end could / will
+ affect the same AA scan line.
+ */
+ if (n_vert==1) {
+ v_start=v_start - (T1aa_level - v_end);
+ }
+
+ ptr = glyph->bits;
+ for (i = 0; i < n_vert; i++) {
+ if (i==0)
+ y=v_start;
+ else if (i==n_vert-1)
+ y=v_end;
+ else
+ y=T1aa_level;
+ T1_AADoLine ( T1aa_level, wd, y, paddedW, ptr, target_ptr, aahstart );
+ ptr += y * paddedW;
+ target_ptr += n_horz_pad;
+ }
+
+ /* .. and set them in aaglyph */
+ aaglyph.metrics.leftSideBearing=aalsb;
+ aaglyph.metrics.rightSideBearing=aalsb + n_horz;
+ aaglyph.metrics.advanceX=(int) floor(glyph->metrics.advanceX/(float)T1aa_level+0.5);
+ aaglyph.metrics.advanceY=(int) floor(glyph->metrics.advanceY/(float)T1aa_level+0.5);
+ aaglyph.metrics.ascent=n_asc;
+ aaglyph.metrics.descent=n_dsc;
+ aaglyph.pFontCacheInfo=NULL;
+
+ /* restore level */
+ T1aa_level=savelevel;
+
+ return(&aaglyph);
+
+}
+
+
+
/* T1_AASetGrayValues(): Sets the byte values that are put into the
pixel position for the respective entries:
Returns 0 if successfull.
@@ -1230,7 +1457,7 @@
unsigned long black)
{
- if (CheckForInit()){
+ if (T1_CheckForInit()){
T1_errno=T1ERR_OP_NOT_PERMITTED;
return(-1);
}
@@ -1259,7 +1486,7 @@
{
int i;
- if (CheckForInit()){
+ if (T1_CheckForInit()){
T1_errno=T1ERR_OP_NOT_PERMITTED;
return(-1);
}
@@ -1288,7 +1515,7 @@
int T1_AANSetGrayValues( unsigned long bg, unsigned long fg)
{
- if (CheckForInit()){
+ if (T1_CheckForInit()){
T1_errno=T1ERR_OP_NOT_PERMITTED;
return(-1);
}
@@ -1313,7 +1540,7 @@
{
int i;
- if (CheckForInit()) {
+ if (T1_CheckForInit()) {
T1_errno=T1ERR_OP_NOT_PERMITTED;
return(-1);
}
@@ -1332,14 +1559,14 @@
-/* Get the current setting of graylevels for 2x antialiasing. The 17
+/* Get the current setting of graylevels for 4x antialiasing. The 17
values are stored at address pgrayvals in order from background to
foreground */
int T1_AAHGetGrayValues( long *pgrayvals)
{
int i;
- if (CheckForInit()) {
+ if (T1_CheckForInit()) {
T1_errno=T1ERR_OP_NOT_PERMITTED;
return(-1);
}
@@ -1350,20 +1577,20 @@
}
for ( i=0; i<17; i++) { /* bg (i=0) to fg (i=16) */
- pgrayvals[i]=gv[i];
+ pgrayvals[i]=gv_h[i];
}
return( 0);
}
-/* Get the current setting of graylevels for 2x antialiasing. The 2
+/* Get the current setting of graylevels for no antialiasing. The 2
values are stored at address pgrayvals in order from background to
foreground */
int T1_AANGetGrayValues( long *pgrayvals)
{
- if (CheckForInit()) {
+ if (T1_CheckForInit()) {
T1_errno=T1ERR_OP_NOT_PERMITTED;
return(-1);
}
@@ -1372,8 +1599,8 @@
T1_errno=T1ERR_INVALID_PARAMETER;
return(-1);
}
- pgrayvals[0]=gv[0]; /* background */
- pgrayvals[1]=gv[1]; /* foreground */
+ pgrayvals[0]=gv_n[0]; /* background */
+ pgrayvals[1]=gv_n[1]; /* foreground */
return( 0);
}
@@ -1385,7 +1612,7 @@
int T1_AASetBitsPerPixel( int bpp)
{
- if (CheckForInit()){
+ if (T1_CheckForInit()){
T1_errno=T1ERR_OP_NOT_PERMITTED;
return(-1);
}
@@ -1425,7 +1652,7 @@
int T1_AASetLevel( int level)
{
- if (CheckForInit()){
+ if (T1_CheckForInit()){
T1_errno=T1ERR_OP_NOT_PERMITTED;
return(-1);
}
@@ -1606,10 +1833,12 @@
offset=0;
target_ptr=aaglyph.bits;
- /* We must check for n_vert==1 because the computation above is not
- valid in this case */
- if (n_vert==1)
- v_start=v_start < v_end ? v_start : v_end;
+ /* We must check for n_vert==1 because then both v_start and v_end could / will
+ affect the same AA scan line.
+ */
+ if (n_vert==1) {
+ v_start=v_start - (T1aa_level - v_end);
+ }
ptr = glyph->bits;
for (i = 0; i < n_vert; i++) {
diff -Nru t1lib-grace/T1lib/t1lib/t1aaset.h t1lib-deb/T1lib/t1lib/t1aaset.h
--- t1lib-grace/T1lib/t1lib/t1aaset.h 2002-01-03 13:15:14.000000000 -0800
+++ t1lib-deb/T1lib/t1lib/t1aaset.h 2007-12-23 07:49:42.000000000 -0800
@@ -1,10 +1,10 @@
/*--------------------------------------------------------------------------
----- File: t1aaset.h
----- Author: Rainer Menzner (Rainer.Menzner@web.de)
- ----- Date: 2001-04-01
+ ----- Date: 2003-01-02
----- Description: This file is part of the t1-library. It contains
definitions and declarations for t1set.c.
- ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2001.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2003.
As of version 0.5, t1lib is distributed under the
GNU General Public Library Lincense. The
conditions can be found in the files LICENSE and
@@ -32,6 +32,9 @@
GLYPH *T1_AASetString( int FontID, char *string, int len,
long spaceoff, int modflag,
float size, T1_TMATRIX *transform);
+GLYPH* T1_AASetRect( int FontID, float size,
+ float width, float height,
+ T1_TMATRIX *transform);
int T1_AASetGrayValues( unsigned long white,
unsigned long gray75,
unsigned long gray50,
@@ -57,6 +60,9 @@
extern GLYPH *T1_AASetString( int FontID, char *string, int len,
long spaceoff, int modflag,
float size, T1_TMATRIX *transform);
+extern GLYPH* T1_AASetRect( int FontID, float size,
+ float width, float height,
+ T1_TMATRIX *transform);
extern int T1_AASetGrayValues( unsigned long white,
unsigned long gray75,
unsigned long gray50,
diff -Nru t1lib-grace/T1lib/t1lib/t1afmtool.c t1lib-deb/T1lib/t1lib/t1afmtool.c
--- t1lib-grace/T1lib/t1lib/t1afmtool.c 2002-07-29 13:37:48.000000000 -0700
+++ t1lib-deb/T1lib/t1lib/t1afmtool.c 2007-12-23 07:49:42.000000000 -0800
@@ -1,11 +1,11 @@
/*--------------------------------------------------------------------------
----- File: t1afmtool.c
----- Author: Rainer Menzner (Rainer.Menzner@web.de)
- ----- Date: 2001-04-01
+ ----- Date: 2007-12-23
----- Description: This file is part of the t1-library. It contains
functions for generating a fallback set of afm data
from type 1 font files.
- ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2001.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2007.
As of version 0.5, t1lib is distributed under the
GNU General Public Library Lincense. The
conditions can be found in the files LICENSE and
@@ -52,6 +52,7 @@
#include "../type1/spaces.h"
#include "../type1/util.h"
#include "../type1/fontfcn.h"
+#include "../type1/paths.h"
#include "../type1/regions.h"
#include "../type1/blues.h"
@@ -89,6 +90,13 @@
char **charnames;
int nochars=0;
FontInfo *pAFMData;
+
+ /* When generaing fallback info, we accumulate a font bounding box that
+ could be useful when the font's definition is missing or trivial. */
+ int acc_llx=0;
+ int acc_lly=0;
+ int acc_urx=0;
+ int acc_ury=0;
/* We return to this if something goes wrong deep in the rasterizer */
@@ -103,7 +111,7 @@
/* Check whether font is loaded: */
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
sprintf( err_warn_msg_buf,
"Can't generate AFM Info from Font %d (invalid ID)\n", FontID);
T1_PrintLog( "T1_GenerateAFMFallbackInfo()", err_warn_msg_buf,
@@ -236,6 +244,21 @@
pAFMData->cmi[i].charBBox.ury =0;
}
pAFMData->cmi[i].ligs=NULL;
+
+ /* Accumulate bounding box of font */
+ if ( pAFMData->cmi[i].charBBox.llx < acc_llx ) {
+ acc_llx=pAFMData->cmi[i].charBBox.llx;
+ }
+ if ( pAFMData->cmi[i].charBBox.lly < acc_lly ) {
+ acc_lly=pAFMData->cmi[i].charBBox.lly;
+ }
+ if ( pAFMData->cmi[i].charBBox.urx > acc_urx ) {
+ acc_urx=pAFMData->cmi[i].charBBox.urx;
+ }
+ if ( pAFMData->cmi[i].charBBox.ury > acc_ury ) {
+ acc_ury=pAFMData->cmi[i].charBBox.ury;
+ }
+
/* We are done with area, so get rid of it. Solves the REALLY
HUGE memory leak */
KillRegion (area);
@@ -246,6 +269,24 @@
nochars, FontID);
T1_PrintLog( "T1_GenerateAFMFallbackInfo()", err_warn_msg_buf,
T1LOG_STATISTIC);
+
+ /* Check whether the bounding box we computed could be better than that
+ specified in the font file itself. Id so, we overwrite it. */
+ if ( pFontBase->pFontArray[FontID].pType1Data->fontInfoP[FONTBBOX].value.data.arrayP[0].data.integer == 0 &&
+ pFontBase->pFontArray[FontID].pType1Data->fontInfoP[FONTBBOX].value.data.arrayP[1].data.integer == 0 &&
+ pFontBase->pFontArray[FontID].pType1Data->fontInfoP[FONTBBOX].value.data.arrayP[2].data.integer == 0 &&
+ pFontBase->pFontArray[FontID].pType1Data->fontInfoP[FONTBBOX].value.data.arrayP[3].data.integer == 0 ) {
+ pFontBase->pFontArray[FontID].pType1Data->fontInfoP[FONTBBOX].value.data.arrayP[0].data.integer = acc_llx;
+ pFontBase->pFontArray[FontID].pType1Data->fontInfoP[FONTBBOX].value.data.arrayP[1].data.integer = acc_lly;
+ pFontBase->pFontArray[FontID].pType1Data->fontInfoP[FONTBBOX].value.data.arrayP[2].data.integer = acc_urx;
+ pFontBase->pFontArray[FontID].pType1Data->fontInfoP[FONTBBOX].value.data.arrayP[3].data.integer = acc_ury;
+
+ sprintf( err_warn_msg_buf,
+ "Substituted accumulated FontBBox [%d,%d,%d,%d] for trivial FontBBox of font %d!",
+ acc_llx, acc_lly, acc_urx, acc_ury, FontID);
+ T1_PrintLog( "T1_GenerateAFMFallbackInfo()", err_warn_msg_buf,
+ T1LOG_WARNING);
+ }
/* make sure to free S */
if (S) {
@@ -281,7 +322,7 @@
/* Check for valid font */
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
sprintf( err_warn_msg_buf,
"Warning: Invalid FontID, font %d not loaded!",
FontID);
diff -Nru t1lib-grace/T1lib/t1lib/t1base.c t1lib-deb/T1lib/t1lib/t1base.c
--- t1lib-grace/T1lib/t1lib/t1base.c 2004-04-13 13:27:44.000000000 -0700
+++ t1lib-deb/T1lib/t1lib/t1base.c 2007-12-23 07:49:42.000000000 -0800
@@ -1,11 +1,11 @@
/*--------------------------------------------------------------------------
----- File: t1base.c
----- Author: Rainer Menzner (Rainer.Menzner@web.de)
- ----- Date: 2001-10-03
+ ----- Date: 2005-05-17
----- Description: This file is part of the t1-library. It contains basic
routines to initialize the data structures used
by the t1-library.
- ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2001.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2005.
As of version 0.5, t1lib is distributed under the
GNU General Public Library Lincense. The
conditions can be found in the files LICENSE and
@@ -50,11 +50,12 @@
#include "../type1/ffilest.h"
#include "../type1/types.h"
-#include "parseAFM.h"
+#include "parseAFM.h"
#include "../type1/objects.h"
#include "../type1/spaces.h"
#include "../type1/util.h"
#include "../type1/fontfcn.h"
+#include "../type1/paths.h"
#include "../type1/regions.h"
@@ -66,8 +67,66 @@
#include "t1delete.h"
+static int test_for_t1_file( char *buffer );
static int T1_pad=0;
+/* A fix for Encoding Vector problem. Initialization / Deinitialization
+ is now done in T1_InitLib() / T1-CloseLib. */
+extern boolean Init_BuiltInEncoding( void);
+extern psobj *StdEncArrayP;
+
+static const char* T1errmsg[] = {
+ "", /* -10 */
+ "", /* -9 */
+ "", /* -8 */
+ "", /* -7 */
+ "", /* -6 */
+ "Attempt to Load Multiple Master Font", /* T1ERR_SCAN_FONT_FORMAT -5 */
+ "Type 1 Font File Open Error", /* T1ERR_SCAN_FILE_OPEN_ERR -4 */
+ "Virtual Memory Exceeded", /* T1ERR_SCAN_OUT_OF_MEMORY -3 */
+ "Syntactical Error Scanning Font File", /* T1ERR_SCAN_ERROR -2 */
+ "Premature End of Font File Encountered", /* T1ERR_SCAN_FILE_EOF -1 */
+ "", /* 0 */
+ "Path Construction Error", /* T1ERR_PATH_ERROR 1 */
+ "Font is Corrupt", /* T1ERR_PARSE_ERROR 2 */
+ "Rasterization Aborted", /* T1ERR_TYPE1_ABORT 3 */
+ "", /* 4 */
+ "", /* 5 */
+ "", /* 6 */
+ "", /* 7 */
+ "", /* 8 */
+ "", /* 9 */
+ "Font ID Invalid in this Context", /* T1ERR_INVALID_FONTID 10 */
+ "Invalid Argument in Function Call", /* T1ERR_INVALID_PARAMETER 11 */
+ "Operation not Permitted", /* T1ERR_OP_NOT_PERMITTED 12 */
+ "Memory Allocation Error", /* T1ERR_ALLOC_MEM 13 */
+ "Error Opening File", /* T1ERR_FILE_OPEN_ERR 14 */
+ "Unspecified T1Lib Error", /* T1ERR_UNSPECIFIED 15 */
+ "Missing AFM Data", /* T1ERR_NO_AFM_DATA 16 */
+ "X11 Interface Error", /* T1ERR_X11 17 */
+ "Missing Component of Composite Character" /* T1ERR_COMPOSITE_CHAR 18 */
+ "Error Scanning Encoding File", /* T1ERR_SCAN_ENCODING 19 */
+ "", /* 20 */
+};
+
+
+/* T1_StrError(): Return an error message corresponding to the value of
+ t1err. */
+const char *T1_StrError( int t1err)
+{
+ int errind;
+
+ errind = t1err + 10;
+
+ if ( errind < 0 )
+ errind = 0;
+ if ( errind > 29 )
+ errind = 0;
+
+ return T1errmsg[errind];
+}
+
+
/* This function is to be called by the user to initialize
the font mechanism */
@@ -80,8 +139,12 @@
char *logfilepath=NULL;
char *envlogreq=NULL;
int usrforcelog=0;
-
-
+
+ /* Check against multiple initialization. */
+ if ( T1_Up != 0 ) {
+ T1_errno=T1ERR_OP_NOT_PERMITTED;
+ return NULL;
+ }
/* Reset T1_errno */
T1_errno=0;
@@ -223,7 +286,12 @@
T1LOG_WARNING);
}
-
+ /* Initialize builtin Standard Encoding */
+ if ( !(Init_BuiltInEncoding()) ) {
+ T1_PrintLog( "T1_InitLib()", "Unable initialize internal StandardEncoding!",
+ T1LOG_ERROR);
+ }
+
/* Set the default encoding to the fonts' internal encoding */
pFontBase->default_enc=NULL;
@@ -255,14 +323,31 @@
if (result>-1)
pFontBase->no_fonts+=result;
i++;
-
}
- if (result == 0){
+ if ( (result == 0) && (i != 0)){
T1_PrintLog( "T1_InitLib()", "No fonts from Font Database File(s) found (T1_errno=%d)",
T1LOG_ERROR, T1_errno);
return(NULL);
}
+ result=0;
+ /* Read XLFD fontdatabase(s) */
+ i=0;
+ while (T1_FDBXLFD_ptr[i]!=NULL) {
+ if ((result=intT1_scanFontDBaseXLFD(T1_FDBXLFD_ptr[i]))==-1){
+ T1_PrintLog( "T1_InitLib()", "Fatal error scanning XLFD Font Database File %s",
+ T1LOG_WARNING, T1_FDB_ptr[i]);
+ }
+ if (result>-1)
+ pFontBase->no_fonts+=result;
+ i++;
+ }
+ if ( (result == 0) && (i != 0)){
+ T1_PrintLog( "T1_InitLib()", "No fonts from XLFD Font Database File(s) found (T1_errno=%d)",
+ T1LOG_ERROR, T1_errno);
+ return(NULL);
+ }
+
/* Initialize the no_fonts... values */
pFontBase->no_fonts_ini=pFontBase->no_fonts;
pFontBase->no_fonts_limit=pFontBase->no_fonts;
@@ -284,7 +369,7 @@
- initializes an array that allows to acces these names by an
index number, the font_ID
- returns -1 on fatal error and the number of fonts located
- successfullly
+ successfully
*/
int intT1_scanFontDBase( char *filename)
{
@@ -295,7 +380,6 @@
int nofonts=0;
FONTPRIVATE* fontarrayP=NULL;
-
#ifndef O_BINARY
# define O_BINARY 0x0
#endif
@@ -408,13 +492,139 @@
}
+/* intT1_scanFontDBaseXLFD():
+ - opens the file with the font definitions,
+ - reads the number of fonts defined and saves this in FontBase,
+ - allocates memory for all the filenames of the Type1 files
+ - tests for .pfa und .pfb files and saves the name found
+ - initializes an array that allows to acces these names by an
+ index number, the font_ID
+ - returns -1 on fatal error and the number of fonts located
+ successfully.
+
+ This function is identical to intT1_scanFontDBase() with the
+ difference that it expects the database file to be in XLFD format,
+ that is, the font's name comes in the first place stead of in
+ the last.
+ */
+int intT1_scanFontDBaseXLFD( char *filename)
+{
+ int fd;
+ int filesize, i, j, l, m;
+ int found=0, located=0;
+ char *filebuffer;
+ int nofonts=0;
+ FONTPRIVATE* fontarrayP=NULL;
+
+#ifndef O_BINARY
+# define O_BINARY 0x0
+#endif
+
+ if ((fd=open( filename, O_RDONLY | O_BINARY))<3){
+ T1_PrintLog( "intT1_scanFontDBaseXLFD()", "XLFD Font Database File %s not found!",
+ T1LOG_WARNING, filename);
+ T1_errno=T1ERR_FILE_OPEN_ERR;
+ return(-1);
+ }
+
+ /* Get the file size */
+ filesize=lseek( fd, 0, 2);
+ /* Reset fileposition to start */
+ lseek (fd, 0, 0);
+
+ if ((filebuffer=(char *)malloc(filesize*sizeof(char)
+ )) == NULL){
+ T1_PrintLog( "intT1_scanFontDBaseXLFD()",
+ "Couldn't allocate memory for loading XLFD font database file %s",
+ T1LOG_ERROR, filename);
+ T1_errno=T1ERR_ALLOC_MEM;
+ return(-1);
+ }
+
+ i=read( fd, filebuffer, filesize);
+ close(fd); /* Close XLFD font database file */
+
+ i=j=l=m=0;
+
+ while (i<filesize) {
+ if (filebuffer[i]=='\n'){ /* We are at the end of line */
+ if (j==0) { /* Read the first line as the number of fonts */
+ filebuffer[i]=0;
+ sscanf( &filebuffer[0], "%d", &nofonts);
+ filebuffer[i]='\n'; /* Because it gives a better feeling */
+ /* (Re)Allocate memory for 'no_fonts' structures: */
+ if ((FontBase.pFontArray=(FONTPRIVATE *)
+ realloc( FontBase.pFontArray, (FontBase.no_fonts+nofonts)*sizeof(FONTPRIVATE))) == NULL) {
+ T1_PrintLog( "inT1_scanFontDBaseXLFD()",
+ "Failed to allocate memory for FONTPRIVATE-area while scanning %s",
+ T1LOG_ERROR, filename);
+ T1_errno=T1ERR_ALLOC_MEM;
+ return(-1);
+ }
+ /* setup pointer to newly allocated area and do a reset */
+ fontarrayP=&(FontBase.pFontArray[FontBase.no_fonts]);
+ memset(fontarrayP, 0, nofonts*sizeof(FONTPRIVATE));
+ located=1; /* In order to increment m */
+ }
+ else { /* We are in the second or higher line */
+ /* l indexes the beginning of the line */
+ while (isspace((int)filebuffer[l])){
+ l++;
+ }
+ /* We are at the first printable character of a line;
+ scan the first white space terminated string as font
+ file name. */
+ sscanf( &(filebuffer[l]), "%s", &(linebuf[0]));
+ /* We print error string before testing because after the call
+ to test_for_t1_file() filename is substituted by an emty
+ string if the file was not found: */
+ sprintf( err_warn_msg_buf, "Type 1 Font file %s.[pfa/pfb] not found (FontID=%d, SearchPath=%s)",
+ linebuf, m-1, T1_GetFileSearchPath(T1_PFAB_PATH));
+ if ((test_for_t1_file( &linebuf[0]))){
+ T1_PrintLog( "intT1_scanFontDBase()", err_warn_msg_buf, T1LOG_WARNING);
+ located=0;
+ }
+ else{
+ /* linebuf contains now the valid Type1 filename; let's
+ now copy this string into the appropriate place in the
+ FONTPRIVATE-struct: */
+ found++;
+ located=1;
+ if ((fontarrayP[m-1].pFontFileName=(char *)
+ calloc( strlen( &linebuf[0])+1, sizeof(char))) == NULL){
+ T1_PrintLog( "intT1_scanFontDBaseXLFD()",
+ "Failed to allocate memory for Filename %s (FontID=%d)",
+ T1LOG_ERROR, &linebuf[0], m-1);
+ T1_errno=T1ERR_ALLOC_MEM;
+ return(-1);
+ }
+ strcpy( fontarrayP[m-1].pFontFileName, &linebuf[0]);
+ }
+ }
+ j++; /* Advance line counter */
+ if ((located))
+ m++;
+ /* Store index to new line */
+ l = i + 1;
+ }
+ if (j>nofonts) /* to ignore especially white space at end */
+ break;
+ i++; /* Step further in file position */
+ }
+ /* Return the memory for file reading */
+ free(filebuffer);
+
+ return( found);
+}
+
+
/* T1_CloseLib(): Close the library and free all associated memory */
int T1_CloseLib( void)
{
int i, j, error=0;
- if (T1_Up){
+ if ( T1_Up != 0 ) {
for (i=pFontBase->no_fonts; i; i--){
/* Free filename only if not NULL and if the font is physical!
Do it before removing the font since the physical information
@@ -445,6 +655,12 @@
else
error=1;
+ /* Get rid of internal StandardEncoding vector */
+ if ( StdEncArrayP != NULL ) {
+ free( StdEncArrayP);
+ StdEncArrayP = NULL;
+ }
+
/* Free search paths */
intT1_FreeSearchPaths();
@@ -617,9 +833,9 @@
-/* CheckForInit(): If no initialization of font mechanism has been
+/* T1_CheckForInit(): If no initialization of font mechanism has been
done, return -1, indicating an error. */
-int CheckForInit(void)
+int T1_CheckForInit(void)
{
if(T1_Up)
return(0);
@@ -630,14 +846,14 @@
-/* CheckForFontID(): Checks the font mechanism concerning the specified
+/* T1_CheckForFontID(): Checks the font mechanism concerning the specified
ID. It returns:
0 if font belonging to FontID has not yet been loaded
1 if font belonging to FontID has already been loaded
-1 if FontID is an invalid specification or t1lib not
initialized
*/
-int CheckForFontID( int FontID)
+int T1_CheckForFontID( int FontID)
{
/* FontID is invalid */
@@ -656,7 +872,7 @@
/* test_for_t1_file returns 0 if a file "name.pfa" or "name.pfb"
was found. Else, -1 is returned. If successful, buffer contains the
found filename string */
-int test_for_t1_file( char *buffer )
+static int test_for_t1_file( char *buffer )
{
int i=0;
char *FullName;
@@ -704,9 +920,9 @@
char *T1_GetFontFileName( int FontID)
{
- static char filename[T1_MAXPATHLEN+1];
+ static char filename[MAXPATHLEN+1];
- if (CheckForInit())return(NULL);
+ if (T1_CheckForInit())return(NULL);
/* Check first for valid FontID */
if ((FontID<0) || (FontID>FontBase.no_fonts)){
@@ -733,7 +949,7 @@
int T1_SetAfmFileName( int FontID, char *afm_name)
{
- if (CheckForFontID(FontID)!=0){
+ if (T1_CheckForFontID(FontID)!=0){
/* Operation may not be applied because FontID is invalid
or font is loaded */
T1_errno=T1ERR_INVALID_FONTID;
@@ -767,9 +983,9 @@
char *T1_GetAfmFileName( int FontID)
{
- static char filename[T1_MAXPATHLEN+1];
+ static char filename[MAXPATHLEN+1];
- if (CheckForInit())return(NULL);
+ if (T1_CheckForInit())return(NULL);
/* Check first for valid FontID */
if ((FontID<0) || (FontID>FontBase.no_fonts)){
@@ -788,10 +1004,11 @@
-/* T1_Get_no_fonts(): Return the number of declared fonts */
-int T1_Get_no_fonts(void)
+/* T1_GetNoFonts(): Return the number of declared fonts */
+int T1_GetNoFonts(void)
{
- if (CheckForInit())return(-1);
+ if (T1_CheckForInit())
+ return(-1);
return(FontBase.no_fonts);
}
@@ -806,11 +1023,11 @@
int i;
- if (CheckForInit())
+ if (T1_CheckForInit())
; /* Not initialized -> no size dependent data -> OK */
else
/* Check if size-dependent data is existent */
- for ( i=T1_Get_no_fonts(); i; i--)
+ for ( i=T1_GetNoFonts(); i; i--)
if (pFontBase->pFontArray[i-1].pFontSizeDeps!=NULL){
T1_errno=T1ERR_OP_NOT_PERMITTED;
return(-1); /* There's is size dependent data for a font */
@@ -862,7 +1079,7 @@
/* Check for a valid source font */
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(-1);
}
@@ -1017,99 +1234,6 @@
-/* bin_dump(): Print a binary dump of a byte, short and
- long variable (used for debug purposes only): */
-void bin_dump_c(unsigned char value, char space_flag)
-{
- int i,j;
-
- for (i=0;i<=7;i++){
- if ((j=((value)>>i)&0x01))
- printf("X");
- else
- printf(".");
- }
- if (space_flag)
- printf(" ");
-
-}
-
-void bin_dump_s(unsigned short value, char space_flag)
-{
- int i,j;
-
- if (T1_CheckEndian()){
- for (i=8;i<=15;i++){
- if ((j=((value)>>i)&0x01))
- printf("X");
- else
- printf(".");
- }
- for (i=0;i<=7;i++){
- if ((j=((value)>>i)&0x01))
- printf("X");
- else
- printf(".");
- }
- }
- else{
- for (i=0;i<=15;i++){
- if ((j=((value)>>i)&0x01))
- printf("X");
- else
- printf(".");
- }
- }
- if (space_flag)
- printf(" ");
-
-}
-
-void bin_dump_l(unsigned long value, char space_flag)
-{
- int i,j;
-
- if (T1_CheckEndian()){
- for (i=24;i<=31;i++){
- if ((j=((value)>>i)&0x01))
- printf("X");
- else
- printf(".");
- }
- for (i=16;i<=23;i++){
- if ((j=((value)>>i)&0x01))
- printf("X");
- else
- printf(".");
- }
- for (i=8;i<=15;i++){
- if ((j=((value)>>i)&0x01))
- printf("X");
- else
- printf(".");
- }
- for (i=0;i<=7;i++){
- if ((j=((value)>>i)&0x01))
- printf("X");
- else
- printf(".");
- }
- }
- else{
- for (i=0;i<=31;i++){
- if ((j=((value)>>i)&0x01))
- printf("X");
- else
- printf(".");
- }
- }
- if (space_flag)
- printf(" ");
-
-}
-
-
-
/* CheckEndian(): Checks whether the current machine is of little or big
endian architecture. This is important for concatenating bitmaps.
Function returns 0 if LittleEndian and 1 if BigEndian representation
@@ -1163,11 +1287,11 @@
char *T1_GetFontFilePath( int FontID)
{
- static char filepath[T1_MAXPATHLEN+1];
+ static char filepath[MAXPATHLEN+1];
char *FileNamePath=NULL;
/* is initialzed? */
- if (CheckForInit()) {
+ if (T1_CheckForInit()) {
T1_errno=T1ERR_INVALID_FONTID;
return(NULL);
}
@@ -1202,13 +1326,13 @@
char *T1_GetAfmFilePath( int FontID)
{
- static char filepath[T1_MAXPATHLEN+1];
+ static char filepath[MAXPATHLEN+1];
char *FontFileName;
char *AFMFilePath;
int i, j;
/* is initialized? */
- if ((CheckForInit())) {
+ if ((T1_CheckForInit())) {
T1_errno=T1ERR_INVALID_FONTID;
return(NULL);
}
@@ -1261,13 +1385,16 @@
filepath[i+4]='\0';
}
/* Get full path of the afm file (The case of a full path name
- name specification is valid */
+ name specification is valid) */
if ((AFMFilePath=intT1_Env_GetCompletePath( filepath, T1_AFM_ptr)) == NULL) {
return NULL;
}
+
strcpy( filepath, AFMFilePath);
free( AFMFilePath);
return( filepath);
}
+
+
diff -Nru t1lib-grace/T1lib/t1lib/t1base.h t1lib-deb/T1lib/t1lib/t1base.h
--- t1lib-grace/T1lib/t1lib/t1base.h 2002-01-03 13:15:14.000000000 -0800
+++ t1lib-deb/T1lib/t1lib/t1base.h 2007-12-23 07:49:42.000000000 -0800
@@ -1,10 +1,10 @@
/*--------------------------------------------------------------------------
----- File: t1base.h
----- Author: Rainer Menzner (Rainer.Menzner@web.de)
- ----- Date: 2001-10-03
+ ----- Date: 2002-05-16
----- Description: This file is part of the t1-library. It contains
declarations and definitions for t1base.c
- ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2001.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2005.
As of version 0.5, t1lib is distributed under the
GNU General Public Library Lincense. The
conditions can be found in the files LICENSE and
@@ -29,21 +29,18 @@
void *T1_InitLib( int log);
int intT1_scanFontDBase( char *filename);
+int intT1_scanFontDBaseXLFD( char *filename);
int T1_CloseLib( void);
int T1_AddFont( char *fontfilename);
void T1_PrintLog( char *func_ident, char *msg_txt, int level, ...);
void T1_SetLogLevel( int level);
-int CheckForInit(void);
-int CheckForFontID( int FontID);
-int test_for_t1_file( char *buffer );
+int T1_CheckForInit(void);
+int T1_CheckForFontID( int FontID);
char *T1_GetFontFileName( int FontID);
-int T1_Get_no_fonts(void);
+int T1_GetNoFonts(void);
int T1_SetDeviceResolutions( float x_res, float y_res);
int T1_CopyFont( int FontID);
int T1_QueryX11Support( void);
-void bin_dump_c(unsigned char value, char space_flag);
-void bin_dump_s(unsigned short value, char space_flag);
-void bin_dump_l(unsigned long value, char space_flag);
int T1_CheckEndian(void);
int T1_SetBitmapPad( int pad);
int T1_GetBitmapPad( void);
@@ -53,6 +50,7 @@
int T1_SetAfmFileName( int FontId, char *afm_name);
char *T1_GetFontFilePath( int FontID);
char *T1_GetAfmFilePath( int FontID);
+const char *T1_StrError( int t1err);
extern int T1_Type1OperatorFlags;
@@ -60,21 +58,18 @@
extern void *T1_InitLib( int log);
extern int intT1_scanFontDBase( char *filename);
+extern int intT1_scanFontDBaseXLFD( char *filename);
extern int T1_CloseLib( void);
extern int T1_AddFont( char *fontfilename);
extern void T1_PrintLog( char *func_ident, char *msg_txt, int level, ...);
extern void T1_SetLogLevel( int level);
-extern int CheckForInit(void);
-extern int CheckForFontID( int FontID);
-extern int test_for_t1_file( char *buffer );
+extern int T1_CheckForInit(void);
+extern int T1_CheckForFontID( int FontID);
extern char *T1_GetFontFileName( int FontID);
-extern int T1_Get_no_fonts(void);
+extern int T1_GetNoFonts(void);
extern int T1_SetDeviceResolutions( float x_res, float y_res);
extern int T1_QueryX11Support( void);
extern int T1_CopyFont( int FontID);
-extern void bin_dump_c(unsigned char value, char space_flag);
-extern void bin_dump_s(unsigned short value, char space_flag);
-extern void bin_dump_l(unsigned long value, char space_flag);
extern int T1_CheckEndian(void);
extern int T1_SetBitmapPad( int pad);
extern int T1_GetBitmapPad( void);
@@ -84,5 +79,6 @@
extern int T1_SetAfmFileName( int FontId, char *afm_name);
extern char *T1_GetFontFilePath( int FontID);
extern char *T1_GetAfmFilePath( int FontID);
+extern const char *T1_StrError( int t1err);
#endif
diff -Nru t1lib-grace/T1lib/t1lib/t1delete.c t1lib-deb/T1lib/t1lib/t1delete.c
--- t1lib-grace/T1lib/t1lib/t1delete.c 2002-01-03 13:15:14.000000000 -0800
+++ t1lib-deb/T1lib/t1lib/t1delete.c 2007-12-23 07:49:42.000000000 -0800
@@ -1,11 +1,11 @@
/*--------------------------------------------------------------------------
----- File: t1delete.c
----- Author: Rainer Menzner (Rainer.Menzner@web.de)
- ----- Date: 2001-06-03
+ ----- Date: 2002-12-02
----- Description: This file is part of the t1-library. It contains
functions for giving free previously allocated
memory areas and similar things.
- ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2001.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2002.
As of version 0.5, t1lib is distributed under the
GNU General Public Library Lincense. The
conditions can be found in the files LICENSE and
@@ -76,7 +76,7 @@
for ( j=0; j<4; j++){
antialias=level[j];
/* Check if size exists; if not, return 1 */
- if ((ptr=QueryFontSize( FontID, size, antialias))!=NULL){
+ if ((ptr=T1int_QueryFontSize( FontID, size, antialias))!=NULL){
/* We have to remove a size-> */
jobs++;
/* Get pointers to structure which is before/after the structure
@@ -140,17 +140,17 @@
FONTSIZEDEPS *ptr;
- if (CheckForFontID(FontID)!=1)
+ if (T1_CheckForFontID(FontID)!=1)
return(-1);
/* Start deleting at the end of the linked list: */
sizecount=0;
- if ((ptr=GetLastFontSize( FontID))==NULL){
+ if ((ptr=T1int_GetLastFontSize( FontID))==NULL){
/* There has not been any size dependent data: */
return(0);
}
- while (((ptr=GetLastFontSize(FontID)) != NULL)){
+ while (((ptr=T1int_GetLastFontSize(FontID)) != NULL)){
currsize=ptr->size;
T1_DeleteSize( FontID, currsize);
sizecount++;
@@ -198,12 +198,12 @@
int result;
- if (CheckForFontID(FontID)==-1){ /* Invalid ID */
+ if (T1_CheckForFontID(FontID)==-1){ /* Invalid ID */
T1_errno=T1ERR_INVALID_FONTID;
return(-1);
}
- if (CheckForFontID(FontID)==0) /* Font is not loaded */
+ if (T1_CheckForFontID(FontID)==0) /* Font is not loaded */
return(0);
/* Memory freeing must be done hierachical, start with size dependent
diff -Nru t1lib-grace/T1lib/t1lib/t1enc.c t1lib-deb/T1lib/t1lib/t1enc.c
--- t1lib-grace/T1lib/t1lib/t1enc.c 2002-07-29 13:37:48.000000000 -0700
+++ t1lib-deb/T1lib/t1lib/t1enc.c 2007-12-23 07:49:42.000000000 -0800
@@ -1,10 +1,10 @@
/*--------------------------------------------------------------------------
----- File: t1enc.c
----- Author: Rainer Menzner (Rainer.Menzner@web.de)
- ----- Date: 2001-10-18
+ ----- Date: 2005-05-01
----- Description: This file is part of the t1-library. It contains
functions encoding handling at runtime.
- ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2001.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2005.
As of version 0.5, t1lib is distributed under the
GNU General Public Library Lincense. The
conditions can be found in the files LICENSE and
@@ -50,6 +50,7 @@
#include "../type1/spaces.h"
#include "../type1/util.h"
#include "../type1/fontfcn.h"
+#include "../type1/paths.h"
#include "../type1/regions.h"
@@ -424,7 +425,6 @@
/* Check if exactly 256 characters have been defined, if not,
return NULL: */
if (charname_count!=256){
- T1_errno=T1ERR_UNSPECIFIED;
return( -1);
}
@@ -534,7 +534,7 @@
}
if ( cnsize<0) {
- /* T1_errno is already set from the respective function */
+ T1_errno=T1ERR_SCAN_ENCODING;
if ( charnames!=NULL) {
free(charnames);
}
@@ -629,7 +629,7 @@
/* First, check for valid font ID residing in memory: */
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(-1);
}
@@ -694,6 +694,7 @@
}
}
/* Update kerning table */
+ pFontBase->pFontArray[FontID].KernMapSize=0;
k=pFontBase->pFontArray[FontID].pAFMData->numOfPairs;
if (k>0){ /* i.e., there are any pairs */
/* OK, it does not suffice to alloc numOfPairs METRICS_ENTRYs, because
@@ -754,7 +755,7 @@
int T1_SetDefaultEncoding( char **encoding)
{
- if (CheckForInit()){
+ if (T1_CheckForInit()){
T1_errno=T1ERR_OP_NOT_PERMITTED;
return(-1);
}
@@ -772,7 +773,7 @@
static char enc_scheme[256];
/* First, check for valid font ID residing in memory: */
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(NULL);
}
diff -Nru t1lib-grace/T1lib/t1lib/t1env.c t1lib-deb/T1lib/t1lib/t1env.c
--- t1lib-grace/T1lib/t1lib/t1env.c 2002-07-29 13:37:48.000000000 -0700
+++ t1lib-deb/T1lib/t1lib/t1env.c 2007-12-23 07:49:42.000000000 -0800
@@ -1,11 +1,11 @@
/*--------------------------------------------------------------------------
----- File: t1env.c
----- Author: Rainer Menzner (Rainer.Menzner@web.de)
- ----- Date: 2001-11-12
+ ----- Date: 2007-12-22
----- Description: This file is part of the t1-library. It implements
the reading of a configuration file and path-searching
of type1-, afm- and encoding files.
- ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2001.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2007.
As of version 0.5, t1lib is distributed under the
GNU General Public Library Lincense. The
conditions can be found in the files LICENSE and
@@ -74,6 +74,7 @@
static int afm_no=-1;
static int enc_no=-1;
static int fdb_no=-1;
+static int fdbxlfd_no=-1;
static char path_sep_char='\0';
static char path_sep_string[2];
@@ -91,6 +92,7 @@
static char T1_enc[]="sys$disk:[]";
#endif
char T1_fdb[]="FontDataBase";
+char T1_fdbxlfd[]=""; /* By default, we do not search XLFD databases. */
/* keywords recognized in config file */
@@ -98,6 +100,7 @@
static const char pfab_key[]="TYPE1";
static const char afm_key[]="AFM";
static const char fdb_key[]="FONTDATABASE";
+static const char fdbxlfd_key[]="FONTDATABASEXLFD";
/* qstrncpy(): Copy bytes from srcP to to destP. srcP is count bytes long
@@ -164,6 +167,12 @@
strcpy(T1_FDB_ptr[0],T1_fdb);
fdb_no=0;
}
+
+ if (fdbxlfd_no==-1) {
+ /* The XLFD font data base defaults to be empty */
+ T1_FDBXLFD_ptr=(char**) calloc( 1, sizeof(char*));
+ fdbxlfd_no=0;
+ }
}
@@ -177,39 +186,53 @@
if (T1_PFAB_ptr!=NULL) {
while (T1_PFAB_ptr[i]!=NULL) {
free(T1_PFAB_ptr[i]);
- T1_PFAB_ptr[i]=NULL;
+ T1_PFAB_ptr[i++]=NULL;
}
free( T1_PFAB_ptr);
+ T1_PFAB_ptr=NULL;
}
i=0;
if (T1_AFM_ptr!=NULL) {
while (T1_AFM_ptr[i]!=NULL) {
free(T1_AFM_ptr[i]);
- T1_AFM_ptr[i]=NULL;
+ T1_AFM_ptr[i++]=NULL;
}
free( T1_AFM_ptr);
+ T1_AFM_ptr=NULL;
}
i=0;
if (T1_ENC_ptr!=NULL) {
while (T1_ENC_ptr[i]!=NULL) {
free(T1_ENC_ptr[i]);
- T1_ENC_ptr[i]=NULL;
+ T1_ENC_ptr[i++]=NULL;
}
free( T1_ENC_ptr);
+ T1_ENC_ptr=NULL;
}
i=0;
if (T1_FDB_ptr!=NULL) {
while (T1_FDB_ptr[i]!=NULL) {
free(T1_FDB_ptr[i]);
- T1_FDB_ptr[i]=NULL;
+ T1_FDB_ptr[i++]=NULL;
}
free( T1_FDB_ptr);
+ T1_FDB_ptr=NULL;
+ }
+ i=0;
+ if (T1_FDBXLFD_ptr!=NULL) {
+ while (T1_FDBXLFD_ptr[i]!=NULL) {
+ free(T1_FDBXLFD_ptr[i]);
+ T1_FDBXLFD_ptr[i++]=NULL;
+ }
+ free( T1_FDBXLFD_ptr);
+ T1_FDBXLFD_ptr=NULL;
}
/* indicate t1lib non-initialized */
pfab_no=-1;
afm_no=-1;
enc_no=-1;
fdb_no=-1;
+ fdbxlfd_no=-1;
return;
}
@@ -242,7 +265,7 @@
env_str=getenv(ENV_CONF_STRING);
linecnt=1;
- if (env_str==NULL) {
+ if (!env_str) {
/* environment variable not set, try to open default file
in user's home directory and afterwards global config file */
if ((usershome=getenv("HOME"))!=NULL) {
@@ -285,7 +308,7 @@
}
else{
sprintf( err_warn_msg_buf, "Using %s as Configfile (global)",
- cnffilepath);
+ globalcnffilepath);
T1_PrintLog( "ScanConfigFile()", err_warn_msg_buf, T1LOG_STATISTIC);
}
}
@@ -358,7 +381,7 @@
idestP=&enc_no;
curr_key=(char*)enc_key;
}
- else if (strncmp( "TYPE1", &linebuf[j], 5)==0) {
+ else if (strncmp( pfab_key, &linebuf[j], 5)==0) {
/* setup target */
destP=&T1_PFAB_ptr;
idestP=&pfab_no;
@@ -370,6 +393,23 @@
idestP=&afm_no;
curr_key=(char*)afm_key;
}
+ else if (strncmp( fdbxlfd_key, &linebuf[j], 16)==0) {
+ /* The handling here is somewhat specific. XLFD font database
+ specifications may coexist with standard font database
+ specification. However, if the standard font database is
+ the default value, an existing XLFD specification clears
+ this default value. Let this precede the standard fdb because
+ otherwise, this code would never be reached. */
+ if (fdb_no==0) { /* default paths are currently setup, get rid of them */
+ free(T1_FDB_ptr[0]);
+ T1_FDB_ptr[0]=NULL;
+ }
+
+ /* setup target */
+ destP=&T1_FDBXLFD_ptr;
+ idestP=&fdbxlfd_no;
+ curr_key=(char*)fdbxlfd_key;
+ }
else if (strncmp( fdb_key, &linebuf[j], 12)==0) {
/* setup target */
destP=&T1_FDB_ptr;
@@ -386,7 +426,10 @@
if (ignoreline==0) {
/* Check for an explicitly assigned value */
if (*idestP==0) { /* default paths are currently setup, get rid of them */
- free((*destP)[0]);
+ if ((*destP)[0]!=NULL) {
+ free((*destP)[0]);
+ (*destP)[0]=NULL;
+ }
}
else { /* append to existing paths */
T1_PrintLog( "ScanConfigFile()",
@@ -558,7 +601,7 @@
/* cut a trailing directory separator */
j=strlen(pathbuf);
if (pathbuf[j-1]==DIRECTORY_SEP_CHAR)
- pathbuf[j--]='\0';
+ pathbuf[--j]='\0';
/* Add the directory separator: */
#ifdef VMS
{ char *p= strrchr(pathbuf, DIRECTORY_SEP_CHAR);
@@ -567,7 +610,24 @@
}
#endif
strcat( pathbuf, DIRECTORY_SEP);
- /* And finally the filename: */
+ /* And finally the filename.
+ The following is fix against a vulnerability given by passing in
+ large filenames, cf.:
+
+ http://www.securityfocus.com/bid/25079
+
+ or
+
+ http://packetstormsecurity.nl/0707-advisories/t1lib.txt
+
+ If current pathbuf + StrippedName + 1 byte for NULL is bigger than
+ pathbuf log a warning and try next pathbuf */
+ if ( strlen(pathbuf) + strlen(StrippedName) + 1 > sizeof(pathbuf) ) {
+ T1_PrintLog( "intT1_Env_GetCompletePath()", "Omitting suspicious long candidate path in order to prevent buffer overflow.",
+ T1LOG_WARNING);
+ i++;
+ continue;
+ }
strcat( pathbuf, StrippedName);
/* Check for existence of the path: */
@@ -620,7 +680,7 @@
/* We do not allow to change the searchpath if the database already
contains one or more entries. */
- if (T1_Get_no_fonts()>0){
+ if (T1_GetNoFonts()>0){
sprintf( err_warn_msg_buf, "Path %s not set, database is not empty",
pathname);
T1_PrintLog( "T1_SetFileSearchPath()", err_warn_msg_buf,
@@ -769,15 +829,14 @@
{
int i;
int pathlen;
- char* newpath;
+ char* newpath = NULL;
int nofonts;
-
if (pathname==NULL)
return(-1);
- nofonts=T1_Get_no_fonts();
+ nofonts=T1_GetNoFonts();
pathlen=strlen(pathname);
@@ -895,6 +954,11 @@
}
T1_ENC_ptr[enc_no]=NULL;
}
+
+ /* Copy new path to where it belongs ... */
+ if (newpath)
+ strcpy(newpath, pathname);
+
return(0);
}
@@ -953,7 +1017,7 @@
fdb_no=1;
/* Load database immediately if t1lib already is initailzed */
- if (CheckForInit()==0) {
+ if (T1_CheckForInit()==0) {
if ((result=intT1_scanFontDBase(T1_FDB_ptr[0]))==-1) {
T1_PrintLog( "T1_AddFontDataBase()", "Fatal error scanning Font Database File %s (T1_errno=%d)",
T1LOG_WARNING, T1_FDB_ptr[0], T1_errno);
@@ -1011,7 +1075,7 @@
}
/* Insert the new database. If t1lib is already initialzed, the database can only
be appended. Otherwise. prepending is also possible.*/
- if ((mode & T1_PREPEND_PATH) && (CheckForInit()!=0) ) { /* prepend */
+ if ((mode & T1_PREPEND_PATH) && (T1_CheckForInit()!=0) ) { /* prepend */
i=fdb_no-2;
while (i>=0) {
T1_FDB_ptr[i+1]=T1_FDB_ptr[i];
@@ -1022,7 +1086,7 @@
}
else { /* append */
T1_FDB_ptr[fdb_no-1]=newpath;
- if (CheckForInit()==0) {
+ if (T1_CheckForInit()==0) {
if ((result=intT1_scanFontDBase(T1_FDB_ptr[fdb_no-1]))==-1) {
T1_PrintLog( "T1_AddFontDataBase()", "Fatal error scanning Font Database File %s (T1_errno=%d)",
T1LOG_WARNING, T1_FDB_ptr[fdb_no-1], T1_errno);
@@ -1036,5 +1100,144 @@
return result;
}
+
+
+
+/* T1_SetFontDataBaseXLFD(): Set a new name for the XLFD font database. It
+ replaces the default name (which is empty and any names specified
+ previously with this function.
+ Return value: 0 if OK, and -1 if filename not valid or an allocation
+ error occurred */
+int T1_SetFontDataBaseXLFD( char *filename)
+{
+ int pathlen;
+ int i;
+ int result=0;
+
+
+ /* check filename */
+ if (filename==NULL) {
+ T1_errno=T1ERR_INVALID_PARAMETER;
+ return -1;
+ }
+
+ /* this function must be called before any font is in the database, that is, usually,
+ before initialization! */
+ if ( pFontBase!=NULL && pFontBase->no_fonts>0) {
+ T1_errno=T1ERR_OP_NOT_PERMITTED;
+ return -1;
+ }
+
+
+ pathlen=strlen(filename)+1;
+ /* Throw away a possibly existing font database-statement */
+ if (fdbxlfd_no==-1) {
+ T1_FDBXLFD_ptr=NULL; /* realloc() will do a malloc() */
+ }
+ else {
+ /* throw away current paths */
+ i=0;
+ while (T1_FDBXLFD_ptr[i]!=NULL) {
+ free (T1_FDBXLFD_ptr[i++]);
+ }
+ }
+
+ if ((T1_FDBXLFD_ptr=(char**)realloc( T1_FDBXLFD_ptr, 2*sizeof(char*)))==NULL) {
+ T1_errno=T1ERR_ALLOC_MEM;
+ return -1;
+ }
+
+ if ((T1_FDBXLFD_ptr[0]=(char*)malloc(pathlen*sizeof(char)))==NULL) {
+ T1_errno=T1ERR_ALLOC_MEM;
+ return -1;
+ }
+ strcpy( T1_FDBXLFD_ptr[0], filename);
+ T1_FDBXLFD_ptr[1]=NULL;
+ fdb_no=1;
+
+ /* Load XLFD database immediately if t1lib already is initailzed */
+ if (T1_CheckForInit()==0) {
+ if ((result=intT1_scanFontDBaseXLFD(T1_FDBXLFD_ptr[0]))==-1) {
+ T1_PrintLog( "T1_AddFontDataBaseXLFD()", "Fatal error scanning XLFD Font Database File %s (T1_errno=%d)",
+ T1LOG_WARNING, T1_FDBXLFD_ptr[0], T1_errno);
+ }
+ if (result>-1)
+ pFontBase->no_fonts+=result;
+ result=pFontBase->no_fonts;
+ }
+ return result;
+
+}
+
+
+/* T1_AddFontDataBaseXLFD(): Add a new XLFD font database file to the list. If
+ the lib is already initialzed, then the new database is immediately loaded.
+ Otherwise it is simply appended to the list and loaded at the time of
+ initialization.
+ Returns: -1 an error occured
+ 0 successfully inserted but not loaded because lib not initilized
+ n>0 the highest defined FontID
+*/
+int T1_AddFontDataBaseXLFD( int mode, char *filename)
+{
+ int i;
+ int pathlen;
+ int result=0;
+ char* newpath;
+
+
+ if (filename==NULL) {
+ T1_errno=T1ERR_INVALID_PARAMETER;
+ return(-1);
+ }
+
+ pathlen=strlen(filename);
+
+ /* Allocate memory for string */
+ if ((newpath=(char*)malloc( (pathlen+1)*sizeof(char)))==NULL) {
+ T1_errno=T1ERR_ALLOC_MEM;
+ return(-1);
+ }
+ strcpy( newpath, filename);
+ /* Check for and handle the existing path configuration */
+ if (fdb_no==0) { /* defauls setup, free the path */
+ free( T1_FDB_ptr[0]);
+ }
+ if (fdbxlfd_no==-1) { /* not initialized! */
+ fdbxlfd_no=0;
+ T1_FDBXLFD_ptr=NULL; /* realloc() will do the malloc()! */
+ }
+
+ if ((T1_FDBXLFD_ptr=(char**)realloc( T1_FDBXLFD_ptr, (++fdbxlfd_no+1)*sizeof(char*)))==NULL) {
+ T1_errno=T1ERR_ALLOC_MEM;
+ return(-1);
+ }
+ /* Insert the new database. If t1lib is already initialzed, the database can only
+ be appended. Otherwise. prepending is also possible.*/
+ if ((mode & T1_PREPEND_PATH) && (T1_CheckForInit()!=0) ) { /* prepend */
+ i=fdbxlfd_no-2;
+ while (i>=0) {
+ T1_FDBXLFD_ptr[i+1]=T1_FDBXLFD_ptr[i];
+ i--;
+ }
+ T1_FDBXLFD_ptr[0]=newpath;
+ result=0;
+ }
+ else { /* append */
+ T1_FDBXLFD_ptr[fdbxlfd_no-1]=newpath;
+ if (T1_CheckForInit()==0) {
+ if ((result=intT1_scanFontDBaseXLFD(T1_FDBXLFD_ptr[fdbxlfd_no-1]))==-1) {
+ T1_PrintLog( "T1_AddFontDataBase()", "Fatal error scanning Font Database File %s (T1_errno=%d)",
+ T1LOG_WARNING, T1_FDBXLFD_ptr[fdbxlfd_no-1], T1_errno);
+ }
+ if (result>-1)
+ pFontBase->no_fonts+=result;
+ result=pFontBase->no_fonts;
+ }
+ }
+ T1_FDBXLFD_ptr[fdbxlfd_no]=NULL;
+ return result;
+
+}
diff -Nru t1lib-grace/T1lib/t1lib/t1env.h t1lib-deb/T1lib/t1lib/t1env.h
--- t1lib-grace/T1lib/t1lib/t1env.h 2002-01-03 13:15:15.000000000 -0800
+++ t1lib-deb/T1lib/t1lib/t1env.h 2007-12-23 07:49:42.000000000 -0800
@@ -1,10 +1,10 @@
/*--------------------------------------------------------------------------
----- File: t1env.h
----- Author: Rainer Menzner (Rainer.Menzner@web.de)
- ----- Date: 2001-09-26
+ ----- Date: 2005-05-16
----- Description: This file is part of the t1-library. It contains
declarations and definitions for t1env.c
- ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2001.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2005.
As of version 0.5, t1lib is distributed under the
GNU General Public Library Lincense. The
conditions can be found in the files LICENSE and
@@ -37,6 +37,8 @@
char *T1_GetFileSearchPath( int type);
int T1_SetFontDataBase( char *filename);
int T1_AddFontDataBase( int mode, char *filename);
+int T1_SetFontDataBaseXLFD( char *filename);
+int T1_AddFontDataBaseXLFD( int mode, char *filename);
#else
@@ -49,6 +51,8 @@
extern char *T1_GetFileSearchPath( int type);
extern int T1_SetFontDataBase( char *filename);
extern int T1_AddFontDataBase( int mode, char *filename);
+extern int T1_SetFontDataBaseXLFD( char *filename);
+extern int T1_AddFontDataBaseXLFD( int mode, char *filename);
#endif
diff -Nru t1lib-grace/T1lib/t1lib/t1extern.h t1lib-deb/T1lib/t1lib/t1extern.h
--- t1lib-grace/T1lib/t1lib/t1extern.h 2002-01-03 13:15:15.000000000 -0800
+++ t1lib-deb/T1lib/t1lib/t1extern.h 2007-12-23 07:49:42.000000000 -0800
@@ -1,10 +1,10 @@
/*--------------------------------------------------------------------------
----- File: t1extern.h
----- Author: Rainer Menzner (Rainer.Menzner@web.de)
- ----- Date: 2001-10-03
+ ----- Date: 2005-05-16
----- Description: This file is part of the t1-library. It contains
external declarations used by the t1-library.
- ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2001.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2005.
As of version 0.5, t1lib is distributed under the
GNU General Public Library Lincense. The
conditions can be found in the files LICENSE and
@@ -89,6 +89,7 @@
extern char **T1_AFM_ptr;
extern char **T1_ENC_ptr;
extern char **T1_FDB_ptr;
+extern char **T1_FDBXLFD_ptr;
/* We use a uchar buffer for error and warning messages: */
extern char err_warn_msg_buf[1024];
diff -Nru t1lib-grace/T1lib/t1lib/t1finfo.c t1lib-deb/T1lib/t1lib/t1finfo.c
--- t1lib-grace/T1lib/t1lib/t1finfo.c 2002-01-03 13:15:15.000000000 -0800
+++ t1lib-deb/T1lib/t1lib/t1finfo.c 2007-12-23 07:49:42.000000000 -0800
@@ -1,11 +1,11 @@
/*--------------------------------------------------------------------------
----- File: t1finfo.c
----- Author: Rainer Menzner (Rainer.Menzner@web.de)
- ----- Date: 2001-06-10
+ ----- Date: 2005-05-01
----- Description: This file is part of the t1-library. It contains
functions for accessing afm-data and some other
fontinformation data.
- ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2001.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2005.
As of version 0.5, t1lib is distributed under the
GNU General Public Library Lincense. The
conditions can be found in the files LICENSE and
@@ -51,6 +51,7 @@
#include "../type1/spaces.h"
#include "../type1/util.h"
#include "../type1/fontfcn.h"
+#include "../type1/paths.h"
#include "../type1/regions.h"
@@ -89,7 +90,7 @@
/* Check whether font is loaded: */
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(0);
}
@@ -131,7 +132,7 @@
uchar1=(unsigned char) char1;
/* Check whether font is loaded: */
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(0);
}
@@ -195,7 +196,7 @@
uchar1=(unsigned char) char1;
/* Check whether font is loaded: */
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(NullBBox);
}
@@ -228,7 +229,7 @@
pFontBase->pFontArray[FontID].pFontEnc,
(int) uchar1, &mode,
pFontBase->pFontArray[FontID].pType1Data,
- DO_RASTER);
+ DO_RASTER,0.0f);
/* Read out bounding box */
ResultBox.llx =area->xmin;
ResultBox.urx =area->xmax;
@@ -273,7 +274,7 @@
is not yet loaded into memory. or an invalid ID has been specified. */
float T1_GetUnderlinePosition( int FontID)
{
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(0.0);
}
@@ -288,7 +289,7 @@
is not yet loaded into memory. or an invalid ID has been specified. */
float T1_GetUnderlineThickness( int FontID)
{
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(0.0);
}
@@ -302,7 +303,7 @@
is not yet loaded into memory. or an invalid ID has been specified. */
float T1_GetItalicAngle( int FontID)
{
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(0.0);
}
@@ -317,7 +318,7 @@
is not yet loaded into memory. or an invalid ID has been specified. */
int T1_GetIsFixedPitch( int FontID)
{
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(0.0);
}
@@ -334,7 +335,7 @@
{
static char fontname[MAXPSNAMELEN];
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(NULL);
}
@@ -356,7 +357,7 @@
{
static char fullname[MAXPSNAMELEN];
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(NULL);
}
@@ -378,7 +379,7 @@
{
static char familyname[MAXPSNAMELEN];
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(NULL);
}
@@ -400,7 +401,7 @@
{
static char weight[128];
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(NULL);
}
@@ -422,7 +423,7 @@
{
static char version[2048];
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(NULL);
}
@@ -444,7 +445,7 @@
{
static char notice[2048];
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(NULL);
}
@@ -469,7 +470,7 @@
char *c1;
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(NULL);
}
@@ -518,7 +519,7 @@
int i,j;
/* Check whether font is loaded: */
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(-1);
}
@@ -600,7 +601,7 @@
psobj *objptr;
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(-1);
}
@@ -654,7 +655,7 @@
static int indices[257];
- if (CheckForFontID(FontID)!=1) {
+ if (T1_CheckForFontID(FontID)!=1) {
T1_errno=T1ERR_INVALID_FONTID;
return(NULL);
}
@@ -711,7 +712,7 @@
ustring=(unsigned char *) string;
/* First, check for a correct ID */
- i=CheckForFontID(FontID);
+ i=T1_CheckForFontID(FontID);
if (i!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(0);
@@ -733,52 +734,76 @@
else /* use value given on command line */
no_chars=len;
- /* Allocate room for temporary arrays of kerning and width arrays: */
- kern_pairs=(int *)calloc(no_chars -1, sizeof(int));
- if (kern_pairs==NULL){
- T1_errno=T1ERR_ALLOC_MEM;
- return(0);
- }
- charwidths=(int *)calloc(no_chars, sizeof(int));
- if (charwidths==NULL){
- T1_errno=T1ERR_ALLOC_MEM;
- return(0);
- }
+ switch (no_chars) {
+ case 0:
+ /* Empty string has width 0 */
+ stringwidth=0;
+ break;
+
+ case 1:
+ /* Width of string with 1 character is the width of that character.
+ If the character is a space, adjust by the value of spaceoff.
+ */
+ stringwidth=T1_GetCharWidth(FontID,ustring[0]);
+ if (ustring[0]==pFontBase->pFontArray[FontID].space_position)
+ stringwidth+=spaceoff;
+ break;
+
+ default:
+ /* Two or more characters. Add widths of characters and adjust by
+ the adjustment widths for any kerning pairs. For spaces, use the
+ width of the space character in the font adjusted by the value of
+ spaceoff.
+ */
+
+ /* Allocate room for temporary arrays of kerning and width arrays: */
+ kern_pairs=(int *)calloc(no_chars -1, sizeof(int));
+ if (kern_pairs==NULL){
+ T1_errno=T1ERR_ALLOC_MEM;
+ return(0);
+ }
+ charwidths=(int *)calloc(no_chars, sizeof(int));
+ if (charwidths==NULL){
+ T1_errno=T1ERR_ALLOC_MEM;
+ return(0);
+ }
- /* If kerning is requested, get kerning amounts and fill the array: */
- if (kerning){
- for (i=0; i<no_chars -1; i++){
- kern_pairs[i]=T1_GetKerning( FontID, ustring[i], ustring[i+1]);
- }
- }
+ /* If kerning is requested, get kerning amounts and fill the array: */
+ if (kerning){
+ for (i=0; i<no_chars -1; i++){
+ kern_pairs[i]=T1_GetKerning( FontID, ustring[i], ustring[i+1]);
+ }
+ }
- /* Compute the correct spacewidth value (in charspace units): */
- spacewidth=T1_GetCharWidth(FontID,pFontBase->pFontArray[FontID].space_position)+spaceoff;
+ /* Compute the correct spacewidth value (in charspace units): */
+ spacewidth=T1_GetCharWidth(FontID,pFontBase->pFontArray[FontID].space_position)+spaceoff;
- /* Fill the width-array: */
- for (i=0; i<no_chars; i++){
- if (ustring[i]==pFontBase->pFontArray[FontID].space_position)
- charwidths[i]=(int)spacewidth;
- else
- charwidths[i]=T1_GetCharWidth(FontID,ustring[i]);
- }
+ /* Fill the width-array: */
+ for (i=0; i<no_chars; i++){
+ if (ustring[i]==pFontBase->pFontArray[FontID].space_position)
+ charwidths[i]=(int)spacewidth;
+ else
+ charwidths[i]=T1_GetCharWidth(FontID,ustring[i]);
+ }
- /* Accumulate width: */
- stringwidth=0;
- for (i=0; i<no_chars-1; i++){
- stringwidth += kern_pairs[i];
- }
- for (i=0; i<no_chars; i++){
- stringwidth += charwidths[i];
- }
+ /* Accumulate width: */
+ stringwidth=0;
+ for (i=0; i<no_chars-1; i++){
+ stringwidth += kern_pairs[i];
+ }
+ for (i=0; i<no_chars; i++){
+ stringwidth += charwidths[i];
+ }
- /* free memory: */
- free( charwidths);
- free( kern_pairs);
+ /* free memory: */
+ free( charwidths);
+ free( kern_pairs);
+
+ break;
+ }
/* .. and return result: */
return( stringwidth);
-
}
@@ -808,7 +833,7 @@
/* First, check for a correct ID */
- i=CheckForFontID(FontID);
+ i=T1_CheckForFontID(FontID);
if (i!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(NullBBox);
@@ -902,7 +927,7 @@
/* First, check for a correct ID */
- i=CheckForFontID(FontID);
+ i=T1_CheckForFontID(FontID);
if (i!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(metrics);
@@ -977,7 +1002,7 @@
struct ps_obj *obj;
/* return Null-box if font not loaded */
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(outbox);
}
@@ -1019,7 +1044,7 @@
int bufmemsize=0;
/* return NULL if font not loaded */
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return( NULL);
}
@@ -1077,7 +1102,7 @@
{
/* Check whether font is loaded: */
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return( -1);
}
@@ -1116,7 +1141,7 @@
{
/* Check whether font is loaded: */
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return( -1);
}
@@ -1151,7 +1176,7 @@
uchar1=char1;
/* Check whether font is loaded: */
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return( -2);
}
@@ -1184,7 +1209,7 @@
unsigned char uchar1;
/* Check whether font is loaded: */
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return( cci);
}
@@ -1253,7 +1278,7 @@
int i;
/* Check whether font is loaded: */
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return( cci);
}
@@ -1312,7 +1337,7 @@
int len, i, j;
/* return NULL if font not loaded */
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return( -1);
}
diff -Nru t1lib-grace/T1lib/t1lib/t1global.h t1lib-deb/T1lib/t1lib/t1global.h
--- t1lib-grace/T1lib/t1lib/t1global.h 2002-01-03 13:15:15.000000000 -0800
+++ t1lib-deb/T1lib/t1lib/t1global.h 2007-12-23 07:49:42.000000000 -0800
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------------
----- File: t1global.h
----- Author: Rainer Menzner (Rainer.Menzner@web.de)
- ----- Date: 2001-04-01
+ ----- Date: 2005-05-16
----- Description: This file is part of the t1-library. It contains
global declarations used by the t1-library.
----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2001.
@@ -99,6 +99,7 @@
char** T1_AFM_ptr=NULL;
char** T1_ENC_ptr=NULL;
char** T1_FDB_ptr=NULL;
+char** T1_FDBXLFD_ptr=NULL;
/* We use a uchar buffer for error and warning messages: */
char err_warn_msg_buf[1024];
diff -Nru t1lib-grace/T1lib/t1lib/t1lib.h t1lib-deb/T1lib/t1lib/t1lib.h
--- t1lib-grace/T1lib/t1lib/t1lib.h 2002-01-03 13:15:15.000000000 -0800
+++ t1lib-deb/T1lib/t1lib/t1lib.h 2007-12-23 07:49:42.000000000 -0800
@@ -1,12 +1,12 @@
/*--------------------------------------------------------------------------
----- File: t1lib.h
----- Author: Rainer Menzner (Rainer.Menzner@web.de)
- ----- Date: 2001-10-03
+ ----- Date: 2004-12-19
----- Description: This file is part of the t1-library. It must be
included by the user of the t1lib. It contains
function declarations and some basic data types, the
user must deal with.
- ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2001.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2004.
As of version 0.5, t1lib is distributed under the
GNU General Public Library Lincense. The
conditions can be found in the files LICENSE and
@@ -38,6 +38,15 @@
extern "C" {
#endif
+/* Version information filled in by configure */
+#define T1LIB_VERSION 5
+#define T1LIB_REVISION 1
+#define T1LIB_PATCHLEVEL 2
+#define T1LIB_VERSIONSTRING "5.1.2"
+
+/* Data Type information filled in by configure. */
+typedef short T1_int16;
+typedef int T1_int32;
/* the data structure which contains the character bitmap description */
typedef struct
@@ -165,6 +174,7 @@
#define T1ERR_NO_AFM_DATA 16
#define T1ERR_X11 17
#define T1ERR_COMPOSITE_CHAR 18
+#define T1ERR_SCAN_ENCODING 19
/* Flags to control the rasterizer */
@@ -182,14 +192,14 @@
/* definitions for outline handling */
#define FRACTBITS 16 /* number of fractional bits in 'fractpel' */
/* From/to conversion of pels/fractpels */
-#define T1_TOPATHPOINT(p) (((long)p)<<FRACTBITS)
+#define T1_TOPATHPOINT(p) (((T1_int32)p)<<FRACTBITS)
#define PPHALF (1<<(FRACTBITS-1))
#define T1_NEARESTPOINT(fp) (((fp)+PPHALF)>>FRACTBITS)
/* A fractional point */
typedef struct {
- long x;
- long y;
+ T1_int32 x;
+ T1_int32 y;
} T1_PATHPOINT;
@@ -264,17 +274,13 @@
extern int T1_AddFont( char *fontfilename);
extern void T1_PrintLog( char *func_ident, char *msg_txt, int level, ...);
extern void T1_SetLogLevel( int level);
-extern int CheckForInit(void);
-extern int CheckForFontID( int FontID);
-extern int test_for_t1_file( char *buffer );
+extern int T1_CheckForInit(void);
+extern int T1_CheckForFontID( int FontID);
extern char *T1_GetFontFileName( int FontID);
-extern int T1_Get_no_fonts(void);
+extern int T1_GetNoFonts(void);
extern int T1_SetDeviceResolutions( float x_res, float y_res);
extern int T1_CopyFont( int FontID);
extern int T1_QueryX11Support( void);
-extern void bin_dump_c(unsigned char value);
-extern void bin_dump_s(unsigned short value);
-extern void bin_dump_l(unsigned long value);
extern int T1_CheckEndian(void);
extern int T1_SetBitmapPad( int pad);
extern int T1_GetBitmapPad( void);
@@ -284,6 +290,7 @@
extern int T1_SetAfmFileName( int FontId, char *afm_name);
extern char *T1_GetFontFilePath( int FontID);
extern char *T1_GetAfmFilePath( int FontID);
+extern const char *T1_StrError( int t1err);
/* from t1delete.c */
extern int T1_DeleteSize( int FontID, float size);
@@ -345,10 +352,7 @@
/* from t1load.c */
extern int T1_LoadFont( int FontID);
-extern int openFontMetricsFile( int FontID);
-extern void *CreateNewFontSize( int FontID, float size, int aa);
-extern void *GetLastFontSize( int FontID);
-extern void *QueryFontSize( int FontID, float size, int aa);
+extern void *T1_QueryFontSize( int FontID, float size, int aa);
/* from t1set.c */
extern GLYPH *T1_SetChar( int FontID, char charcode,
@@ -356,6 +360,9 @@
extern GLYPH *T1_SetString( int FontID, char *string, int len,
long spaceoff, int modflag,
float size, T1_TMATRIX *transform);
+extern GLYPH* T1_SetRect( int FontID, float size,
+ float width, float height,
+ T1_TMATRIX *transform);
extern GLYPH *T1_CopyGlyph(GLYPH *glyph);
extern void T1_DumpGlyph( GLYPH *glyph);
extern GLYPH *T1_ConcatGlyphs( GLYPH *glyph1, GLYPH *glyph2,
@@ -384,6 +391,12 @@
extern T1_TMATRIX *T1_TransformMatrix( T1_TMATRIX *matrix,
double cxx, double cyx,
double cxy, double cyy);
+extern int T1_StrokeFont( int FontID, int dostroke);
+extern int T1_SetStrokeFlag( int FontID);
+extern int T1_ClearStrokeFlag( int FontID);
+extern int T1_GetStrokeMode( int FontID);
+extern int T1_SetStrokeWidth( int FontID, float strokewidth);
+extern float T1_GetStrokeWidth( int FontID);
/* from t1aaset.c */
@@ -392,6 +405,9 @@
extern GLYPH *T1_AASetString( int FontID, char *string, int len,
long spaceoff, int modflag,
float size, T1_TMATRIX *transform);
+extern GLYPH* T1_AASetRect( int FontID, float size,
+ float width, float height,
+ T1_TMATRIX *transform);
extern int T1_AASetGrayValues(unsigned long white,
unsigned long gray75,
unsigned long gray50,
diff -Nru t1lib-grace/T1lib/t1lib/t1libx.h t1lib-deb/T1lib/t1lib/t1libx.h
--- t1lib-grace/T1lib/t1lib/t1libx.h 1969-12-31 16:00:00.000000000 -0800
+++ t1lib-deb/T1lib/t1lib/t1libx.h 2007-12-23 07:49:42.000000000 -0800
@@ -0,0 +1,93 @@
+/*--------------------------------------------------------------------------
+ ----- File: t1libx.h
+ ----- Author: Rainer Menzner (Rainer.Menzner@web.de)
+ ----- Date: 2003-01-02
+ ----- Description: This file is part of the t1-library. It must be
+ included by the user of the t1lib. It contains
+ function declarations for the X11 wrapper.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2003.
+ As of version 0.5, t1lib is distributed under the
+ GNU General Public Library Lincense. The
+ conditions can be found in the files LICENSE and
+ LGPL, which should reside in the toplevel
+ directory of the distribution. Please note that
+ there are parts of t1lib that are subject to
+ other licenses:
+ The parseAFM-package is copyrighted by Adobe Systems
+ Inc.
+ The type1 rasterizer is copyrighted by IBM and the
+ X11-consortium.
+ ----- Warranties: Of course, there's NO WARRANTY OF ANY KIND :-)
+ ----- Credits: I want to thank IBM and the X11-consortium for making
+ their rasterizer freely available.
+ Also thanks to Piet Tutelaers for his ps2pk, from
+ which I took the rasterizer sources in a format
+ independent from X11.
+ Thanks to all people who make free software living!
+--------------------------------------------------------------------------*/
+
+
+#ifndef T1LIBX_H_INCLUDED
+
+#define T1LIBX_H_INCLUDED
+
+
+#ifndef _XLIB_H_
+#include <X11/Xlib.h>
+#endif
+
+
+#define T1LIB_X11_SUPPORT
+
+/* For paint mode of X-rastering functions */
+#define T1_OPAQUE 0x1
+#define T1_TRANSPARENT 0x0
+
+
+/* type definitions, needed by the user: */
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+
+/* from t1x11.c */
+extern int T1_SetX11Params( Display *display,
+ Visual *visual,
+ unsigned int depth,
+ Colormap colormap);
+extern GLYPH *T1_SetCharX( Drawable d, GC gc, int mode, int x, int y,
+ int FontID, char charcode,
+ float size, T1_TMATRIX *transform);
+extern GLYPH *T1_SetStringX( Drawable d, GC gc, int mode, int x, int y,
+ int FontID, char *string, int len,
+ long spaceoff, int modflag,
+ float size, T1_TMATRIX *transform);
+extern GLYPH *T1_SetRectX( Drawable d, GC gc, int mode, int x_dest, int y_dest,
+ int FontID, float size,
+ float width, float height,
+ T1_TMATRIX *transform);
+extern GLYPH *T1_AASetCharX( Drawable d, GC gc, int mode, int x, int y,
+ int FontID, char charcode,
+ float size, T1_TMATRIX *transform);
+extern GLYPH *T1_AASetStringX( Drawable d, GC gc, int mode, int x, int y,
+ int FontID, char *string, int len,
+ long spaceoff, int modflag,
+ float size, T1_TMATRIX *transform);
+extern GLYPH *T1_AASetRectX( Drawable d, GC gc, int mode, int x_dest, int y_dest,
+ int FontID, float size,
+ float width, float height,
+ T1_TMATRIX *transform);
+extern int T1_ComputeAAColorsX( unsigned long fg,
+ unsigned long bg,
+ int nolevels);
+extern int T1_GetDepthOfDrawable( Drawable drawable);
+extern void T1_LogicalPositionX( int pos_switch);
+extern XImage *T1_XImageFromGlyph( GLYPH *pglyph);
+
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif /* T1LIBX_H_INCLUDED */
diff -Nru t1lib-grace/T1lib/t1lib/t1load.c t1lib-deb/T1lib/t1lib/t1load.c
--- t1lib-grace/T1lib/t1lib/t1load.c 2002-07-29 13:37:48.000000000 -0700
+++ t1lib-deb/T1lib/t1lib/t1load.c 2007-12-23 07:49:42.000000000 -0800
@@ -1,11 +1,11 @@
/*--------------------------------------------------------------------------
----- File: t1load.c
----- Author: Rainer Menzner (Rainer.Menzner@web.de)
- ----- Date: 2001-10-03
+ ----- Date: 2007-12-23
----- Description: This file is part of the t1-library. It contains
functions for loading fonts and for managing size
dependent data.
- ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2001.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2007.
As of version 0.5, t1lib is distributed under the
GNU General Public Library Lincense. The
conditions can be found in the files LICENSE and
@@ -30,6 +30,15 @@
#define ANSI_REALLOC_VM
+/* Note: On some systems, like e.g. my Linux box, realloc() frequently returns
+ the identical pointer, if the memory chunk is *decreased* in size. As
+ a consequence, pointer shifting (as implemented below) would never
+ actually appear. The following definition enforces pointer shifting,
+ and hence allows to check pointer shifting on every system. Do not
+ activate this, it is meant for testing only!
+*/
+/* #define ANSI_REALLOC_ENFORCE_POINTERSHIFTING */
+
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -53,6 +62,7 @@
#include "../type1/util.h"
#include "../type1/fontfcn.h"
#include "../type1/blues.h"
+#include "../type1/paths.h"
#include "../type1/regions.h"
@@ -77,7 +87,7 @@
int T1_LoadFont( int FontID)
{
- int i, j, k, l, m;
+ int i, j, k, l, m, n;
char *FileName, *FileNamePath;
int mode; /* This is used by the type1-library for error reporting */
char *charname;
@@ -100,13 +110,13 @@
int char1, char2;
- if (CheckForInit()){
+ if (T1_CheckForInit()){
T1_errno=T1ERR_OP_NOT_PERMITTED;
return(-1);
}
- i=CheckForFontID(FontID);
+ i=T1_CheckForFontID(FontID);
if (i==1)
return(0); /* Font already loaded */
if (i==-1){
@@ -150,6 +160,40 @@
free(FileNamePath);
+ /* Set some default for FontBBox and Encoding if the font does not provide
+ correct data. Strictly taken, these fonts do not adhere to the Type1
+ specification. However, it is easy to work around and find reasonable
+ defaults. This solution has been proposed by the Debian community (see
+ http://bugs.debian.org/313236). */
+ /* 1. FontBBox. We set default values of 0 which is recommended by Adobe
+ in cases where the font does not make use of the SEAC primitive. Later on,
+ if AFM fallback info is computed, these settings might be overwritten with
+ meaningful values. */
+ if (pFontBase->pFontArray[FontID].pType1Data->fontInfoP[FONTBBOX].value.data.arrayP == NULL) {
+ if ((pFontBase->pFontArray[FontID].pType1Data->fontInfoP[FONTBBOX].value.data.arrayP =
+ (psobj *)vm_alloc(4 * sizeof(psobj))) == NULL) {
+ T1_PrintLog( "T1_LoadFont()", "Error allocating memory for fontbbox objects (FontID=%d)",
+ T1LOG_ERROR, FontID);
+ T1_errno=T1ERR_ALLOC_MEM;
+ return(-1);
+ }
+ for (n = 0; n < 4; n++) {
+ pFontBase->pFontArray[FontID].pType1Data->fontInfoP[FONTBBOX].value.data.arrayP[n].type = OBJ_INTEGER;
+ pFontBase->pFontArray[FontID].pType1Data->fontInfoP[FONTBBOX].value.data.arrayP[n].len = 0;
+ pFontBase->pFontArray[FontID].pType1Data->fontInfoP[FONTBBOX].value.data.arrayP[n].data.integer = 0;
+ }
+ T1_PrintLog( "T1_LoadFont()", "Missing FontBBox, adding a trivial one in order to avoid crashes (FontID=%d)",
+ T1LOG_WARNING, FontID);
+ }
+ /* 2. Encoding. In this case, we simply fallback to Standard Encoding. */
+ if (pFontBase->pFontArray[FontID].pFontEnc == NULL &&
+ pFontBase->pFontArray[FontID].pType1Data->fontInfoP[ENCODING].value.data.arrayP == NULL) {
+ pFontBase->pFontArray[FontID].pType1Data->fontInfoP[ENCODING].value.data.valueP = (char *) StdEncArrayP;
+ T1_PrintLog( "T1_LoadFont()", "Missing, invalid or undefined Encoding, setting up Standard Encoding in order to avoid crashes (FontID=%d)",
+ T1LOG_WARNING, FontID);
+ }
+
+
/* Store the base address of virtual memory and realloc in order not
to waste too much memory: */
pFontBase->pFontArray[FontID].vm_base=vm_base;
@@ -158,7 +202,12 @@
/* Get size of VM, ... */
tmp_size=((unsigned long)vm_used - (unsigned long)vm_base);
/* ... realloc to that size ... */
- tmp_ptr=(char *)realloc(vm_base, tmp_size);
+#ifdef ANSI_REALLOC_ENFORCE_POINTERSHIFTING
+ tmp_ptr=(char *)malloc( tmp_size);
+ memcpy( tmp_ptr, vm_base, tmp_size);
+#else
+ tmp_ptr=(char *)realloc(vm_base, tmp_size);
+#endif
/* ... and shift all pointers refering to that area */
if (tmp_ptr > vm_base){
shift= (unsigned long)tmp_ptr - (unsigned long)vm_base;
@@ -211,24 +260,18 @@
}
/* The encoding needs special treatment: */
if (pFontBase->pFontArray[FontID].pType1Data->fontInfoP[j].value.type==OBJ_ENCODING){
- /* If a builtin encoding is used, it is sufficient to shift the pointer
- to the Encoding since the character-namestrings of builtin encodings
- are static and thus located on the heap.
- For font-specific encoding, character-namestrings reside in VM and
- thus each entry has to be shifted.
- Caution: We still have to shift the builtin encoding-pointer, since
- they also point to are located in VM: */
- ldummy=(long)StdEncArrayP;
- ldummy +=shift;
- StdEncArrayP=(psobj *)ldummy;
- ldummy=(long)pFontBase->pFontArray[FontID].pType1Data->fontInfoP[j].value.data.valueP;
- ldummy +=shift;
- pFontBase->pFontArray[FontID].pType1Data->fontInfoP[j].value.data.valueP=(char *)ldummy;
+ /* If builtin StandardEncoding is used, we do nothing here. Standard Encoding
+ is now located once for all fonts on the heap. For font-specific encodings
+ we have to move all pointers appropriately, because this is entirely located
+ in VM */
if (pFontBase->pFontArray[FontID].pType1Data->fontInfoP[j].value.data.arrayP
- == StdEncArrayP){ /* Font uses builtin standard encoding */
+ == StdEncArrayP){ /* Font uses builtin StandardEncoding */
;
}
else{ /* Font-specific encoding */
+ ldummy=(long)pFontBase->pFontArray[FontID].pType1Data->fontInfoP[j].value.data.valueP;
+ ldummy +=shift;
+ pFontBase->pFontArray[FontID].pType1Data->fontInfoP[j].value.data.valueP=(char *)ldummy;
for (k=0; k<256; k++){
ldummy=(long)pFontBase->pFontArray[FontID].pType1Data->fontInfoP[j].value.data.arrayP[k].data.arrayP;
/* The ".notdef" is also static and may not be shifted (Thanks, Derek ;) */
@@ -346,24 +389,18 @@
}
/* The encoding needs special treatment: */
if (pFontBase->pFontArray[FontID].pType1Data->fontInfoP[j].value.type==OBJ_ENCODING){
- /* If a builtin encoding is used, it is sufficient to shift the pointer
- to the Encoding since the character-namestrings of builtin encodings
- are static and thus located on the heap.
- For font-specific encoding, character-namestrings reside in VM and
- thus each entry has to be shifted.
- Caution: We still have to shift the builtin encoding-pointer, since
- they also point to are located in VM: */
- ldummy=(long)StdEncArrayP;
- ldummy -=shift;
- StdEncArrayP=(psobj *)ldummy;
- ldummy=(long)pFontBase->pFontArray[FontID].pType1Data->fontInfoP[j].value.data.valueP;
- ldummy -=shift;
- pFontBase->pFontArray[FontID].pType1Data->fontInfoP[j].value.data.valueP=(char *)ldummy;
+ /* If builtin StandardEncoding is used, we do nothing here. Standard Encoding
+ is now located once for all fonts on the heap. For font-specific encodings
+ we have to move all pointers appropriately, because this is entirely located
+ in VM */
if (pFontBase->pFontArray[FontID].pType1Data->fontInfoP[j].value.data.arrayP
- == StdEncArrayP){ /* Font uses builtin encoding */
+ == StdEncArrayP){ /* Font uses builtin StandardEncoding */
;
}
else{ /* Font-specific encoding */
+ ldummy=(long)pFontBase->pFontArray[FontID].pType1Data->fontInfoP[j].value.data.valueP;
+ ldummy -=shift;
+ pFontBase->pFontArray[FontID].pType1Data->fontInfoP[j].value.data.valueP=(char *)ldummy;
for (k=0; k<256; k++){
ldummy=(long)pFontBase->pFontArray[FontID].pType1Data->fontInfoP[j].value.data.arrayP[k].data.arrayP;
/* The ".notdef" is also static and may not be shifted (Thanks, Derek ;) */
@@ -436,6 +473,11 @@
(unsigned long)vm_base);
T1_PrintLog( "T1_LoadFont()", err_warn_msg_buf, T1LOG_DEBUG);
}
+#ifdef ANSI_REALLOC_ENFORCE_POINTERSHIFTING
+ /* If pointer shifting had been enforced by allocating from
+ scratch using malloc() free the previous vm. */
+ free( vm_base);
+#endif
#endif
/* Generate a message how much VM the current font consumes */
@@ -608,6 +650,7 @@
}
/* We now create an encoding-specific kerning table which will speed up
looking for kerning pairs! */
+ pFontBase->pFontArray[FontID].KernMapSize=0;
/* First, get number of defined kerning pairs: */
k=pFontBase->pFontArray[FontID].pAFMData->numOfPairs;
if (k>0){ /* i.e., there are any pairs */
@@ -850,7 +893,7 @@
-/* CreateNewFontSize( FontID, size): Create a new size "size" of font
+/* T1int_CreateNewFontSize( FontID, size): Create a new size "size" of font
"FontID" and allocate all data necessary for this. The data
structure is connected to the linked list of FontSizeDeps for this
font. Returns a pointer to the newly created FontSizeDeps-struct
@@ -863,7 +906,7 @@
2: low-antialiased bytemaps are stored in this struct
4: high-antialiased bytemaps are stored in this struct
*/
-FONTSIZEDEPS *CreateNewFontSize( int FontID, float size, int aa)
+FONTSIZEDEPS *T1int_CreateNewFontSize( int FontID, float size, int aa)
{
FONTSIZEDEPS *pFontSizeDeps, *pPrev;
@@ -872,7 +915,7 @@
/* First, get to the last font size in the linked list for this font.
The following routine returns the address of the last struct in the
linked list of FONTSIZEDEPS or NULL if none exists. */
- pFontSizeDeps=GetLastFontSize( FontID);
+ pFontSizeDeps=T1int_GetLastFontSize( FontID);
pPrev=pFontSizeDeps;
@@ -939,10 +982,10 @@
-/* QueryFontSize( FontID, size, aa): Search if a requested size of font
+/* T1_QueryFontSize( FontID, size, aa): Search if a requested size of font
FontID is already existing. If so, it returns a pointer to the
respective FontSizeDeps-structure, otherwise NULL is returned: */
-FONTSIZEDEPS *QueryFontSize( int FontID, float size, int aa)
+FONTSIZEDEPS *T1int_QueryFontSize( int FontID, float size, int aa)
{
FONTSIZEDEPS *link_ptr;
@@ -967,10 +1010,10 @@
}
-/* FONTSIZEDEPS *GetLastFontSize( FontID): Get the address of the
+/* FONTSIZEDEPS *T1int_GetLastFontSize( FontID): Get the address of the
last struct in the linked list of FontSizeDeps or NULL if there is
no existing size dependent data. */
-FONTSIZEDEPS *GetLastFontSize( int FontID)
+FONTSIZEDEPS *T1int_GetLastFontSize( int FontID)
{
FONTSIZEDEPS *link_ptr, *result_ptr;
diff -Nru t1lib-grace/T1lib/t1lib/t1load.h t1lib-deb/T1lib/t1lib/t1load.h
--- t1lib-grace/T1lib/t1lib/t1load.h 2002-01-03 13:15:15.000000000 -0800
+++ t1lib-deb/T1lib/t1lib/t1load.h 2007-12-23 07:49:42.000000000 -0800
@@ -1,10 +1,10 @@
/*--------------------------------------------------------------------------
----- File: t1load.h
----- Author: Rainer Menzner (Rainer.Menzner@web.de)
- ----- Date: 2001-04-01
+ ----- Date: 2002-12-02
----- Description: This file is part of the t1-library. It contains
declarations and definitions for t1load.c.
- ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2001.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2002.
As of version 0.5, t1lib is distributed under the
GNU General Public Library Lincense. The
conditions can be found in the files LICENSE and
@@ -30,9 +30,9 @@
int T1_LoadFont( int FontID);
static int openFontMetricsFile( int FontID, int open_sloppy);
-FONTSIZEDEPS *CreateNewFontSize( int FontID, float size, int aa);
-FONTSIZEDEPS *GetLastFontSize( int FontID);
-FONTSIZEDEPS *QueryFontSize( int FontID, float size, int aa);
+FONTSIZEDEPS *T1int_CreateNewFontSize( int FontID, float size, int aa);
+FONTSIZEDEPS *T1int_GetLastFontSize( int FontID);
+FONTSIZEDEPS *T1int_QueryFontSize( int FontID, float size, int aa);
int fontfcnA( char *env, int *mode, psfont *Font_Ptr);
static int cmp_METRICS_ENTRY( const void *entry1, const void *entry2);
extern char *vm_base; /* from fontfcn.c in initfont()! */
@@ -41,8 +41,8 @@
#else
extern int T1_LoadFont( int FontID);
-extern FONTSIZEDEPS *CreateNewFontSize( int FontID, float size, int aa);
-extern FONTSIZEDEPS *GetLastFontSize( int FontID);
-extern FONTSIZEDEPS *QueryFontSize( int FontID, float size, int aa);
+extern FONTSIZEDEPS *T1int_CreateNewFontSize( int FontID, float size, int aa);
+extern FONTSIZEDEPS *T1int_GetLastFontSize( int FontID);
+extern FONTSIZEDEPS *T1int_QueryFontSize( int FontID, float size, int aa);
#endif
diff -Nru t1lib-grace/T1lib/t1lib/t1misc.h t1lib-deb/T1lib/t1lib/t1misc.h
--- t1lib-grace/T1lib/t1lib/t1misc.h 2004-04-13 13:27:44.000000000 -0700
+++ t1lib-deb/T1lib/t1lib/t1misc.h 2007-12-23 07:49:42.000000000 -0800
@@ -1,10 +1,10 @@
/*--------------------------------------------------------------------------
----- File: t1misc.h
----- Author: Rainer Menzner (Rainer.Menzner@web.de)
- ----- Date: 2001-10-03
+ ----- Date: 2004-11-27
----- Description: This file is part of the t1-library. It contains
some miscellaneous definitions.
- ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2001.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2004.
As of version 0.5, t1lib is distributed under the
GNU General Public Library Lincense. The
conditions can be found in the files LICENSE and
@@ -55,7 +55,13 @@
/* The maximum length of a PostScript name of a font: */
#define MAXPSNAMELEN 256
-#define T1_MAXPATHLEN 1024
+#ifndef MAXPATHLEN
+# ifdef PATH_MAX
+# define MAXPATHLEN PATH_MAX
+# else
+# define MAXPATHLEN 4096
+# endif
+#endif
/* The default resolution used by the library */
#define DEFAULT_RES 72.0
@@ -71,7 +77,7 @@
#if defined(VMS)
# define DIRECTORY_SEP "]"
# define DIRECTORY_SEP_CHAR ']'
-#elif defined(MSDOS) | defined(_WIN32) | defined(__EMX__) | defined(_MSC_VER)
+#elif defined(MSDOS) | defined(_WIN32) | defined(_MSC_VER)
# define DIRECTORY_SEP "\\"
# define DIRECTORY_SEP_CHAR '\\'
#else
@@ -176,6 +182,7 @@
#define T1ERR_NO_AFM_DATA 16
#define T1ERR_X11 17
#define T1ERR_COMPOSITE_CHAR 18
+#define T1ERR_SCAN_ENCODING 19
/* The info_flags meaning */
@@ -183,9 +190,10 @@
#define AFM_SLOPPY_SUCCESS (short)0x0002
#define AFM_SELFGEN_SUCCESS (short)0x0004
#define USES_STANDARD_ENCODING (short)0x0008
+#define RASTER_STROKED (short)0x0010
+#define CACHE_STROKED (short)0x0020
#define FONT_NOCACHING (short)0x0100
-
#ifndef PI
#define PI 3.1415927
#endif
diff -Nru t1lib-grace/T1lib/t1lib/t1outline.c t1lib-deb/T1lib/t1lib/t1outline.c
--- t1lib-grace/T1lib/t1lib/t1outline.c 2002-01-03 13:15:15.000000000 -0800
+++ t1lib-deb/T1lib/t1lib/t1outline.c 2007-12-23 07:49:42.000000000 -0800
@@ -1,11 +1,11 @@
/*--------------------------------------------------------------------------
----- File: t1outline.c
----- Author: Rainer Menzner (Rainer.Menzner@web.de)
- ----- Date: 2001-05-27
+ ----- Date: 2005-05-01
----- Description: This file is part of the t1-library. It contains
functions for getting glyph outline descriptions of
strings and characters.
- ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2001.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2005.
As of version 0.5, t1lib is distributed under the
GNU General Public Library Lincense. The
conditions can be found in the files LICENSE and
@@ -52,8 +52,8 @@
#include "../type1/spaces.h"
#include "../type1/util.h"
#include "../type1/fontfcn.h"
-#include "../type1/regions.h"
#include "../type1/paths.h"
+#include "../type1/regions.h"
#include "t1types.h"
@@ -121,7 +121,7 @@
/* First, check for a correct ID */
- i=CheckForFontID(FontID);
+ i=T1_CheckForFontID(FontID);
if (i==-1){
T1_errno=T1ERR_INVALID_FONTID;
return(NULL);
@@ -141,8 +141,8 @@
/* font is now loaded into memory =>
Check for size: */
- if ((font_ptr=QueryFontSize( FontID, size, NO_ANTIALIAS))==NULL){
- font_ptr=CreateNewFontSize( FontID, size, NO_ANTIALIAS);
+ if ((font_ptr=T1int_QueryFontSize( FontID, size, NO_ANTIALIAS))==NULL){
+ font_ptr=T1int_CreateNewFontSize( FontID, size, NO_ANTIALIAS);
if (font_ptr==NULL){
T1_errno=T1ERR_ALLOC_MEM;
return(NULL);
@@ -175,7 +175,7 @@
fontarrayP->pFontEnc,
ucharcode, &mode,
fontarrayP->pType1Data,
- DO_NOT_RASTER);
+ DO_NOT_RASTER,0.0f);
KillSpace (Current_S);
return((T1_OUTLINE *)charpath);
@@ -224,7 +224,7 @@
ustring=(unsigned char*)string;
/* First, check for a correct ID */
- i=CheckForFontID(FontID);
+ i=T1_CheckForFontID(FontID);
if (i==-1){
T1_errno=T1ERR_INVALID_FONTID;
return(NULL);
@@ -250,8 +250,8 @@
/* font is now loaded into memory =>
Check for size: */
- if ((font_ptr=QueryFontSize( FontID, size, NO_ANTIALIAS))==NULL){
- font_ptr=CreateNewFontSize( FontID, size, NO_ANTIALIAS);
+ if ((font_ptr=T1int_QueryFontSize( FontID, size, NO_ANTIALIAS))==NULL){
+ font_ptr=T1int_CreateNewFontSize( FontID, size, NO_ANTIALIAS);
if (font_ptr==NULL){
T1_errno=T1ERR_ALLOC_MEM;
return(NULL);
@@ -326,7 +326,7 @@
no_chars, &mode,
fontarrayP->pType1Data,
kern_pairs, spacewidth,
- DO_NOT_RASTER);
+ DO_NOT_RASTER,0.0f);
KillSpace (Current_S);
/* In all cases, free memory for kerning pairs */
@@ -378,7 +378,7 @@
/* First, check for a correct ID */
- i=CheckForFontID(FontID);
+ i=T1_CheckForFontID(FontID);
if (i==-1){
T1_errno=T1ERR_INVALID_FONTID;
return(NULL);
@@ -398,8 +398,8 @@
/* font is now loaded into memory =>
Check for size: */
- if ((font_ptr=QueryFontSize( FontID, size, NO_ANTIALIAS))==NULL){
- font_ptr=CreateNewFontSize( FontID, size, NO_ANTIALIAS);
+ if ((font_ptr=T1int_QueryFontSize( FontID, size, NO_ANTIALIAS))==NULL){
+ font_ptr=T1int_CreateNewFontSize( FontID, size, NO_ANTIALIAS);
if (font_ptr==NULL){
T1_errno=T1ERR_ALLOC_MEM;
return(NULL);
diff -Nru t1lib-grace/T1lib/t1lib/t1outline.h t1lib-deb/T1lib/t1lib/t1outline.h
--- t1lib-grace/T1lib/t1lib/t1outline.h 2002-01-03 13:15:15.000000000 -0800
+++ t1lib-deb/T1lib/t1lib/t1outline.h 2007-12-23 07:49:42.000000000 -0800
@@ -1,10 +1,10 @@
/*--------------------------------------------------------------------------
----- File: t1outline.h
----- Author: Rainer Menzner (Rainer.Menzner@web.de)
- ----- Date: 2001-05-27
+ ----- Date: 2002-10-18
----- Description: This file is part of the t1-library. It contains
definitions and declarations for t1outline.c.
- ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2001.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2002.
As of version 0.5, t1lib is distributed under the
GNU General Public Library Lincense. The
conditions can be found in the files LICENSE and
@@ -72,13 +72,15 @@
struct XYspace *S, char **ev,
unsigned char index, int *mode,
psfont *Font_Ptr,
- int do_raster);
+ int do_raster,
+ float strokewidth);
extern struct region *fontfcnB_string( int FontID, int modflag,
struct XYspace *S, char **ev,
unsigned char *string, int no_chars,
int *mode, psfont *Font_Ptr,
int *kern_pairs, long spacewidth,
- int do_raster);
+ int do_raster,
+ float strokewidth);
extern struct region *fontfcnB_ByName( int FontID, int modflag,
struct XYspace *S,
char *charname,
diff -Nru t1lib-grace/T1lib/t1lib/t1set.c t1lib-deb/T1lib/t1lib/t1set.c
--- t1lib-grace/T1lib/t1lib/t1set.c 2002-01-03 13:15:15.000000000 -0800
+++ t1lib-deb/T1lib/t1lib/t1set.c 2007-12-23 07:49:42.000000000 -0800
@@ -1,11 +1,11 @@
/*--------------------------------------------------------------------------
----- File: t1set.c
----- Author: Rainer Menzner (Rainer.Menzner@web.de)
- ----- Date: 2001-05-27
+ ----- Date: 2005-05-01
----- Description: This file is part of the t1-library. It contains
functions for setting characters and strings of
characters.
- ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2001.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2005.
As of version 0.5, t1lib is distributed under the
GNU General Public Library Lincense. The
conditions can be found in the files LICENSE and
@@ -52,6 +52,7 @@
#include "../type1/spaces.h"
#include "../type1/util.h"
#include "../type1/fontfcn.h"
+#include "../type1/paths.h"
#include "../type1/regions.h"
@@ -76,6 +77,12 @@
extern char *t1_get_abort_message( int number);
extern struct region *Interior(struct segment *path, int fillrule);
extern unsigned T1_AA_TYPE32 T1aa_bg; /* white value */
+
+
+static void T1_ComputeLineParameters( int FontID, int width,
+ int mode, float size,
+ int *startx, int *endx,
+ int *starty, int *endy);
@@ -90,6 +97,99 @@
+/* bin_dump(): Print a binary dump of a byte, short and
+ long variable (used for debug purposes only): */
+static void bin_dump_c(unsigned char value, char space_flag)
+{
+ int i,j;
+
+ for (i=0;i<=7;i++){
+ if ((j=((value)>>i)&0x01))
+ printf("X");
+ else
+ printf(".");
+ }
+ if (space_flag)
+ printf(" ");
+
+}
+
+static void bin_dump_s(unsigned short value, char space_flag)
+{
+ int i,j;
+
+ if (T1_CheckEndian()){
+ for (i=8;i<=15;i++){
+ if ((j=((value)>>i)&0x01))
+ printf("X");
+ else
+ printf(".");
+ }
+ for (i=0;i<=7;i++){
+ if ((j=((value)>>i)&0x01))
+ printf("X");
+ else
+ printf(".");
+ }
+ }
+ else{
+ for (i=0;i<=15;i++){
+ if ((j=((value)>>i)&0x01))
+ printf("X");
+ else
+ printf(".");
+ }
+ }
+ if (space_flag)
+ printf(" ");
+
+}
+
+static void bin_dump_l(unsigned long value, char space_flag)
+{
+ int i,j;
+
+ if (T1_CheckEndian()){
+ for (i=24;i<=31;i++){
+ if ((j=((value)>>i)&0x01))
+ printf("X");
+ else
+ printf(".");
+ }
+ for (i=16;i<=23;i++){
+ if ((j=((value)>>i)&0x01))
+ printf("X");
+ else
+ printf(".");
+ }
+ for (i=8;i<=15;i++){
+ if ((j=((value)>>i)&0x01))
+ printf("X");
+ else
+ printf(".");
+ }
+ for (i=0;i<=7;i++){
+ if ((j=((value)>>i)&0x01))
+ printf("X");
+ else
+ printf(".");
+ }
+ }
+ else{
+ for (i=0;i<=31;i++){
+ if ((j=((value)>>i)&0x01))
+ printf("X");
+ else
+ printf(".");
+ }
+ }
+ if (space_flag)
+ printf(" ");
+
+}
+
+
+
/* T1_SetChar(...): Generate the bitmap for a character */
GLYPH *T1_SetChar( int FontID, char charcode, float size,
T1_TMATRIX *transform)
@@ -98,9 +198,11 @@
int mode;
struct region *area;
struct XYspace *Current_S;
- int cache_flag=1;
- int rot_flag=0;
+ int cache_flag = 1;
+ int rot_flag = 0;
unsigned char ucharcode;
+ float strokewidth = 0.0f;
+ volatile int strokeextraflag = 0;
FONTSIZEDEPS *font_ptr;
@@ -145,7 +247,7 @@
glyph.bpp=1;
/* First, check for a correct ID */
- i=CheckForFontID(FontID);
+ i=T1_CheckForFontID(FontID);
if (i==-1){
T1_errno=T1ERR_INVALID_FONTID;
return(NULL);
@@ -181,18 +283,42 @@
rot_flag=0;
cache_flag=1;
}
+
+ /* handle stroking stuff */
+ if ( pFontBase->pFontArray[FontID].info_flags & RASTER_STROKED) {
+ /* Stroking requested. If caching is not desired, clear cache_flag.
+ Otherwise, leave it unaffected. */
+ if ( (pFontBase->pFontArray[FontID].info_flags & CACHE_STROKED) == 0 ) {
+ /* filled glyphs are cached, indicate that character is to be rendered
+ on the fly and not to be cached */
+ strokeextraflag = 1;
+ cache_flag = 0;
+ }
+ strokewidth = pFontBase->pFontArray[FontID].StrokeWidth;
+ }
+ else {
+ /* filling requested. */
+ if ( (pFontBase->pFontArray[FontID].info_flags & CACHE_STROKED) != 0 ) {
+ /* stroked glyphs are cached, indicate that character is to be rendered
+ on the fly and not to be cached */
+ strokeextraflag = 1;
+ cache_flag = 0;
+ }
+ strokewidth = 0.0f;
+ }
+
/* font is now loaded into memory =>
Check for size: */
- if ((font_ptr=QueryFontSize( FontID, size, NO_ANTIALIAS))==NULL){
- font_ptr=CreateNewFontSize( FontID, size, NO_ANTIALIAS);
+ if ((font_ptr=T1int_QueryFontSize( FontID, size, NO_ANTIALIAS))==NULL){
+ font_ptr=T1int_CreateNewFontSize( FontID, size, NO_ANTIALIAS);
if (font_ptr==NULL){
T1_errno=T1ERR_ALLOC_MEM;
return(NULL);
}
}
else {/* size is already existent in cache */
- /* If no rotation, try to get character from cache */
- if (rot_flag==0){
+ /* If no rotation and no noncached stroking , try to get character from cache */
+ if ( (rot_flag==0) && (strokeextraflag==0) ) {
/* we don't use the .bits entry to check because in newer releases
also white glyphs (bits=NULL) are allowed. Rather, we check
whether bpp > 0! */
@@ -240,7 +366,8 @@
fontarrayP->pFontEnc,
ucharcode, &mode,
fontarrayP->pType1Data,
- DO_RASTER);
+ DO_RASTER,
+ strokewidth);
KillSpace (Current_S);
/* fill the glyph-structure */
@@ -355,6 +482,8 @@
static int lastno_chars=0;
float factor;
long spacewidth; /* This is given to fontfcnb_string() */
+ float strokewidth = 0.0f;
+ volatile int strokeextraflag = 0;
FONTSIZEDEPS *font_ptr;
@@ -467,7 +596,7 @@
cache_flag=0;
/* First, check for a correct ID */
- i=CheckForFontID(FontID);
+ i=T1_CheckForFontID(FontID);
if (i==-1){
T1_errno=T1ERR_INVALID_FONTID;
return(NULL);
@@ -507,10 +636,33 @@
cache_flag=0;
}
+ /* handle stroking stuff */
+ if ( pFontBase->pFontArray[FontID].info_flags & RASTER_STROKED) {
+ /* Stroking requested. If caching is not desired, clear cache_flag.
+ Otherwise, leave it unaffected. */
+ if ( (pFontBase->pFontArray[FontID].info_flags & CACHE_STROKED) == 0 ) {
+ /* filled glyphs are cached, indicate that character is to be rendered
+ on the fly and not to be cached */
+ strokeextraflag = 1;
+ cache_flag = 0;
+ }
+ strokewidth = pFontBase->pFontArray[FontID].StrokeWidth;
+ }
+ else {
+ /* filling requested. */
+ if ( (pFontBase->pFontArray[FontID].info_flags & CACHE_STROKED) != 0 ) {
+ /* stroked glyphs are cached, indicate that character is to be rendered
+ on the fly and not to be cached */
+ strokeextraflag = 1;
+ cache_flag = 0;
+ }
+ strokewidth = 0.0f;
+ }
+
/* font is now loaded into memory =>
Check for size: */
- if ((font_ptr=QueryFontSize( FontID, size, NO_ANTIALIAS))==NULL){
- font_ptr=CreateNewFontSize( FontID, size, NO_ANTIALIAS);
+ if ((font_ptr=T1int_QueryFontSize( FontID, size, NO_ANTIALIAS))==NULL){
+ font_ptr=T1int_CreateNewFontSize( FontID, size, NO_ANTIALIAS);
if (font_ptr==NULL){
T1_errno=T1ERR_ALLOC_MEM;
return(NULL);
@@ -583,7 +735,7 @@
*/
/* First, ensure that all needed characters are in the Cache; if not,
generate them */
- if ((rot_flag==0)){
+ if ( (rot_flag==0) && (strokeextraflag==0) ){
overallwidth=0;
for (i=0; i<no_chars; i++) {
currchar= &(font_ptr->pFontCache[ustring[i]]);
@@ -597,7 +749,8 @@
fontarrayP->pFontEnc,
ustring[i], &mode,
fontarrayP->pType1Data,
- DO_RASTER);
+ DO_RASTER,
+ strokewidth);
/* fill the glyph-structure */
if (mode > 0) {
@@ -969,6 +1122,9 @@
endmask = (char) ~(0xFF << ((start+string_glyph.metrics.advanceX) % 8));
Target_c= (unsigned char *)(string_glyph.bits +(i*paddedW/8)
+ (start / 8));
+ if (!Target_c) {
+ continue;
+ }
j=middle;
if (j == 0)
*Target_c++ |= startmask & endmask;
@@ -994,6 +1150,9 @@
endmask = (char) ~(0xFF << ((start+string_glyph.metrics.advanceX) % 8));
Target_c= (unsigned char *)(string_glyph.bits +(i*paddedW/8)
+ (start / 8));
+ if (!Target_c) {
+ continue;
+ }
j=middle;
if (j == 0)
*Target_c++ |= startmask & endmask;
@@ -1019,6 +1178,9 @@
endmask = (char) ~(0xFF << ((start+string_glyph.metrics.advanceX) % 8));
Target_c= (unsigned char *)(string_glyph.bits +(i*paddedW/8)
+ (start / 8));
+ if (!Target_c) {
+ continue;
+ }
j=middle;
if (j == 0)
*Target_c++ |= startmask & endmask;
@@ -1055,7 +1217,8 @@
ustring, no_chars, &mode,
fontarrayP->pType1Data,
kern_pairs, spacewidth,
- DO_RASTER);
+ DO_RASTER,
+ strokewidth);
KillSpace (Current_S);
/* In all cases, free memory for kerning pairs */
@@ -1378,10 +1541,10 @@
/* This function will essentially return the bounding box of the
line-rule */
-void T1_ComputeLineParameters( int FontID, int mode,
- int width, float size,
- int *startx, int *endx,
- int *starty, int *endy)
+static void T1_ComputeLineParameters( int FontID, int mode,
+ int width, float size,
+ int *startx, int *endx,
+ int *starty, int *endy)
{
float position=0.0, thickness=0.0;
int startx1, startx2, endx1, endx2;
@@ -1902,3 +2065,185 @@
}
+
+
+/* T1_SetRect(): Raster a rectangle, whose size is given in charspace units.
+ The resulting glyph does not cause any escapement. */
+GLYPH* T1_SetRect( int FontID, float size,
+ float width, float height, T1_TMATRIX *transform)
+{
+ int i;
+ int mode;
+ struct region *area;
+ struct XYspace *Current_S;
+ float strokewidth = 0.0f;
+
+ FONTSIZEDEPS *font_ptr;
+ FONTPRIVATE *fontarrayP;
+
+ volatile int memsize=0;
+ LONG h,w;
+ LONG paddedW;
+
+ static GLYPH glyph={NULL,{0,0,0,0,0,0},NULL,1};
+
+
+ /* We return to this if something goes wrong deep in the rasterizer */
+ if ((i=setjmp( stck_state))!=0) {
+ T1_errno=T1ERR_TYPE1_ABORT;
+ sprintf( err_warn_msg_buf, "t1_abort: Reason: %s",
+ t1_get_abort_message( i));
+ T1_PrintLog( "T1_SetRect()", err_warn_msg_buf,
+ T1LOG_ERROR);
+ return( NULL);
+ }
+
+ font_ptr = NULL;
+
+ /* Reset character glyph, if necessary */
+ if (glyph.bits!=NULL){
+ free(glyph.bits);
+ glyph.bits=NULL;
+ }
+ glyph.metrics.leftSideBearing=0;
+ glyph.metrics.rightSideBearing=0;
+ glyph.metrics.advanceX=0;
+ glyph.metrics.advanceY=0;
+ glyph.metrics.ascent=0;
+ glyph.metrics.descent=0;
+ glyph.pFontCacheInfo=NULL;
+ glyph.bpp=1;
+
+ /* First, check for a correct ID. */
+ i=T1_CheckForFontID(FontID);
+ if ( i == -1 ) {
+ return NULL;
+ }
+ /* if necessary load font into memory */
+ if ( i == 0 )
+ if ( T1_LoadFont( FontID) )
+ return NULL;
+
+ /* Check for valid size */
+ if (size<=0.0){
+ T1_errno=T1ERR_INVALID_PARAMETER;
+ return(NULL);
+ }
+
+ /* Assign padding value */
+ T1_pad=pFontBase->bitmap_pad;
+ if (pFontBase->endian)
+ T1_byte=1;
+ else
+ T1_byte=0;
+ T1_wordsize=T1_pad;
+
+ if ( i > 0 ) {
+ /* FontID identifies a valid font */
+ fontarrayP = &(pFontBase->pFontArray[FontID]);
+
+ /* Check for size and create it if necessary */
+ if ((font_ptr=T1int_QueryFontSize( FontID, size, NO_ANTIALIAS))==NULL){
+ font_ptr=T1int_CreateNewFontSize( FontID, size, NO_ANTIALIAS);
+ if (font_ptr==NULL){
+ T1_errno=T1ERR_ALLOC_MEM;
+ return(NULL);
+ }
+ }
+
+ /* handle stroking stuff */
+ if ( fontarrayP->info_flags & RASTER_STROKED) {
+ strokewidth = pFontBase->pFontArray[FontID].StrokeWidth;
+ }
+ else {
+ strokewidth = 0.0f;
+ }
+ }
+ else {
+ fontarrayP = NULL;
+ strokewidth = 0.0f;
+ }
+
+
+ /* Setup an appropriate charspace matrix. Note that the rasterizer
+ assumes vertical values with inverted sign! Transformation should
+ create a copy of the local charspace matrix which then still has
+ to be made permanent. */
+ if ( transform != NULL ) {
+ Current_S = (struct XYspace *)
+ Permanent(Scale(Transform (font_ptr->pCharSpaceLocal,
+ transform->cxx, - transform->cxy,
+ transform->cyx, - transform->cyy),
+ DeviceSpecifics.scale_x, DeviceSpecifics.scale_y));
+ }
+ else{
+ Current_S = (struct XYspace *)
+ Permanent(Scale(Transform(font_ptr->pCharSpaceLocal,
+ 1.0, 0.0, 0.0, -1.0),
+ DeviceSpecifics.scale_x, DeviceSpecifics.scale_y));
+ }
+
+ mode=0;
+ area=fontfcnRect( width,
+ height,
+ Current_S,
+ &mode,
+ DO_RASTER,
+ strokewidth);
+ KillSpace (Current_S);
+
+ /* fill the glyph-structure */
+ if ( mode > 0 ) {
+ sprintf( err_warn_msg_buf, "fontfcnRect() set mode=%d", mode);
+ T1_PrintLog( "T1_SetRect()", err_warn_msg_buf, T1LOG_WARNING);
+ T1_errno=mode;
+ return(NULL);
+ }
+ if ( area == NULL ) {
+ T1_PrintLog( "T1_SetRect()", "area=NULL returned by fontfcnRect()", T1LOG_WARNING);
+ T1_errno=mode;
+ return(NULL);
+ }
+ h = area->ymax - area->ymin;
+ w = area->xmax - area->xmin;
+
+ paddedW = PAD(w, T1_pad);
+
+ if (h > 0 && w > 0) {
+ memsize = h * paddedW / 8 + 1;
+ /* This is for the users copy of the character, for security-reasons
+ the original pointer to the cache area is not used. The entry glyph.bits
+ is free'ed every time this function is called: */
+ glyph.bits = (char *)malloc(memsize*sizeof( char));
+ if ( glyph.bits == NULL ) {
+ T1_errno=T1ERR_ALLOC_MEM;
+ /* make sure to get rid of 'area' before leaving! */
+ KillRegion (area);
+ return(NULL);
+ }
+ }
+ else {
+ h = w = 0;
+ area->xmin = area->xmax = 0;
+ area->ymin = area->ymax = 0;
+ }
+
+ /* Assign metrics */
+ glyph.metrics.leftSideBearing = area->xmin;
+ glyph.metrics.advanceX = NEARESTPEL(area->ending.x - area->origin.x);
+ glyph.metrics.advanceY = - NEARESTPEL(area->ending.y - area->origin.y);
+ glyph.metrics.rightSideBearing = area->xmax;
+ glyph.metrics.descent = - area->ymax;
+ glyph.metrics.ascent = - area->ymin;
+
+
+ if (h > 0 && w > 0) {
+ (void) memset(glyph.bits, 0, memsize);
+ fill(glyph.bits, h, paddedW, area, T1_byte, T1_bit, T1_wordsize );
+ }
+
+ /* make sure to get rid of 'area' before leaving! */
+ KillRegion (area);
+
+ return(&glyph);
+}
diff -Nru t1lib-grace/T1lib/t1lib/t1set.h t1lib-deb/T1lib/t1lib/t1set.h
--- t1lib-grace/T1lib/t1lib/t1set.h 2002-01-03 13:15:15.000000000 -0800
+++ t1lib-deb/T1lib/t1lib/t1set.h 2007-12-23 07:49:42.000000000 -0800
@@ -1,10 +1,10 @@
/*--------------------------------------------------------------------------
----- File: t1set.h
----- Author: Rainer Menzner (Rainer.Menzner@web.de)
- ----- Date: 2001-05-27
+ ----- Date: 2003-01-02
----- Description: This file is part of the t1-library. It contains
definitions and declarations for t1set.c.
- ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2001.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2003.
As of version 0.5, t1lib is distributed under the
GNU General Public Library Lincense. The
conditions can be found in the files LICENSE and
@@ -32,16 +32,15 @@
GLYPH *T1_SetString( int FontID, char *string, volatile int len,
long spaceoff, int modflag,
float size, T1_TMATRIX *transform);
+GLYPH* T1_SetRect( int FontID, float size,
+ float width, float height,
+ T1_TMATRIX *transform);
void fill(char *dest, int h, int w,
struct region *area, int byte, int bit,
int wordsize);
void fillrun(char *p, pel x0, pel x1, int bit);
GLYPH *T1_CopyGlyph(GLYPH *glyph);
void T1_DumpGlyph( GLYPH *glyph);
-void T1_ComputeLineParameters( int FontID, int width,
- int mode, float size,
- int *startx, int *endx,
- int *starty, int *endy);
GLYPH *T1_ConcatGlyphs( GLYPH *glyph1, GLYPH *glyph2,
int x_off, int y_off, int modflag);
void T1_DumpGlyph( GLYPH *glyph);
@@ -55,6 +54,9 @@
extern GLYPH *T1_SetString( int FontID, char *string, volatile int len,
long spaceoff, int modflag,
float size, T1_TMATRIX *transform);
+extern GLYPH* T1_SetRect( int FontID, float size,
+ float width, float height,
+ T1_TMATRIX *transform);
extern void fill(char *dest, int h, int w,
struct region *area, int byte, int bit,
int wordsize);
@@ -73,15 +75,24 @@
struct XYspace *S, char **ev,
unsigned char index, int *mode,
psfont *Font_Ptr,
- int do_raster);
+ int do_raster,
+ float strokewidth);
extern struct region *fontfcnB_string( int FontID, int modflag,
struct XYspace *S, char **ev,
unsigned char *string, int no_chars,
int *mode, psfont *Font_Ptr,
int *kern_pairs, long spacewidth,
- int do_raster);
+ int do_raster,
+ float strokewidth);
extern struct region *fontfcnB_ByName( int FontID, int modflag,
struct XYspace *S,
char *charname,
int *mode, psfont *Font_Ptr,
int do_raster);
+extern struct region* fontfcnRect( float width,
+ float height,
+ struct XYspace* S,
+ int* mode,
+ int do_raster,
+ float strokewidth);
+
diff -Nru t1lib-grace/T1lib/t1lib/t1subset.c t1lib-deb/T1lib/t1lib/t1subset.c
--- t1lib-grace/T1lib/t1lib/t1subset.c 2002-07-29 13:37:48.000000000 -0700
+++ t1lib-deb/T1lib/t1lib/t1subset.c 2014-03-27 20:23:42.298776009 -0700
@@ -1,10 +1,10 @@
/*--------------------------------------------------------------------------
----- File: t1subset.c
----- Author: Rainer Menzner (Rainer.Menzner@web.de)
- ----- Date: 2001-09-09
+ ----- Date: 2005-05-01
----- Description: This file is part of the t1-library. It contains
functions for subsetting type 1 fonts.
- ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2001.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2005.
As of version 0.5, t1lib is distributed under the
GNU General Public Library Lincense. The
conditions can be found in the files LICENSE and
@@ -50,6 +50,7 @@
#include "../type1/spaces.h"
#include "../type1/util.h"
#include "../type1/fontfcn.h"
+#include "../type1/paths.h"
#include "../type1/regions.h"
@@ -58,6 +59,7 @@
#include "t1finfo.h"
#include "t1misc.h"
#include "t1base.h"
+#include "t1delete.h"
#include "t1subset.h"
/* Segment header for pfb-files (reminder):
@@ -81,6 +83,7 @@
#define SEGMENT_EOF 3
+extern psobj *StdEncArrayP; /* For accessing StandardEncoding */
static char *charstringP;
static int charstringL;
@@ -194,8 +197,6 @@
-/* A function for reading a Type 1 font file. eexec-decryption
- is done on the fly. */
char *T1_SubsetFont( int FontID,
char *mask,
unsigned int flags,
@@ -222,6 +223,7 @@
char *csdone; /* stores which charstrings already have been written */
int currstring_no=0;
char *charnameP;
+ char charnamebuf[257];
unsigned char cipher;
char rdstring[3];
char ndstring[3];
@@ -236,6 +238,8 @@
int m=0;
int n=0;
int o=0;
+ int p=0;
+
int notdefencoded=0;
int stdenc=0;
@@ -245,11 +249,17 @@
int encrypt=1; /* 1=ASCII-hex, 2=Binary, 0=None (for debugging) */
int dindex=0;
int nocharstrings=0;
+ char encmask[256]; /* Mask after resolving composite characters */
+ T1_COMP_CHAR_INFO* cci = NULL;
+ /* variables for checking SEAC's */
+ int qs_num = 0;
+ unsigned char qs_piece1 = 0;
+ unsigned char qs_piece2 = 0;
/* Otherwise we would get invalid accesses later */
- if (CheckForFontID(FontID)!=1) {
+ if (T1_CheckForFontID(FontID)!=1) {
T1_errno=T1ERR_INVALID_FONTID;
return(NULL);
}
@@ -262,13 +272,81 @@
return(NULL);
}
+ /* Reset resulting encoding mask */
for ( j=0; j<256; j++) {
- if (mask[j]!=0) {
- nocharstrings++;
- }
+ encmask[j] = 0;
}
+
+ /* Build encmask, a mask, where all required elementary character
+ definitions required are tagged. Font internal SEAC definitions
+ are evaluated at first priority, and as a fallback, also user
+ specified composite character data is taken into account.
+ */
+ for ( j=0; j<256; j++) {
+ if ( mask[j] != 0 ) {
+ /* In any case, tag slot j itself */
+ encmask[j] |= 0x01;
+ /* Now check against correctly defined SEAC (Standard
+ Encoding Accented Character). */
+ if ( (qs_num = T1int_QuerySEAC( FontID,
+ j,
+ &qs_piece1,
+ &qs_piece2
+ )) > 1 ) {
+ /* We have a SEAC --> reserve 2 additional slots,
+ the basechar and the accent. The index numbers in this case
+ always refer to to StandardEncoding, which is not necessarily
+ the font's current encoding. We indicate this by using bit 2
+ 0x2 inverse sign. */
+ encmask[qs_piece1] |= 0x2;
+ encmask[qs_piece2] |= 0x2;
+ }
+ else {
+ /* OK, it is no a SEAC, but we still check against AFM composite character
+ data definition. This is non-standard, but we give the user the chance
+ to access all single character definitions in order construct arbitrary
+ composite characters. */
+ if ( cci != NULL ) {
+ T1_FreeCompCharData( cci);
+ }
+ cci = T1_GetCompCharData( FontID, j);
+
+ if ( (cci != NULL) && (cci->numPieces > 1) ) {
+ /* Tag all components that are required to construct
+ the composite character j. */
+ for ( p=0; p<cci->numPieces; p++) {
+ encmask[cci->pieces[p].piece] |= 0x1;
+ }
+ }
+ }
+ } /* if ( mask[j] != 0 ) */
+ } /* for ... mask */
+ /* Inspect encmask, get number of atomic charstrings and check for
+ ".notdef" being encoded. */
+ for ( j=0; j<256; j++) {
+ if ( (encmask[j] & 0x01) != 0 ) {
+ ++nocharstrings;
+ /* Obtain name from current encoding */
+ charnameP=T1_GetCharName( FontID, j);
+ }
+ if ( (encmask[j] & 0x02) != 0 ) {
+ ++nocharstrings;
+ /* Obtain name from StandardEncoding */
+ strncpy( charnamebuf, (StdEncArrayP[j]).data.nameP, (StdEncArrayP[j]).len);
+ charnamebuf[StdEncArrayP[j].len] = '\0';
+ charnameP=charnamebuf;
+ }
+ if ( encmask[j] != 0 ) {
+
+ if ( strcmp(charnameP, ".notdef") == 0 ) {
+ notdefencoded=1;
+ }
+ }
+ }
+
+
/* adjust encrypting type according to flags. Default is ASCII-hex
encryption because the output may be verbatim inserted into a
PostScript-file. */
@@ -312,6 +390,7 @@
ensure that "eexec" does not get split between two reads.
Otherwise, decryption would not be started. */
retval=T1Gets(&(filebuf[i]), 1025, ifp);
+
i+=retval;
if ( (dindex==0) && (T1GetDecrypt()>0) ) {
dindex=i-retval; /* from this point on we have decrypted bytes */
@@ -319,12 +398,27 @@
dindex);
T1_PrintLog( "T1_SubsetFont()", err_warn_msg_buf,
T1LOG_DEBUG);
- }
+ }
+
+ /* Encoding handling follows.
+ Note: If the font file defines StandardEncoding (as we will check shortly),
+ but the font has been reencoded by t1lib, we enforce reencoding
+ in any case so that all characters are accessible eventually in
+ the subset.
+ */
+ if ( pFontBase->pFontArray[FontID].pFontEnc != NULL ) {
+ T1_PrintLog( "T1_SubsetFont()", "Font is reencoded by t1lib, enforcing Reencoding of subset",
+ T1LOG_DEBUG);
+ /* Set flag to enforce reenocde in case of StandardEncoding */
+ flags |= T1_SUBSET_FORCE_REENCODE;
+ /* Reset flag to enforce reenocde in case of StandardEncoding */
+ flags &= ~T1_SUBSET_SKIP_REENCODE;
+ }
- /* Encoding handling */
if (strstr( &(filebuf[i-retval]), "/Encoding")!=NULL) {
if (strstr( &(filebuf[i-retval]), "StandardEncoding")!=NULL) {
stdenc=1;
+
if ((flags & T1_SUBSET_FORCE_REENCODE)!=0) {
/* we ignore the current line ... */
i-=retval;
@@ -341,8 +435,11 @@
}
}
else {
- /* The encoding is explicitly defined in the font file. We skip the
- whole definition unless reencoding should be skipped. */
+ /* The encoding is explicitly defined in the font file. We skip copying
+ the whole definition because we will reencode the subset later, unless
+ reencoding should be skipped by means of the flag settings. If the font
+ has been reencoded by t1lib, we enforce reencoding in order to ensure
+ that all characters in the subset will be accessible (see above). */
stdenc=0;
retval=T1Gets(&(filebuf[i]), 1025, ifp);
i+=retval;
@@ -370,19 +467,22 @@
}
/* At this point, if required, the actual encoding definition
- follows */
+ follows. */
if ( reencode!=0) {
k=0;
+
+ /* Write actually required encoding slots. We only encode the
+ characters required from the current fonts encoding. Characters
+ from StandardEncoding required by composite chars are not encoded. */
for ( j=0; j<256; j++) {
- if (mask[j]!=0) {
+ if ( (encmask[j] & 0x01) !=0 ) {
charnameP=T1_GetCharName( FontID, j);
i+=sprintf( &(filebuf[i]), "dup %d /%s put\n", j,
charnameP);
k++;
- if (strcmp(charnameP, ".notdef")==0)
- notdefencoded=1;
}
}
+
/* finish encoding definition */
i+=sprintf( &(filebuf[i]), "readonly def\n");
sprintf( err_warn_msg_buf, "Encoded %d characters",
@@ -394,7 +494,7 @@
} /* end of if (...encoding handling...) */
- /* Extract the names are used for the charstring definitions.
+ /* Extract the names that are used for the charstring definitions.
We will later need them! */
if (strstr( &(filebuf[i-retval]), "/RD")!=NULL) {
sprintf( rdstring, "RD");
@@ -416,12 +516,14 @@
i-dindex);
T1_PrintLog( "T1_SubsetFont()", err_warn_msg_buf,
T1LOG_DEBUG);
+
/* if .notdef is not in the encoding mask, we have to reserve
room for the additional charstring .notdef. Note that still
nocharstrings is an upper bound estimation, which is reached
in cases where no characters are encoded more than one time. */
- if (notdefencoded==0)
- nocharstrings++;
+ if ( notdefencoded == 0 ) {
+ nocharstrings++;
+ }
i+=sprintf( &(filebuf[i]), "2 index /CharStrings %d dict dup begin\n",
nocharstrings);
@@ -461,11 +563,20 @@
/* Now, step through the specifier matrix and write only the
necessary charstrings. */
for ( j=0; j<256; j++) {
- if (mask[j]!=0) {
- charnameP=T1_GetCharName( FontID, j);
+ if (encmask[j]!=0) {
+ if ( (encmask[j] & 0x01) != 0 ) {
+ /* Obtain name from current encoding */
+ charnameP=T1_GetCharName( FontID, j);
+ }
+ else {
+ /* Obtain name from StandardEncoding */
+ strncpy( charnamebuf, (StdEncArrayP[j]).data.nameP, (StdEncArrayP[j]).len);
+ charnamebuf[StdEncArrayP[j].len] = '\0';
+ charnameP=charnamebuf;
+ }
if ((currstring_no=locateCharString( FontID, charnameP))==0) {
- /* This is mysterious, but causes no harm because .notdef
- will be substituted */
+ /* Atomic character not found. This is mysterious, but causes no harm
+ because .notdef will be substituted */
sprintf( err_warn_msg_buf, "Could not locate CS ""%s"" for index %d",
charnameP, j);
T1_PrintLog( "T1_SubsetFont()", err_warn_msg_buf,
@@ -481,8 +592,8 @@
i+=sprintf( &(filebuf[i]), " %s\n", ndstring);
csdone[currstring_no-1]=1;
sprintf( err_warn_msg_buf,
- "Processing of CS ""%s"" for index %d successful (len=%d bytes, line=%d bytes)",
- charnameP, j, charstringL, i-k);
+ "Processing of CS ""%s"" for index %d (EncMaskFlag=0x%X) successful (len=%d bytes, line=%d bytes)",
+ charnameP, j, encmask[j], charstringL, i-k);
T1_PrintLog( "T1_SubsetFont()", err_warn_msg_buf,
T1LOG_DEBUG);
}
@@ -494,8 +605,17 @@
}
}
}
- if (csdone!=NULL)
+
+ /* Get rid of temporary data */
+ if (csdone!=NULL) {
free( csdone);
+ csdone = NULL;
+ }
+ if ( cci != NULL ) {
+ free( cci);
+ cci = NULL;
+ }
+
/* All charstrings are written. Some PostScript code follows */
i+=sprintf( &(filebuf[i]),
"end\nend\nreadonly put\nnoaccess put\ndup /FontName get exch definefont pop\nmark currentfile closefile\n");
@@ -639,7 +759,7 @@
tr_len);
T1_PrintLog( "T1_SubsetFont()", err_warn_msg_buf,
T1LOG_DEBUG);
- l+=sprintf( &(trailerbuf[l]), linebuf); /* contains the PostScript trailer */
+ l+=sprintf( &(trailerbuf[l]), "%s", linebuf); /* contains the PostScript trailer */
}
/* compute size of output file */
@@ -785,7 +905,7 @@
static char *charstring=NULL;
- if (CheckForFontID(FontID)!=1) {
+ if (T1_CheckForFontID(FontID)!=1) {
T1_errno=T1ERR_INVALID_FONTID;
return(NULL);
}
@@ -826,7 +946,7 @@
int T1_GetlenIV( int FontID)
{
- if (CheckForFontID(FontID)!=1) {
+ if (T1_CheckForFontID(FontID)!=1) {
T1_errno=T1ERR_INVALID_FONTID;
return( -2);
}
diff -Nru t1lib-grace/T1lib/t1lib/t1subset.h t1lib-deb/T1lib/t1lib/t1subset.h
--- t1lib-grace/T1lib/t1lib/t1subset.h 2002-01-03 13:15:15.000000000 -0800
+++ t1lib-deb/T1lib/t1lib/t1subset.h 2007-12-23 07:49:42.000000000 -0800
@@ -1,10 +1,10 @@
/*--------------------------------------------------------------------------
----- File: t1subset.h
----- Author: Rainer Menzner (Rainer.Menzner@web.de)
- ----- Date: 2001-04-01
+ ----- Date: 2004-12-02
----- Description: This file is part of the t1-library. It contains
declarations and definitions for t1subset.c.
- ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2001.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2004.
As of version 0.5, t1lib is distributed under the
GNU General Public Library Lincense. The
conditions can be found in the files LICENSE and
@@ -49,6 +49,12 @@
extern int T1Close( FILE *f);
extern void T1io_reset( void);
+extern int T1int_QuerySEAC( int FontID,
+ unsigned char index,
+ unsigned char* piece1,
+ unsigned char* piece2
+ );
+
char *T1_SubsetFont( int FontID,
char *mask,
unsigned int flags,
diff -Nru t1lib-grace/T1lib/t1lib/t1trans.c t1lib-deb/T1lib/t1lib/t1trans.c
--- t1lib-grace/T1lib/t1lib/t1trans.c 2002-01-03 13:15:15.000000000 -0800
+++ t1lib-deb/T1lib/t1lib/t1trans.c 2007-12-23 07:49:42.000000000 -0800
@@ -1,11 +1,11 @@
/*--------------------------------------------------------------------------
----- File: t1trans.c
----- Author: Rainer Menzner (Rainer.Menzner@web.de)
- ----- Date: 2001-04-01
+ ----- Date: 2005-05-01
----- Description: This file is part of the t1-library. It contains
functions for transforming fonts and setting
line-parameters.
- ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2001.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2005.
As of version 0.5, t1lib is distributed under the
GNU General Public Library Lincense. The
conditions can be found in the files LICENSE and
@@ -51,6 +51,7 @@
#include "../type1/spaces.h"
#include "../type1/util.h"
#include "../type1/fontfcn.h"
+#include "../type1/paths.h"
#include "../type1/regions.h"
@@ -69,7 +70,7 @@
{
/* First, check for font residing in memory: */
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(-1);
}
@@ -95,7 +96,7 @@
double T1_GetExtend( int FontID)
{
/* First, check for font residing in memory: */
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(0.0);
}
@@ -115,7 +116,7 @@
{
/* First, check for font residing in memory: */
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(-1);
}
@@ -141,7 +142,7 @@
double T1_GetSlant( int FontID)
{
/* First, check for font residing in memory: */
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(0.0);
}
@@ -160,7 +161,7 @@
{
/* First, check for font residing in memory: */
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(-1);
}
@@ -190,7 +191,7 @@
T1_TMATRIX tmatrix={0.0, 0.0, 0.0, 0.0};
/* First, check for font residing in memory: */
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(tmatrix);
}
@@ -212,7 +213,7 @@
int T1_SetLinePosition( int FontID, int linetype, float value)
{
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(-1);
}
@@ -241,7 +242,7 @@
int T1_SetLineThickness( int FontID, int linetype, float value)
{
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(-1);
}
@@ -269,7 +270,7 @@
float T1_GetLinePosition( int FontID, int linetype)
{
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(0.0);
}
@@ -292,7 +293,7 @@
float T1_GetLineThickness( int FontID, int linetype)
{
- if (CheckForFontID(FontID)!=1){
+ if (T1_CheckForFontID(FontID)!=1){
T1_errno=T1ERR_INVALID_FONTID;
return(0.0);
}
@@ -534,3 +535,169 @@
}
+
+/* T1_StrokeFont(): Switch the font referenced by FontID to stroking
+ or filling. The stroked character will be cached and
+ filled characters are no longer cached and vice versa.
+ This is only allowed if no size dependent data exists.
+ Of course, the font must already have been loaded.
+ Returns 0 for success and -1 otherwise.
+ */
+int T1_StrokeFont( int FontID, int dostroke)
+{
+
+ /* First, check for font residing in memory: */
+ if ( T1_CheckForFontID( FontID) != 1 ) {
+ T1_errno = T1ERR_INVALID_FONTID;
+ return -1;
+ }
+
+ /* Second, check whether size-dependent data exists: */
+ if ( pFontBase->pFontArray[FontID].pFontSizeDeps != NULL ) {
+ T1_errno = T1ERR_OP_NOT_PERMITTED;
+ return -1;
+ }
+
+ if ( dostroke != 0 ) {
+ pFontBase->pFontArray[FontID].info_flags |= RASTER_STROKED;
+ pFontBase->pFontArray[FontID].info_flags |= CACHE_STROKED;
+ }
+ else {
+ pFontBase->pFontArray[FontID].info_flags &= ~RASTER_STROKED;
+ pFontBase->pFontArray[FontID].info_flags &= ~CACHE_STROKED;
+ }
+
+
+ return 0;
+}
+
+
+
+/* T1_SetStrokeFlag(): Return the stroke flag for font FontID.
+ Return: 0 flag has been set
+ -1 flag could not be set
+*/
+int T1_SetStrokeFlag( int FontID)
+{
+ /* First, check for font residing in memory: */
+ if ( T1_CheckForFontID(FontID) != 1 ) {
+ T1_errno = T1ERR_INVALID_FONTID;
+ return -1;
+ }
+
+ /* Set stroke flag to true */
+ pFontBase->pFontArray[FontID].info_flags |= RASTER_STROKED;
+
+ return 0;
+
+}
+
+
+
+/* T1_ClearStrokeFlag(): Reset the stroke flag for font FontID.
+ Return: 0 flag has been reset
+ -1 flag could not be reset
+*/
+int T1_ClearStrokeFlag( int FontID)
+{
+ /* First, check for font residing in memory: */
+ if ( T1_CheckForFontID(FontID) != 1 ) {
+ T1_errno = T1ERR_INVALID_FONTID;
+ return -1;
+ }
+
+ /* Reset stroke flag */
+ pFontBase->pFontArray[FontID].info_flags &= ~RASTER_STROKED;
+
+ return 0;
+
+}
+
+
+
+/* T1_GetStrokeMode(): Return the stroke flag for font FontID.
+ Return: -1 if font is not loaded.
+ 0 if flag is reset,
+ 1 if stroking is enabled for this font,
+ 2 if stroked characters are cached,
+ 3 if stroking is enabled and stroked
+ characters are cached.
+*/
+int T1_GetStrokeMode( int FontID)
+{
+ int outval = 0;
+
+ /* First, check for font residing in memory: */
+ if ( T1_CheckForFontID( FontID) != 1 ) {
+ T1_errno = T1ERR_INVALID_FONTID;
+ return -1;
+ }
+
+ if ( (pFontBase->pFontArray[FontID].info_flags & CACHE_STROKED) != 0 )
+ outval |= 0x02;
+
+ if ( (pFontBase->pFontArray[FontID].info_flags & RASTER_STROKED) != 0 )
+ outval |= 0x01;
+
+ return outval;
+
+}
+
+
+
+/* T1_SetStrokeWidth(): Set the penwidth used when stroking font FontID.
+ Return -1 If width could not be set.
+ 0 if width has been set.
+ */
+int T1_SetStrokeWidth( int FontID, float strokewidth)
+{
+ /* First, check for font residing in memory: */
+ if ( T1_CheckForFontID( FontID) != 1 ) {
+ T1_errno = T1ERR_INVALID_FONTID;
+ return -1;
+ }
+
+ /* Second, check whether caching stroked characters is enabled
+ for this font and glyph data is already existing. In this case
+ the operation is forbidden, unless the previous non-zero value
+ is just restored! */
+ if ( ((pFontBase->pFontArray[FontID].info_flags & CACHE_STROKED) != 0) &&
+ (pFontBase->pFontArray[FontID].pFontSizeDeps != NULL) &&
+ (pFontBase->pFontArray[FontID].SavedStrokeWidth != strokewidth)
+ ) {
+ T1_errno = T1ERR_OP_NOT_PERMITTED;
+ return -1;
+ }
+
+ /* OK, accept stroke width after ensuring a numerically meaningful
+ value */
+ if ( strokewidth < 0.0f ) {
+ T1_errno = T1ERR_INVALID_PARAMETER;
+ return -1;
+ }
+
+ pFontBase->pFontArray[FontID].StrokeWidth = strokewidth;
+
+ if ( strokewidth != 0.0f )
+ pFontBase->pFontArray[FontID].SavedStrokeWidth = strokewidth;
+
+ return 0;
+
+}
+
+
+
+/* T1_GetStrokeWidth(): Get the penwidth used when stroking font FontID.
+ If 0.0 is returned, it might also indicate that the font is not loaded.
+*/
+float T1_GetStrokeWidth( int FontID)
+{
+ /* First, check for font residing in memory: */
+ if ( T1_CheckForFontID( FontID) != 1 ) {
+ T1_errno = T1ERR_INVALID_FONTID;
+ return 0.0f;
+ }
+
+ return pFontBase->pFontArray[FontID].StrokeWidth;
+}
+
diff -Nru t1lib-grace/T1lib/t1lib/t1trans.h t1lib-deb/T1lib/t1lib/t1trans.h
--- t1lib-grace/T1lib/t1lib/t1trans.h 2002-01-03 13:15:15.000000000 -0800
+++ t1lib-deb/T1lib/t1lib/t1trans.h 2007-12-23 07:49:42.000000000 -0800
@@ -1,10 +1,10 @@
/*--------------------------------------------------------------------------
----- File: t1trans.h
----- Author: Rainer Menzner (Rainer.Menzner@web.de)
- ----- Date: 2001-04-01
+ ----- Date: 2002-10-19
----- Description: This file is part of the t1-library. It contains
definitions and declarations fort t1trans.c
- ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2001.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2002.
As of version 0.5, t1lib is distributed under the
GNU General Public Library Lincense. The
conditions can be found in the files LICENSE and
@@ -47,9 +47,17 @@
T1_TMATRIX *T1_TransformMatrix( T1_TMATRIX *matrix,
double cxx, double cyx,
double cxy, double cyy);
+int T1_StrokeFont( int FontID, int dostroke);
+int T1_SetStrokeFlag( int FontID);
+int T1_ClearStrokeFlag( int FontID);
+int T1_GetStrokeMode( int FontID);
+int T1_SetStrokeWidth( int FontID, float strokewidth);
+float T1_GetStrokeWidth( int FontID);
+
#else
+
extern int T1_ExtendFont( int FontID, double extend);
extern int T1_SlantFont( int FontID, double slant);
extern int T1_TransformFont( int FontID, T1_TMATRIX *matrix);
@@ -70,6 +78,12 @@
extern T1_TMATRIX *T1_TransformMatrix( T1_TMATRIX *matrix,
double cxx, double cyx,
double cxy, double cyy);
+extern int T1_StrokeFont( int FontID, int dostroke);
+extern int T1_SetStrokeFlag( int FontID);
+extern int T1_ClearStrokeFlag( int FontID);
+extern int T1_GetStrokeMode( int FontID);
+extern int T1_SetStrokeWidth( int FontID, float strokewidth);
+extern float T1_GetStrokeWidth( int FontID);
#endif
diff -Nru t1lib-grace/T1lib/t1lib/t1types.h t1lib-deb/T1lib/t1lib/t1types.h
--- t1lib-grace/T1lib/t1lib/t1types.h 2002-01-03 13:15:15.000000000 -0800
+++ t1lib-deb/T1lib/t1lib/t1types.h 2007-12-23 07:49:42.000000000 -0800
@@ -1,10 +1,10 @@
/*--------------------------------------------------------------------------
----- File: t1types.h
----- Author: Rainer Menzner (Rainer.Menzner@web.de)
- ----- Date: 2001-06-04
+ ----- Date: 2004-12-09
----- Description: This file is part of the t1-library. It contains
type definitions used by the t1-library.
- ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2001.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2004.
As of version 0.5, t1lib is distributed under the
GNU General Public Library Lincense. The
conditions can be found in the files LICENSE and
@@ -28,6 +28,7 @@
#define T1TYPES_H
+#include "sysconf.h"
typedef struct
{
@@ -74,6 +75,9 @@
float OvrLnThick;
float OvrStrkPos;
float OvrStrkThick;
+ float StrokeWidth;
+ float SavedStrokeWidth;
+
unsigned short physical; /* This entry is used to decide, whether a
font is associated with an own physical
fontfile, or whether it has been created
@@ -144,7 +148,7 @@
-/* A data that makes most important information available to user. */
+/* A data type that makes most important information available to user. */
typedef struct
{
int width; /* The glyph's width */
@@ -161,14 +165,14 @@
#define FRACTBITS 16 /* number of fractional bits in 'fractpel' */
/* From/to conversion of pels/fractpels */
-#define T1_TOPATHPOINT(p) (((long)p)<<FRACTBITS)
+#define T1_TOPATHPOINT(p) (((T1_AA_TYPE32)p)<<FRACTBITS)
#define PPHALF (1<<(FRACTBITS-1))
#define T1_NEARESTPOINT(fp) (((fp)+PPHALF)>>FRACTBITS)
/* A fractional point */
typedef struct {
- long x;
- long y;
+ T1_AA_TYPE32 x;
+ T1_AA_TYPE32 y;
} T1_PATHPOINT;
diff -Nru t1lib-grace/T1lib/t1lib/t1x11.c t1lib-deb/T1lib/t1lib/t1x11.c
--- t1lib-grace/T1lib/t1lib/t1x11.c 1969-12-31 16:00:00.000000000 -0800
+++ t1lib-deb/T1lib/t1lib/t1x11.c 2007-12-23 07:49:42.000000000 -0800
@@ -0,0 +1,1168 @@
+/*--------------------------------------------------------------------------
+ ----- File: t1x11.c
+ ----- Author: Rainer Menzner (Rainer.Menzner@web.de)
+ ----- Date: 2005-05-01
+ ----- Description: This file is part of the t1-library. It contains
+ functions for generating glyphs with data in
+ X11-Pixmap format.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2005.
+ As of version 0.5, t1lib is distributed under the
+ GNU General Public Library Lincense. The
+ conditions can be found in the files LICENSE and
+ LGPL, which should reside in the toplevel
+ directory of the distribution. Please note that
+ there are parts of t1lib that are subject to
+ other licenses:
+ The parseAFM-package is copyrighted by Adobe Systems
+ Inc.
+ The type1 rasterizer is copyrighted by IBM and the
+ X11-consortium.
+ ----- Warranties: Of course, there's NO WARRANTY OF ANY KIND :-)
+ ----- Credits: I want to thank IBM and the X11-consortium for making
+ their rasterizer freely available.
+ Also thanks to Piet Tutelaers for his ps2pk, from
+ which I took the rasterizer sources in a format
+ independent from X11.
+ Thanks to all people who make free software living!
+--------------------------------------------------------------------------*/
+
+#define T1X11_C
+
+
+#include <stdio.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <math.h>
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+#include "../type1/types.h"
+#include "parseAFM.h"
+#include "../type1/objects.h"
+#include "../type1/spaces.h"
+#include "../type1/util.h"
+#include "../type1/fontfcn.h"
+#include "../type1/paths.h"
+#include "../type1/regions.h"
+
+#include "t1types.h"
+#include "t1extern.h"
+#include "t1set.h"
+#include "t1aaset.h"
+#include "t1load.h"
+#include "t1finfo.h"
+#include "t1misc.h"
+#include "t1x11.h"
+#include "t1base.h"
+
+
+
+#define T1GCMASK GCForeground | GCBackground
+
+/* As a fall back */
+#ifndef T1_AA_TYPE16
+#define T1_AA_TYPE16 short
+#endif
+#ifndef T1_AA_TYPE32
+#define T1_AA_TYPE32 int
+#endif
+
+
+
+/* The three important X11 parameters t1lib has to deal with: */
+static Display *T1_display=NULL; /* Must be accessible from t1delete.c */
+static Visual *T1_visual=NULL;
+static Colormap T1_colormap;
+static unsigned int T1_depth=0;
+static int T1_byte_order;
+static int lastlevel=0;
+static unsigned long oldfg_n=0, oldbg_n=0, oldfg_l=0, oldbg_l=0;
+static unsigned long oldfg_h=0, oldbg_h=0, oldfg=0, oldbg=0;
+
+
+extern int T1aa_SmartOn; /* from t1aaset.c */
+extern float T1aa_smartlimit1;
+extern float T1aa_smartlimit2;
+
+
+
+static XColor aacolors[AAMAXPLANES];
+static unsigned long aapixels[AAMAXPLANES];
+
+
+/* The following parameter determines whether t1lib will use logical
+ positioning of chars and string (place the origin at specified
+ destination-point) or absolute positioning with respect to the
+ origin (upper left corner) of the generated bitmap/pixmap. */
+static int T1_lposition=1;
+
+
+
+/* T1_SetX11Params(): Set X11-parameters which t1lib has to know in order
+ to properly generate pixmaps from characters */
+int T1_SetX11Params( Display *display,
+ Visual *visual,
+ unsigned int depth,
+ Colormap colormap)
+{
+
+ T1_display =display;
+ T1_visual =visual;
+ T1_depth =depth;
+ T1_colormap =colormap;
+
+ if (T1_CheckEndian()==0)
+ T1_byte_order=0;
+ else
+ T1_byte_order=1;
+
+ /* For bug hunting: */
+ if (ImageByteOrder( T1_display)==0)
+ T1_PrintLog( "T1_SetX11Params()",
+ "X-Server uses Little Endian data representation",
+ T1LOG_DEBUG);
+ else
+ T1_PrintLog( "T1_SetX11Params()",
+ "X-Server uses Big Endian data representation",
+ T1LOG_DEBUG);
+
+ return(0);
+}
+
+
+
+/* T1_SetCharX(): Generate an object of type GLYPH, i.e, a glyph with
+ a pixmap ID instead of a pointer to a bitmap: */
+
+GLYPH *T1_SetCharX( Drawable d, GC gc, int mode, int x_dest, int y_dest,
+ int FontID, char charcode,
+ float size, T1_TMATRIX *transform)
+{
+ GLYPH *pglyph;
+ static GLYPH xglyph={NULL,{0,0,0,0,0,0},NULL,0};
+
+ int height, width;
+ Pixmap clipmask=0;
+ int opaque;
+
+
+ xglyph.metrics.leftSideBearing=0;
+ xglyph.metrics.rightSideBearing=0;
+ xglyph.metrics.advanceX=0;
+ xglyph.metrics.advanceY=0;
+ xglyph.metrics.ascent=0;
+ xglyph.metrics.descent=0;
+ xglyph.pFontCacheInfo=NULL;
+
+
+ opaque=mode;
+
+
+ if ((pglyph=T1_SetChar( FontID, charcode, size, transform))==NULL){
+ T1_PrintLog( "T1_SetCharX()",
+ "T1_SetChar() returned NULL-pointer!",
+ T1LOG_WARNING);
+ return(NULL);
+ }
+
+ /* Check for empty bitmap */
+ if (pglyph->bits==NULL) {
+ xglyph=*pglyph;
+ return( &xglyph);
+ }
+
+ width=pglyph->metrics.rightSideBearing-pglyph->metrics.leftSideBearing;
+ height=pglyph->metrics.ascent-pglyph->metrics.descent;
+
+
+ clipmask=XCreateBitmapFromData( T1_display,
+ d,
+ (char *)pglyph->bits,
+ PAD(width, pFontBase->bitmap_pad),
+ height
+ );
+
+ /* Correct position */
+ if (T1_lposition){
+ x_dest += pglyph->metrics.leftSideBearing;
+ y_dest -= pglyph->metrics.ascent;
+ }
+
+ if (opaque==0){
+ XSetClipMask(T1_display, gc, clipmask);
+ XSetClipOrigin(T1_display, gc, x_dest, y_dest);
+ }
+
+ XCopyPlane( T1_display, clipmask, d, gc, 0, 0,
+ width, height, x_dest, y_dest, 0x01);
+
+ if (clipmask){
+ XFreePixmap( T1_display, clipmask);
+ clipmask=0;
+ XSetClipMask(T1_display, gc, None);
+ XSetClipOrigin(T1_display, gc, 0, 0);
+ }
+
+ pglyph->bits=NULL; /* Since XDestroyImage() free's this also! */
+ xglyph.metrics.leftSideBearing=pglyph->metrics.leftSideBearing;
+ xglyph.metrics.rightSideBearing=pglyph->metrics.rightSideBearing;
+ xglyph.metrics.advanceX=pglyph->metrics.advanceX;
+ xglyph.metrics.advanceY=pglyph->metrics.advanceY;
+ xglyph.metrics.ascent=pglyph->metrics.ascent;
+ xglyph.metrics.descent=pglyph->metrics.descent;
+ xglyph.bpp=pglyph->bpp;
+
+ return( &xglyph);
+
+
+}
+
+
+
+/* T1_SetStringX(...): Draw a string of characters into an X11 drawable */
+GLYPH *T1_SetStringX( Drawable d, GC gc, int mode, int x_dest, int y_dest,
+ int FontID, char *string, int len,
+ long spaceoff, int modflag, float size,
+ T1_TMATRIX *transform)
+{
+ GLYPH *pglyph;
+ static GLYPH xglyph={NULL,{0,0,0,0,0,0},NULL,0};
+
+ int height, width;
+ Pixmap clipmask=0;
+ int opaque;
+
+
+ xglyph.metrics.leftSideBearing=0;
+ xglyph.metrics.rightSideBearing=0;
+ xglyph.metrics.advanceX=0;
+ xglyph.metrics.advanceY=0;
+ xglyph.metrics.ascent=0;
+ xglyph.metrics.descent=0;
+ xglyph.pFontCacheInfo=NULL;
+
+
+ opaque=mode;
+
+
+ if ((pglyph=T1_SetString( FontID, string, len,
+ spaceoff, modflag, size,
+ transform))==NULL){
+ T1_PrintLog( "T1_SetStringX()",
+ "T1_SetString() returned NULL-pointer!",
+ T1LOG_WARNING);
+ return(NULL);
+ }
+
+ /* Check for empty bitmap */
+ if (pglyph->bits==NULL) {
+ xglyph=*pglyph;
+ return( &xglyph);
+ }
+
+ width=pglyph->metrics.rightSideBearing-pglyph->metrics.leftSideBearing;
+ height=pglyph->metrics.ascent-pglyph->metrics.descent;
+
+ clipmask=XCreateBitmapFromData( T1_display,
+ d,
+ (char *)pglyph->bits,
+ PAD(width, pFontBase->bitmap_pad), /* width */
+ height
+ );
+
+ /* Correct position */
+ if (T1_lposition){
+ x_dest += pglyph->metrics.leftSideBearing;
+ y_dest -= pglyph->metrics.ascent;
+ }
+
+ if (opaque==0){
+ XSetClipMask(T1_display, gc, clipmask);
+ XSetClipOrigin(T1_display, gc, x_dest, y_dest);
+ }
+
+ XCopyPlane( T1_display, clipmask, d, gc, 0, 0,
+ width, height, x_dest, y_dest, 0x01);
+
+ if (clipmask){
+ XFreePixmap( T1_display, clipmask);
+ clipmask=0;
+ XSetClipMask(T1_display, gc, None);
+ XSetClipOrigin(T1_display, gc, 0, 0);
+ }
+
+ pglyph->bits=NULL; /* Since XDestroyImage() free's this also! */
+ xglyph.metrics.leftSideBearing=pglyph->metrics.leftSideBearing;
+ xglyph.metrics.rightSideBearing=pglyph->metrics.rightSideBearing;
+ xglyph.metrics.advanceX=pglyph->metrics.advanceX;
+ xglyph.metrics.advanceY=pglyph->metrics.advanceY;
+ xglyph.metrics.ascent=pglyph->metrics.ascent;
+ xglyph.metrics.descent=pglyph->metrics.descent;
+ xglyph.bpp=pglyph->bpp;
+
+ return( &xglyph);
+
+
+}
+
+
+/* T1_SetRectX(): Draw a rectangle into an x11 drawable */
+
+GLYPH *T1_SetRectX( Drawable d, GC gc, int mode, int x_dest, int y_dest,
+ int FontID, float size,
+ float rwidth, float rheight,
+ T1_TMATRIX *transform)
+{
+ GLYPH *pglyph;
+ static GLYPH xglyph={NULL,{0,0,0,0,0,0},NULL,0};
+
+ int height, width;
+ Pixmap clipmask=0;
+ int opaque;
+
+
+ xglyph.metrics.leftSideBearing=0;
+ xglyph.metrics.rightSideBearing=0;
+ xglyph.metrics.advanceX=0;
+ xglyph.metrics.advanceY=0;
+ xglyph.metrics.ascent=0;
+ xglyph.metrics.descent=0;
+ xglyph.pFontCacheInfo=NULL;
+
+
+ opaque=mode;
+
+
+ if ((pglyph=T1_SetRect( FontID, size, rwidth, rheight, transform))==NULL){
+ T1_PrintLog( "T1_SetRectrX()",
+ "T1_SetRect() returned NULL-pointer!",
+ T1LOG_WARNING);
+ return(NULL);
+ }
+
+ /* Check for empty bitmap */
+ if (pglyph->bits==NULL) {
+ xglyph=*pglyph;
+ return( &xglyph);
+ }
+
+ width=pglyph->metrics.rightSideBearing-pglyph->metrics.leftSideBearing;
+ height=pglyph->metrics.ascent-pglyph->metrics.descent;
+
+
+ clipmask=XCreateBitmapFromData( T1_display,
+ d,
+ (char *)pglyph->bits,
+ PAD(width, pFontBase->bitmap_pad),
+ height
+ );
+
+ /* Correct position */
+ if (T1_lposition){
+ x_dest += pglyph->metrics.leftSideBearing;
+ y_dest -= pglyph->metrics.ascent;
+ }
+
+ if (opaque==0){
+ XSetClipMask(T1_display, gc, clipmask);
+ XSetClipOrigin(T1_display, gc, x_dest, y_dest);
+ }
+
+ XCopyPlane( T1_display, clipmask, d, gc, 0, 0,
+ width, height, x_dest, y_dest, 0x01);
+
+ if (clipmask){
+ XFreePixmap( T1_display, clipmask);
+ clipmask=0;
+ XSetClipMask(T1_display, gc, None);
+ XSetClipOrigin(T1_display, gc, 0, 0);
+ }
+
+ pglyph->bits=NULL; /* Since XDestroyImage() free's this also! */
+ xglyph.metrics.leftSideBearing=pglyph->metrics.leftSideBearing;
+ xglyph.metrics.rightSideBearing=pglyph->metrics.rightSideBearing;
+ xglyph.metrics.advanceX=pglyph->metrics.advanceX;
+ xglyph.metrics.advanceY=pglyph->metrics.advanceY;
+ xglyph.metrics.ascent=pglyph->metrics.ascent;
+ xglyph.metrics.descent=pglyph->metrics.descent;
+ xglyph.bpp=pglyph->bpp;
+
+ return( &xglyph);
+
+
+}
+
+
+
+/* T1_AASetCharX(): Generate an object of type GLYPH, i.e, a glyph with
+ a pixmap ID instead of a pointer to a bitmap: */
+GLYPH *T1_AASetCharX( Drawable d, GC gc, int mode, int x_dest, int y_dest,
+ int FontID, char charcode,
+ float size, T1_TMATRIX *transform)
+{
+ int j, k;
+
+ GLYPH *pglyph;
+ XImage *ximage;
+
+ static GLYPH xglyph={NULL,{0,0,0,0,0,0},NULL,0};
+
+ int height, width, width_pad;
+
+ XGCValues xgcvalues;
+ static unsigned long fg, bg;
+
+ Pixmap clipmask=0;
+ int clipmask_h, clipmask_v, line_off;
+ char *clipmask_ptr;
+
+ int opaque;
+
+
+
+ xglyph.metrics.leftSideBearing=0;
+ xglyph.metrics.rightSideBearing=0;
+ xglyph.metrics.advanceX=0;
+ xglyph.metrics.advanceY=0;
+ xglyph.metrics.ascent=0;
+ xglyph.metrics.descent=0;
+ xglyph.pFontCacheInfo=NULL;
+
+
+ opaque=mode;
+
+ xglyph.bpp=T1_depth;
+
+ /* In order to be able to contruct the pixmap we need to know
+ foreground and background color as well the copy function */
+ XGetGCValues( T1_display, gc, T1GCMASK, &xgcvalues);
+ fg=xgcvalues.foreground;
+ bg=xgcvalues.background;
+
+
+ /* At this point we must compute the colors that are needed to do
+ antialiasing between fore- and background. The following function
+ fills the static aacolors */
+ if (T1aa_SmartOn==0)
+ j=T1_AAGetLevel();
+ else if (size>=T1aa_smartlimit2)
+ j=1;
+ else if (size>=T1aa_smartlimit1)
+ j=2;
+ else
+ j=4;
+ if ( j!=lastlevel || fg!=oldfg || bg!=oldbg ){
+ switch ( j){
+ case 1:
+ if ( fg!=oldfg_n || bg!=oldbg_n){
+ oldfg_n=fg;
+ oldbg_n=bg;
+ /* computing colors is not necessary here */
+ T1_AANSetGrayValues( bg, fg);
+ }
+ break;
+ case 2:
+ if ( fg!=oldfg_l || bg!=oldbg_l){
+ T1_ComputeAAColorsX( fg, bg, AAMAXPLANES);
+ /*~derekn*/
+ /* If fg=bg, the clipmask will be messed up; in this case */
+ /* we can arbitrarily change bg to get a correct clipmask. */
+ if (opaque == 0 && fg == bg)
+ aapixels[0] = bg = (fg > 0) ? fg - 1 : fg + 1;
+ oldfg_l=fg;
+ oldbg_l=bg;
+ T1_AASetGrayValues(aapixels[0], /* white */
+ aapixels[4],
+ aapixels[8],
+ aapixels[12],
+ aapixels[16] ); /* black */
+ }
+ break;
+ case 4:
+ if ( fg!=oldfg_h || bg!=oldbg_h){
+ T1_ComputeAAColorsX( fg, bg, AAMAXPLANES);
+ /*~derekn*/
+ /* If fg=bg, the clipmask will be messed up; in this case */
+ /* we can arbitrarily change bg to get a correct clipmask. */
+ if (opaque == 0 && fg == bg)
+ aapixels[0] = bg = (fg > 0) ? fg - 1 : fg + 1;
+ oldfg_h=fg;
+ oldbg_h=bg;
+ T1_AAHSetGrayValues( aapixels);
+ }
+ break;
+ }
+ lastlevel=j;
+ oldfg=fg;
+ oldbg=bg;
+ }
+
+ if ((pglyph=T1_AASetChar( FontID, charcode, size,
+ transform))==NULL){
+ T1_PrintLog( "T1_AASetCharX()",
+ "T1_AASetChar() returned NULL-pointer!",
+ T1LOG_WARNING);
+ return(NULL);
+ }
+
+ /* Check for empty bitmap */
+ if (pglyph->bits==NULL) {
+ xglyph=*pglyph;
+ return( &xglyph);
+ }
+
+ width=pglyph->metrics.rightSideBearing-pglyph->metrics.leftSideBearing;
+ height=pglyph->metrics.ascent-pglyph->metrics.descent;
+
+
+ /* Correct position */
+ if (T1_lposition){
+ x_dest += pglyph->metrics.leftSideBearing;
+ y_dest -= pglyph->metrics.ascent;
+ }
+
+ if (opaque==0){
+ clipmask_v=height;
+ clipmask_h=width;
+ width_pad=PAD(width*T1aa_bpp, pFontBase->bitmap_pad)/T1aa_bpp;
+ clipmask_ptr=(char *)calloc((PAD(clipmask_h, 8)>>3) * clipmask_v, sizeof( char));
+ if (clipmask_ptr==NULL){
+ T1_errno=T1ERR_ALLOC_MEM;
+ return(NULL);
+ }
+ /* Note: We pad the clipmask always to byte boundary */
+ if (pglyph->bpp==8)
+ for ( k=0; k<clipmask_v; k++){
+ line_off=k*(PAD(clipmask_h, 8)>>3);
+ for (j=0; j<clipmask_h; j++){
+ if (((char *)(pglyph->bits))[k*width_pad+j]!=bg)
+ clipmask_ptr[line_off+(j>>3)] |= (0x01<<(j%8));
+ }
+ }
+ else if (pglyph->bpp==16)
+ for ( k=0; k<clipmask_v; k++){
+ line_off=k*(PAD(clipmask_h, 8)>>3);
+ for (j=0; j<clipmask_h; j++){
+ if (((T1_AA_TYPE16 *)(pglyph->bits))[k*width_pad+j]!=(T1_AA_TYPE16)bg)
+ clipmask_ptr[line_off+(j>>3)] |= (0x01<<(j%8));
+ }
+ }
+ else
+ for ( k=0; k<clipmask_v; k++){
+ line_off=k*(PAD(clipmask_h, 8)>>3);
+ for (j=0; j<clipmask_h; j++){
+ if (((T1_AA_TYPE32 *)(pglyph->bits))[k*width_pad+j]!=(T1_AA_TYPE32)bg)
+ clipmask_ptr[line_off+(j>>3)] |= (0x01<<(j%8));
+ }
+ }
+
+ clipmask=XCreateBitmapFromData( T1_display,
+ d,
+ (char *)clipmask_ptr,
+ width,
+ height
+ );
+ free( clipmask_ptr);
+ XSetClipMask(T1_display, gc, clipmask);
+ XSetClipOrigin(T1_display, gc, x_dest, y_dest);
+
+ }
+ ximage=XCreateImage( T1_display,
+ T1_visual,
+ T1_depth,
+ ZPixmap, /* XYBitmap or XYPixmap */
+ 0, /* No offset */
+ (char *)pglyph->bits,
+ width,
+ height,
+ pFontBase->bitmap_pad,
+ 0 /*PAD(width,8)/8*/ /* number of bytes per line */
+ );
+ ximage->byte_order=T1_byte_order;
+ XPutImage(T1_display,
+ d,
+ gc,
+ ximage,
+ 0,
+ 0,
+ x_dest,
+ y_dest,
+ width,
+ height
+ );
+ XDestroyImage(ximage);
+ if (clipmask){
+ XFreePixmap( T1_display, clipmask);
+ clipmask=0;
+ XSetClipMask(T1_display, gc, None);
+ XSetClipOrigin(T1_display, gc, 0, 0);
+ }
+
+ pglyph->bits=NULL; /* Since XDestroyImage() free's this also! */
+ xglyph.metrics.leftSideBearing=pglyph->metrics.leftSideBearing;
+ xglyph.metrics.rightSideBearing=pglyph->metrics.rightSideBearing;
+ xglyph.metrics.advanceX=pglyph->metrics.advanceX;
+ xglyph.metrics.advanceY=pglyph->metrics.advanceY;
+ xglyph.metrics.ascent=pglyph->metrics.ascent;
+ xglyph.metrics.descent=pglyph->metrics.descent;
+ xglyph.bpp=pglyph->bpp;
+
+ return( &xglyph);
+
+
+}
+
+
+
+/* T1_AASetStringX(...): Draw a string of characters into an X11 drawable */
+GLYPH *T1_AASetStringX( Drawable d, GC gc, int mode, int x_dest, int y_dest,
+ int FontID, char *string, int len,
+ long spaceoff, int modflag, float size,
+ T1_TMATRIX *transform)
+{
+ int j, k;
+
+ GLYPH *pglyph;
+ XImage *ximage;
+
+
+ static GLYPH xglyph={NULL,{0,0,0,0,0,0},NULL,0};
+
+ int height, width, width_pad;
+
+ XGCValues xgcvalues;
+ static unsigned long fg, bg;
+
+
+ Pixmap clipmask=0;
+ int clipmask_h, clipmask_v, line_off;
+ char *clipmask_ptr;
+
+ int opaque;
+
+
+ xglyph.metrics.leftSideBearing=0;
+ xglyph.metrics.rightSideBearing=0;
+ xglyph.metrics.advanceX=0;
+ xglyph.metrics.advanceY=0;
+ xglyph.metrics.ascent=0;
+ xglyph.metrics.descent=0;
+ xglyph.pFontCacheInfo=NULL;
+
+
+ opaque=mode;
+
+
+ /* In order to be able to contruct the pixmap we need to know
+ foreground and background color as well the copy function */
+ XGetGCValues( T1_display, gc, T1GCMASK, &xgcvalues);
+ fg=xgcvalues.foreground;
+ bg=xgcvalues.background;
+
+ xglyph.bpp=T1_depth;
+
+ /* At this point we must compute the colors that are needed to do
+ antialiasing between fore- and background. The following function
+ fills the static aacolors */
+ if (T1aa_SmartOn==0)
+ j=T1_AAGetLevel();
+ else if (size>=T1aa_smartlimit2)
+ j=1;
+ else if (size>=T1aa_smartlimit1)
+ j=2;
+ else
+ j=4;
+ if ( j!=lastlevel || fg!=oldfg || bg!=oldbg ){
+ switch ( j){
+ case 1:
+ if ( fg!=oldfg_n || bg!=oldbg_n){
+ oldfg_n=fg;
+ oldbg_n=bg;
+ /* computing colors is not necessary here */
+ T1_AANSetGrayValues( bg, fg);
+ }
+ break;
+ case 2:
+ if ( fg!=oldfg_l || bg!=oldbg_l){
+ T1_ComputeAAColorsX( fg, bg, AAMAXPLANES);
+ /*~derekn*/
+ /* If fg=bg, the clipmask will be messed up; in this case */
+ /* we can arbitrarily change bg to get a correct clipmask. */
+ if (opaque == 0 && fg == bg)
+ aapixels[0] = bg = (fg > 0) ? fg - 1 : fg + 1;
+ oldfg_l=fg;
+ oldbg_l=bg;
+ T1_AASetGrayValues(aapixels[0], /* white */
+ aapixels[4],
+ aapixels[8],
+ aapixels[12],
+ aapixels[16] ); /* black */
+ }
+ break;
+ case 4:
+ if ( fg!=oldfg_h || bg!=oldbg_h){
+ T1_ComputeAAColorsX( fg, bg, AAMAXPLANES);
+ /*~derekn*/
+ /* If fg=bg, the clipmask will be messed up; in this case */
+ /* we can arbitrarily change bg to get a correct clipmask. */
+ if (opaque == 0 && fg == bg)
+ aapixels[0] = bg = (fg > 0) ? fg - 1 : fg + 1;
+ oldfg_h=fg;
+ oldbg_h=bg;
+ T1_AAHSetGrayValues( aapixels);
+ }
+ break;
+ }
+ lastlevel=j;
+ oldfg=fg;
+ oldbg=bg;
+ }
+
+
+ if ((pglyph=T1_AASetString( FontID, string, len,
+ spaceoff, modflag, size,
+ transform))==NULL){
+ T1_PrintLog( "T1_AASetStringX()",
+ "T1_AASetString() returned NULL-pointer!",
+ T1LOG_WARNING);
+ return(NULL);
+ }
+
+ /* Check for empty bitmap */
+ if (pglyph->bits==NULL) {
+ xglyph=*pglyph;
+ return( &xglyph);
+ }
+
+ width=pglyph->metrics.rightSideBearing-pglyph->metrics.leftSideBearing;
+ height=pglyph->metrics.ascent-pglyph->metrics.descent;
+
+
+ /* Correct position */
+ if (T1_lposition){
+ x_dest += pglyph->metrics.leftSideBearing;
+ y_dest -= pglyph->metrics.ascent;
+ }
+
+ if (opaque==0){
+ clipmask_v=height;
+ clipmask_h=width;
+ width_pad=PAD(width*T1aa_bpp, pFontBase->bitmap_pad)/T1aa_bpp;
+ clipmask_ptr=(char *)calloc((PAD(clipmask_h, 8)>>3) * clipmask_v, sizeof( char));
+ if (clipmask_ptr==NULL){
+ T1_errno=T1ERR_ALLOC_MEM;
+ return(NULL);
+ }
+ /* Note: We pad the clipmask always to byte boundary */
+ if (pglyph->bpp==8)
+ for ( k=0; k<clipmask_v; k++){
+ line_off=k*(PAD(clipmask_h, 8)>>3);
+ for (j=0; j<clipmask_h; j++){
+ if (((char *)(pglyph->bits))[k*width_pad+j]!=bg)
+ clipmask_ptr[line_off+(j>>3)] |= (0x01<<(j%8));
+ }
+ }
+ else if (pglyph->bpp==16)
+ for ( k=0; k<clipmask_v; k++){
+ line_off=k*(PAD(clipmask_h, 8)>>3);
+ for (j=0; j<clipmask_h; j++){
+ if (((T1_AA_TYPE16 *)(pglyph->bits))[k*width_pad+j]!=(T1_AA_TYPE16)bg)
+ clipmask_ptr[line_off+(j>>3)] |= (0x01<<(j%8));
+ }
+ }
+ else
+ for ( k=0; k<clipmask_v; k++){
+ line_off=k*(PAD(clipmask_h, 8)>>3);
+ for (j=0; j<clipmask_h; j++){
+ if (((T1_AA_TYPE32 *)(pglyph->bits))[k*width_pad+j]!=(T1_AA_TYPE32)bg)
+ clipmask_ptr[line_off+(j>>3)] |= (0x01<<(j%8));
+ }
+ }
+
+ clipmask=XCreateBitmapFromData( T1_display,
+ d,
+ (char *)clipmask_ptr,
+ width,
+ height
+ );
+ free( clipmask_ptr);
+ XSetClipMask(T1_display, gc, clipmask);
+ XSetClipOrigin(T1_display, gc, x_dest, y_dest);
+
+ }
+ ximage=XCreateImage( T1_display,
+ T1_visual,
+ T1_depth,
+ ZPixmap, /* XYBitmap or XYPixmap */
+ 0, /* No offset */
+ (char *)pglyph->bits,
+ width,
+ height,
+ pFontBase->bitmap_pad, /* lines padded to bytes */
+ 0 /*PAD(width,8)/8*/ /* number of bytes per line */
+ );
+ ximage->byte_order=T1_byte_order;
+ XPutImage(T1_display,
+ d,
+ gc,
+ ximage,
+ 0,
+ 0,
+ x_dest,
+ y_dest,
+ width,
+ height
+ );
+ XDestroyImage(ximage);
+ if (clipmask){
+ XFreePixmap( T1_display, clipmask);
+ clipmask=0;
+ XSetClipMask(T1_display, gc, None);
+ XSetClipOrigin(T1_display, gc, 0, 0);
+ }
+
+ pglyph->bits=NULL; /* Since XDestroyImage() free's this also! */
+ xglyph.metrics.leftSideBearing=pglyph->metrics.leftSideBearing;
+ xglyph.metrics.rightSideBearing=pglyph->metrics.rightSideBearing;
+ xglyph.metrics.advanceX=pglyph->metrics.advanceX;
+ xglyph.metrics.advanceY=pglyph->metrics.advanceY;
+ xglyph.metrics.ascent=pglyph->metrics.ascent;
+ xglyph.metrics.descent=pglyph->metrics.descent;
+ xglyph.bpp=pglyph->bpp;
+
+ return( &xglyph);
+
+
+}
+
+
+
+/* T1_AASetCharX(): Draw a rectangle into an x11 drawable */
+GLYPH *T1_AASetRectX( Drawable d, GC gc, int mode, int x_dest, int y_dest,
+ int FontID, float size,
+ float rwidth, float rheight,
+ T1_TMATRIX *transform)
+{
+ int j, k;
+
+ GLYPH *pglyph;
+ XImage *ximage;
+
+ static GLYPH xglyph={NULL,{0,0,0,0,0,0},NULL,0};
+
+ int height, width, width_pad;
+
+ XGCValues xgcvalues;
+ static unsigned long fg, bg;
+
+ Pixmap clipmask=0;
+ int clipmask_h, clipmask_v, line_off;
+ char *clipmask_ptr;
+
+ int opaque;
+
+
+
+ xglyph.metrics.leftSideBearing=0;
+ xglyph.metrics.rightSideBearing=0;
+ xglyph.metrics.advanceX=0;
+ xglyph.metrics.advanceY=0;
+ xglyph.metrics.ascent=0;
+ xglyph.metrics.descent=0;
+ xglyph.pFontCacheInfo=NULL;
+
+
+ opaque=mode;
+
+ xglyph.bpp=T1_depth;
+
+ /* In order to be able to contruct the pixmap we need to know
+ foreground and background color as well the copy function */
+ XGetGCValues( T1_display, gc, T1GCMASK, &xgcvalues);
+ fg=xgcvalues.foreground;
+ bg=xgcvalues.background;
+
+
+ /* At this point we must compute the colors that are needed to do
+ antialiasing between fore- and background. The following function
+ fills the static aacolors */
+ if (T1aa_SmartOn==0)
+ j=T1_AAGetLevel();
+ else if (size>=T1aa_smartlimit2)
+ j=1;
+ else if (size>=T1aa_smartlimit1)
+ j=2;
+ else
+ j=4;
+ if ( j!=lastlevel || fg!=oldfg || bg!=oldbg ){
+ switch ( j){
+ case 1:
+ if ( fg!=oldfg_n || bg!=oldbg_n){
+ oldfg_n=fg;
+ oldbg_n=bg;
+ /* computing colors is not necessary here */
+ T1_AANSetGrayValues( bg, fg);
+ }
+ break;
+ case 2:
+ if ( fg!=oldfg_l || bg!=oldbg_l){
+ T1_ComputeAAColorsX( fg, bg, AAMAXPLANES);
+ /*~derekn*/
+ /* If fg=bg, the clipmask will be messed up; in this case */
+ /* we can arbitrarily change bg to get a correct clipmask. */
+ if (opaque == 0 && fg == bg)
+ aapixels[0] = bg = (fg > 0) ? fg - 1 : fg + 1;
+ oldfg_l=fg;
+ oldbg_l=bg;
+ T1_AASetGrayValues(aapixels[0], /* white */
+ aapixels[4],
+ aapixels[8],
+ aapixels[12],
+ aapixels[16] ); /* black */
+ }
+ break;
+ case 4:
+ if ( fg!=oldfg_h || bg!=oldbg_h){
+ T1_ComputeAAColorsX( fg, bg, AAMAXPLANES);
+ /*~derekn*/
+ /* If fg=bg, the clipmask will be messed up; in this case */
+ /* we can arbitrarily change bg to get a correct clipmask. */
+ if (opaque == 0 && fg == bg)
+ aapixels[0] = bg = (fg > 0) ? fg - 1 : fg + 1;
+ oldfg_h=fg;
+ oldbg_h=bg;
+ T1_AAHSetGrayValues( aapixels);
+ }
+ break;
+ }
+ lastlevel=j;
+ oldfg=fg;
+ oldbg=bg;
+ }
+
+ if ((pglyph=T1_AASetRect( FontID, size, rwidth, rheight, transform))==NULL){
+ T1_PrintLog( "T1_AASetRectX()",
+ "T1_AASetRect() returned NULL-pointer!",
+ T1LOG_WARNING);
+ return(NULL);
+ }
+
+ /* Check for empty bitmap */
+ if (pglyph->bits==NULL) {
+ xglyph=*pglyph;
+ return( &xglyph);
+ }
+
+ width=pglyph->metrics.rightSideBearing-pglyph->metrics.leftSideBearing;
+ height=pglyph->metrics.ascent-pglyph->metrics.descent;
+
+
+ /* Correct position */
+ if (T1_lposition){
+ x_dest += pglyph->metrics.leftSideBearing;
+ y_dest -= pglyph->metrics.ascent;
+ }
+
+ if (opaque==0){
+ clipmask_v=height;
+ clipmask_h=width;
+ width_pad=PAD(width*T1aa_bpp, pFontBase->bitmap_pad)/T1aa_bpp;
+ clipmask_ptr=(char *)calloc((PAD(clipmask_h, 8)>>3) * clipmask_v, sizeof( char));
+ if (clipmask_ptr==NULL){
+ T1_errno=T1ERR_ALLOC_MEM;
+ return(NULL);
+ }
+ /* Note: We pad the clipmask always to byte boundary */
+ if (pglyph->bpp==8)
+ for ( k=0; k<clipmask_v; k++){
+ line_off=k*(PAD(clipmask_h, 8)>>3);
+ for (j=0; j<clipmask_h; j++){
+ if (((char *)(pglyph->bits))[k*width_pad+j]!=bg)
+ clipmask_ptr[line_off+(j>>3)] |= (0x01<<(j%8));
+ }
+ }
+ else if (pglyph->bpp==16)
+ for ( k=0; k<clipmask_v; k++){
+ line_off=k*(PAD(clipmask_h, 8)>>3);
+ for (j=0; j<clipmask_h; j++){
+ if (((T1_AA_TYPE16 *)(pglyph->bits))[k*width_pad+j]!=(T1_AA_TYPE16)bg)
+ clipmask_ptr[line_off+(j>>3)] |= (0x01<<(j%8));
+ }
+ }
+ else
+ for ( k=0; k<clipmask_v; k++){
+ line_off=k*(PAD(clipmask_h, 8)>>3);
+ for (j=0; j<clipmask_h; j++){
+ if (((T1_AA_TYPE32 *)(pglyph->bits))[k*width_pad+j]!=(T1_AA_TYPE32)bg)
+ clipmask_ptr[line_off+(j>>3)] |= (0x01<<(j%8));
+ }
+ }
+
+ clipmask=XCreateBitmapFromData( T1_display,
+ d,
+ (char *)clipmask_ptr,
+ width,
+ height
+ );
+ free( clipmask_ptr);
+ XSetClipMask(T1_display, gc, clipmask);
+ XSetClipOrigin(T1_display, gc, x_dest, y_dest);
+
+ }
+ ximage=XCreateImage( T1_display,
+ T1_visual,
+ T1_depth,
+ ZPixmap, /* XYBitmap or XYPixmap */
+ 0, /* No offset */
+ (char *)pglyph->bits,
+ width,
+ height,
+ pFontBase->bitmap_pad,
+ 0 /*PAD(width,8)/8*/ /* number of bytes per line */
+ );
+ ximage->byte_order=T1_byte_order;
+ XPutImage(T1_display,
+ d,
+ gc,
+ ximage,
+ 0,
+ 0,
+ x_dest,
+ y_dest,
+ width,
+ height
+ );
+ XDestroyImage(ximage);
+ if (clipmask){
+ XFreePixmap( T1_display, clipmask);
+ clipmask=0;
+ XSetClipMask(T1_display, gc, None);
+ XSetClipOrigin(T1_display, gc, 0, 0);
+ }
+
+ pglyph->bits=NULL; /* Since XDestroyImage() free's this also! */
+ xglyph.metrics.leftSideBearing=pglyph->metrics.leftSideBearing;
+ xglyph.metrics.rightSideBearing=pglyph->metrics.rightSideBearing;
+ xglyph.metrics.advanceX=pglyph->metrics.advanceX;
+ xglyph.metrics.advanceY=pglyph->metrics.advanceY;
+ xglyph.metrics.ascent=pglyph->metrics.ascent;
+ xglyph.metrics.descent=pglyph->metrics.descent;
+ xglyph.bpp=pglyph->bpp;
+
+ return( &xglyph);
+
+
+}
+
+
+
+/* T1_ComputeAAColorsX(): Compute the antialiasing colors in dependency
+ of foreground and background */
+int T1_ComputeAAColorsX( unsigned long fg, unsigned long bg, int nolevels)
+{
+
+ static unsigned long last_fg;
+ static unsigned long last_bg;
+ long delta_red, delta_green, delta_blue;
+ int i;
+ int nocolors=0;
+
+
+ aacolors[0].pixel=bg;
+ aacolors[nolevels-1].pixel=fg;
+
+ if ((fg==last_fg)&&(bg==last_bg))
+ return(nocolors);
+
+ /* Get RGB values for fore- and background */
+ XQueryColor( T1_display, T1_colormap, &aacolors[0]);
+ XQueryColor( T1_display, T1_colormap, &aacolors[nolevels-1]);
+ delta_red = (aacolors[nolevels-1].red - aacolors[0].red)/(nolevels-1);
+ delta_green = (aacolors[nolevels-1].green - aacolors[0].green)/(nolevels-1);
+ delta_blue = (aacolors[nolevels-1].blue - aacolors[0].blue)/(nolevels-1);
+ aapixels[0]=aacolors[0].pixel;
+ aapixels[nolevels-1]=aacolors[nolevels-1].pixel;
+
+ for (i=1; i<nolevels-1; i++){
+ aacolors[i].red = aacolors[0].red + i*delta_red;
+ aacolors[i].green = aacolors[0].green + i*delta_green;
+ aacolors[i].blue = aacolors[0].blue + i*delta_blue;
+ aacolors[i].flags = DoRed | DoGreen | DoBlue;
+ aacolors[i].pad = aacolors[0].pad;
+ /* Allocate color in current palette */
+ if (XAllocColor( T1_display, T1_colormap, &aacolors[i])!=0){
+ aapixels[i]=aacolors[i].pixel;
+ nocolors++;
+ }
+ }
+
+ return(nocolors);
+
+}
+
+
+
+/* Set the positioning switch */
+void T1_LogicalPositionX( int pos_switch)
+{
+ if (pos_switch)
+ T1_lposition=1;
+ else
+ T1_lposition=0;
+ return;
+}
+
+
+
+XImage *T1_XImageFromGlyph( GLYPH *pglyph)
+{
+ XImage *ximage;
+
+ /* Check for empty bitmap */
+ if (pglyph->bits==NULL) {
+ T1_errno=T1ERR_INVALID_PARAMETER;
+ return( NULL);
+ }
+
+ if (pglyph->bpp==1) { /* we have a bitmap glyph */
+ ximage=XCreateImage( T1_display,
+ T1_visual,
+ 1,
+ XYBitmap, /* XYBitmap or XYPixmap */
+ 0, /* No offset */
+ (char *)pglyph->bits,
+ pglyph->metrics.rightSideBearing-pglyph->metrics.leftSideBearing,
+ pglyph->metrics.ascent-pglyph->metrics.descent,
+ pFontBase->bitmap_pad,
+ 0 /* number of bytes per line */
+ );
+ }
+ else { /* we have an anztialiased glyph */
+ ximage=XCreateImage( T1_display,
+ T1_visual,
+ T1_depth,
+ ZPixmap, /* XYBitmap or XYPixmap */
+ 0, /* No offset */
+ (char *)pglyph->bits,
+ pglyph->metrics.rightSideBearing-pglyph->metrics.leftSideBearing,
+ pglyph->metrics.ascent-pglyph->metrics.descent,
+ pFontBase->bitmap_pad,
+ 0 /* number of bytes per line */
+ );
+ }
+
+ if (ximage==NULL) {
+ T1_errno=T1ERR_X11;
+ return( NULL);
+ }
+ ximage->byte_order=T1_byte_order; /* Set t1libs byteorder */
+
+ return( ximage);
+
+}
+
diff -Nru t1lib-grace/T1lib/t1lib/t1x11.h t1lib-deb/T1lib/t1lib/t1x11.h
--- t1lib-grace/T1lib/t1lib/t1x11.h 1969-12-31 16:00:00.000000000 -0800
+++ t1lib-deb/T1lib/t1lib/t1x11.h 2007-12-23 07:49:42.000000000 -0800
@@ -0,0 +1,103 @@
+/*--------------------------------------------------------------------------
+ ----- File: t1x11.h
+ ----- Author: Rainer Menzner (Rainer.Menzner@web.de)
+ ----- Date: 2003-01-02
+ ----- Description: This file is part of the t1-library. It contains
+ definitions and declarations for t1x11.c.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2003.
+ As of version 0.5, t1lib is distributed under the
+ GNU General Public Library Lincense. The
+ conditions can be found in the files LICENSE and
+ LGPL, which should reside in the toplevel
+ directory of the distribution. Please note that
+ there are parts of t1lib that are subject to
+ other licenses:
+ The parseAFM-package is copyrighted by Adobe Systems
+ Inc.
+ The type1 rasterizer is copyrighted by IBM and the
+ X11-consortium.
+ ----- Warranties: Of course, there's NO WARRANTY OF ANY KIND :-)
+ ----- Credits: I want to thank IBM and the X11-consortium for making
+ their rasterizer freely available.
+ Also thanks to Piet Tutelaers for his ps2pk, from
+ which I took the rasterizer sources in a format
+ independent from X11.
+ Thanks to all people who make free software living!
+--------------------------------------------------------------------------*/
+
+#include <X11/Xlib.h>
+
+#ifdef T1X11_C
+
+int T1_SetX11Params( Display *display,
+ Visual *visual,
+ unsigned int depth,
+ Colormap colormap);
+GLYPH *T1_SetCharX( Drawable d, GC gc, int mode, int x, int y,
+ int FontID, char charcode,
+ float size, T1_TMATRIX *transform);
+GLYPH *T1_SetStringX( Drawable d, GC gc, int mode, int x, int y,
+ int FontID, char *string, int len,
+ long spaceoff, int modflag,
+ float size, T1_TMATRIX *transform);
+GLYPH *T1_SetRectX( Drawable d, GC gc, int mode, int x_dest, int y_dest,
+ int FontID, float size,
+ float width, float height,
+ T1_TMATRIX *transform);
+GLYPH *T1_AASetCharX( Drawable d, GC gc, int mode, int x, int y,
+ int FontID, char charcode,
+ float size, T1_TMATRIX *transform);
+GLYPH *T1_AASetStringX( Drawable d, GC gc, int mode, int x, int y,
+ int FontID, char *string, int len,
+ long spaceoff, int modflag,
+ float size, T1_TMATRIX *transform);
+GLYPH *T1_AASetRectX( Drawable d, GC gc, int mode, int x_dest, int y_dest,
+ int FontID, float size,
+ float width, float height,
+ T1_TMATRIX *transform);
+int T1_ComputeAAColorsX( unsigned long fg,
+ unsigned long bg,
+ int nolevels);
+int T1_GetDepthOfDrawable( Drawable drawable);
+void T1_LogicalPositionX( int pos_switch);
+
+
+#else
+
+extern Display *T1_display;
+
+extern int T1_SetX11Params( Display *display,
+ Visual *visual,
+ unsigned int depth,
+ Colormap colormap);
+extern GLYPH *T1_SetCharX( Drawable d, GC gc, int mode, int x, int y,
+ int FontID, char charcode,
+ float size, T1_TMATRIX *transform);
+extern GLYPH *T1_SetStringX( Drawable d, GC gc, int mode, int x, int y,
+ int FontID, char *string, int len,
+ long spaceoff, int modflag,
+ float size, T1_TMATRIX *transform);
+extern GLYPH *T1_SetRectX( Drawable d, GC gc, int mode, int x_dest, int y_dest,
+ int FontID, float size,
+ float width, float height,
+ T1_TMATRIX *transform);
+extern GLYPH *T1_AASetCharX( Drawable d, GC gc, int mode, int x, int y,
+ int FontID, char charcode,
+ float size, T1_TMATRIX *transform);
+extern GLYPH *T1_AASetStringX( Drawable d, GC gc, int mode, int x, int y,
+ int FontID, char *string, int len,
+ long spaceoff, int modflag,
+ float size, T1_TMATRIX *transform);
+extern GLYPH *T1_AASetRectX( Drawable d, GC gc, int mode, int x_dest, int y_dest,
+ int FontID, float size,
+ float width, float height,
+ T1_TMATRIX *transform);
+extern int T1_ComputeAAColorsX( unsigned long fg,
+ unsigned long bg,
+ int nolevels);
+extern int T1_GetDepthOfDrawable( Drawable drawable);
+extern void T1_LogicalPositionX( int pos_switch);
+
+
+#endif
+
diff -Nru t1lib-grace/T1lib/type1/.dependencies t1lib-deb/T1lib/type1/.dependencies
--- t1lib-grace/T1lib/type1/.dependencies 2002-01-03 13:15:17.000000000 -0800
+++ t1lib-deb/T1lib/type1/.dependencies 2007-12-23 07:49:42.000000000 -0800
@@ -4,18 +4,18 @@
curves.h lines.h arith.h
fontfcn.lo: fontfcn.c t1imager.h types.h fontmisc.h util.h fontfcn.h \
paths_rmz.h spaces_rmz.h ../t1lib/parseAFM.h ../t1lib/t1types.h \
- ../t1lib/t1extern.h ../t1lib/t1misc.h ../t1lib/t1base.h \
- ../t1lib/t1finfo.h
+ ../t1lib/sysconf.h ../t1lib/t1extern.h ../t1lib/t1misc.h \
+ ../t1lib/t1base.h ../t1lib/t1finfo.h
hints.lo: hints.c types.h objects.h spaces.h paths.h regions.h hints.h
-lines.lo: lines.c types.h objects.h spaces.h regions.h lines.h
+lines.lo: lines.c types.h objects.h spaces.h paths.h regions.h lines.h
objects.lo: objects.c types.h objects.h spaces.h paths.h regions.h \
fonts.h pictures.h strokes.h cluts.h
paths.lo: paths.c types.h objects.h spaces.h paths.h regions.h fonts.h \
pictures.h strokes.h trig.h
-regions.lo: regions.c types.h objects.h spaces.h regions.h paths.h \
+regions.lo: regions.c types.h objects.h spaces.h paths.h regions.h \
curves.h lines.h pictures.h fonts.h hints.h strokes.h
scanfont.lo: scanfont.c t1stdio.h types.h util.h token.h fontfcn.h \
- blues.h
+ blues.h ../t1lib/t1misc.h
spaces.lo: spaces.c types.h objects.h spaces.h paths.h pictures.h \
fonts.h arith.h trig.h
t1io.lo: t1io.c t1stdio.h types.h t1hdigit.h
diff -Nru t1lib-grace/T1lib/type1/fontfcn.c t1lib-deb/T1lib/type1/fontfcn.c
--- t1lib-grace/T1lib/type1/fontfcn.c 2002-01-03 13:15:17.000000000 -0800
+++ t1lib-deb/T1lib/type1/fontfcn.c 2007-12-23 07:49:42.000000000 -0800
@@ -46,16 +46,24 @@
#include "../t1lib/t1base.h"
#include "../t1lib/t1finfo.h"
+/* Note: The argument decodeonly is used to make Type1Char() decode only
+ such that later certain characterictics of the pass can be queried
+ (here, information about the parts of a seac).
+*/
extern xobject Type1Char(psfont *env, struct XYspace *S,
psobj *charstrP, psobj *subrsP,
psobj *osubrsP,
struct blues_struct *bluesP,
- int *modeP, char *name);
+ int *modeP, char *name,
+ float strokewidth,
+ int decodeonly);
extern xobject Type1Line(psfont *env, struct XYspace *S,
- float line_position,
- float line_thickness,
- float line_length);
-extern boolean Init_BuiltInEncoding( void);
+ float line_position,
+ float line_thickness,
+ float line_length,
+ float strokewidth);
+extern int T1int_Type1QuerySEAC( unsigned char* base,
+ unsigned char* accent);
void objFormatName(psobj *objP, int length, char *valueP);
extern void T1io_reset( void);
@@ -64,13 +72,49 @@
#define LINETYPE 0x10+0x00
#define MOVETYPE 0x10+0x05
+#if 1
+struct region {
+ XOBJ_COMMON /* xobject common data define 3-26-91 PNM */
+ /* type = REGIONTYPE */
+ struct fractpoint origin; /* beginning handle: X,Y origin of region */
+ struct fractpoint ending; /* ending handle: X,Y change after painting region */
+ pel xmin,ymin; /* minimum X,Y of region */
+ pel xmax,ymax; /* mat1_mum X,Y of region */
+ struct edgelist *anchor; /* list of edges that bound the region */
+ struct picture *thresholded; /* region defined by thresholded picture*/
+ /*
+ Note that the ending handle and the bounding box values are stored
+ relative to 'origin'.
+
+ The above elements describe a region. The following elements are
+ scratchpad areas used while the region is being built:
+ */
+ fractpel lastdy; /* direction of last segment */
+ fractpel firstx,firsty; /* starting point of current edge */
+ fractpel edgexmin,edgexmax; /* x extent of current edge */
+ struct edgelist *lastedge,*firstedge; /* last and first edges in subpath */
+ pel *edge; /* pointer to array of X values for edge */
+ fractpel edgeYstop; /* Y value where 'edges' array ends */
+ int (*newedgefcn)(); /* function to use when building a new edge */
+ struct strokeinfo *strokeinfo; /* scratchpad info during stroking only */
+} ;
+struct edgelist {
+ XOBJ_COMMON /* xobject common data define 3-26-91 PNM */
+ /* type = EDGETYPE */
+ struct edgelist *link; /* pointer to next in linked list */
+ struct edgelist *subpath; /* informational link for "same subpath" */
+ pel xmin,xmax; /* range of edge in X */
+ pel ymin,ymax; /* range of edge in Y */
+ pel *xvalues; /* pointer to ymax-ymin X values */
+};
+#endif
/***================================================================***/
/* GLOBALS */
/***================================================================***/
static char CurCharName[257]="";
static char BaseCharName[257]="";
-char CurFontName[120];
+char CurFontName[MAXPATHLEN+1];
char *CurFontEnv;
char *vm_base = NULL;
@@ -119,7 +163,6 @@
{
if (!(vm_init())) return(FALSE);
vm_base = vm_next_byte();
- if (!(Init_BuiltInEncoding())) return(FALSE);
strcpy(CurFontName, ""); /* iniitialize to none */
FontP->vm_start = vm_next_byte();
FontP->FontFileName.len = 0;
@@ -140,7 +183,8 @@
FontP->fontInfoP = NULL;
FontP->BluesP = NULL;
/* This will load the font into the FontP */
- strcpy(CurFontName,env);
+ strncpy(CurFontName,env, MAXPATHLEN);
+ CurFontName[MAXPATHLEN] = '\0';
FontP->FontFileName.len = strlen(CurFontName);
FontP->FontFileName.data.nameP = CurFontName;
T1io_reset();
@@ -241,7 +285,8 @@
struct XYspace *S, char **ev,
unsigned char index, int *mode,
psfont *Font_Ptr,
- int do_raster)
+ int do_raster,
+ float strokewidth)
{
psobj *charnameP; /* points to psobj that is name of character*/
@@ -337,7 +382,7 @@
/* get CharString and character path */
theStringP = &(CharStringsDictP[basechar].value);
tmppath2 = (struct segment *) Type1Char(FontP,S,theStringP,SubrsArrayP,NULL,
- FontP->BluesP,mode,CurCharName);
+ FontP->BluesP,mode,CurCharName,strokewidth,0);
/* if Type1Char reported an error, then return */
if ( *mode == FF_PARSE_ERROR || *mode==FF_PATH_ERROR)
return(NULL);
@@ -378,7 +423,7 @@
strncpy( (char *)CurCharName, (char *)charnameP->data.stringP, charnameP->len);
CurCharName[charnameP->len]='\0';
charpath=(struct segment *)Type1Char(FontP,S,theStringP,SubrsArrayP,NULL,
- FontP->BluesP,mode,CurCharName);
+ FontP->BluesP,mode,CurCharName,strokewidth,0);
/* return if Type1Char reports an error */
if ( *mode == FF_PARSE_ERROR || *mode==FF_PATH_ERROR)
return(NULL);
@@ -593,7 +638,8 @@
unsigned char *string, int no_chars,
int *mode, psfont *Font_Ptr,
int *kern_pairs, long spacewidth,
- int do_raster)
+ int do_raster,
+ float strokewidth)
{
psobj *charnameP; /* points to psobj that is name of character*/
@@ -714,7 +760,7 @@
/* get CharString and character path */
theStringP = &(CharStringsDictP[basechar].value);
tmppath2 = (struct segment *) Type1Char(FontP,S,theStringP,SubrsArrayP,NULL,
- FontP->BluesP,mode,CurCharName);
+ FontP->BluesP,mode,CurCharName,strokewidth,0);
strcpy( BaseCharName, CurCharName);
/* if Type1Char reports an error, clean up and return */
if ( *mode == FF_PARSE_ERROR || *mode==FF_PATH_ERROR) {
@@ -790,7 +836,7 @@
strncpy( (char *)CurCharName, (char *)charnameP->data.stringP, charnameP->len);
CurCharName[charnameP->len]='\0';
tmppath5=(struct segment *)Type1Char(FontP,S,theStringP,SubrsArrayP,NULL,
- FontP->BluesP,mode,CurCharName);
+ FontP->BluesP,mode,CurCharName,strokewidth,0);
/* return if Type1Char reports an error */
if ( *mode == FF_PARSE_ERROR || *mode==FF_PATH_ERROR)
return(NULL);
@@ -873,21 +919,21 @@
tmppath2=(struct segment *)Type1Line(FontP,S,
pFontBase->pFontArray[FontID].UndrLnPos,
pFontBase->pFontArray[FontID].UndrLnThick,
- (float) acc_width);
+ (float) acc_width,strokewidth);
charpath=(struct segment *)Join(charpath,tmppath2);
}
if (modflag & T1_OVERLINE){
tmppath2=(struct segment *)Type1Line(FontP,S,
pFontBase->pFontArray[FontID].OvrLnPos,
pFontBase->pFontArray[FontID].OvrLnThick,
- (float) acc_width);
+ (float) acc_width,strokewidth);
charpath=(struct segment *)Join(charpath,tmppath2);
}
if (modflag & T1_OVERSTRIKE){
tmppath2=(struct segment *)Type1Line(FontP,S,
pFontBase->pFontArray[FontID].OvrStrkPos,
pFontBase->pFontArray[FontID].OvrStrkThick,
- (float) acc_width);
+ (float) acc_width,strokewidth);
charpath=(struct segment *)Join(charpath,tmppath2);
}
@@ -1012,7 +1058,7 @@
/* get CharString and character path */
theStringP = &(CharStringsDictP[basechar].value);
tmppath2 = (struct segment *) Type1Char(FontP,S,theStringP,SubrsArrayP,NULL,
- FontP->BluesP,mode,CurCharName);
+ FontP->BluesP,mode,CurCharName, 0.0f, 0);
/* if Type1Char reported an error, then return */
if ( *mode == FF_PARSE_ERROR || *mode==FF_PATH_ERROR)
return(NULL);
@@ -1053,7 +1099,7 @@
strncpy( (char *)CurCharName, (char *)charnameP->data.stringP, charnameP->len);
CurCharName[charnameP->len]='\0';
charpath=(struct segment *)Type1Char(FontP,S,theStringP,SubrsArrayP,NULL,
- FontP->BluesP,mode,CurCharName);
+ FontP->BluesP,mode,CurCharName,0.0f,0);
/* return if Type1Char reports an error */
if ( *mode == FF_PARSE_ERROR || *mode==FF_PATH_ERROR)
return(NULL);
@@ -1103,3 +1149,118 @@
}
+
+xobject fontfcnRect( float width,
+ float height,
+ struct XYspace* S,
+ int *mode,
+ int do_raster,
+ float strokewidth)
+{
+ struct segment *charpath = NULL; /* the path for this character (rectangle) */
+
+ charpath = (struct segment *) Type1Line( NULL, S,
+ 0.5f * height, /* position */
+ height, /* thickness */
+ -width, /* width */
+ strokewidth /* strokewidth */
+ );
+
+ if (do_raster) {
+ /* fill with winding rule unless path was requested */
+ if (*mode != FF_PATH) {
+ charpath = (struct segment *)Interior(charpath,WINDINGRULE+CONTINUITY);
+ }
+ }
+
+ return((xobject) charpath);
+
+}
+
+
+
+/* T1int_QuerySEAC(): Query for Type of character definition of index "index".
+
+ Returns: 0 if charstring for currenc[index] not defined
+ 1 if charstring defines a self-containing character
+ 2 if charstring references other definition by means of
+ the SEAC directive.
+*/
+int T1int_QuerySEAC( int FontID,
+ unsigned char index,
+ unsigned char* basepiece,
+ unsigned char* accpiece
+ )
+{
+
+ psobj *charnameP; /* points to psobj that is name of character*/
+ int thischar;
+ int mode = 0;
+
+ psdict *CharStringsDictP; /* dictionary with char strings */
+ psobj CodeName; /* used to store the translation of the name*/
+ psobj *SubrsArrayP;
+ psobj *theStringP;
+ char **ev;
+ struct XYspace *S;
+ struct segment *path=NULL; /* the path for this character */
+
+
+ /* set the global font pointer to the address of already allocated
+ structure and setup pointers*/
+ FontP=pFontBase->pFontArray[FontID].pType1Data;
+ CharStringsDictP = FontP->CharStringsP;
+ SubrsArrayP = &(FontP->Subrs);
+ charnameP = &CodeName;
+
+ /* get encoding */
+ ev=pFontBase->pFontArray[FontID].pFontEnc;
+
+ if (ev==NULL){ /* font-internal encoding should be used */
+ charnameP->len = FontP->fontInfoP[ENCODING].value.data.arrayP[index].len;
+ charnameP->data.stringP = (unsigned char *) FontP->fontInfoP[ENCODING].value.data.arrayP[index].data.arrayP;
+ }
+ else{ /* some user-supplied encoding is to be used */
+ charnameP->len = strlen(ev[index]);
+ charnameP->data.stringP = (unsigned char *) ev[index];
+ }
+ strncpy( (char *)CurCharName, (char *)charnameP->data.stringP, charnameP->len);
+ CurCharName[charnameP->len]='\0';
+
+
+ /* search the chars string for this charname as key */
+ thischar = SearchDictName(CharStringsDictP,charnameP);
+ /* thischar is now the index of the base character in the CharStrings
+ dictionary */
+
+ if ( thischar <= 0 ) {
+ /* CharString not defined, return */
+ return 0;
+ }
+
+ /* Setup NULL-space, not needed when paths aren't created */
+ S = NULL;
+
+
+ /* we provide the Type1Char() procedure with the name of the character
+ to rasterize for debugging purposes */
+ strncpy( (char *)CurCharName, (char *)charnameP->data.stringP, charnameP->len);
+ CurCharName[charnameP->len]='\0';
+ /* get CharString and character path */
+ theStringP = &(CharStringsDictP[thischar].value);
+
+ path = (struct segment *) Type1Char(FontP,S,theStringP,SubrsArrayP,NULL,
+ FontP->BluesP,&mode,CurCharName,0, 1);
+
+ /* if Type1Char reported an error, then return */
+ if ( mode == FF_PARSE_ERROR || mode==FF_PATH_ERROR) {
+ return -1;
+ }
+
+ if ( T1int_Type1QuerySEAC( basepiece, accpiece) > 0 ) {
+ return 2;
+ }
+
+ return 1;
+
+}
diff -Nru t1lib-grace/T1lib/type1/fontstruct.h t1lib-deb/T1lib/type1/fontstruct.h
--- t1lib-grace/T1lib/type1/fontstruct.h 1999-09-07 13:51:21.000000000 -0700
+++ t1lib-deb/T1lib/type1/fontstruct.h 2007-12-23 07:49:42.000000000 -0800
@@ -1,4 +1,4 @@
-/* $Header: /home/fnevgeny/cvsroot/grace/T1lib/type1/fontstruct.h,v 1.3 1999/09/07 20:51:21 fnevgeny Exp $ */
+/* $Header: fontstruct.h,v 1.10 91/07/22 15:37:41 keith Exp $ */
/***********************************************************
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
diff -Nru t1lib-grace/T1lib/type1/hints.c t1lib-deb/T1lib/type1/hints.c
--- t1lib-grace/T1lib/type1/hints.c 1999-05-08 17:38:00.000000000 -0700
+++ t1lib-deb/T1lib/type1/hints.c 2007-12-23 07:49:42.000000000 -0800
@@ -369,30 +369,37 @@
register struct edgelist *edge; /* represents edge */
register pel y; /* 'y' value to find edge for */
{
- register struct edgelist *e; /* loop variable */
-
- if (y < edge->ymin) {
- if (ISTOP(edge->flag))
- return(MINPEL);
- for (e = edge->subpath; e->subpath != edge; e = e->subpath) { ; }
- if (e->ymax == edge->ymin)
- return(XofY(e, y));
- }
- else if (y >= edge->ymax) {
- if (ISBOTTOM(edge->flag))
- return(MINPEL);
- e = edge->subpath;
- if (e->ymin == edge->ymax)
- return(XofY(e, y));
- }
- else
- return(XofY(edge, y));
-
- abort("bad subpath chain", 11);
- /*NOTREACHED*/
- /* To make ANSI-C-compiler happy: */
- return(y);
-
+ register struct edgelist *e; /* loop variable */
+
+ if (y < edge->ymin) {
+ if (ISTOP(edge->flag)) {
+ return(MINPEL);
+ }
+
+ for (e = edge->subpath; e->subpath != edge; e = e->subpath) { ; }
+ if (e->ymax == edge->ymin) {
+ return(XofY(e, y));
+ }
+ }
+ else if (y >= edge->ymax) {
+ if (ISBOTTOM(edge->flag)) {
+ return(MINPEL);
+ }
+ e = edge->subpath;
+ if (e->ymin == edge->ymax) {
+ return(XofY(e, y));
+ }
+ }
+ else {
+ return(XofY(edge, y));
+ }
+
+
+ abort("bad subpath chain", 11);
+ /*NOTREACHED*/
+ /* To make ANSI-C-compiler happy: */
+ return(y);
+
}
/*
:h3.ISBREAK() Macro - Tests if an Edge List is at a "Break"
@@ -495,139 +502,166 @@
static void FixSubPaths(R)
register struct region *R; /* anchor of region */
{
- register struct edgelist *e; /* fast loop variable */
- register struct edgelist *edge; /* current edge in region */
- register struct edgelist *next; /* next in subpath after 'edge' */
- register struct edgelist *break1; /* first break after 'next' */
- register struct edgelist *break2=NULL; /* last break before 'edge' */
- register struct edgelist *prev; /* previous edge for fixing links */
- int left = TRUE;
-
- for (edge = R->anchor; edge != NULL; edge = edge->link) {
-
- if (left)
- edge->flag |= ISLEFT(ON);
- left = !left;
-
- next = edge->subpath;
-
- if (!ISBREAK(edge, next))
- continue;
- if (edge->ymax < next->ymin)
- abort("disjoint subpath?", 13);
-/*
-'edge' now contains an edgelist at the bottom of an edge, and 'next'
-contains the next subsequent edgelist in the subpath, which must be at
-the top. We refer to this a "break" in the subpath.
-*/
- next->flag |= ISTOP(ON);
- edge->flag |= ISBOTTOM(ON);
-
- if (ISDOWN(edge->flag) != ISDOWN(next->flag))
- continue;
-/*
-We are now in the unusual case; both edges are going in the same
-direction so this must be a "false break" due to the way that the user
-created the path. We'll have to fix it.
-*/
- for (break1 = next; !ISBREAK(break1, break1->subpath); break1 = break1->subpath) { ; }
-
- for (e = break1->subpath; e != edge; e = e->subpath)
- if (ISBREAK(e, e->subpath))
- break2 = e;
-/*
-Now we've set up 'break1' and 'break2'. I've found the following
-diagram invaluable. 'break1' is the first break after 'next'. 'break2'
-is the LAST break before 'edge'.
-&drawing.
- next
- +------+ +---->+------+
- +--->| >-----+ | | >-----+
- | | | | | | | |
- | +-------------+ | +-------------+
- | | |break1| | | | |
- | +->| >-------+ +->| >-----+
- | | | | | |
- | | | +-------------+
- | +------+ | | |
- | +----------------+ | | |
- | | +------+ | +->| >-----+
- | +->| >-----+ | | | |
- | | | | | +-------------+
- | +-------------+ | | | |
- | | |edge | | | |break2|
- | +->| >-----+ | +->| >-----+
- | | | | | | | |
- | | | | | | | |
- | | | | | | | |
- | +------+ | | +------+ |
- | | | |
- +---------------+ +---------------+
-
-&edrawing.
-We want to fix this situation by having 'edge' point to where 'break1'
-now points, and having 'break1' point to where 'break2' now points.
-Finally, 'break2' should point to 'next'. Also, we observe that
-'break1' can't be a bottom, and is also not a top unless it is the same
-as 'next':
-*/
- edge->subpath = break1->subpath;
-
- break1->subpath = break2->subpath;
- if (ISBREAK(break1, break1->subpath))
- abort("unable to fix subpath break?", 14);
-
- break2->subpath = next;
-
- break1->flag &= ~ISBOTTOM(ON);
- if (break1 != next)
- break1->flag &= ~ISTOP(ON);
- }
-/*
-This region might contain "ambiguous" edges; edges exactly equal to
-edge->link. Due to the random dynamics of where they get sorted into
-the list, they can yield false crossings, where the edges appear
-to cross. This confuses our continuity logic no end. Since we can
-swap them without changing the region, we do.
-*/
- for (edge = R->anchor, prev = NULL; VALIDEDGE(edge); prev = edge, edge = prev->link) {
-
- if (! ISAMBIGUOUS(edge->flag))
- continue;
-
- next = edge->subpath;
-
- while (ISAMBIGUOUS(next->flag) && next != edge)
- next = next->subpath;
-/*
-We've finally found a non-ambiguous edge; we make sure it is left/right
-compatible with 'edge':
-*/
- if ( (ISLEFT(edge->flag) == ISLEFT(next->flag) && ISDOWN(edge->flag) == ISDOWN(next->flag) )
- || (ISLEFT(edge->flag) != ISLEFT(next->flag) && ISDOWN(edge->flag) != ISDOWN(next->flag) ) )
- continue;
-
-/*
-Incompatible, we will swap 'edge' and the following edge in the list.
-You may think that there must be a next edge in this swath. So did I.
-No! If there is a totally ambiguous inner loop, for example, we could
-get all the way to the outside without resolving ambiguity.
-*/
- next = edge->link; /* note new meaning of 'next' */
- if (next == NULL || edge->ymin != next->ymin)
- continue;
- if (prev == NULL)
- R->anchor = next;
- else
- prev->link = next;
- edge->link = next->link;
- next->link = edge;
- edge->flag ^= ISLEFT(ON);
- edge->flag &= ~ISAMBIGUOUS(ON);
- next->flag ^= ISLEFT(ON);
- next->flag &= ~ISAMBIGUOUS(ON);
- edge = next;
- }
+ register struct edgelist *e; /* fast loop variable */
+ register struct edgelist *edge; /* current edge in region */
+ register struct edgelist *next; /* next in subpath after 'edge' */
+ register struct edgelist *break1; /* first break after 'next' */
+ register struct edgelist *break2=NULL; /* last break before 'edge' */
+ register struct edgelist *prev; /* previous edge for fixing links */
+ int left = TRUE;
+
+ for (edge = R->anchor; edge != NULL; edge = edge->link) {
+
+ if (left)
+ edge->flag |= ISLEFT(ON);
+ left = !left;
+
+ next = edge->subpath;
+
+ if (!ISBREAK(edge, next))
+ continue;
+ if (edge->ymax < next->ymin)
+ abort("disjoint subpath?", 13);
+ /*
+ 'edge' now contains an edgelist at the bottom of an edge, and 'next'
+ contains the next subsequent edgelist in the subpath, which must be at
+ the top. We refer to this a "break" in the subpath.
+ */
+ next->flag |= ISTOP(ON);
+ edge->flag |= ISBOTTOM(ON);
+
+ if (ISDOWN(edge->flag) != ISDOWN(next->flag))
+ continue;
+ /*
+ We are now in the unusual case; both edges are going in the same
+ direction so this must be a "false break" due to the way that the user
+ created the path. We'll have to fix it.
+ */
+ for (break1 = next; !ISBREAK(break1, break1->subpath); break1 = break1->subpath) { ; }
+
+ for (e = break1->subpath; e != edge; e = e->subpath)
+ if (ISBREAK(e, e->subpath))
+ break2 = e;
+ /*
+ Now we've set up 'break1' and 'break2'. I've found the following
+ diagram invaluable. 'break1' is the first break after 'next'. 'break2'
+ is the LAST break before 'edge'.
+ &drawing.
+ next
+ +------+ +---->+------+
+ +--->| >-----+ | | >-----+
+ | | | | | | | |
+ | +-------------+ | +-------------+
+ | | |break1| | | | |
+ | +->| >-------+ +->| >-----+
+ | | | | | |
+ | | | +-------------+
+ | +------+ | | |
+ | +----------------+ | | |
+ | | +------+ | +->| >-----+
+ | +->| >-----+ | | | |
+ | | | | | +-------------+
+ | +-------------+ | | | |
+ | | |edge | | | |break2|
+ | +->| >-----+ | +->| >-----+
+ | | | | | | | |
+ | | | | | | | |
+ | | | | | | | |
+ | +------+ | | +------+ |
+ | | | |
+ +---------------+ +---------------+
+
+ &edrawing.
+ We want to fix this situation by having 'edge' point to where 'break1'
+ now points, and having 'break1' point to where 'break2' now points.
+ Finally, 'break2' should point to 'next'. Also, we observe that
+ 'break1' can't be a bottom, and is also not a top unless it is the same
+ as 'next':
+ */
+ edge->subpath = break1->subpath;
+
+ break1->subpath = break2->subpath;
+ if (ISBREAK(break1, break1->subpath))
+ abort("unable to fix subpath break?", 14);
+
+ break2->subpath = next;
+
+ break1->flag &= ~ISBOTTOM(ON);
+ if (break1 != next)
+ break1->flag &= ~ISTOP(ON);
+ }
+
+ /*
+ This region might contain "ambiguous" edges; edges exactly equal to
+ edge->link. Due to the random dynamics of where they get sorted into
+ the list, they can yield false crossings, where the edges appear
+ to cross. This confuses our continuity logic no end. Since we can
+ swap them without changing the region, we do.
+ */
+ for (edge = R->anchor, prev = NULL; VALIDEDGE(edge); prev = edge, edge = prev->link) {
+
+ if (! ISAMBIGUOUS(edge->flag)) {
+ continue;
+ }
+
+ next = edge->subpath;
+
+ while (ISAMBIGUOUS(next->flag) && next != edge) {
+ next = next->subpath;
+ }
+
+ /*
+ We've finally found a non-ambiguous edge; we make sure it is left/right
+ compatible with 'edge':
+ */
+ if ( (ISLEFT(edge->flag) == ISLEFT(next->flag) && ISDOWN(edge->flag) == ISDOWN(next->flag) )
+ || (ISLEFT(edge->flag) != ISLEFT(next->flag) && ISDOWN(edge->flag) != ISDOWN(next->flag) ) ) {
+ continue;
+ }
+
+ /*
+ Incompatible, we will swap 'edge' and the following edge in the list.
+ You may think that there must be a next edge in this swath. So did I.
+ No! If there is a totally ambiguous inner loop, for example, we could
+ get all the way to the outside without resolving ambiguity.
+ */
+ next = edge->link; /* note new meaning of 'next' */
+ if (next == NULL || edge->ymin != next->ymin) {
+ continue;
+ }
+
+ /*
+ printf(" Swap: \n");
+ printf(" Edge=0x%x, ymin=%d, ymax=%d, xmin=%d, xmax=%d, fpx1=%ld, fpx2=%ld\n",
+ edge, edge->ymin, edge->ymax, edge->xmin, edge->xmax, edge->fpx1, edge->fpx2);
+ printf(" Link=0x%x, ymin=%d, ymax=%d, xmin=%d, xmax=%d, fpx1=%ld, fpx2=%ld\n",
+ next, next->ymin, next->ymax, next->xmin, next->xmax, next->fpx1, next->fpx2);
+ printf(" Edge=0x%x (amb=%d), x[ymin]=%d, x[ymax]=%d, px1=%ld, px2=%ld\n",
+ edge, ISAMBIGUOUS(edge->flag), edge->xvalues[0], edge->xvalues[edge->ymax - edge->ymin],
+ edge->fpx1>>FRACTBITS, edge->fpx2>>FRACTBITS);
+ printf(" Link=0x%x (amb=%d), x[ymin]=%d, x[ymax]=%d, px1=%ld, px2=%ld\n",
+ next, ISAMBIGUOUS(next->flag), next->xvalues[0], next->xvalues[next->ymax - next->ymin],
+ next->fpx1>>FRACTBITS, next->fpx2>>FRACTBITS);
+ */
+
+ /* Check ambiguity also for link edge (RMz) */
+ if ( !ISAMBIGUOUS(next->flag) ) {
+ continue;
+ }
+
+
+ if (prev == NULL)
+ R->anchor = next;
+ else
+ prev->link = next;
+ edge->link = next->link;
+ next->link = edge;
+ edge->flag ^= ISLEFT(ON);
+ edge->flag &= ~ISAMBIGUOUS(ON);
+ next->flag ^= ISLEFT(ON);
+ next->flag &= ~ISAMBIGUOUS(ON);
+ edge = next;
+ }
}
/*
:h3.DumpSubPaths()
@@ -719,11 +753,12 @@
int y; /* y value */
int x; /* new x value */
{
- if (e->xmin > x) e->xmin = x;
- if (e->xmax < x) e->xmax = x;
- e->xvalues[y - e->ymin] = x;
+ if (e->xmin > x) e->xmin = x;
+ if (e->xmax < x) e->xmax = x;
+ e->xvalues[y - e->ymin] = x;
}
+
/*-------------------------------------------------------------------------*/
/* the following three macros tell us whether we are at a birth point, a */
/* death point, or simply in the middle of the character */
@@ -822,107 +857,128 @@
void ApplyContinuity(R)
struct region *R;
{
- struct edgelist *left;
- struct edgelist *right;
- struct edgelist *edge,*e2;
- pel rightXabove,rightXbelow,leftXabove,leftXbelow;
- pel leftX,rightX;
- int i;
- LONG newcenter,abovecenter,belowcenter;
-
- FixSubPaths(R);
- if (RegionDebug >= 3)
- DumpSubPaths(R->anchor);
- left = R->anchor;
-/* loop through and do all of the easy checking. ( no tops or bottoms) */
- while(VALIDEDGE(left))
- {
- right = left->link;
- for(i=left->ymin;i<left->ymax;++i)
- {
- leftX = findXofY(left,i);
- rightX = findXofY(right,i);
- leftXbelow = findXofY(left,i+1);
- rightXbelow = findXofY(right,i+1);
- if(rightX <= leftX)
- {
-/* then, we have a break in a near vertical line */
- leftXabove = findXofY(left,i-1);
- rightXabove = findXofY(right,i-1);
- if( IsValidPel(leftXabove) && IsValidPel(rightXabove) )
- {
- abovecenter = leftXabove + rightXabove;
- }
- else
- {
- abovecenter = leftX + rightX;
- }
- if( IsValidPel(leftXbelow) && IsValidPel(rightXbelow) )
- {
- belowcenter = leftXbelow + rightXbelow;
- }
- else
- {
- belowcenter = leftX + rightX;
- }
- newcenter = abovecenter + belowcenter;
- if( newcenter > 4*leftX )
- {
- rightX = rightX + 1;
- }
- else if( newcenter < 4*leftX)
- {
- leftX = leftX - 1;
- }
- else
- {
- rightX = rightX + 1;
- }
- writeXofY(right,i,rightX);
- writeXofY(left,i,leftX);
- if(rightX > R->xmax) {R->xmax = rightX;}
- if(leftX < R->xmin) {R->xmin = leftX;}
- }
- if( !WeAreAtBottom(left,i) && (leftXbelow>=rightX))
- {
-/* then we have a break in a near horizontal line in the middle */
- writeXofY(right,i,leftXbelow);
- }
- if( !WeAreAtBottom(right,i) && (leftX >=rightXbelow))
- {
-/* then we have a break in a near horizontal line in the middle */
- writeXofY(left,i,rightXbelow);
- }
+ struct edgelist *left;
+ struct edgelist *right;
+ struct edgelist *edge,*e2;
+ pel rightXabove,rightXbelow,leftXabove,leftXbelow;
+ pel leftX,rightX;
+ int i;
+ long edgecnt = 0;
+
+ fractpel xavrg = 0;
+ LONG newcenter,abovecenter,belowcenter;
+
+
+ FixSubPaths(R);
+ if ( RegionDebug >= 3)
+ DumpSubPaths(R->anchor);
+ left = R->anchor;
+
+ /* loop through and do all of the easy checking. ( no tops or bottoms) */
+ while(VALIDEDGE(left)) {
+ right = left->link;
+ for(i=left->ymin;i<left->ymax;++i) {
+ leftX = findXofY(left,i);
+ rightX = findXofY(right,i);
+ leftXbelow = findXofY(left,i+1);
+ rightXbelow = findXofY(right,i+1);
+ if(rightX <= leftX) {
+
+ /* then, we have a break in a near vertical line */
+ leftXabove = findXofY(left,i-1);
+ rightXabove = findXofY(right,i-1);
+ /* Check above current scanline */
+ if ( IsValidPel(leftXabove) && IsValidPel(rightXabove) ) {
+ abovecenter = leftXabove + rightXabove;
+ }
+ else {
+ /* We are at the top. We can assume that the current edge list is just started
+ --> Inspect the stored start fractpel values in order to decide about
+ to which side to extend. -->
+ Compute arithmetic average between left and right edge at high resolution */
+ xavrg = ((left->fpx1 + right->fpx1) >> 1);
+ /* round down to get left (not nearest!) and get right edge by adding one pel. */
+ leftXabove = (xavrg >> FRACTBITS);
+ rightXabove = leftXabove + 1;
+ abovecenter = leftXabove + rightXabove;
+ belowcenter = leftXabove + rightXabove;
+ }
+
+ /* Check below current scanline */
+ if ( IsValidPel(leftXbelow) && IsValidPel(rightXbelow) ) {
+ belowcenter = leftXbelow + rightXbelow;
+ }
+ else {
+ /* We are at the bottom. We can assume that the current edge list terminates here
+ --> Inspect the stored end fractpel values in order to decide about
+ to which side to extend. -->
+ Compute arithmetic average between left and right edge at high resolution */
+ xavrg = ((left->fpx2 + right->fpx2) >> 1);
+ /* round down to get left (not nearest!) and get right edge by adding one pel. */
+ leftXbelow = (xavrg >> FRACTBITS);
+ rightXbelow = leftXbelow + 1;
+ abovecenter = leftXbelow + rightXbelow;
+ belowcenter = leftXbelow + rightXbelow;
+ }
+
+ newcenter = abovecenter + belowcenter;
+
+ if( newcenter > 4*leftX ) {
+ rightX = rightX + 1;
+ writeXofY(right,i,rightX);
+ }
+ else if( newcenter < 4*leftX) {
+ leftX = leftX - 1;
+ writeXofY(left,i,leftX);
+ }
+ else {
+ rightX = rightX + 1;
+ writeXofY(right,i,rightX);
+ }
+
+ if ( rightX > R->xmax ) {
+ R->xmax = rightX;
+ }
+ if ( leftX < R->xmin ) {
+ R->xmin = leftX;
+ }
+ }
+ if( !WeAreAtBottom(left,i) && (leftXbelow>=rightX)) {
+ /* then we have a break in a near horizontal line in the middle */
+ writeXofY(right,i,leftXbelow);
+ }
+ if( !WeAreAtBottom(right,i) && (leftX >=rightXbelow)) {
+ /* then we have a break in a near horizontal line in the middle */
+ writeXofY(left,i,rightXbelow);
+ }
+ }
+ left = right->link;
+ ++edgecnt;
}
- left = right->link;
- }
-/*
-There may be "implied horizontal lines" between edges that have
-implications for continuity. This loop looks for white runs that
-have implied horizontal lines on the top or bottom, and calls
-CollapseWhiteRuns to check and fix any continuity problems from
-them.
-*/
- for (edge = R->anchor; VALIDEDGE(edge); edge = edge->link) {
- if ((!ISTOP(edge->flag) && !ISBOTTOM(edge->flag)) || ISLEFT(edge->flag))
- continue; /* at some future date we may want left edge logic here too */
- for (e2 = edge->link; VALIDEDGE(e2) && SAMESWATH(edge,e2); e2 = e2->link) {
- if (ISTOP(e2->flag) && ISTOP(edge->flag)
- && NONE != ImpliedHorizontalLine(edge,e2,edge->ymin)) {
- if (ISLEFT(e2->flag))
- CollapseWhiteRun(R->anchor, edge->ymin-1,
- edge, e2, edge->ymin);
- }
- if (ISBOTTOM(e2->flag) && ISBOTTOM(edge->flag)
- && NONE != ImpliedHorizontalLine(edge,e2, edge->ymax)) {
- if (ISLEFT(e2->flag))
- CollapseWhiteRun(R->anchor, edge->ymax,
- edge, e2, edge->ymax-1);
- }
- }
+
+ /*
+ There may be "implied horizontal lines" between edges that have
+ implications for continuity. This loop looks for white runs that
+ have implied horizontal lines on the top or bottom, and calls
+ CollapseWhiteRuns to check and fix any continuity problems from
+ them.
+ */
+ for (edge = R->anchor; VALIDEDGE(edge); edge = edge->link) {
+ if ((!ISTOP(edge->flag) && !ISBOTTOM(edge->flag)) || ISLEFT(edge->flag))
+ continue; /* at some future date we may want left edge logic here too */
+ for (e2 = edge->link; VALIDEDGE(e2) && SAMESWATH(edge,e2); e2 = e2->link) {
+ if (ISTOP(e2->flag) && ISTOP(edge->flag)
+ && NONE != ImpliedHorizontalLine(edge,e2,edge->ymin)) {
+ if (ISLEFT(e2->flag))
+ CollapseWhiteRun(R->anchor, edge->ymin-1,
+ edge, e2, edge->ymin);
+ }
+ if (ISBOTTOM(e2->flag) && ISBOTTOM(edge->flag)
+ && NONE != ImpliedHorizontalLine(edge,e2, edge->ymax)) {
+ if (ISLEFT(e2->flag))
+ CollapseWhiteRun(R->anchor, edge->ymax,
+ edge, e2, edge->ymax-1);
}
+ }
+ }
}
-
-
-
-
diff -Nru t1lib-grace/T1lib/type1/lines.c t1lib-deb/T1lib/type1/lines.c
--- t1lib-grace/T1lib/type1/lines.c 1998-11-24 14:08:54.000000000 -0800
+++ t1lib-deb/T1lib/type1/lines.c 2014-03-27 20:23:42.310776026 -0700
@@ -43,6 +43,7 @@
#include "types.h"
#include "objects.h"
#include "spaces.h"
+#include "paths.h"
#include "regions.h"
#include "lines.h"
@@ -66,6 +67,10 @@
None.
*/
+#define BITS (sizeof(LONG)*8)
+#define HIGHTEST(p) (((p)>>(BITS-2)) != 0) /* includes sign bit */
+#define TOOBIG(xy) ((xy < 0) ? HIGHTEST(-xy) : HIGHTEST(xy))
+
/*
:h2.StepLine() - Produces Run Ends for a Line After Checks
@@ -83,6 +88,9 @@
IfTrace4((LineDebug > 0), ".....StepLine: (%d,%d) to (%d,%d)\n",
x1, y1, x2, y2);
+ if ( TOOBIG(x1) || TOOBIG(x2) || TOOBIG(y1) || TOOBIG(y2))
+ abort("Lines this big not supported", 49);
+
dy = y2 - y1;
/*
@@ -147,6 +155,7 @@
x = RoundFP(x1,PREC);
y = RoundFP(y1,PREC);
+
edgeP += y;
count = RoundFP(y2,PREC) - y;
/*------------------------------------------------------------------*/
@@ -172,6 +181,15 @@
}
else /* positive dx */
{
+
+ if ( dx == 0 ) {
+ while(--count >= 0 ) {
+ *(edgeP++) = x;
+ }
+ return;
+
+ }
+
#define P PREC
d = (dy*((x<<P)-x1+(1<<(P-1)))-dx*((y<<P)-y1+(1<<(P-1))))>>P;
#undef P
diff -Nru t1lib-grace/T1lib/type1/objects.c t1lib-deb/T1lib/type1/objects.c
--- t1lib-grace/T1lib/type1/objects.c 2002-01-03 13:15:17.000000000 -0800
+++ t1lib-deb/T1lib/type1/objects.c 2014-03-27 20:23:42.310776026 -0700
@@ -542,7 +542,7 @@
return(NULL);
if (ISPATHTYPE(obj->type))
- obj = (struct xobject *) CopyPath(obj);
+ obj = (struct xobject *) CopyPath((struct segment *)obj);
else
switch (obj->type) {
case SPACETYPE:
@@ -584,7 +584,7 @@
return(NULL);
}
if (ISPATHTYPE(obj->type))
- KillPath(obj);
+ KillPath((struct segment *)obj);
else {
switch (obj->type) {
case REGIONTYPE:
@@ -957,7 +957,7 @@
sprintf(typemsg, "Wrong object type in %s; expected %s, found %s.\n",
name, TypeFmt(expect), TypeFmt(obj->type));
- IfTrace0(TRUE,typemsg);
+ IfTrace1(TRUE, "%s", typemsg);
ObjectPostMortem(obj);
@@ -1137,12 +1137,13 @@
"Context: out of them", /* 46 */
"MatrixInvert: can't", /* 47 */
"xiStub called", /* 48 */
- "Illegal access type1 abort() message" /* 49 */
+ "Lines this big not supported", /* 49 */
+ "Illegal access type1 abort() message" /* 50 */
};
- /* no is valid from 1 to 48 */
- if ( (number<1)||(number>48))
- number=49;
+ /* no is valid from 1 to 49 */
+ if ( (number<1)||(number>49))
+ number=50;
return( err_msgs[number-1]);
}
diff -Nru t1lib-grace/T1lib/type1/objects.h t1lib-deb/T1lib/type1/objects.h
--- t1lib-grace/T1lib/type1/objects.h 1999-09-07 13:51:21.000000000 -0700
+++ t1lib-deb/T1lib/type1/objects.h 2014-03-27 20:23:42.298776009 -0700
@@ -214,7 +214,7 @@
/*SHARED*/
/* NDW: personally, I want to see status and error messages! */
#define IfTrace0(condition,model) \
- {if (condition) printf(model);}
+ {if (condition) fputs(model,stdout);}
#define IfTrace1(condition,model,arg0) \
{if (condition) printf(model,arg0);}
#define IfTrace2(condition,model,arg0,arg1) \
@@ -288,7 +288,7 @@
void t1_DumpArea(); /* dump a region structure */
void t1_DumpText(); /* dump a textpath structure */
-void t1_DumpPath(); /* dump a path list */
+void T1_DumpPath(); /* dump a path list */
void t1_DumpSpace(); /* dump a coordinate space structure */
void t1_DumpEdges(); /* dump a region's edge list */
void t1_FormatFP(); /* dump a format a "fractpel" coordinate */
diff -Nru t1lib-grace/T1lib/type1/paths.c t1lib-deb/T1lib/type1/paths.c
--- t1lib-grace/T1lib/type1/paths.c 2001-02-19 13:43:33.000000000 -0800
+++ t1lib-deb/T1lib/type1/paths.c 2007-12-23 07:49:42.000000000 -0800
@@ -1049,21 +1049,23 @@
register struct segment *p; /* input path */
register struct fractpoint *pt; /* pointer to x,y to set */
{
- struct fractpoint mypoint; /* I pass this to TextDelta */
- register fractpel x,y; /* working variables for path current point */
-
- for (x=y=0; p != NULL; p=p->link) {
- x += p->dest.x;
- y += p->dest.y;
- if (p->type == TEXTTYPE) {
- TextDelta(p, &mypoint);
- x += mypoint.x;
- y += mypoint.y;
- }
- }
-
- pt->x = x;
- pt->y = y;
+ register fractpel x,y; /* working variables for path current point */
+
+ for (x=y=0; p != NULL; p=p->link) {
+ x += p->dest.x;
+ y += p->dest.y;
+ if (p->type == TEXTTYPE) {
+ struct fractpoint mypoint;
+
+ mypoint.x = mypoint.y = 0;
+ TextDelta(p, &mypoint);
+ x += mypoint.x;
+ y += mypoint.y;
+ }
+ }
+
+ pt->x = x;
+ pt->y = y;
}
/*
diff -Nru t1lib-grace/T1lib/type1/paths.h t1lib-deb/T1lib/type1/paths.h
--- t1lib-grace/T1lib/type1/paths.h 1998-11-24 14:08:54.000000000 -0800
+++ t1lib-deb/T1lib/type1/paths.h 2007-12-23 07:49:42.000000000 -0800
@@ -52,11 +52,46 @@
#define QueryPath(p,t,B,C,D,r) t1_QueryPath(p,t,B,C,D,r)
#define QueryBounds(p,S,x1,y1,x2,y2) t1_QueryBounds(p,S,x1,y1,x2,y2)
+/*SHARED*/
+
+struct segment {
+ XOBJ_COMMON /* xobject common data define 3-26-91 PNM */
+ unsigned char size; /* size of the structure */
+ unsigned char context; /* index to device context */
+ struct segment *link; /* pointer to next structure in linked list */
+ struct segment *last; /* pointer to last structure in list */
+ struct fractpoint dest; /* relative ending location of path segment */
+};
+#define ISCLOSED(flag) ((flag)&0x80) /* subpath is closed */
+#define LASTCLOSED(flag) ((flag)&0x40) /* last segment in closed subpath */
+
+/*
+ NOTE: The ISCLOSED flag is set on the MOVETYPE segment before the
+ subpath proper; the LASTCLOSED flag is set on the last segment (LINETYPE)
+ in the subpath
+
+ We define the ISPATHANCHOR predicate to test that a path handle
+ passed by the user is valid:
+*/
+
+#define ISPATHANCHOR(p) (ISPATHTYPE(p->type)&&p->last!=NULL)
+
+/*
+ For performance reasons, a user's "location" object is identical to
+ a path whose only segment is a move segment. We define a predicate
+ to test for this case. See also :hdref refid=location..
+*/
+
+#define ISLOCATION(p) ((p)->type == MOVETYPE && (p)->link == NULL)
+
+/*END SHARED*/
+
+
struct segment *t1_Loc(); /* create a location object (or "move" segment) */
struct segment *t1_ILoc(); /* integer argument version of same */
struct segment *t1_Line(); /* straight line path segment */
-struct segment *t1_Join(); /* join two paths or regions together */
+struct segment *t1_Join(struct segment *,struct segment *); /* join two paths or regions together */
struct segment *t1_ClosePath(); /* close a path or path set */
struct conicsegment *t1_Conic(); /* conic curve path segment */
struct conicsegment *t1_RoundConic(); /* ditto, specified another way */
@@ -86,8 +121,8 @@
#define Hypoteneuse(dx,dy) t1_Hypoteneuse(dx,dy)
#define BoxPath(S,h,w) t1_BoxPath(S,h,w)
-struct segment *t1_CopyPath(); /* duplicate a path */
-void t1_KillPath(); /* destroy a path */
+struct segment *t1_CopyPath(struct segment *); /* duplicate a path */
+void t1_KillPath(struct segment *); /* destroy a path */
struct segment *t1_PathXform(); /* transform a path arbitrarily */
void t1_PathDelta(); /* calculate the ending point of a path */
struct segment *t1_PathSegment(); /* produce a MOVE or LINE segment */
@@ -101,39 +136,6 @@
#define ConsumePath(p) MAKECONSUME(p,KillPath(p))
#define UniquePath(p) MAKEUNIQUE(p,CopyPath(p))
-/*END SHARED*/
-/*SHARED*/
-
-struct segment {
- XOBJ_COMMON /* xobject common data define 3-26-91 PNM */
- unsigned char size; /* size of the structure */
- unsigned char context; /* index to device context */
- struct segment *link; /* pointer to next structure in linked list */
- struct segment *last; /* pointer to last structure in list */
- struct fractpoint dest; /* relative ending location of path segment */
-} ;
-
-#define ISCLOSED(flag) ((flag)&0x80) /* subpath is closed */
-#define LASTCLOSED(flag) ((flag)&0x40) /* last segment in closed subpath */
-
-/*
-NOTE: The ISCLOSED flag is set on the MOVETYPE segment before the
-subpath proper; the LASTCLOSED flag is set on the last segment (LINETYPE)
-in the subpath
-
-We define the ISPATHANCHOR predicate to test that a path handle
-passed by the user is valid:
-*/
-
-#define ISPATHANCHOR(p) (ISPATHTYPE(p->type)&&p->last!=NULL)
-
-/*
-For performance reasons, a user's "location" object is identical to
-a path whose only segment is a move segment. We define a predicate
-to test for this case. See also :hdref refid=location..
-*/
-
-#define ISLOCATION(p) ((p)->type == MOVETYPE && (p)->link == NULL)
/*END SHARED*/
/*SHARED*/
diff -Nru t1lib-grace/T1lib/type1/regions.c t1lib-deb/T1lib/type1/regions.c
--- t1lib-grace/T1lib/type1/regions.c 2002-01-03 13:15:17.000000000 -0800
+++ t1lib-deb/T1lib/type1/regions.c 2007-12-23 07:49:42.000000000 -0800
@@ -46,8 +46,8 @@
#include "types.h"
#include "objects.h"
#include "spaces.h"
-#include "regions.h"
#include "paths.h"
+#include "regions.h"
#include "curves.h"
#include "lines.h"
#include "pictures.h"
@@ -268,6 +268,11 @@
for (p=area->anchor; VALIDEDGE(p); p=p->link) {
newp = NewEdge(p->xmin, p->xmax, p->ymin, p->ymax, p->xvalues, ISDOWN(p->flag));
+ newp->fpx1 = p->fpx1;
+ newp->fpx2 = p->fpx2;
+ newp->fpy1 = p->fpy1;
+ newp->fpy2 = p->fpy2;
+
if (r->anchor == NULL)
r->anchor = last = newp;
else
@@ -373,225 +378,155 @@
register struct segment *p; /* take interior of this path */
register int fillrule; /* rule to follow if path crosses itself */
{
- register fractpel x,y; /* keeps ending point of path segment */
- fractpel lastx,lasty; /* previous x,y from path segment before */
- register struct region *R; /* region I will build */
- register struct segment *nextP; /* next segment of path */
- struct fractpoint hint; /* accumulated hint value */
- char tempflag; /* flag; is path temporary? */
- char Cflag; /* flag; should we apply continuity? */
-
- IfTrace2((MustTraceCalls),". INTERIOR(%p, %d)\n", p, (LONG) fillrule);
-
- if (p == NULL)
- return(NULL);
-/*
-Establish the 'Cflag' continuity flag based on user's fill rule and
-our own 'Continuity' pragmatic (0: never do continuity, 1: do what
-user asked, >1: do it regardless).
-*/
- if (fillrule > 0) {
- Cflag = Continuity > 0;
- fillrule -= CONTINUITY;
- }
- else
- Cflag = Continuity > 1;
-
- ARGCHECK((fillrule != WINDINGRULE && fillrule != EVENODDRULE),
- "Interior: bad fill rule", NULL, NULL, (1,p), struct region *);
-
- if (p->type == TEXTTYPE)
-/* if (fillrule != EVENODDRULE)
- else */
- return((struct region *)UniquePath(p));
- if (p->type == STROKEPATHTYPE){
- if (fillrule == WINDINGRULE)
- return((struct region *)DoStroke(p));
- else
- p = CoercePath(p);
- }
-
-
- R = (struct region *)Allocate(sizeof(struct region), &EmptyRegion, 0);
-
- ARGCHECK(!ISPATHANCHOR(p), "Interior: bad path", p, R, (0), struct region *);
- ARGCHECK((p->type != MOVETYPE), "Interior: path not closed", p, R, (0), struct region *);
-
-
-/* changed definition from !ISPERMANENT to references <= 1 3-26-91 PNM */
- tempflag = (p->references <= 1); /* only first segment in path is so marked */
- if (!ISPERMANENT(p->flag)) p->references -= 1;
-
- R->newedgefcn = newfilledge;
-/*
-Believe it or not, "R" is now completely initialized. We are counting
-on the copy of template to get other fields the way we want them,
-namely
-:ol.
-:li.anchor = NULL
-:li.xmin, ymin, xmax, ymax, to minimum and maximum values respectively.
-:eol.
-Anchor = NULL is very
-important to ChangeDirection.
-See :hdref refid=CD..
-
-To minimize problems of "wrapping" in our pel arithmetic, we keep an
-origin of the region which is the first move. Hopefully, that keeps
-numbers within plus or minus 32K pels.
-*/
- R->origin.x = 0/*TOFRACTPEL(NEARESTPEL(p->dest.x))*/;
- R->origin.y = 0/*TOFRACTPEL(NEARESTPEL(p->dest.y))*/;
- lastx = - R->origin.x;
- lasty = - R->origin.y;
-/*
-ChangeDirection initializes other important fields in R, such as
-lastdy, edge, edgeYstop, edgexmin, and edgexmax. The first segment
-is a MOVETYPE, so it will be called first.
-*/
-/*
-The hints data structure must be initialized once for each path.
-*/
-
- if (ProcessHints)
- InitHints(); /* initialize hint data structure */
-
- while (p != NULL) {
-
- x = lastx + p->dest.x;
- y = lasty + p->dest.y;
-
- IfTrace2((HintDebug > 0),"Ending point = (%d,%d)\n",
- x,
- y);
-
- nextP = p->link;
-
-/*
-Here we start the hints processing by initializing the hint value to
-zero. If ProcessHints is FALSE, the value will remain zero.
-Otherwise, hint accumulates the computed hint values.
-*/
-
- hint.x = hint.y = 0;
-
-/*
-If we are processing hints, and this is a MOVE segment (other than
-the first on the path), we need to close (reverse) any open hints.
-*/
-
- if (ProcessHints)
- if ((p->type == MOVETYPE) && (p->last == NULL)) {
- CloseHints(&hint);
- IfTrace2((HintDebug>0),"Closed point= (%d,%d)\n",
- x+hint.x,
- y+hint.y);
- }
-
-/*
-Next we run through all the hint segments (if any) attached to this
-segment. If ProcessHints is TRUE, we will accumulate computed hint
-values. In either case, nextP will be advanced to the first non-HINT
-segment (or NULL), and each hint segment will be freed if necessary.
-*/
-
- while ((nextP != NULL) && (nextP->type == HINTTYPE)) {
- if (ProcessHints)
- ProcessHint(nextP, x + hint.x, y + hint.y, &hint);
-
- {
- register struct segment *saveP = nextP;
-
- nextP = nextP->link;
- if (tempflag)
- Free(saveP);
- }
- }
-
-/*
-We now apply the full hint value to the ending point of the path segment.
-*/
- /* printf("Applying hints (x=%d,y=%d)\n", hint.x, hint.y);*/
-
- x += hint.x;
- y += hint.y;
-
- IfTrace2((HintDebug>0),"Hinted ending point = (%d,%d)\n",
- x, y);
-
- switch(p->type) {
-
- case LINETYPE:
- StepLine(R, lastx, lasty, x, y);
- break;
-
- case CONICTYPE:
- {
-
-/*
-For a conic curve, we apply half the hint value to the conic midpoint.
-*/
-
- }
- break;
-
- case BEZIERTYPE:
- {
- register struct beziersegment *bp = (struct beziersegment *) p;
-
-/*
-For a Bezier curve, we apply the full hint value to the Bezier C point.
-*/
-
- StepBezier(R, lastx, lasty,
- lastx + bp->B.x, lasty + bp->B.y,
- lastx + bp->C.x + hint.x,
- lasty + bp->C.y + hint.y,
- x, y);
- }
- break;
-
- case MOVETYPE:
-/*
-At this point we have encountered a MOVE segment. This breaks the
-path, making it disjoint.
-*/
- if (p->last == NULL) /* i.e., not first in path */
- ChangeDirection(CD_LAST, R, lastx, lasty, (fractpel) 0);
-
- ChangeDirection(CD_FIRST, R, x, y, (fractpel) 0);
-/*
-We'll just double check for closure here. We forgive an appended
-MOVETYPE at the end of the path, if it isn't closed:
-*/
- if (!ISCLOSED(p->flag) && p->link != NULL)
- return((struct region *)ArgErr("Fill: sub-path not closed", p, NULL));
- break;
-
- default:
- abort("Interior: path type error", 30);
- }
-/*
-We're done with this segment. Advance to the next path segment in
-the list, freeing this one if necessary:
-*/
- lastx = x; lasty = y;
-
- if (tempflag)
- Free(p);
- p = nextP;
- }
- ChangeDirection(CD_LAST, R, lastx, lasty, (fractpel) 0);
- R->ending.x = lastx;
- R->ending.y = lasty;
-/*
-Finally, clean up the region's based on the user's 'fillrule' request:
-*/
- if (Cflag)
- ApplyContinuity(R);
- if (fillrule == WINDINGRULE)
- Unwind(R->anchor);
- return(R);
+ register fractpel x,y; /* keeps ending point of path segment */
+ fractpel lastx,lasty; /* previous x,y from path segment before */
+ register struct region *R; /* region I will build */
+ register struct segment *nextP; /* next segment of path */
+ char tempflag; /* flag; is path temporary? */
+ char Cflag; /* flag; should we apply continuity? */
+
+ IfTrace2((MustTraceCalls),". INTERIOR(%p, %d)\n", p, (LONG) fillrule);
+
+ if (p == NULL)
+ return(NULL);
+ /*
+ Establish the 'Cflag' continuity flag based on user's fill rule and
+ our own 'Continuity' pragmatic (0: never do continuity, 1: do what
+ user asked, >1: do it regardless).
+ */
+ if (fillrule > 0) {
+ Cflag = Continuity > 0;
+ fillrule -= CONTINUITY;
+ }
+ else
+ Cflag = Continuity > 1;
+
+ ARGCHECK((fillrule != WINDINGRULE && fillrule != EVENODDRULE),
+ "Interior: bad fill rule", NULL, NULL, (1,p), struct region *);
+
+ if (p->type == TEXTTYPE)
+ /* if (fillrule != EVENODDRULE)
+ else */
+ return((struct region *)UniquePath(p));
+ if (p->type == STROKEPATHTYPE){
+ if (fillrule == WINDINGRULE)
+ return((struct region *)DoStroke(p));
+ else
+ p = CoercePath(p);
+ }
+
+
+ R = (struct region *)Allocate(sizeof(struct region), &EmptyRegion, 0);
+
+ ARGCHECK(!ISPATHANCHOR(p), "Interior: bad path", p, R, (0), struct region *);
+ ARGCHECK((p->type != MOVETYPE), "Interior: path not closed", p, R, (0), struct region *);
+
+
+ /* changed definition from !ISPERMANENT to references <= 1 3-26-91 PNM */
+ tempflag = (p->references <= 1); /* only first segment in path is so marked */
+ if (!ISPERMANENT(p->flag)) p->references -= 1;
+
+ R->newedgefcn = newfilledge;
+ /*
+ Believe it or not, "R" is now completely initialized. We are counting
+ on the copy of template to get other fields the way we want them,
+ namely
+ :ol.
+ :li.anchor = NULL
+ :li.xmin, ymin, xmax, ymax, to minimum and maximum values respectively.
+ :eol.
+ Anchor = NULL is very
+ important to ChangeDirection.
+ See :hdref refid=CD..
+
+ To minimize problems of "wrapping" in our pel arithmetic, we keep an
+ origin of the region which is the first move. Hopefully, that keeps
+ numbers within plus or minus 32K pels.
+ */
+ R->origin.x = 0/*TOFRACTPEL(NEARESTPEL(p->dest.x))*/;
+ R->origin.y = 0/*TOFRACTPEL(NEARESTPEL(p->dest.y))*/;
+ lastx = - R->origin.x;
+ lasty = - R->origin.y;
+ /*
+ ChangeDirection initializes other important fields in R, such as
+ lastdy, edge, edgeYstop, edgexmin, and edgexmax. The first segment
+ is a MOVETYPE, so it will be called first.
+ */
+ /*
+ Note: Hinting is completely performed in charspace coordinates
+ in the Type 1 module. Therefore, I have removed the code
+ to handle hint segments. (2002-08-11)
+ */
+
+ while (p != NULL) {
+
+ x = lastx + p->dest.x;
+ y = lasty + p->dest.y;
+
+ nextP = p->link;
+
+ switch(p->type) {
+
+ case LINETYPE:
+ StepLine(R, lastx, lasty, x, y);
+ break;
+
+ case CONICTYPE:
+ /* 2nd order Beziers not implemented! */
+ break;
+
+ case BEZIERTYPE:
+ {
+ register struct beziersegment *bp = (struct beziersegment *) p;
+
+ StepBezier(R, lastx, lasty,
+ lastx + bp->B.x, lasty + bp->B.y,
+ lastx + bp->C.x,
+ lasty + bp->C.y,
+ x, y);
+ }
+ break;
+
+ case MOVETYPE:
+ /* At this point we have encountered a MOVE segment. This breaks the
+ path, making it disjoint. */
+ if (p->last == NULL) /* i.e., not first in path */
+ ChangeDirection(CD_LAST, R, lastx, lasty, (fractpel) 0, (fractpel) 0, (fractpel) 0);
+
+ ChangeDirection(CD_FIRST, R, x, y, (fractpel) 0, (fractpel) 0, (fractpel) 0);
+ /* We'll just double check for closure here. We forgive an appended
+ MOVETYPE at the end of the path, if it isn't closed: */
+ if (!ISCLOSED(p->flag) && p->link != NULL)
+ return((struct region *)ArgErr("Fill: sub-path not closed", p, NULL));
+ break;
+
+ default:
+ abort("Interior: path type error", 30);
+ }
+ /* We're done with this segment. Advance to the next path segment in
+ the list, freeing this one if necessary: */
+ lastx = x; lasty = y;
+
+ if (tempflag)
+ Free(p);
+ p = nextP;
+ }
+ ChangeDirection(CD_LAST, R, lastx, lasty, (fractpel) 0, (fractpel) 0, (fractpel) 0);
+ R->ending.x = lastx;
+ R->ending.y = lasty;
+
+
+ /* Finally, clean up the region's based on the user's 'fillrule' request: */
+ if (Cflag)
+ ApplyContinuity(R);
+
+ if (fillrule == WINDINGRULE)
+ Unwind(R->anchor);
+
+ return R;
}
+
+
/*
:h4.Unwind() - Discards Edges That Fail the Winding Rule Test
@@ -664,7 +599,7 @@
is appropriate.
*/
-void ChangeDirection(type, R, x, y, dy)
+void ChangeDirection(type, R, x, y, dy, x2, y2)
int type; /* CD_FIRST, CD_CONTINUE, or CD_LAST */
register struct region *R; /* region in which we are changing direction */
fractpel x,y; /* current beginning x,y */
@@ -699,7 +634,8 @@
(*R->newedgefcn)(R, R->edgexmin, R->edgexmax, ymin, ymax,
- R->lastdy > 0, x_at_ymin, x_at_ymax);
+ R->lastdy > 0, x_at_ymin, x_at_ymax,
+ x, y, x2, y2);
}
@@ -750,37 +686,89 @@
up to date.
*/
-static int newfilledge(R, xmin, xmax, ymin, ymax, isdown)
- register struct region *R; /* region being built */
- fractpel xmin,xmax; /* X range of this edge */
- fractpel ymin,ymax; /* Y range of this edge */
- int isdown; /* flag: TRUE means edge goes down, else up */
-{
-
- register pel pelxmin,pelymin,pelxmax,pelymax; /* pel versions of bounds */
- register struct edgelist *edge; /* newly created edge */
-
- pelymin = NEARESTPEL(ymin);
- pelymax = NEARESTPEL(ymax);
- if (pelymin == pelymax)
- return(0);
-
- pelxmin = NEARESTPEL(xmin);
- pelxmax = NEARESTPEL(xmax);
-
- if (pelxmin < R->xmin) R->xmin = pelxmin;
- if (pelxmax > R->xmax) R->xmax = pelxmax;
- if (pelymin < R->ymin) R->ymin = pelymin;
- if (pelymax > R->ymax) R->ymax = pelymax;
-
- edge = NewEdge(pelxmin, pelxmax, pelymin, pelymax, &R->edge[pelymin], isdown);
- edge->subpath = R->lastedge;
- R->lastedge = edge;
- if (R->firstedge == NULL)
- R->firstedge = edge;
-
- R->anchor = SortSwath(R->anchor, edge, swathxsort);
- return(0);
+static int newfilledge(R, xmin, xmax, ymin, ymax, isdown, x1, y1, x2, y2)
+ register struct region *R; /* region being built */
+ fractpel xmin,xmax; /* X range of this edge */
+ fractpel ymin,ymax; /* Y range of this edge */
+ int isdown; /* flag: TRUE means edge goes down, else up */
+ fractpel x1;
+ fractpel y1;
+ fractpel x2;
+ fractpel y2;
+{
+
+ register pel pelxmin,pelymin,pelxmax,pelymax; /* pel versions of bounds */
+ register struct edgelist *edge; /* newly created edge */
+
+ pelymin = NEARESTPEL(ymin);
+ pelymax = NEARESTPEL(ymax);
+ if (pelymin == pelymax)
+ return(0);
+
+ pelxmin = NEARESTPEL(xmin);
+ pelxmax = NEARESTPEL(xmax);
+
+ if (pelxmin < R->xmin) R->xmin = pelxmin;
+ if (pelxmax > R->xmax) R->xmax = pelxmax;
+ if (pelymin < R->ymin) R->ymin = pelymin;
+ if (pelymax > R->ymax) R->ymax = pelymax;
+
+ edge = NewEdge(pelxmin, pelxmax, pelymin, pelymax, &R->edge[pelymin], isdown);
+
+ /* Save maximum and minimum values of edge in order to be able to
+ use them in ApplyContinity. */
+ edge->fpx1 = x1;
+ edge->fpy1 = y1;
+ edge->fpx2 = x2;
+ edge->fpy2 = y2;
+
+ edge->subpath = R->lastedge;
+ R->lastedge = edge;
+ if (R->firstedge == NULL)
+ R->firstedge = edge;
+
+ R->anchor = SortSwath(R->anchor, edge, swathxsort);
+
+ /*
+ {
+ struct region* r = (struct region*) R;
+ struct edgelist* el = (struct edgelist*) (r->anchor);
+
+ while ( el != 0 )
+ {
+ long i = 0;
+ short int* spl;
+ short int* spr;
+ int xl;
+ int xr;
+
+ printf( "Region after Sort (NE=%ld) : ymin=%d, ymax=%d, xmin=%d, xmax=%d\n",
+ callcount, el->ymin, el->ymax, el->xmin, el->xmax);
+ for ( i=0; i<((el->ymax)-(el->ymin)); i++ ) {
+ spl = el->xvalues;
+ if ( el->link != NULL ) {
+ spr = el->link->xvalues;
+ xl = spl[i];
+ xr = spr[i];
+ printf( "Region after Sort (NE=%ld): y=%ld xleft=%d, xright=%d\n",
+ callcount, el->ymin + i, xl, xr);
+ }
+ else {
+ printf( "Region after Sort (NE=%ld): y=%ld xval=%d\n",
+ callcount, el->ymin + i, spl[i]);
+ }
+ }
+ if ( el->link != 0 )
+ el = el->link->link;
+ else
+ break;
+ }
+ }
+
+ ++callcount;
+ */
+
+ return 0;
}
/*
@@ -812,106 +800,108 @@
register struct edgelist *edge; /* incoming edge or pair of edges */
struct edgelist *(*swathfcn)(); /* horizontal sorter */
{
- register struct edgelist *before,*after;
- struct edgelist base;
-
- if (RegionDebug > 0) {
- if (RegionDebug > 2) {
- IfTrace3(TRUE,"SortSwath(anchor=%p, edge=%p, fcn=%p)\n",
- anchor, edge, swathfcn);
- }
- else {
- IfTrace3(TRUE,"SortSwath(anchor=%p, edge=%p, fcn=%p)\n",
- anchor, edge, swathfcn);
- }
- }
- if (anchor == NULL)
- return(edge);
-
- before = &base;
- before->ymin = before->ymax = MINPEL;
- before->link = after = anchor;
-
-/*
-If the incoming edge is above the current list, we connect the current
-list to the bottom of the incoming edge. One slight complication is
-if the incoming edge overlaps into the current list. Then, we
-first split the incoming edge in two at the point of overlap and recursively
-call ourselves to sort the bottom of the split into the current list:
-*/
- if (TOP(edge) < TOP(after)) {
- if (BOTTOM(edge) > TOP(after)) {
-
- after = SortSwath(after, splitedge(edge, TOP(after)), swathfcn);
- }
- vertjoin(edge, after);
- return(edge);
- }
-/*
-At this point the top of edge is not higher than the top of the list,
-which we keep in 'after'. We move the 'after' point down the list,
-until the top of the edge occurs in the swath beginning with 'after'.
-
-If the bottom of 'after' is below the bottom of the edge, we have to
-split the 'after' swath into two parts, at the bottom of the edge.
-If the bottom of 'after' is above the bottom of the swath,
-*/
-
- while (VALIDEDGE(after)) {
-
- if (TOP(after) == TOP(edge)) {
- if (BOTTOM(after) > BOTTOM(edge))
- vertjoin(after, splitedge(after, BOTTOM(edge)));
- else if (BOTTOM(after) < BOTTOM(edge)) {
- after = SortSwath(after,
- splitedge(edge, BOTTOM(after)), swathfcn);
- }
- break;
- }
- else if (TOP(after) > TOP(edge)) {
- IfTrace0((BOTTOM(edge) < TOP(after) && RegionDebug > 0),
- "SortSwath: disjoint edges\n");
- if (BOTTOM(edge) > TOP(after)) {
- after = SortSwath(after,
- splitedge(edge, TOP(after)), swathfcn);
- }
- break;
- }
- else if (BOTTOM(after) > TOP(edge))
- vertjoin(after, splitedge(after, TOP(edge)));
-
- before = after;
- after = after->link;
- }
-
-/*
-At this point 'edge' exactly corresponds in height to the current
-swath pointed to by 'after'.
-*/
- if (after != NULL && TOP(after) == TOP(edge)) {
- before = (*swathfcn)(before, edge);
- after = before->link;
- }
-/*
-At this point 'after' contains all the edges after 'edge', and 'before'
-contains all the edges before. Whew! A simple matter now of adding
-'edge' to the linked list in its rightful place:
-*/
- before->link = edge;
- if (RegionDebug > 1) {
- IfTrace3(TRUE,"SortSwath: in between %p and %p are %p",
- before, after, edge);
- while (edge->link != NULL) {
- edge = edge->link;
- IfTrace1(TRUE," and %p", edge);
- }
- IfTrace0(TRUE,"\n");
- }
- else
- for (; edge->link != NULL; edge = edge->link) { ; }
-
- edge->link = after;
- return(base.link);
+ register struct edgelist *before,*after;
+ struct edgelist base;
+
+ if (RegionDebug > 0) {
+ if (RegionDebug > 2) {
+ IfTrace3(TRUE,"SortSwath(anchor=%p, edge=%p, fcn=%p)\n",
+ anchor, edge, swathfcn);
+ }
+ else {
+ IfTrace3(TRUE,"SortSwath(anchor=%p, edge=%p, fcn=%p)\n",
+ anchor, edge, swathfcn);
+ }
+ }
+ if (anchor == NULL)
+ return(edge);
+
+ before = &base;
+ before->ymin = before->ymax = MINPEL;
+ before->link = after = anchor;
+
+ /*
+ If the incoming edge is above the current list, we connect the current
+ list to the bottom of the incoming edge. One slight complication is
+ if the incoming edge overlaps into the current list. Then, we
+ first split the incoming edge in two at the point of overlap and recursively
+ call ourselves to sort the bottom of the split into the current list:
+ */
+ if (TOP(edge) < TOP(after)) {
+ if (BOTTOM(edge) > TOP(after)) {
+ after = SortSwath(after, splitedge(edge, TOP(after)), swathfcn);
+ }
+ vertjoin(edge, after);
+ return(edge);
+ }
+
+ /*
+ At this point the top of edge is not higher than the top of the list,
+ which we keep in 'after'. We move the 'after' point down the list,
+ until the top of the edge occurs in the swath beginning with 'after'.
+
+ If the bottom of 'after' is below the bottom of the edge, we have to
+ split the 'after' swath into two parts, at the bottom of the edge.
+ If the bottom of 'after' is above the bottom of the swath,
+ */
+
+ while (VALIDEDGE(after)) {
+
+ if (TOP(after) == TOP(edge)) {
+ if (BOTTOM(after) > BOTTOM(edge))
+ vertjoin(after, splitedge(after, BOTTOM(edge)));
+ else if (BOTTOM(after) < BOTTOM(edge)) {
+ after = SortSwath(after,
+ splitedge(edge, BOTTOM(after)), swathfcn);
+ }
+ break;
+ }
+ else if (TOP(after) > TOP(edge)) {
+ IfTrace0((BOTTOM(edge) < TOP(after) && RegionDebug > 0),
+ "SortSwath: disjoint edges\n");
+ if (BOTTOM(edge) > TOP(after)) {
+ after = SortSwath(after,
+ splitedge(edge, TOP(after)), swathfcn);
+ }
+ break;
+ }
+ else if (BOTTOM(after) > TOP(edge))
+ vertjoin(after, splitedge(after, TOP(edge)));
+
+ before = after;
+ after = after->link;
+ }
+
+ /*
+ At this point 'edge' exactly corresponds in height to the current
+ swath pointed to by 'after'.
+ */
+ if (after != NULL && TOP(after) == TOP(edge)) {
+ before = (*swathfcn)(before, edge);
+ after = before->link;
+ }
+ /*
+ At this point 'after' contains all the edges after 'edge', and 'before'
+ contains all the edges before. Whew! A simple matter now of adding
+ 'edge' to the linked list in its rightful place:
+ */
+ before->link = edge;
+ if (RegionDebug > 1) {
+ IfTrace3(TRUE,"SortSwath: in between %p and %p are %p",
+ before, after, edge);
+ while (edge->link != NULL) {
+ edge = edge->link;
+ IfTrace1(TRUE," and %p", edge);
+ }
+ IfTrace0(TRUE,"\n");
+ }
+ else
+ for (; edge->link != NULL; edge = edge->link) { ; }
+
+ edge->link = after;
+
+ return base.link;
+
}
/*
@@ -926,66 +916,78 @@
struct edgelist *list; /* area to split */
register pel y; /* Y value to split list at */
{
- register struct edgelist *new; /* anchor for newly built list */
- register struct edgelist *last=NULL; /* end of newly built list */
- register struct edgelist *r; /* temp pointer to new structure */
- register struct edgelist *lastlist; /* temp pointer to last 'list' value */
-
- IfTrace2((RegionDebug > 1),"splitedge of %p at %d ", list, (LONG) y);
-
- lastlist = new = NULL;
-
- while (list != NULL) {
- if (y < list->ymin)
- break;
- if (y >= list->ymax)
- abort("splitedge: above top of list", 33);
- if (y == list->ymin)
- abort("splitedge: would be null", 34);
-
- r = (struct edgelist *)Allocate(sizeof(struct edgelist), list, 0);
-/*
-At this point 'r' points to a copy of the single structure at 'list'.
-We will make 'r' be the new split 'edgelist'--the lower half.
-We don't bother to correct 'xmin' and 'xmax', we'll take the
-the pessimistic answer that results from using the old values.
-*/
- r->ymin = y;
- r->xvalues = list->xvalues + (y - list->ymin);
-/*
-Note that we do not need to allocate new memory for the X values,
-they can remain with the old "edgelist" structure. We do have to
-update that old structure so it is not as high:
-*/
- list->ymax = y;
-/*
-Insert 'r' in the subpath chain:
-*/
- r->subpath = list->subpath;
- list->subpath = r;
-/*
-Now attach 'r' to the list we are building at 'new', and advance
-'list' to point to the next element in the old list:
-*/
- if (new == NULL)
- new = r;
- else
- last->link = r;
- last = r;
- lastlist = list;
- list = list->link;
- }
-/*
-At this point we have a new list built at 'new'. We break the old
-list at 'lastlist', and add the broken off part to the end of 'new'.
-Then, we return the caller a pointer to 'new':
-*/
- if (new == NULL)
- abort("null splitedge", 35);
- lastlist->link = NULL;
- last->link = list;
- IfTrace1((RegionDebug > 1),"yields %p\n", new);
- return(new);
+ register struct edgelist *new; /* anchor for newly built list */
+ register struct edgelist *last=NULL; /* end of newly built list */
+ register struct edgelist *r; /* temp pointer to new structure */
+ register struct edgelist *lastlist; /* temp pointer to last 'list' value */
+
+ IfTrace2((RegionDebug > 1),"splitedge of %p at %d ", list, (LONG) y);
+
+ lastlist = new = NULL;
+
+ while (list != NULL) {
+ if (y < list->ymin)
+ break;
+
+ if (y >= list->ymax)
+ abort("splitedge: above top of list", 33);
+ if (y == list->ymin)
+ abort("splitedge: would be null", 34);
+
+ r = (struct edgelist *)Allocate(sizeof(struct edgelist), list, 0);
+ /*
+ At this point 'r' points to a copy of the single structure at 'list'.
+ We will make 'r' be the new split 'edgelist'--the lower half.
+ We don't bother to correct 'xmin' and 'xmax', we'll take the
+ the pessimistic answer that results from using the old values.
+ */
+ r->ymin = y;
+ r->xvalues = list->xvalues + (y - list->ymin);
+
+ /*
+ Update the fpx values so that ApplyContinuity() will continue
+ to work. Note that high precision is a fake, here!
+ */
+ r->fpx1 = (r->xvalues[0]) << FRACTBITS;
+ r->fpx2 = (list->xvalues[list->ymax - list->ymin - 1]) << FRACTBITS;
+ list->fpx2 = (list->xvalues[y - list->ymin -1]) << FRACTBITS;
+
+ /*
+ Note that we do not need to allocate new memory for the X values,
+ they can remain with the old "edgelist" structure. We do have to
+ update that old structure so it is not as high:
+ */
+ list->ymax = y;
+
+ /*
+ Insert 'r' in the subpath chain:
+ */
+ r->subpath = list->subpath;
+ list->subpath = r;
+ /*
+ Now attach 'r' to the list we are building at 'new', and advance
+ 'list' to point to the next element in the old list:
+ */
+ if (new == NULL) {
+ new = r;
+ }
+ else
+ last->link = r;
+ last = r;
+ lastlist = list;
+ list = list->link;
+ }
+ /*
+ At this point we have a new list built at 'new'. We break the old
+ list at 'lastlist', and add the broken off part to the end of 'new'.
+ Then, we return the caller a pointer to 'new':
+ */
+ if (new == NULL)
+ abort("null splitedge", 35);
+ lastlist->link = NULL;
+ last->link = list;
+ IfTrace1((RegionDebug > 1),"yields %p\n", new);
+ return(new);
}
/*
@@ -1559,7 +1561,7 @@
currentworkarea = (pel *)Allocate(0, NULL, idy * sizeof(pel));
currentsize = idy;
}
- ChangeDirection(CD_CONTINUE, R, x1, y1, y2 - y1);
+ ChangeDirection(CD_CONTINUE, R, x1, y1, y2 - y1, x2, y2);
}
/*
diff -Nru t1lib-grace/T1lib/type1/regions.h t1lib-deb/T1lib/type1/regions.h
--- t1lib-grace/T1lib/type1/regions.h 1998-11-24 14:08:54.000000000 -0800
+++ t1lib-deb/T1lib/type1/regions.h 2007-12-23 07:49:42.000000000 -0800
@@ -35,7 +35,7 @@
#define Complement(area) t1_Complement(area)
#define Overlap(a1,a2) t1_OverLap(a1,a2)
-struct region *t1_Interior(); /* returns the interior of a closed path */
+struct region *t1_Interior(struct segment *,int); /* returns the interior of a closed path */
struct region *t1_Union(); /* set union of paths or regions */
struct region *t1_Intersect(); /* set intersection of regions */
struct region *t1_Complement(); /* complement of a region */
@@ -45,7 +45,7 @@
/*END SHARED*/
/*SHARED*/
-#define ChangeDirection(type,R,x,y,dy) t1_ChangeDirection(type,R,x,y,dy)
+#define ChangeDirection(type,R,x,y,dy,x2,y2) t1_ChangeDirection(type,R,x,y,dy,x2,y2)
void t1_ChangeDirection(); /* called when we change direction in Y */
#define CD_FIRST -1 /* enumeration of ChangeDirection type */
@@ -80,17 +80,17 @@
#define GOING_TO(R, x1, y1, x2, y2, dy) { \
if (dy < 0) { \
if (R->lastdy >= 0) \
- ChangeDirection(CD_CONTINUE, R, x1, y1, dy); \
+ ChangeDirection(CD_CONTINUE, R, x1, y1, dy, x2, y2); \
if (y2 < R->edgeYstop) \
MoreWorkArea(R, x1, y1, x2, y2); \
} \
else if (dy > 0) { \
if (R->lastdy <= 0) \
- ChangeDirection(CD_CONTINUE, R, x1, y1, dy); \
+ ChangeDirection(CD_CONTINUE, R, x1, y1, dy, x2, y2); \
if (y2 > R->edgeYstop) \
MoreWorkArea(R, x1, y1, x2, y2); \
} \
- else /* dy == 0 */ ChangeDirection(CD_CONTINUE, R, x1, y1, dy); \
+ else /* dy == 0 */ ChangeDirection(CD_CONTINUE, R, x1, y1, dy, x2, y2); \
if (x2 < R->edgexmin) R->edgexmin = x2; \
else if (x2 > R->edgexmax) R->edgexmax = x2; \
}
@@ -166,13 +166,18 @@
/*SHARED*/
struct edgelist {
- XOBJ_COMMON /* xobject common data define 3-26-91 PNM */
- /* type = EDGETYPE */
- struct edgelist *link; /* pointer to next in linked list */
- struct edgelist *subpath; /* informational link for "same subpath" */
- pel xmin,xmax; /* range of edge in X */
- pel ymin,ymax; /* range of edge in Y */
- pel *xvalues; /* pointer to ymax-ymin X values */
+ XOBJ_COMMON /* xobject common data define 3-26-91 PNM */
+ /* type = EDGETYPE */
+ struct edgelist *link; /* pointer to next in linked list */
+ struct edgelist *subpath; /* informational link for "same subpath" */
+ pel xmin,xmax; /* range of edge in X */
+ pel ymin,ymax; /* range of edge in Y */
+ pel *xvalues; /* pointer to ymax-ymin X values */
+
+ fractpel fpx1; /* Added by RMz, author of t1lib, 2002-08-15. */
+ fractpel fpy1; /* This produces a little memory overhead, but */
+ fractpel fpx2; /* gives the opportunity to take more */
+ fractpel fpy2; /* intelligent decisions in ApplyContinuity(). */
} ;
/*
The end of the list is marked by either "link" being NULL, or by
diff -Nru t1lib-grace/T1lib/type1/scanfont.c t1lib-deb/T1lib/type1/scanfont.c
--- t1lib-grace/T1lib/type1/scanfont.c 2002-07-29 13:37:50.000000000 -0700
+++ t1lib-deb/T1lib/type1/scanfont.c 2007-12-23 07:49:42.000000000 -0800
@@ -30,12 +30,14 @@
/* Author: Katherine A. Hitchcock IBM Almaden Research Laboratory */
#include <string.h>
+#include <stdlib.h>
#include "t1stdio.h"
#include "util.h"
#include "token.h"
#include "fontfcn.h"
#include "blues.h"
+#include "../t1lib/t1misc.h"
/* #define DEBUG_SCANFONT */
@@ -247,7 +249,7 @@
int i;
psobj *encodingArrayP;
- encodingArrayP = (psobj *)vm_alloc(256*(sizeof(psobj)));
+ encodingArrayP = (psobj *)malloc(256*(sizeof(psobj)));
if (!encodingArrayP)
return NULL;
@@ -267,6 +269,12 @@
boolean Init_BuiltInEncoding()
{
+ if ( StdEncArrayP != NULL) {
+ /* Note: We should not run into this case because multiple
+ initialization should be caught by T1_InitLib(). */
+ return FALSE;
+ }
+
StdEncArrayP = MakeEncodingArrayP(StdEnc);
if (StdEncArrayP==NULL)
return( FALSE);
@@ -1217,7 +1225,7 @@
{
- char filename[128];
+ char filename[MAXPATHLEN+1];
FILE *fileP;
char *nameP;
int namelen;
@@ -1234,6 +1242,10 @@
while ((namelen>0) && ( nameP[namelen-1] == ' ')) {
namelen--;
}
+ if ( namelen >= MAXPATHLEN ) {
+ /* Hopefully, this will lead to a file open error */
+ namelen = MAXPATHLEN;
+ }
strncpy(filename,nameP,namelen);
filename[namelen] = '\0';
/* file name is now constructed */
@@ -1281,10 +1293,14 @@
tokenStartP[tokenLength] = '\0';
/* At this point we check for the font not being a
Multiple Master Font. If it is, we return an error.
- (RMz, 01/29/1999) */
- if (strncmp(tokenStartP, "BlendAxisTypes", 14)==0){
- rc=SCAN_MMFONT;
- break;
+ However, we restrict searching for forbidden keywords
+ to FontInfo, in order not to make assumptions about
+ internal PostScript routine names. (RMz, 2004-11-27) */
+ if ( !InPrivateDict ) {
+ if (strncmp(tokenStartP, "BlendAxisTypes", 14)==0){
+ rc=SCAN_MMFONT;
+ break;
+ }
}
if (InPrivateDict ) {
if (0== strncmp(tokenStartP,"Subrs",5) ) {
@@ -1343,7 +1359,11 @@
filterFile.data.fileP = T1eexec(inputP->data.fileP);
if (filterFile.data.fileP == NULL) {
fclose(inputFile.data.fileP);
- return(SCAN_FILE_OPEN_ERROR);
+ /* SCAN_FILE_OPEN_ERROR replaced because at this point
+ a portion of the file has already been read successfully.
+ We hence have encountered a premature end of file
+ (2002-08-17, RMz). */
+ return SCAN_FILE_EOF;
}
inputP = &filterFile;
diff -Nru t1lib-grace/T1lib/type1/t1chardump t1lib-deb/T1lib/type1/t1chardump
--- t1lib-grace/T1lib/type1/t1chardump 1969-12-31 16:00:00.000000000 -0800
+++ t1lib-deb/T1lib/type1/t1chardump 2007-12-23 07:49:42.000000000 -0800
@@ -0,0 +1,697 @@
+/*--------------------------------------------------------------------------
+ ----- File: t1chardump
+ ----- Author: Rainer Menzner (Rainer.Menzner@web.de)
+ ----- Date: 2003-03-02
+ ----- Description: This file is part of the t1-library. It contains
+ code responsible for dumping outline data to a
+ PostScript file (used only for debugging.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2003.
+ As of version 0.5, t1lib is distributed under the
+ GNU General Public Library Lincense. The
+ conditions can be found in the files LICENSE and
+ LGPL, which should reside in the toplevel
+ directory of the distribution. Please note that
+ there are parts of t1lib that are subject to
+ other licenses:
+ The parseAFM-package is copyrighted by Adobe Systems
+ Inc.
+ The type1 rasterizer is copyrighted by IBM and the
+ X11-consortium.
+ ----- Warranties: Of course, there's NO WARRANTY OF ANY KIND :-)
+ ----- Credits: I want to thank IBM and the X11-consortium for making
+ their rasterizer freely available.
+ Also thanks to Piet Tutelaers for his ps2pk, from
+ which I took the rasterizer sources in a format
+ independent from X11.
+ Thanks to all people who make free software living!
+--------------------------------------------------------------------------*/
+
+fputs( "\
+%!PS-Adobe-2.0 EPSF-1.2\n\
+%%Creator: t1lib\n\
+%%Title: Type1Char Character Dump\n\
+%%Pages: 1\n\
+%%PageOrder: Ascend\n\
+%%BoundingBox: 0 0 596 842\n\
+%%DocumentPaperSizes: a4\n\
+%%EndComments\n\
+%!\n\
+/T1LibDict 100 dict def \n\
+T1LibDict begin\n\
+% Setup the size from the type1 module\n\
+/t1SetupSize {\n\
+ /size exch def\n\
+} def\n\
+\n\
+% Prepare the page. Compute scales and fill the charspace unit square\n\
+% background\n\
+/t1PreparePage {\n\
+\n\
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n\
+ %\n\
+ % Start of Customizable Section\n\
+ %\n\
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n\
+\n\
+ % Setup a standard linewidth\n\
+ /t1dumpstdlinewidth 1.0 def\n\
+ % Setup a scale for drawing direction arrows\n\
+ /arrowscale 3.0 def\n\
+\n\
+ % Should we draw the device pixel grid? (1=yes, otherwise no)\n\
+ /t1drawgrid 1 def\n\
+ % Should we draw stems? (1=yes, otherwise no)\n\
+ /t1drawstems 1 def\n\
+ % Should we draw alignment zones? (1=yes, otherwise no)\n\
+ /t1drawzones 1 def\n\
+ % Should we fill the charspace unit square? (1=yes, otherwise no)\n\
+ /t1fillunitsquare 1 def\n\
+ % Should we fill the device page? (1=yes, otherwise no)\n\
+ /t1fillpage 1 def\n\
+ % Should we show path segment On-Curve points? (1=yes, otherwise no)\n\
+ /t1showoncurvepoints 1 def\n\
+ % Should we show path segment Off Curve points? (1=yes, otherwise no)\n\
+ /t1showoffcurvepoints 1 def\n\
+ % Should we show Bezier tangets and their defining points? (1=yes, otherwise no)\n\
+ /t1showbeziertangents 1 def\n\
+\n\
+ % Define a few colors\n\
+ /t1linecolor { 0.0 0.0 0.0 } def\n\
+ /t1hlinecolor { 1.0 0.0 0.0 } def\n\
+ /t1slinecolor { 1.0 1.0 1.0 } def\n\
+ /t1movecolor { 0.0 0.0 0.0 } def\n\
+ /t1hmovecolor { 1.0 0.0 0.0 } def\n\
+ /t1smovecolor { 1.0 1.0 1.0 } def\n\
+ /t1curvecolor { 0.0 0.0 0.0 } def\n\
+ /t1hcurvecolor { 1.0 0.0 0.0 } def\n\
+ /t1scurvecolor { 0.0 0.0 1.0 } def\n\
+ /t1sprolongatecolor { 1.0 0.0 1.0 } def\n\
+ /t1stemcolor { 0.0 0.0 1.0 } def\n\
+ /t1alignedstemcolor { 1.0 0.0 1.0 } def\n\
+ /t1bottomzonecolor { 1.0 1.0 0.0 } def\n\
+ /t1topzonecolor { 1.0 1.0 0.0 } def\n\
+ /t1arrowcolor { 0.0 0.0 0.0 } def\n\
+ /t1harrowcolor { 1.0 0.0 0.0 } def\n\
+ /t1sarrowcolor { 0.0 0.0 1.0 } def\n\
+ /t1sbwcolor { 0.0 0.0 0.0 } def\n\
+ /t1closepathcolor { 0.0 0.0 0.0 } def\n\
+ /t1hclosepathcolor { 1.0 0.0 0.0 } def\n\
+ /t1sclosepathcolor { 0.0 0.0 1.0 } def\n\
+ /t1pagecolor { 0.7 0.7 0.7 } def\n\
+ /t1unitsquarecolor { 0.4 0.4 0.4 } def\n\
+ /t1gridcolor { 0.0 0.0 0.0 } def\n\
+\n\
+ % Line scale relative to the standard linewidth
+ /t1linescale 0.4 def\n\
+ /t1hlinescale 0.4 def\n\
+ /t1slinescale 0.4 def\n\
+ /t1movescale 0.4 def\n\
+ /t1hmovescale 0.4 def\n\
+ /t1smovescale 0.4 def\n\
+ /t1curvescale 0.4 def\n\
+ /t1hcurvescale 0.4 def\n\
+ /t1scurvescale 0.4 def\n\
+ /t1curvetangentscale 0.5 def\n\
+ /t1sprolongatescale 0.4 def\n\
+ /t1stemscale 0.5 def\n\
+ /t1alignedstemscale 0.5 def\n\
+ /t1bottomzonescale 0.5 def\n\
+ /t1topzonescale 0.5 def\n\
+ /t1closepathscale 0.4 def\n\
+ /t1hclosepathscale 0.4 def\n\
+ /t1sclosepathscale 0.4 def\n\
+ /t1gridscale 0.5 def\n\
+\n\
+ % Line dash specifications (stems and zones are not configurable!)
+ /t1linedash { [] 0 } def\n\
+ /t1hlinedash { [] 0 } def\n\
+ /t1slinedash { [] 0 } def\n\
+ /t1movedash { [2 2] 0 } def\n\
+ /t1hmovedash { [2 2] 0 } def\n\
+ /t1smovedash { [2 2] 0 } def\n\
+ /t1curvedash { [] 0 } def\n\
+ /t1hcurvedash { [] 0 } def\n\
+ /t1scurvedash { [] 0 } def\n\
+ /t1sprolongatedash { [1 1] 0 }def\n\
+ /t1closepathdash { [] 0 } def\n\
+ /t1hclosepathdash { [] 0 } def\n\
+ /t1sclosepathdash { [] 0 } def\n\
+ /t1griddash { [3 3] 0 } def\n\
+\n\
+ % Define a clipping rectangle ROI (in charspace coordinates)\n\
+ /t1ROIxmin -200 def\n\
+ /t1ROIxmax 1200 def\n\
+ /t1ROIymin -500 def\n\
+ /t1ROIymax 1200 def\n\
+\n\
+ % Device values (in bp). These must match the Bounding Box Statement!\n\
+ /xmindev 0 neg def\n\
+ /xmaxdev 596 def\n\
+ /ymindev 0 neg def\n\
+ /ymaxdev 842 def\n\
+ /dxdev 1 def\n\
+ /dydev 1 def\n\
+\n\
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n\
+ %\n\
+ % End of Customizable Section\n\
+ %\n\
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n\
+\n\
+ % logical pixel values\n\
+ /xminpixel t1ROIxmin 1000.0 div size mul def\n\
+ /xmaxpixel t1ROIxmax 1000.0 div size mul def\n\
+ /yminpixel t1ROIymin 1000.0 div size mul def\n\
+ /ymaxpixel t1ROIymax 1000.0 div size mul def\n\
+ /dxpixel 1 def\n\
+ /dypixel 1 def\n\
+\n\
+ % compute scales and set minimum scale\n\
+ /scalex xmaxdev xmindev sub xmaxpixel xminpixel sub div def\n\
+ /scaley ymaxdev ymindev sub ymaxpixel yminpixel sub div def\n\
+ scalex scaley gt { /scale scaley def } { /scale scalex def } ifelse\n\
+\n\
+ % Fill device page\n\
+ xmindev ymindev moveto\n\
+ xmaxdev 0 rlineto\n\
+ 0 ymaxdev rlineto\n\
+ xmaxdev neg 0 rlineto\n\
+ 0 ymaxdev neg rlineto\n\
+ closepath\n\
+ clip\n\
+ t1fillpage 1 eq\n\
+ {\n\
+ t1pagecolor setrgbcolor\n\
+ fill\n\
+ } if\n\
+\n\
+ % reassign device values\n\
+ /xmindev xminpixel scale mul def\n\
+ /xmaxdev xmaxpixel scale mul def\n\
+ /ymindev yminpixel scale mul def\n\
+ /ymaxdev ymaxpixel scale mul def\n\
+ /dxdev dxpixel scale mul def\n\
+ /dydev dypixel scale mul def\n\
+\n\
+ % translate coordinate system \n\
+ xminpixel scale mul neg yminpixel scale mul neg translate\n\
+ \n\
+ % Fill unit square of charspace coordinate system \n\
+ t1fillunitsquare 1 eq\n\
+ {\n\
+ t1unitsquarecolor setrgbcolor\n\
+ 0 0 moveto\n\
+ size scale mul 0 rlineto\n\
+ 0 size scale mul rlineto\n\
+ size scale mul neg 0 rlineto\n\
+ 0 size scale mul neg rlineto\n\
+ closepath fill\n\
+ } if\n\
+} def\n\
+\n\
+/t1FinishPage {\n\
+ t1drawgrid 1 eq\n\
+ {\n\
+ t1gridcolor setrgbcolor\n\
+ t1gridscale setlinewidth\n\
+ t1griddash setdash\n\
+ % draw grid and align to the point (0,0)\n\
+ 0 dxdev xmaxdev {\n\
+ /xval exch def\n\
+ xval ymindev moveto\n\
+ xval ymaxdev lineto\n\
+ stroke\n\
+ } for\n\
+ 0 dxdev neg xmindev {\n\
+ /xval exch def\n\
+ xval ymindev moveto\n\
+ xval ymaxdev lineto\n\
+ stroke\n\
+ } for\n\
+ 0 dydev ymaxdev {\n\
+ /yval exch def\n\
+ xmindev yval moveto\n\
+ xmaxdev yval lineto\n\
+ stroke\n\
+ } for\n\
+ 0 dydev neg ymindev {\n\
+ /yval exch def\n\
+ xmindev yval moveto\n\
+ xmaxdev yval lineto\n\
+ stroke\n\
+ } for\n\
+ } if\n\
+} def\n\
+\n\
+% Define three arrow routines available for later providing the output with directions\n\
+/t1arrowhead {\n\
+ /tmpy exch def\n\
+ /tmpx exch def\n\
+ gsave\n\
+ t1arrowcolor setrgbcolor\n\
+ currx curry translate\n\
+ tmpy tmpx atan rotate\n\
+ newpath\n\
+ 0 0 moveto\n\
+ 0 2 arrowscale currentlinewidth neg mul mul rlineto\n\
+ 6 arrowscale currentlinewidth mul mul 2 arrowscale currentlinewidth mul mul rlineto\n\
+ 6 arrowscale currentlinewidth mul mul neg 2 arrowscale currentlinewidth mul mul rlineto\n\
+ closepath\n\
+ fill\n\
+ grestore\n\
+ tmpx\n\
+ tmpy\n\
+} def\n\
+/t1harrowhead {\n\
+ /tmpy exch def\n\
+ /tmpx exch def\n\
+ gsave\n\
+ t1harrowcolor setrgbcolor\n\
+ currhx currhy translate\n\
+ tmpy tmpx atan rotate\n\
+ newpath\n\
+ 0 0 moveto\n\
+ 0 2 arrowscale currentlinewidth neg mul mul rlineto\n\
+ 6 arrowscale currentlinewidth mul mul 2 arrowscale currentlinewidth mul mul rlineto\n\
+ 6 arrowscale currentlinewidth mul mul neg 2 arrowscale currentlinewidth mul mul rlineto\n\
+ closepath\n\
+ fill\n\
+ grestore\n\
+ tmpx\n\
+ tmpy\n\
+} def\n\
+/t1sarrowhead {\n\
+ /tmpy exch def\n\
+ /tmpx exch def\n\
+ gsave\n\
+ t1sarrowcolor setrgbcolor\n\
+ currsx currsy translate\n\
+ tmpy tmpx atan rotate\n\
+ newpath\n\
+ 0 0 moveto\n\
+ 0 2 arrowscale currentlinewidth neg mul mul rlineto\n\
+ 6 arrowscale currentlinewidth mul mul 2 arrowscale currentlinewidth mul mul rlineto\n\
+ 6 arrowscale currentlinewidth mul mul neg 2 arrowscale currentlinewidth mul mul rlineto\n\
+ closepath\n\
+ fill\n\
+ grestore\n\
+ tmpx\n\
+ tmpy\n\
+} def\n\
+\n\
+/t1rlineto {\n\
+ /y2 exch scale mul def\n\
+ /x2 exch scale mul def\n\
+ t1linecolor setrgbcolor\n\
+ t1linedash setdash\n\
+ t1linescale t1dumpstdlinewidth mul setlinewidth\n\
+ t1showoncurvepoints 1 eq\n\
+ {\n\
+ newpath currx x2 add curry y2 add 1.5 currentlinewidth mul 0 360 arc closepath fill\n\
+ } if\n\
+ currx curry moveto\n\
+ x2 y2 rlineto\n\
+ stroke\n\
+ /currx currx x2 add def\n\
+ /curry curry y2 add def\n\
+} def\n\
+\n\
+/t1srlineto {\n\
+ /y2 exch scale mul def\n\
+ /x2 exch scale mul def\n\
+ t1slinecolor setrgbcolor\n\
+ t1slinedash setdash\n\
+ t1slinescale t1dumpstdlinewidth mul setlinewidth\n\
+ t1showoncurvepoints 1 eq\n\
+ {\n\
+ newpath currsx x2 add currsy y2 add 1.5 currentlinewidth mul 0 360 arc closepath fill\n\
+ } if\n\
+ currsx currsy moveto\n\
+ x2 y2 rlineto\n\
+ stroke\n\
+ /currsx currsx x2 add def\n\
+ /currsy currsy y2 add def\n\
+} def\n\
+\n\
+/t1sprolongate {\n\
+ /y2 exch scale mul def\n\
+ /x2 exch scale mul def\n\
+ t1sprolongatecolor setrgbcolor\n\
+ t1sprolongatedash setdash\n\
+ t1sprolongatescale t1dumpstdlinewidth mul setlinewidth\n\
+ t1showoncurvepoints 1 eq\n\
+ {\n\
+ newpath currsx x2 add currsy y2 add 1.5 currentlinewidth mul 0 360 arc closepath fill\n\
+ } if\n\
+ currsx currsy moveto\n\
+ x2 y2 rlineto\n\
+ stroke\n\
+ /currsx currsx x2 add def\n\
+ /currsy currsy y2 add def\n\
+} def\n\
+\n\
+/t1hintedrlineto {\n\
+ /y2 exch scale mul def\n\
+ /x2 exch scale mul def\n\
+ t1hlinecolor setrgbcolor\n\
+ t1hlinedash setdash\n\
+ t1hlinescale t1dumpstdlinewidth mul setlinewidth\n\
+ t1showoncurvepoints 1 eq\n\
+ {\n\
+ newpath currhx x2 add currhy y2 add 1.5 currentlinewidth mul 0 360 arc closepath fill\n\
+ } if\n\
+ currhx currhy moveto\n\
+ x2 y2 rlineto\n\
+ stroke\n\
+ /currhx currhx x2 add def\n\
+ /currhy currhy y2 add def\n\
+} def\n\
+\n\
+/t1rmoveto {\n\
+ /y2 exch scale mul def\n\
+ /x2 exch scale mul def\n\
+ t1movecolor setrgbcolor\n\
+ t1movedash setdash\n\
+ t1movescale t1dumpstdlinewidth mul setlinewidth\n\
+ t1showoncurvepoints 1 eq\n\
+ {\n\
+ newpath currx x2 add curry y2 add 1.5 currentlinewidth mul 0 360 arc closepath fill\n\
+ } if\n\
+ currx curry moveto\n\
+ x2 y2 rlineto\n\
+ stroke\n\
+ /currx currx x2 add def\n\
+ /curry curry y2 add def\n\
+ /startx currx def\n\
+ /starty curry def\n\
+} def\n\
+\n\
+/t1srmoveto {\n\
+ /y2 exch scale mul def\n\
+ /x2 exch scale mul def\n\
+ t1smovecolor setrgbcolor\n\
+ t1smovedash setdash\n\
+ t1smovescale t1dumpstdlinewidth mul setlinewidth\n\
+ t1showoncurvepoints 1 eq\n\
+ {\n\
+ newpath currsx x2 add currsy y2 add 1.5 currentlinewidth mul 0 360 arc closepath fill\n\
+ } if\n\
+ currsx currsy moveto\n\
+ x2 y2 rlineto\n\
+ stroke\n\
+ /currsx currsx x2 add def\n\
+ /currsy currsy y2 add def\n\
+ /startsx currsx def\n\
+ /startsy currsy def\n\
+} def\n\
+\n\
+/t1hintedrmoveto {\n\
+ /y2 exch scale mul def\n\
+ /x2 exch scale mul def\n\
+ t1hmovecolor setrgbcolor\n\
+ t1hmovedash setdash\n\
+ t1hmovescale t1dumpstdlinewidth mul setlinewidth\n\
+ t1showoncurvepoints 1 eq\n\
+ {\n\
+ newpath currhx x2 add currhy y2 add 1.5 currentlinewidth mul 0 360 arc closepath fill\n\
+ } if\n\
+ currhx currhy moveto\n\
+ x2 y2 rlineto\n\
+ stroke\n\
+ /currhx currhx x2 add def\n\
+ /currhy currhy y2 add def\n\
+ /starthx currhx def\n\
+ /starthy currhy def\n\
+} def\n\
+\n\
+/t1rrcurveto {\n\
+ /y4 exch scale mul def\n\
+ /x4 exch scale mul def\n\
+ /y3 exch scale mul def\n\
+ /x3 exch scale mul def\n\
+ /y2 exch scale mul def\n\
+ /x2 exch scale mul def\n\
+ t1curvecolor setrgbcolor\n\
+ t1curvedash setdash\n\
+ t1curvescale t1dumpstdlinewidth mul setlinewidth\n\
+ t1showoffcurvepoints 1 eq\n\
+ {\n
+ newpath currx x2 add curry y2 add 1.0 currentlinewidth mul 0 360 arc closepath fill\n\
+ newpath currx x2 x3 add add curry y2 y3 add add 1.0 currentlinewidth mul 0 360 arc closepath fill\n\
+ } if\n\
+ t1showoncurvepoints 1 eq\n\
+ {\n\
+ newpath currx x2 x3 x4 add add add curry y2 y3 y4 add add add 1.5 currentlinewidth mul 0 360 arc closepath fill\n\
+ } if\n\
+ t1showbeziertangents 1 eq\n\
+ {\n\
+ [2 2] 0 setdash\n\
+ t1curvetangentscale currentlinewidth mul setlinewidth\n\
+ currx curry moveto\n\
+ currx x2 add curry y2 add lineto\n\
+ stroke\n\
+ currx x2 x3 add add curry y2 y3 add add moveto\n\
+ currx x2 x3 x4 add add add curry y2 y3 y4 add add add lineto\n\
+ stroke\n\
+ } if\n\
+ t1curvedash setdash\n\
+ t1curvescale t1dumpstdlinewidth mul setlinewidth\n\
+ currx curry moveto\n\
+ x2 y2 x2 x3 add y2 y3 add x2 x3 x4 add add y2 y3 y4 add add rcurveto\n\
+ stroke\n\
+ /currx currx x2 x3 x4 add add add def\n\
+ /curry curry y2 y3 y4 add add add def\n\
+} def\n\
+\n\
+/t1srrcurveto {\n\
+ /y4 exch scale mul def\n\
+ /x4 exch scale mul def\n\
+ /y3 exch scale mul def\n\
+ /x3 exch scale mul def\n\
+ /y2 exch scale mul def\n\
+ /x2 exch scale mul def\n\
+ t1scurvecolor setrgbcolor\n\
+ t1scurvedash setdash\n\
+ t1scurvescale t1dumpstdlinewidth mul setlinewidth\n\
+ t1showoffcurvepoints 1 eq\n\
+ {\n\
+ newpath currsx x2 add currsy y2 add 1.0 currentlinewidth mul 0 360 arc closepath fill\n\
+ newpath currsx x2 x3 add add currsy y2 y3 add add 1.0 currentlinewidth mul 0 360 arc closepath fill\n\
+ } if\n\
+ t1showoncurvepoints 1 eq\n\
+ {\n\
+ newpath currsx x2 x3 x4 add add add currsy y2 y3 y4 add add add 1.5 currentlinewidth mul 0 360 arc closepath fill\n\
+ } if\n\
+ t1showbeziertangents 1 eq\n\
+ {\n\
+ [2 2] 0 setdash\n\
+ t1curvetangentscale currentlinewidth mul setlinewidth\n\
+ currsx currsy moveto\n\
+ currsx x2 add currsy y2 add lineto\n\
+ stroke\n\
+ currsx x2 x3 add add currsy y2 y3 add add moveto\n\
+ currsx x2 x3 x4 add add add currsy y2 y3 y4 add add add lineto\n\
+ stroke\n\
+ } if\n\
+ t1scurvedash setdash\n\
+ t1scurvescale t1dumpstdlinewidth mul setlinewidth\n\
+ currsx currsy moveto\n\
+ x2 y2 x2 x3 add y2 y3 add x2 x3 x4 add add y2 y3 y4 add add rcurveto\n\
+ stroke\n\
+ /currsx currsx x2 x3 x4 add add add def\n\
+ /currsy currsy y2 y3 y4 add add add def\n\
+} def\n\
+\n\
+/t1hintedrrcurveto {\n\
+ /y4 exch scale mul def\n\
+ /x4 exch scale mul def\n\
+ /y3 exch scale mul def\n\
+ /x3 exch scale mul def\n\
+ /y2 exch scale mul def\n\
+ /x2 exch scale mul def\n\
+ t1hcurvecolor setrgbcolor\n\
+ t1hcurvedash setdash\n\
+ t1hcurvescale t1dumpstdlinewidth mul setlinewidth\n\
+ t1showoncurvepoints 1 eq\n\
+ {\n\
+ newpath currhx x2 add currhy y2 add 1.0 currentlinewidth mul 0 360 arc closepath fill\n\
+ newpath currhx x2 x3 add add currhy y2 y3 add add 1.0 currentlinewidth mul 0 360 arc closepath fill\n\
+ } if\n\
+ t1showoncurvepoints 1 eq\n\
+ {\n\
+ newpath currhx x2 x3 x4 add add add currhy y2 y3 y4 add add add 1.5 currentlinewidth mul 0 360 arc closepath fill\n\
+ } if\n\
+ t1showbeziertangents 1 eq\n\
+ {\n\
+ [2 2] 0 setdash\n\
+ t1curvetangentscale currentlinewidth mul setlinewidth\n\
+ currhx currhy moveto\n\
+ currhx x2 add currhy y2 add lineto\n\
+ stroke\n\
+ currhx x2 x3 add add currhy y2 y3 add add moveto\n\
+ currhx x2 x3 x4 add add add currhy y2 y3 y4 add add add lineto\n\
+ stroke\n\
+ } if\n\
+ t1hcurvedash setdash\n\
+ t1hcurvescale t1dumpstdlinewidth mul setlinewidth\n\
+ currhx currhy moveto\n\
+ x2 y2 x2 x3 add y2 y3 add x2 x3 x4 add add y2 y3 y4 add add rcurveto\n\
+ stroke\n\
+ /currhx currhx x2 x3 x4 add add add def\n\
+ /currhy currhy y2 y3 y4 add add add def\n\
+} def\n\
+\n\
+/t1sbw {\n\
+ /wy exch scale mul def\n\
+ /wx exch scale mul def\n\
+ /sby exch scale mul def\n\
+ /sbx exch scale mul def\n\
+ t1sbwcolor setrgbcolor\n\
+ newpath sbx sby 3 0 360 arc closepath fill\n\
+ newpath wx wy 3 0 360 arc closepath fill\n\
+ /currx sbx def\n\
+ /curry sby def\n\
+ /currhx sbx def\n\
+ /currhy sby def\n\
+ /currsx sbx def\n\
+ /currsy sby def\n\
+} def\n\
+\n\
+/t1closepath {\n\
+ t1closepathdash setdash\n\
+ t1closepathscale t1dumpstdlinewidth mul setlinewidth\n\
+ t1closepathcolor setrgbcolor\n\
+ currx curry moveto\n\
+ startx starty lineto\n\
+ stroke\n\
+} def\n\
+\n\
+/t1sclosepath {\n\
+ t1sclosepathdash setdash\n\
+ t1sclosepathscale t1dumpstdlinewidth mul setlinewidth\n\
+ t1sclosepathcolor setrgbcolor\n\
+ currsx currsy moveto\n\
+ startsx startsy lineto\n\
+ stroke\n\
+} def\n\
+\n\
+/t1hintedclosepath {\n\
+ t1hclosepathdash setdash\n\
+ t1hclosepathscale t1dumpstdlinewidth mul setlinewidth\n\
+ t1hclosepathcolor setrgbcolor\n\
+ currhx currhy moveto\n\
+ starthx starthy lineto\n\
+ stroke\n\
+} def\n\
+\n\
+/t1vstem {\n\
+ t1drawstems 1 eq\n\
+ {\n\
+ /stemwidth exch scale mul def\n\
+ /stemstart exch scale mul def\n\
+ t1stemscale t1dumpstdlinewidth mul setlinewidth\n\
+ t1stemcolor setrgbcolor\n\
+ [] 0 setdash\n\
+ stemstart ymindev moveto\n\
+ stemstart ymaxdev lineto\n\
+ stroke\n\
+ [2 2] 0 setdash\n\
+ stemwidth stemstart add ymindev moveto\n\
+ stemwidth stemstart add ymaxdev lineto\n\
+ stroke\n\
+ } if\n\
+} def\n\
+\n\
+/t1alignedvstem {\n\
+ t1drawstems 1 eq\n\
+ {\n\
+ /stemwidth exch scale mul def\n\
+ /stemstart exch scale mul def\n\
+ t1alignedstemscale t1dumpstdlinewidth mul setlinewidth\n\
+ t1alignedstemcolor setrgbcolor\n\
+ [] 0 setdash\n\
+ stemstart ymindev moveto\n\
+ stemstart ymaxdev lineto\n\
+ stroke\n\
+ [2 2] 0 setdash\n\
+ stemwidth stemstart add ymindev moveto\n\
+ stemwidth stemstart add ymaxdev lineto\n\
+ stroke\n\
+ } if\n\
+} def\n\
+\n\
+/t1hstem {\n\
+ t1drawstems 1 eq\n\
+ {\n\
+ /stemwidth exch scale mul def\n\
+ /stemstart exch scale mul def\n\
+ t1stemscale t1dumpstdlinewidth mul setlinewidth\n\
+ t1stemcolor setrgbcolor\n\
+ [] 0 setdash\n\
+ xmindev stemstart moveto\n\
+ xmaxdev stemstart lineto\n\
+ stroke\n\
+ [2 2] 0 setdash\n\
+ xmindev stemwidth stemstart add moveto\n\
+ xmaxdev stemwidth stemstart add lineto\n\
+ stroke\n\
+ } if\n\
+} def\n\
+\n\
+/t1alignedhstem {\n\
+ t1drawstems 1 eq\n\
+ {\n\
+ /stemwidth exch scale mul def\n\
+ /stemstart exch scale mul def\n\
+ t1alignedstemscale t1dumpstdlinewidth mul setlinewidth\n\
+ t1alignedstemcolor setrgbcolor\n\
+ [] 0 setdash\n\
+ xmindev stemstart moveto\n\
+ xmaxdev stemstart lineto\n\
+ stroke\n\
+ [2 2] 0 setdash\n\
+ xmindev stemwidth stemstart add moveto\n\
+ xmaxdev stemwidth stemstart add lineto\n\
+ stroke\n\
+ } if\n\
+} def\n\
+\n\
+/t1bottomzone {\n\
+ t1drawzones 1 eq\n\
+ {\n\
+ /bottom exch scale mul def\n\
+ /top exch scale mul def\n\
+ t1bottomzonescale t1dumpstdlinewidth mul setlinewidth\n\
+ t1bottomzonecolor setrgbcolor\n\
+ [] 0 setdash\n\
+ xmindev bottom moveto\n\
+ xmaxdev bottom lineto\n\
+ stroke\n\
+ [2 2] 0 setdash\n\
+ xmindev top moveto\n\
+ xmaxdev top lineto\n\
+ stroke\n\
+ } if\n\
+} def\n\
+\n\
+/t1topzone {\n\
+ t1drawzones 1 eq\n\
+ {\n\
+ /bottom exch scale mul def\n\
+ /top exch scale mul def\n\
+ t1topzonescale t1dumpstdlinewidth mul setlinewidth\n\
+ t1topzonecolor setrgbcolor\n\
+ [2 2] 0 setdash\n\
+ xmindev bottom moveto\n\
+ xmaxdev bottom lineto\n\
+ stroke\n\
+ [] 0 setdash\n\
+ xmindev top moveto\n\
+ xmaxdev top lineto\n\
+ stroke\n\
+ } if\n\
+} def\n\
+\n\
+end\n\
+\n\
+% Next follows drawing code from charstring commands:\n", fp);
diff -Nru t1lib-grace/T1lib/type1/t1io.c t1lib-deb/T1lib/type1/t1io.c
--- t1lib-grace/T1lib/type1/t1io.c 2002-07-29 13:37:50.000000000 -0700
+++ t1lib-deb/T1lib/type1/t1io.c 2007-12-23 07:49:42.000000000 -0800
@@ -56,7 +56,7 @@
/* we define this to switch to decrypt-debugging mode. The stream of
decrypted bytes will be written to stdout! This contains binary
charstring data */
-/* #define DEBUG_DECRYPTION */
+/* #define DEBUG_DECRYPTION */
/* #define DEBUG_PFB_BLOCKS */
/* Constants and variables used in the decryption */
@@ -82,8 +82,8 @@
/* Our routines */
F_FILE *T1Open(), *T1eexec();
-int T1Close();
-int T1Read(), T1Getc(), T1Ungetc();
+int T1Close(F_FILE *);
+int T1Read(), T1Getc(F_FILE *), T1Ungetc(int,F_FILE *);
void T1io_reset(void);
STATIC int T1Decrypt(), T1Fill();
@@ -104,7 +104,7 @@
#ifndef O_BINARY
# define O_BINARY 0x0
#endif
-
+
/* We know we are only reading */
if ((of->fd=open(fn, O_RDONLY | O_BINARY)) < 0) return NULL;
@@ -154,7 +154,7 @@
T1Gets(): Read a line of the file and save it to string. At most,
(size-1) bytes are read. The user *must* ensure (by making size large
enough) that "eexec" does not get split between two calls because
- in this case, eexec-encryption does not set in.
+ in this case, eexec-decryption does not set in.
------------------------------------------------------------ */
int T1Gets(char *string,
int size,
@@ -198,7 +198,7 @@
}
/* do not skip white space as required by Adobe spec, because
- if have found fonts where the first encrypted byte was of
+ I have found fonts where the first encrypted byte was of
white space type. */
if ( (eexec_startOK==1) && (eexec_endOK==1)) {
T1eexec( f);
@@ -228,7 +228,15 @@
seen a pfb-file which uses the sequence '\r''\n' as a newline
indicator, as known from DOS. So we don't take care for this case
and simply map both single characters \r and \n into \n. Of course,
- this can only be done in the ASCII section of the font. */
+ this can only be done in the ASCII section of the font.
+
+ 2002-10-26: Well, life life is teaching me better: There *are* fonts
+ out there, ASCII encoded pfa's, that use the crappy DOSian 0x0d 0x0a
+ sequence as line separation. In order to make it still work, we absorb
+ the byte 0x0a. Failure to do so result in decryption failure. The
+ workaround is implemented T1eexec():
+
+ */
if ( *(f->b_ptr)=='\n' || *(f->b_ptr)=='\r') {
if (in_eexec==0)
string[i-1]='\n';
@@ -269,6 +277,7 @@
char *ctmP;
int i=0, j;
int datasize;
+ int len;
datasize=size;
@@ -289,11 +298,18 @@
datasize=i; /* we skip the segment marker of pfb-files */
}
if ((ctmP=strstr( &(buf[j]), "cleartomark"))!=NULL) {
- memcpy( string, &(buf[i]), datasize-i);
- string[datasize-i]='\0';
+ /* buf[i-1] now is the first character after cleartomark. Advance now
+ to the next non white character of EOF. */
+ len = datasize - i;
+ while ( (isspace( (int)(buf[i-1])) != 0) &&
+ (i < datasize) ) {
+ ++i;
+ }
+ memcpy( string, &(buf[i-1]), len);
+ string[len]='\0';
lseek( f->fd, off_save, SEEK_SET);
free( buf);
- return( datasize-i);
+ return len;
}
i--;
}
@@ -386,6 +402,7 @@
int H;
unsigned char *p;
+ int testchar;
unsigned char randomP[8];
r = 55665; /* initial key */
@@ -394,7 +411,15 @@
#ifdef DEBUG_DECRYPTION
printf("T1eexec(1): first 20 bytes=%.20s, b_cnt=%d\n", f->b_ptr, f->b_cnt);
#endif
-
+
+ /* As the very first action we check the first byte against 0x0a.
+ This mmight happen in context with the T1gets() function for
+ pfa files that use DOSian linefeed style. If that character appears
+ here, we absorb it (see also T1Gets()!).
+ */
+ if ( ( testchar = T1Getc( f)) != 0x0a )
+ T1Ungetc( testchar, f);
+
/* Consume the 4 random bytes, determining if we are also to
ASCIIDecodeHex as we process our input. (See pages 63-64
of the Adobe Type 1 Font Format book.) */
diff -Nru t1lib-grace/T1lib/type1/t1stdio.h t1lib-deb/T1lib/type1/t1stdio.h
--- t1lib-grace/T1lib/type1/t1stdio.h 1998-12-22 15:56:32.000000000 -0800
+++ t1lib-deb/T1lib/type1/t1stdio.h 2007-12-23 07:49:42.000000000 -0800
@@ -63,7 +63,9 @@
#ifndef NULL
#define NULL 0 /* null pointer */
#endif
+#ifndef EOF
#define EOF (-1) /* end of file */
+#endif
#define F_BUFSIZ (512)
#define getc(f) \
@@ -74,7 +76,7 @@
)
extern FILE *T1Open(), *T1eexec();
-extern int T1Close(), T1Ungetc(), T1Read();
+extern int T1Close(F_FILE *), T1Ungetc(int,F_FILE *), T1Read();
#define fclose(f) T1Close(f)
#define fopen(name,mode) T1Open(name,mode)
diff -Nru t1lib-grace/T1lib/type1/type1.c t1lib-deb/T1lib/type1/type1.c
--- t1lib-grace/T1lib/type1/type1.c 2001-02-19 13:43:34.000000000 -0800
+++ t1lib-deb/T1lib/type1/type1.c 2014-03-27 20:23:42.310776026 -0700
@@ -42,13 +42,29 @@
/* (Font level hints & stem hints) */
/* */
/*********************************************************************/
-
+
+
+/* Write debug info into a PostScript file? */
+/* #define DUMPDEBUGPATH */
+/* If Dumping a debug path, should we dump both character and
+ outline path? Warning: Do never enable this, unless, your name
+ is Rainer Menzner and you know what you are doing! */
+/* #define DUMPDEBUGPATHBOTH */
+
+/* Generate a bunch of stderr output to understand and debug
+ the generation of outline surrounding curves */
+/* #define DEBUG_OUTLINE_SURROUNDING */
+
+#define SUBPATH_CLOSED 1
+#define SUBPATH_OPEN 0
+
/******************/
/* Include Files: */
/******************/
#include "types.h"
#include <stdio.h> /* a system-dependent include, usually */
#include <math.h>
+#include <stdlib.h>
#include "objects.h"
#include "spaces.h"
@@ -60,7 +76,218 @@
#include "util.h" /* PostScript objects */
#include "fontfcn.h"
#include "blues.h" /* Blues structure for font-level hints */
-
+
+
+/* Considerations about hinting (2002-07-11, RMz (Author of t1lib))
+
+ It turns out that the hinting code as used until now produces some
+ artifacts in which may show up in suboptimal bitmaps. I have therefore
+ redesigned the algorithm. It is generally a bad idea to hint every
+ point that falls into a stem hint.
+
+ The idea is to hint only points for
+ which at least one of the two neighboring curve/line segments is aligned
+ with the stem in question. For curves, we are speaking about the
+ tangent line, that is, the line defined by (p1-p2) or (p3-p4).
+
+ For vertical stems this means, that only points which are connected
+ exactly into vertical direction are hinted. That is, the dx of the
+ respective curve vanishes. For horizontal stems, accordingly, dy must
+ vanish at least on one hand side of the point in order to be considered
+ as a stem.
+
+ Unfortunately this principle requires information about both sides of the
+ neighborhood of the point in question. In other words, it is not possible
+ to define a segment completely until the next segment has been inspected.
+ The idea thus is not compatible with the code in this file.
+
+ Furthermore, if certain points of a character outline are hinted according
+ to the stem hint info from the charstring, the non-hinted points may not be
+ left untouched. This would lead to very strong artifacts at small sizes,
+ especially if characters are defined in terms of curves. This is predominantly
+ the case for ComputerModern, for example.
+
+ To conclude, it is best to build a point list from the character description
+ adjust the non-hinted points after hinting has been completely finished.
+
+
+ Another rule we should state is
+
+ We can work around this by not directly connecting the path segments at
+ the end of the lineto/curveto's, but rather deferring this to the beginning
+ of the next path constructing function. It's not great but it should work.
+
+ The functions that produce segments are
+
+ 1) RMoveTo()
+ 2) RLineto()
+ 3) RRCurveTo()
+ 4) DoClosePath()
+
+ Their code is moved into the switch statement of the new function
+ handleCurrentSegment(). This function is called when a new segment generating
+ operation has been decoded from the charstring. At this point a serious
+ decision about how to hint the points is possible.
+
+ ...
+*/
+
+
+/* The following struct is used to record points that define a path
+ in absolute charspace coordinates. x and y describe the location and
+ hinted, if greater 0, indicates that this point has been hinted. Bit 0
+ (0x1) indicates vertically adjusted and Bit 1 (0x2) indicates
+ horizontally adjusted. If hinted == -1, this point is not to be hinted
+ at all. This, for example, is the case for a a (H)SBW command.
+
+ The member type can be one of
+
+ PPOINT_SBW --> initial path point as setup by (H)SBW
+ PPOINT_MOVE --> point that finishes a MOVE segment
+ PPOINT_LINE --> point that finishes a LINE segment
+ PPOINT_BEZIER_B --> second point of a BEZIER segment
+ PPOINT_BEZIER_C --> third point of a BEZIER segment
+ PPOINT_BEZIER_D --> fourth point of a BEZIER segment
+ PPOINT_CLOSEPATH --> a ClosePath command
+ PPOINT_ENDCHAR --> an EndChar command
+ PPOINT_SEAC --> a Standard Encoding Accented Char command
+ PPOINT_NONE --> an invalid entry
+
+
+ Note: BEZIER_B and BEZIER_C points generally cannot be flagged as
+ being hinted because are off-curve points.
+*/
+typedef struct
+{
+ double x; /* x-coordinate */
+ double y; /* y-coordinate */
+ double ax; /* adjusted x-coordinate */
+ double ay; /* adjusted y-coordinate */
+ double dxpr; /* x-shift in right path due to incoming segment (previous) */
+ double dypr; /* y-shift in right path due to incoming segment (previous) */
+ double dxnr; /* x-shift in right path due to outgoing segment (next) */
+ double dynr; /* y-shift in right path due to incoming segment (next) */
+ double dxir; /* x-shift in right path resulting from prologation of the linkend tangents (intersect) */
+ double dyir; /* y-shift in right path resulting from prologation of the linkend tangents (intersect) */
+ double dist2prev; /* distance to the previous point in path (used only for stroking) */
+ double dist2next; /* distance to the next point in path (used only for stroking) */
+ enum
+ {
+ PPOINT_SBW,
+ PPOINT_MOVE,
+ PPOINT_LINE,
+ PPOINT_BEZIER_B,
+ PPOINT_BEZIER_C,
+ PPOINT_BEZIER_D,
+ PPOINT_CLOSEPATH,
+ PPOINT_ENDCHAR,
+ PPOINT_SEAC,
+ PPOINT_NONE
+ } type; /* type of path point */
+ signed char hinted; /* is this point hinted? */
+ unsigned char shape; /* is the outline concave or convex or straight at this point? This flag
+ is only relevant for onCurve points in the context of stroking! */
+} PPOINT;
+
+#define CURVE_NONE 0x00
+#define CURVE_STRAIGHT 0x01
+#define CURVE_CONVEX 0x02
+#define CURVE_CONCAVE 0x03
+
+#ifdef DEBUG_OUTLINE_SURROUNDING
+static char* pptypes[] = {
+ "PPOINT_SBW",
+ "PPOINT_MOVE",
+ "PPOINT_LINE",
+ "PPOINT_BEZIER_B",
+ "PPOINT_BEZIER_C",
+ "PPOINT_BEZIER_D",
+ "PPOINT_CLOSEPATH",
+ "PPOINT_ENDCHAR",
+ "PPOINT_SEAC"
+};
+static char* ppshapes[] = {
+ "SHAPE_OFFCURVE",
+ "SHAPE_STRAIGHT",
+ "SHAPE_CONVEX",
+ "SHAPE_CONCAVE"
+};
+#endif
+
+
+/* The PPOINT structs are organized in an array which is allocated
+ in chunks of 256 entries. A new point is allocated by a call to
+ nextPPoint and returns the index in the array of the newly
+ allocated point. */
+static PPOINT* ppoints = NULL;
+static long numppoints = 0;
+static long numppointchunks = 0;
+static int closepathatfirst = 0;
+
+static long nextPPoint( void)
+{
+ ++numppoints;
+ /* Check whether to reallocate */
+ if ( numppoints > (numppointchunks * 256) ) {
+ ++numppointchunks;
+ ppoints = (PPOINT*) realloc( ppoints, (numppointchunks * 256) * sizeof( PPOINT));
+ }
+ /* return the current index */
+ return numppoints-1;
+}
+
+static void createFillPath( void);
+static void createStrokePath( double strokewidth, int subpathclosed);
+static void createClosedStrokeSubPath( long startind, long stopind,
+ double strokewidth, int subpathclosed);
+static long computeDistances( long startind, long stopind, int subpathclosed);
+static void transformOnCurvePathPoint( double strokewidth,
+ long prevind, long currind, long lastind);
+static void transformOffCurvePathPoint( double strokewidth, long currind);
+/* values for flag:
+ INTERSECT_PREVIOUS: only take previous path segment into account.
+ INTERSECT_NEXT: only take next path segment into account.
+ INTERSECT_BOTH: do a real intersection
+*/
+#define INTERSECT_PREVIOUS -1
+#define INTERSECT_NEXT 1
+#define INTERSECT_BOTH 0
+static void intersectRight( long index, double halfwidth, long flag);
+/* values for orientation:
+ PATH_LEFT: we are constructing the left path.
+ PATH_RIGHT: we are constructing the right path.
+*/
+#define PATH_LEFT 1
+#define PATH_RIGHT 0
+/* values for position:
+ PATH_START: current point starts the current path (use next-values).
+ PATH_END: current point ends the current path (use prev-values).
+*/
+#define PATH_START 0
+#define PATH_END 1
+static void linkNode( long index, int position, int orientation);
+
+
+static long handleNonSubPathSegments( long pindex);
+static void handleCurrentSegment( long pindex);
+static void adjustBezier( long pindex);
+
+static double size;
+static double scxx, scyx, scxy, scyy;
+static double up;
+
+#ifdef DUMPDEBUGPATH
+static FILE* psfile = NULL;
+static void PSDumpProlog( FILE* fp);
+static void PSDumpEpilog( FILE* fp);
+#endif
+
+/* variables for querying SEAC from external */
+static int isseac = 0;
+static unsigned char seacbase = 0;
+static unsigned char seacaccent = 0;
+
+
/**********************************/
/* Type1 Constants and Structures */
/**********************************/
@@ -71,7 +298,7 @@
#define MAXLABEL 256 /* Maximum number of new hints */
#define MAXSTEMS 512 /* Maximum number of VSTEM and HSTEM hints */
#define EPS 0.001 /* Small number for comparisons */
-
+
/************************************/
/* Adobe Type 1 CharString commands */
/************************************/
@@ -143,7 +370,7 @@
#define CC IfTrace1(TRUE, "Char \"%s\": ", currentchar)
-/* To make some compiler happy we have to care about return types! */
+/* To make some compiler happy we have to care about return types! */
#define Errori {errflag = TRUE; return 0;} /* integer */
#define Errord {errflag = TRUE; return 0.0;} /* double */
#define Errorv {errflag = TRUE; return;} /* void */
@@ -159,21 +386,47 @@
/********************/
/* global variables */
/********************/
-struct stem { /* representation of a STEM hint */
- int vertical; /* TRUE if vertical, FALSE otherwise */
- DOUBLE x, dx; /* interval of vertical stem */
- DOUBLE y, dy; /* interval of horizontal stem */
- struct segment *lbhint, *lbrevhint; /* left or bottom hint adjustment */
- struct segment *rthint, *rtrevhint; /* right or top hint adjustment */
+struct stem { /* representation of a STEM hint */
+ int vertical; /* TRUE if vertical, FALSE otherwise */
+ DOUBLE x, dx; /* interval of vertical stem */
+ DOUBLE y, dy; /* interval of horizontal stem */
+ DOUBLE alx, aldx; /* interval of grid-aligned vertical stem */
+ DOUBLE aly, aldy; /* interval of grid-aligned horizontal stem */
+ double lbhintval; /* adjustment value for left or bottom hint */
+ double rthintval; /* adjustment value for right ir top hint */
};
+/******************************************************/
+/* Subroutines and statics for the Type1Char routines */
+/******************************************************/
+
+static int strindex; /* index into PostScript string being interpreted */
+static double currx, curry; /* accumulated x and y values */
+static double hcurrx, hcurry; /* accumulated values with hinting */
+
+
+struct callstackentry {
+ psobj *currstrP; /* current CharStringP */
+ int currindex; /* current strindex */
+ unsigned short currkey; /* current decryption key */
+ };
+
+static DOUBLE Stack[MAXSTACK];
+static int Top;
+static struct callstackentry CallStack[MAXCALLSTACK];
+static int CallTop;
+static DOUBLE PSFakeStack[MAXPSFAKESTACK];
+static int PSFakeTop;
+
+
extern struct XYspace *IDENTITY;
static DOUBLE escapementX, escapementY;
static DOUBLE sidebearingX, sidebearingY;
static DOUBLE accentoffsetX, accentoffsetY;
-static struct segment *path;
+static struct segment *path; /* path of basechar */
+static struct segment *apath; /* pass of accent char */
static int errflag;
/*************************************************/
@@ -207,11 +460,6 @@
static int CallOtherSubr();
static int SetCurrentPoint();
-/*****************************************/
-/* statics for Flex procedures (FlxProc) */
-/*****************************************/
-static struct segment *FlxOldPath; /* save path before Flex feature */
-
/******************************************************/
/* statics for Font level hints (Blues) (see blues.h) */
/******************************************************/
@@ -332,6 +580,16 @@
blues->FamilyBlues[i];
alignmentzones[numalignmentzones].topy =
blues->FamilyBlues[i+1];
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL ) {
+ if ( alignmentzones[numalignmentzones].topzone == TRUE )
+ fprintf( psfile, "%f %f t1topzone\n", (blues->FamilyBlues[i])*up,
+ (blues->BlueValues[i+1])*up);
+ else
+ fprintf( psfile, "%f %f t1bottomzone\n", (blues->FamilyBlues[i])*up,
+ (blues->BlueValues[i+1])*up);
+ }
+#endif
continue;
}
}
@@ -339,6 +597,16 @@
/* use this font's Blue zones */
alignmentzones[numalignmentzones].bottomy = blues->BlueValues[i];
alignmentzones[numalignmentzones].topy = blues->BlueValues[i+1];
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL ) {
+ if ( alignmentzones[numalignmentzones].topzone == TRUE )
+ fprintf( psfile, "%f %f t1topzone\n", (blues->BlueValues[i])*up,
+ (blues->BlueValues[i+1])*up);
+ else
+ fprintf( psfile, "%f %f t1bottomzone\n", (blues->BlueValues[i])*up,
+ (blues->BlueValues[i+1])*up);
+ }
+#endif
}
/* do the OtherBlues zones */
@@ -362,6 +630,12 @@
blues->FamilyOtherBlues[i];
alignmentzones[numalignmentzones].topy =
blues->FamilyOtherBlues[i+1];
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL ) {
+ fprintf( psfile, "%f %f t1bottomzone\n", (blues->FamilyOtherBlues[i])*up,
+ (blues->FamilyOtherBlues[i+1])*up);
+ }
+#endif
continue;
}
}
@@ -369,6 +643,12 @@
/* use this font's Blue zones (as opposed to the Family Blues */
alignmentzones[numalignmentzones].bottomy = blues->OtherBlues[i];
alignmentzones[numalignmentzones].topy = blues->OtherBlues[i+1];
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL ) {
+ fprintf( psfile, "%f %f t1bottomzone\n", (blues->OtherBlues[i])*up,
+ (blues->OtherBlues[i+1])*up);
+ }
+#endif
}
return(0);
@@ -395,20 +675,7 @@
}
-static int FinitStems() /* Terminate the STEM hint data structures */
-{
- int i;
-
- for (i = 0; i < numstems; i++) {
- Destroy(stems[i].lbhint);
- Destroy(stems[i].lbrevhint);
- Destroy(stems[i].rthint);
- Destroy(stems[i].rtrevhint);
- }
- return(0);
-
-}
-
+
/*******************************************************************/
/* Compute the dislocation that a stemhint should cause for points */
/* inside the stem. */
@@ -441,10 +708,9 @@
else if (FABS(cyx) < 0.00001 || FABS(cxy) < 0.00001)
rotated = FALSE; /* Char is upright (0 or 180 degrees), possibly oblique. */
else {
- stems[stemno].lbhint = NULL; /* Char is at non-axial angle, ignore hints. */
- stems[stemno].lbrevhint = NULL;
- stems[stemno].rthint = NULL;
- stems[stemno].rtrevhint = NULL;
+ stems[stemno].lbhintval = 0.0; /* Char is at non-axial angle, ignore hints. */
+ stems[stemno].rthintval = 0.0;
+ ProcessHints = 0;
return(0);
}
@@ -454,10 +720,18 @@
verticalondevice = !rotated;
stemstart = stems[stemno].x;
stemwidth = stems[stemno].dx;
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL )
+ fprintf( psfile, "%f %f t1vstem\n", stemstart*up, stemwidth*up);
+#endif
} else {
verticalondevice = rotated;
stemstart = stems[stemno].y;
stemwidth = stems[stemno].dy;
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL )
+ fprintf( psfile, "%f %f t1hstem\n", stemstart*up, stemwidth*up);
+#endif
}
/* Determine how many pixels (non-negative) correspond to 1 character space
@@ -476,7 +750,7 @@
unitpixels = FABS(Ypixels);
onepixel = 1.0 / unitpixels;
-
+
/**********************/
/* ADJUST STEM WIDTHS */
/**********************/
@@ -501,7 +775,7 @@
widthdiff = blues->StemSnapH[i] - stemwidth;
}
}
-
+
/* Only expand or contract stems if they differ by less than 1 pixel from
the closest standard width, otherwise make the width difference = 0. */
if (FABS(widthdiff) > onepixel)
@@ -528,7 +802,7 @@
stemshift = 0.0;
- if (!stems[stemno].vertical) {
+ if ( !stems[stemno].vertical ) {
/* Get bottom and top boundaries of the stem. */
stembottom = stemstart;
@@ -648,11 +922,18 @@
rthintvalue = stemshift + widthdiff; /* top */
}
- stems[stemno].lbhint = (struct segment *)Permanent(Loc(CharSpace, 0.0, lbhintvalue));
- stems[stemno].lbrevhint = (struct segment *)Permanent(Loc(CharSpace, 0.0, -lbhintvalue));
- stems[stemno].rthint = (struct segment *)Permanent(Loc(CharSpace, 0.0, rthintvalue));
- stems[stemno].rtrevhint = (struct segment *)Permanent(Loc(CharSpace, 0.0, -rthintvalue));
-
+ stems[stemno].lbhintval = lbhintvalue;
+ stems[stemno].rthintval = rthintvalue;
+
+ /* store grid-aligned stems values */
+ stems[stemno].aly = stemstart + lbhintvalue;
+ stems[stemno].aldy = stemwidth + widthdiff;
+
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL )
+ fprintf( psfile, "%f %f t1alignedhstem\n", (stems[stemno].aly)*up,
+ (stems[stemno].aldy)*up);
+#endif
return(0);
} /* endif (i < numalignmentzones) */
@@ -671,157 +952,180 @@
rthintvalue = stemshift + widthdiff / 2; /* right or top */
if (stems[stemno].vertical) {
- stems[stemno].lbhint = (struct segment *)Permanent(Loc(CharSpace, lbhintvalue, 0.0));
- stems[stemno].lbrevhint = (struct segment *)Permanent(Loc(CharSpace, -lbhintvalue, 0.0));
- stems[stemno].rthint = (struct segment *)Permanent(Loc(CharSpace, rthintvalue, 0.0));
- stems[stemno].rtrevhint = (struct segment *)Permanent(Loc(CharSpace, -rthintvalue, 0.0));
+ stems[stemno].lbhintval = lbhintvalue;
+ stems[stemno].rthintval = rthintvalue;
+
+ /* store grid-aligned stem values */
+ stems[stemno].alx = stemstart + stemshift;
+ stems[stemno].aldx = stemwidth + widthdiff;
+
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL )
+ fprintf( psfile, "%f %f t1alignedvstem\n", (stems[stemno].alx)*up,
+ (stems[stemno].aldx)*up);
+#endif
} else {
- stems[stemno].lbhint = (struct segment *)Permanent(Loc(CharSpace, 0.0, lbhintvalue));
- stems[stemno].lbrevhint = (struct segment *)Permanent(Loc(CharSpace, 0.0, -lbhintvalue));
- stems[stemno].rthint = (struct segment *)Permanent(Loc(CharSpace, 0.0, rthintvalue));
- stems[stemno].rtrevhint = (struct segment *)Permanent(Loc(CharSpace, 0.0, -rthintvalue));
+ stems[stemno].lbhintval = lbhintvalue;
+ stems[stemno].rthintval = rthintvalue;
+
+ /* store grid-aligned stem values */
+ stems[stemno].aly = stemstart + stemshift;
+ stems[stemno].aldy = stemwidth + widthdiff;
+
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL )
+ fprintf( psfile, "%f %f t1alignedhstem\n", (stems[stemno].aly)*up,
+ (stems[stemno].aldy)*up);
+#endif
}
return(0);
}
+
#define LEFT 1
#define RIGHT 2
#define BOTTOM 3
#define TOP 4
-
-/*********************************************************************/
-/* Adjust a point using the given stem hint. Use the left/bottom */
-/* hint value or the right/top hint value depending on where the */
-/* point lies in the stem. */
-/*********************************************************************/
-static struct segment *Applyhint(p, stemnumber, half)
-struct segment *p;
-int stemnumber, half;
-{
- if (half == LEFT || half == BOTTOM)
- return Join(p, stems[stemnumber].lbhint); /* left or bottom hint */
- else
- return Join(p, stems[stemnumber].rthint); /* right or top hint */
-}
-
-/*********************************************************************/
-/* Adjust a point using the given reverse hint. Use the left/bottom */
-/* hint value or the right/top hint value depending on where the */
-/* point lies in the stem. */
-/*********************************************************************/
-static struct segment *Applyrevhint(p, stemnumber, half)
-struct segment *p;
-int stemnumber, half;
-{
- if (half == LEFT || half == BOTTOM)
- return Join(p, stems[stemnumber].lbrevhint); /* left or bottom hint */
- else
- return Join(p, stems[stemnumber].rtrevhint); /* right or top hint */
-}
-
+
+
/***********************************************************************/
/* Find the vertical and horizontal stems that the current point */
/* (x, y) may be involved in. At most one horizontal and one vertical */
/* stem can apply to a single point, since there are no overlaps */
/* allowed. */
-/* The actual hintvalue is returned as a location. */
+/* The point list updated by this function. */
/* Hints are ignored inside a DotSection. */
/***********************************************************************/
-static struct segment *FindStems(x, y, dx, dy)
-DOUBLE x, y, dx, dy;
+static void FindStems( double x, double y,
+ double dx, double dy,
+ double nextdx, double nextdy)
{
int i;
int newvert, newhor;
- struct segment *p;
int newhorhalf, newverthalf;
+
+ /* The following values will be used to decide whether a curve
+ crosses or touches a stem in an aligned manner or not */
+ double dtana = 0.0; /* tangent of pre-delta against horizontal line */
+ double dtanb = 0.0; /* tangent of pre-delta against vertical line */
+ double nextdtana = 0.0; /* tangent of post-delta against horizontal line */
+ double nextdtanb = 0.0; /* tangent of post-delta against vertical line */
+
+ if (ppoints == NULL || numppoints < 1) Error0v("FindStems: No previous point!\n");
- if (InDotSection) return(NULL);
-
+ /* setup default hinted position */
+ ppoints[numppoints-1].ax = ppoints[numppoints-1].x;
+ ppoints[numppoints-1].ay = ppoints[numppoints-1].y;
+ if ( ppoints[numppoints-1].hinted == -1 )
+ /* point is not to be hinted! */
+ return;
+ else
+ ppoints[numppoints-1].hinted = 0;
+
+ if ( InDotSection )
+ return;
+
+ if ( ProcessHints == 0 ) {
+ return;
+ }
+
+ /* setup (absolute) tangent values and define limits that indicate nearly
+ horizontal or nearly vertical alignment */
+#define NEARLYVERTICAL 0.2 /* This corresponds to about 11.3 degress deviation */
+#define NEARLYHORIZONTAL 0.2 /* from the ideal direction. */
+ if ( dy != 0 ) {
+ dtana = dx/dy;
+ if ( dtanb < 0.0 )
+ dtana = -dtana;
+ }
+ else
+ dtana = NEARLYHORIZONTAL;
+ if ( dx != 0 ) {
+ dtanb = dy/dx;
+ if ( dtanb < 0.0 )
+ dtanb = -dtanb;
+ }
+ else
+ dtanb = NEARLYVERTICAL;
+ if ( nextdy != 0 ) {
+ nextdtana = nextdx/nextdy;
+ if ( nextdtana < 0.0 )
+ nextdtana = -nextdtana;
+ }
+ else
+ nextdtana = NEARLYHORIZONTAL;
+ if ( nextdx != 0 ) {
+ nextdtanb = nextdy/nextdx;
+ if ( nextdtanb < 0.0 )
+ nextdtanb = -nextdtanb;
+ }
+ else
+ nextdtanb = NEARLYVERTICAL;
+
newvert = newhor = -1;
newhorhalf = newverthalf = -1;
-
+
for (i = currstartstem; i < numstems; i++) {
if (stems[i].vertical) { /* VSTEM hint */
- if ((x >= stems[i].x - EPS) &&
- (x <= stems[i].x+stems[i].dx + EPS)) {
- newvert = i;
- if (dy != 0.0) {
- if (dy < 0) newverthalf = LEFT;
- else newverthalf = RIGHT;
- } else {
- if (x < stems[i].x+stems[i].dx / 2) newverthalf = LEFT;
- else newverthalf = RIGHT;
- }
+ /* OK, stem is crossed in an aligned way */
+ if ( (dtana <= NEARLYVERTICAL) || (nextdtana <= NEARLYVERTICAL)) {
+ if ((x >= stems[i].x ) &&
+ (x <= stems[i].x+stems[i].dx )) {
+ newvert = i;
+ if (x < stems[i].x+stems[i].dx / 2)
+ newverthalf = LEFT;
+ else
+ newverthalf = RIGHT;
+ }
}
- } else { /* HSTEM hint */
- if ((y >= stems[i].y - EPS) &&
- (y <= stems[i].y+stems[i].dy + EPS)) {
- newhor = i;
- if (dx != 0.0) {
- if (dx < 0) newhorhalf = TOP;
- else newhorhalf = BOTTOM;
- } else {
- if (y < stems[i].y+stems[i].dy / 2) newhorhalf = BOTTOM;
- else newhorhalf = TOP;
- }
+ }
+ else { /* HSTEM hint */
+ if ( (dtanb <= NEARLYHORIZONTAL) || (nextdtanb <= NEARLYHORIZONTAL)) {
+ /* OK, stem is crossed in an aligned way */
+ if ((y >= stems[i].y ) &&
+ (y <= stems[i].y+stems[i].dy )) {
+ newhor = i;
+ if (y < stems[i].y+stems[i].dy / 2)
+ newhorhalf = BOTTOM;
+ else
+ newhorhalf = TOP;
+ }
}
}
}
-
- p = NULL;
-
- if (newvert == -1 && oldvert == -1) ; /* Outside of any hints */
- else if (newvert == oldvert &&
- newverthalf == oldverthalf); /* No hint change */
- else if (oldvert == -1) { /* New vertical hint in effect */
- p = Applyhint(p, newvert, newverthalf);
- } else if (newvert == -1) { /* Old vertical hint no longer in effect */
- p = Applyrevhint(p, oldvert, oldverthalf);
- } else { /* New vertical hint in effect, old hint no longer in effect */
- p = Applyrevhint(p, oldvert, oldverthalf);
- p = Applyhint(p, newvert, newverthalf);
- }
-
- if (newhor == -1 && oldhor == -1) ; /* Outside of any hints */
- else if (newhor == oldhor &&
- newhorhalf == oldhorhalf) ; /* No hint change */
- else if (oldhor == -1) { /* New horizontal hint in effect */
- p = Applyhint(p, newhor, newhorhalf);
- } else if (newhor == -1) { /* Old horizontal hint no longer in effect */
- p = Applyrevhint(p, oldhor, oldhorhalf);
- }
- else { /* New horizontal hint in effect, old hint no longer in effect */
- p = Applyrevhint(p, oldhor, oldhorhalf);
- p = Applyhint(p, newhor, newhorhalf);
+
+ if ( newvert != -1 ) {
+ /* mark the latest point in the point list to be v-hinted! */
+ if ( newverthalf == LEFT ) {
+ /* left hint */
+ ppoints[numppoints-1].ax += stems[newvert].lbhintval;
+ }
+ else {
+ /* right hint */
+ ppoints[numppoints-1].ax += stems[newvert].rthintval;
+ }
+ ppoints[numppoints-1].hinted |= 0x01;
}
-
- oldvert = newvert; oldverthalf = newverthalf;
- oldhor = newhor; oldhorhalf = newhorhalf;
-
- return p;
+ if ( newhor != -1 ) {
+ /* mark the latest point in the point list to be h-hinted! */
+ if ( newhorhalf == BOTTOM ) {
+ /* bottom hint */
+ ppoints[numppoints-1].ay += stems[newhor].lbhintval;
+ }
+ else {
+ /* top hint */
+ ppoints[numppoints-1].ay += stems[newhor].rthintval;
+ }
+ ppoints[numppoints-1].hinted |= 0x02;
+ }
+
+ return;
+
}
-
-/******************************************************/
-/* Subroutines and statics for the Type1Char routines */
-/******************************************************/
-
-static int strindex; /* index into PostScript string being interpreted */
-static DOUBLE currx, curry; /* accumulated x and y values for hints */
-
-struct callstackentry {
- psobj *currstrP; /* current CharStringP */
- int currindex; /* current strindex */
- unsigned short currkey; /* current decryption key */
- };
-
-static DOUBLE Stack[MAXSTACK];
-static int Top;
-static struct callstackentry CallStack[MAXCALLSTACK];
-static int CallTop;
-static DOUBLE PSFakeStack[MAXPSFAKESTACK];
-static int PSFakeTop;
-
+
+
+/* Type 1 internal functions */
static int ClearStack()
{
Top = -1;
@@ -986,7 +1290,7 @@
static int DoRead(CodeP)
int *CodeP;
{
- if (strindex >= CharStringP->len) return(FALSE); /* end of string */
+ if (!CharStringP || strindex >= CharStringP->len) return(FALSE); /* end of string */
/* We handle the non-documented Adobe convention to use lenIV=-1 to
suppress charstring encryption. */
if (blues->lenIV==-1) {
@@ -1394,20 +1698,25 @@
static int RLineTo(dx, dy)
DOUBLE dx, dy;
{
- struct segment *B;
-
- IfTrace2((FontDebug), "RLineTo %f %f\n", dx, dy);
-
- B = Loc(CharSpace, dx, dy);
-
- if (ProcessHints) {
- currx += dx;
- curry += dy;
- /* B = Join(B, FindStems(currx, curry)); */
- B = Join(B, FindStems(currx, curry, dx, dy));
- }
-
- path = Join(path, Line(B));
+ long pindex = 0;
+
+ /* compute hinting for previous segment! */
+ if (ppoints == NULL || numppoints < 2) Error0i("RLineTo: No previous point!\n");
+ FindStems( currx, curry, currx-ppoints[numppoints-2].x, curry-ppoints[numppoints-2].y, dx, dy);
+
+ /* Allocate a new path point and pre-setup data */
+ pindex = nextPPoint();
+ ppoints[pindex].x = currx + dx;
+ ppoints[pindex].y = curry + dy;
+ ppoints[pindex].ax = ppoints[pindex].x;
+ ppoints[pindex].ay = ppoints[pindex].y;
+ ppoints[pindex].type = PPOINT_LINE;
+ ppoints[pindex].hinted = 0;
+
+ /* update ideal position */
+ currx += dx;
+ curry += dy;
+
return(0);
}
@@ -1418,31 +1727,55 @@
static int RRCurveTo(dx1, dy1, dx2, dy2, dx3, dy3)
DOUBLE dx1, dy1, dx2, dy2, dx3, dy3;
{
- struct segment *B, *C, *D;
-
- IfTrace4((FontDebug), "RRCurveTo %f %f %f %f ", dx1, dy1, dx2, dy2);
- IfTrace2((FontDebug), "%f %f\n", dx3, dy3);
-
- B = Loc(CharSpace, dx1, dy1);
- C = Loc(CharSpace, dx2, dy2);
- D = Loc(CharSpace, dx3, dy3);
-
- if (ProcessHints) {
- /* For a Bezier curve, we apply the full hint value to
- the Bezier C point (and thereby D point). */
- currx += dx1 + dx2 + dx3;
- curry += dy1 + dy2 + dy3;
- /* C = Join(C, FindStems(currx, curry)); */
- C = Join(C, FindStems(currx, curry, dx3, dy3));
- }
-
- /* Since XIMAGER is not completely relative, */
- /* we need to add up the delta values */
-
- C = Join(C, Dup(B));
- D = Join(D, Dup(C));
-
- path = Join(path, Bezier(B, C, D));
+ long pindex = 0;
+
+ /* compute hinting for previous point! */
+ if (ppoints == NULL || numppoints < 2) Error0i("RRCurveTo: No previous point!\n");
+ FindStems( currx, curry, currx-ppoints[numppoints-2].x, curry-ppoints[numppoints-2].y, dx1, dy1);
+
+ /* Allocate three new path points and pre-setup data */
+ pindex = nextPPoint();
+ ppoints[pindex].x = currx + dx1;
+ ppoints[pindex].y = curry + dy1;
+ ppoints[pindex].ax = ppoints[pindex].x;
+ ppoints[pindex].ay = ppoints[pindex].y;
+ ppoints[pindex].type = PPOINT_BEZIER_B;
+ ppoints[pindex].hinted = 0;
+
+ /* update ideal position */
+ currx += dx1;
+ curry += dy1;
+
+ /* compute hinting for previous point! */
+ FindStems( currx, curry, currx-ppoints[numppoints-2].x, curry-ppoints[numppoints-2].y, dx2, dy2);
+
+ pindex = nextPPoint();
+ ppoints[pindex].x = currx + dx2;
+ ppoints[pindex].y = curry + dy2;
+ ppoints[pindex].ax = ppoints[pindex].x;
+ ppoints[pindex].ay = ppoints[pindex].y;
+ ppoints[pindex].type = PPOINT_BEZIER_C;
+ ppoints[pindex].hinted = 0;
+
+ /* update ideal position */
+ currx += dx2;
+ curry += dy2;
+
+ /* compute hinting for previous point! */
+ FindStems( currx, curry, currx-ppoints[numppoints-2].x, curry-ppoints[numppoints-2].y, dx3, dy3);
+
+ pindex = nextPPoint();
+ ppoints[pindex].x = currx + dx3;
+ ppoints[pindex].y = curry + dy3;
+ ppoints[pindex].ax = ppoints[pindex].x;
+ ppoints[pindex].ay = ppoints[pindex].y;
+ ppoints[pindex].type = PPOINT_BEZIER_D;
+ ppoints[pindex].hinted = 0;
+
+ /* update ideal position */
+ currx += dx3;
+ curry += dy3;
+
return(0);
}
@@ -1451,12 +1784,52 @@
/* current point */
static int DoClosePath()
{
- struct segment *CurrentPoint;
-
- IfTrace0((FontDebug), "DoClosePath\n");
- CurrentPoint = Phantom(path);
- path = ClosePath(path);
- path = Join(Snap(path), CurrentPoint);
+ long pindex = 0;
+ long i = 0;
+ long tmpind;
+ double deltax = 0.0;
+ double deltay = 0.0;
+
+ if (ppoints == NULL || numppoints < 1) Error0i("DoClosePath: No previous point!");
+
+ /* If this ClosePath command together with the starting point of this
+ path completes to a segment aligned to a stem, we would miss
+ hinting for this point. --> Check and explicitly care for this! */
+ /* 1. Step back in the point list to the last moveto-point */
+ i = numppoints - 1;
+ while ( (i > 0) && (ppoints[i].type != PPOINT_MOVE ) ) {
+ --i;
+ }
+
+ /* 2. Re-hint starting point and hint current point */
+ if ( ppoints[i].type == PPOINT_MOVE) {
+ deltax = ppoints[i].x - ppoints[numppoints-1].x;
+ deltay = ppoints[i].y - ppoints[numppoints-1].y;
+
+ if (ppoints == NULL || numppoints <= i + 1) Error0i("DoClosePath: No previous point!");
+ /* save nummppoints and reset to move point */
+ tmpind = numppoints;
+ numppoints = i + 1;
+
+ /* re-hint starting point of current subpath (uses the value of numppoints!) */
+ FindStems( ppoints[i].x, ppoints[i].y, deltax, deltay,
+ ppoints[i+1].x-ppoints[i].x, ppoints[i+1].y-ppoints[i].y);
+
+ /* restore numppoints and setup hinting for current point */
+ numppoints = tmpind;
+ FindStems( currx, curry, currx-ppoints[numppoints-2].x, curry-ppoints[numppoints-2].y,
+ deltax, deltay);
+ }
+
+ /* Allocate a new path point and pre-setup data */
+ pindex = nextPPoint();
+ ppoints[pindex].x = currx;
+ ppoints[pindex].y = curry;
+ ppoints[pindex].ax = ppoints[pindex-1].x;
+ ppoints[pindex].ay = ppoints[pindex-1].y;
+ ppoints[pindex].type = PPOINT_CLOSEPATH;
+ ppoints[pindex].hinted = 0;
+
return(0);
}
@@ -1466,7 +1839,7 @@
static int CallSubr(subrno)
int subrno;
{
- IfTrace1((FontDebug), "CallSubr %d\n", subrno);
+ IfTrace2((FontDebug), "CallSubr %d (CallStackSize=%d)\n", subrno, CallTop);
if ((subrno < 0) || (subrno >= SubrsP->len))
Error0i("CallSubr: subrno out of range\n");
PushCall(CharStringP, strindex, r);
@@ -1495,16 +1868,26 @@
/* font dictionary */
static int EndChar()
{
+ long pindex = 0;
+
IfTrace0((FontDebug), "EndChar\n");
/* There is no need to compute and set bounding box for
the cache, since XIMAGER does that on the fly. */
- /* Perform a Closepath just in case the command was left out */
- path = ClosePath(path);
-
- /* Set character width */
- path = Join(Snap(path), Loc(CharSpace, escapementX, escapementY));
+ /* Allocate a new path point and pre-setup data.
+ Note: For this special case, we use the variables that usually
+ store hinted coordinates for the escapement of the character.
+ It is required in handleCurrentSegment().
+ */
+ pindex = nextPPoint();
+ ppoints[pindex].x = currx;
+ ppoints[pindex].y = curry;
+ ppoints[pindex].ax = escapementX;
+ ppoints[pindex].ay = escapementY;
+ ppoints[pindex].type = PPOINT_ENDCHAR;
+ ppoints[pindex].hinted = -1;
+
return(0);
}
@@ -1514,21 +1897,38 @@
static int RMoveTo(dx,dy)
DOUBLE dx,dy;
{
- struct segment *B;
-
- IfTrace2((FontDebug), "RMoveTo %f %f\n", dx, dy);
-
- B = Loc(CharSpace, dx, dy);
-
- if (ProcessHints) {
- currx += dx;
- curry += dy;
- /* B = Join(B, FindStems(currx, curry)); */
- B = Join(B, FindStems(currx, curry, 0.0, 0.0));
+ long pindex = 0;
+
+ /* Compute hinting for this path point! */
+ if ( numppoints == 1 ) {
+ /* Since RMoveTo for this case starts a new path segment
+ (flex-constructs have already been handled), the current
+ point is hinted here only taking the next point into account,
+ but not the previous. Later on, in DoClosePath(), we'll step
+ back to this point and the position might be rehinted. */
+ FindStems( currx, curry, 0, 0, dx, dy);
}
-
- path = Join(path, B);
- return(0);
+ else {
+ if (ppoints == NULL || numppoints < 2) Error0i("RMoveTo: No previous point!\n");
+ FindStems( currx, curry, ppoints[numppoints-2].x, ppoints[numppoints-2].y, dx, dy);
+ }
+
+
+
+ /* Allocate a new path point and pre-setup data */
+ pindex = nextPPoint();
+ ppoints[pindex].x = currx + dx;
+ ppoints[pindex].y = curry + dy;
+ ppoints[pindex].ax = ppoints[pindex].x;
+ ppoints[pindex].ay = ppoints[pindex].y;
+ ppoints[pindex].type = PPOINT_MOVE;
+ ppoints[pindex].hinted = 0;
+
+ /* update ideal position */
+ currx += dx;
+ curry += dy;
+
+ return 0;
}
/* - DOTSECTION |- */
@@ -1548,8 +1948,12 @@
unsigned char bchar, achar;
{
int Code;
- struct segment *mypath;
-
+ long pindex = 0;
+
+ isseac = 1;
+ seacaccent = achar;
+ seacbase = bchar;
+
IfTrace4((FontDebug), "SEAC %f %f %f %d ", asb, adx, ady, bchar);
IfTrace1((FontDebug), "%d\n", achar);
@@ -1558,9 +1962,9 @@
/* The variables accentoffsetX/Y modify sidebearingX/Y in Sbw(). */
/* Note that these incorporate the base character's sidebearing shift by */
/* using the current sidebearingX, Y values. */
- accentoffsetX = sidebearingX + adx - asb;
- accentoffsetY = sidebearingY + ady;
-
+ accentoffsetX = adx - asb;
+ accentoffsetY = ady;
+
/* Set path = NULL to avoid complaints from Sbw(). */
path = NULL;
@@ -1580,10 +1984,18 @@
Decode(Code);
if (errflag) return(0);
}
- /* Copy snapped path to mypath and set path to NULL as above. */
- mypath = Snap(path);
- path = NULL;
-
+
+ /* Allocate a new path point. Data in this case is not relevant
+ in handleSegment(), we merely insert a snap() in order to return
+ to origin of the accent char. */
+ pindex = nextPPoint();
+ ppoints[pindex].x = accentoffsetX;
+ ppoints[pindex].y = accentoffsetY;
+ ppoints[pindex].ax = accentoffsetX;
+ ppoints[pindex].ay = accentoffsetY;
+ ppoints[pindex].type = PPOINT_SEAC;
+ ppoints[pindex].hinted = 0;
+
/* We must reset these to null now. */
accentoffsetX = accentoffsetY = 0;
@@ -1595,7 +2007,6 @@
ClearPSFakeStack();
ClearCallStack();
- FinitStems();
InitStems();
for (;;) {
@@ -1603,7 +2014,7 @@
Decode(Code);
if (errflag) return(0);
}
- path = Join(mypath, path);
+
return(0);
}
@@ -1614,6 +2025,9 @@
static int Sbw(sbx, sby, wx, wy)
DOUBLE sbx, sby, wx, wy;
{
+ long pindex = 0;
+
+
IfTrace4((FontDebug), "SBW %f %f %f %f\n", sbx, sby, wx, wy);
escapementX = wx; /* Character width vector */
@@ -1623,8 +2037,29 @@
sidebearingX = sbx + accentoffsetX;
sidebearingY = sby + accentoffsetY;
+ currx = sidebearingX;
+ curry = sidebearingY;
+ /*
path = Join(path, Loc(CharSpace, sidebearingX, sidebearingY));
- if (ProcessHints) {currx = sidebearingX; curry = sidebearingY;}
+ if (ProcessHints) {
+ hcurrx = sidebearingX;
+ hcurry = sidebearingY;
+ }
+ */
+
+ /* Allocate a path point and setup.
+ Note: In this special case, we store the char escapement in the members
+ ax and ay. They are required in handleCurrentSegment(). Hinting
+ is not required for SBW, anyhow!
+ */
+ pindex = nextPPoint();
+ ppoints[pindex].x = currx;
+ ppoints[pindex].y = curry;
+ ppoints[pindex].ax = wx;
+ ppoints[pindex].ay = wy;
+ ppoints[pindex].type = PPOINT_SBW;
+ ppoints[pindex].hinted = -1; /* indicate that point is not to be hinted */
+
return(0);
}
@@ -1675,24 +2110,6 @@
#define PaintType (0)
-#define lineto(x,y) { \
- struct segment *CurrentPoint; \
- DOUBLE CurrentX, CurrentY; \
- CurrentPoint = Phantom(path); \
- QueryLoc(CurrentPoint, CharSpace, &CurrentX, &CurrentY); \
- Destroy(CurrentPoint); \
- RLineTo(x - CurrentX, y - CurrentY); \
-}
-
-#define curveto(x0,y0,x1,y1,x2,y2) { \
- struct segment *CurrentPoint; \
- DOUBLE CurrentX, CurrentY; \
- CurrentPoint = Phantom(path); \
- QueryLoc(CurrentPoint, CharSpace, &CurrentX, &CurrentY); \
- Destroy(CurrentPoint); \
- RRCurveTo(x0 - CurrentX, y0 - CurrentY, x1 - x0, y1 - y0, x2 - x1, y2 - y1); \
-}
-
#define xshrink(x) ((x - c4x2) * shrink +c4x2)
#define yshrink(y) ((y - c4y2) * shrink +c4y2)
@@ -1741,9 +2158,16 @@
DOUBLE eShift;
DOUBLE cx, cy;
DOUBLE ex, ey;
-
- Destroy(path);
- path = FlxOldPath; /* Restore previous path (stored in FlxProc1) */
+
+ if (ppoints == NULL || numppoints < 8) Error0v("FlxProc: No previous point!");
+
+ /* Our PPOINT list now contains 7 moveto commands which
+ are about to be consumed by the Flex mechanism. --> Remove these
+ seven elements (their values already reside on the PSFakeStack!)
+ and approriately restore the current accumulated position. */
+ numppoints -= 7;
+ currx = ppoints[numppoints-1].x;
+ curry = ppoints[numppoints-1].y;
if (ProcessHints) {
dmin = TYPE1_ABS(idmin) / 100.0; /* Minimum Flex height in pixels */
@@ -1865,15 +2289,25 @@
}
if (x2 == x5 || y2 == y5) {
- lineto(x5, y5);
+ RLineTo( x5 - currx, y5 - curry); \
} else {
- curveto(x0, y0, x1, y1, x2, y2);
- curveto(x3, y3, x4, y4, x5, y5);
+ RRCurveTo( x0 - currx, y0 - curry,
+ x1 - x0, y1 - y0,
+ x2 - x1,
+ y2 - y1);
+ RRCurveTo( x3 - currx, y3 - curry,
+ x4 - x3, y4 - y3,
+ x5 - x4, y5 - y4);
}
} else { /* ProcessHints is off */
PickCoords(FALSE); /* Pick original control points */
- curveto(x0, y0, x1, y1, x2, y2);
- curveto(x3, y3, x4, y4, x5, y5);
+ RRCurveTo( x0 - currx, y0 - curry,
+ x1 - x0, y1 - y0,
+ x2 - x1,
+ y2 - y1);
+ RRCurveTo( x3 - currx, y3 - curry,
+ x4 - x3, y4 - y3,
+ x5 - x4, y5 - y4);
}
PSFakePush(epY);
@@ -1885,12 +2319,9 @@
/* Saves and clears path, then restores currentpoint */
static void FlxProc1()
{
- struct segment *CurrentPoint;
-
- CurrentPoint = Phantom(path);
-
- FlxOldPath = path;
- path = CurrentPoint;
+ /* Since we are now building the path point list,
+ there's nothing to do here! */
+ return;
}
/* FlxProc2() = OtherSubrs[2]; Part of Flex */
@@ -1898,16 +2329,10 @@
/* Returns currentpoint on stack */
static void FlxProc2()
{
- struct segment *CurrentPoint;
- DOUBLE CurrentX, CurrentY;
-
- CurrentPoint = Phantom(path);
- QueryLoc(CurrentPoint, CharSpace, &CurrentX, &CurrentY);
- Destroy(CurrentPoint);
-
+ if (ppoints == NULL || numppoints < 1) Error0v("FlxProc2: No previous point!");
/* Push CurrentPoint on fake PostScript stack */
- PSFakePush(CurrentX);
- PSFakePush(CurrentY);
+ PSFakePush( ppoints[numppoints-1].x);
+ PSFakePush( ppoints[numppoints-1].y);
}
/* HintReplace() = OtherSubrs[3]; Hint Replacement */
@@ -1988,12 +2413,43 @@
psobj *charstrP, psobj *subrsP,
psobj *osubrsP,
struct blues_struct *bluesP,
- int *modeP, char *charname)
+ int *modeP, char *charname,
+ float strokewidth,
+ int decodeonly)
{
int Code;
-
- path = NULL;
+ long i = 0;
+
+ double xp, yp;
+#ifdef DUMPDEBUGPATH
+ char fnbuf[128];
+#endif
+ struct segment* p;
+
+ /* Reset SEAC querying variables */
+ isseac = 0;
+ seacbase = 0;
+ seacaccent = 0;
+
+ /* Reset point list */
+ ppoints = NULL;
+ numppoints = 0;
+ numppointchunks = 0;
+
+ /* disable hinting for stroking */
+ if ( strokewidth != 0.0f )
+ ProcessHints = 0;
+
+ if ( env->fontInfoP[PAINTTYPE].value.data.integer == 1 )
+ ProcessHints = 0;
+
+ path = NULL;
+ apath = NULL;
errflag = FALSE;
+
+ if ( S == NULL ) {
+ S=(struct XYspace *) IDENTITY;
+ }
/* Make parameters available to all Type1 routines */
currentchar=charname;
@@ -2005,7 +2461,24 @@
ModeP = modeP;
blues = bluesP;
-
+
+ if ( decodeonly == 0 ) {
+ QuerySpace( S, &scxx, &scyx, &scxy, &scyy); /* Transformation matrix */
+ p = ILoc( S, 1, 0);
+ QueryLoc(p, IDENTITY, &xp, &yp);
+ up = FABS(xp);
+
+ size = scxx * 1000.0;
+#ifdef DUMPDEBUGPATH
+ sprintf( fnbuf, "t1dump_%s_%f.eps", charname, size);
+ psfile = fopen( fnbuf, "wb");
+ if ( psfile != NULL ) {
+ PSDumpProlog( psfile);
+ fprintf( psfile, "T1LibDict begin\n\ngsave\n%f t1SetupSize\nt1PreparePage\n", size);
+ }
+#endif
+ }
+
/* compute the alignment zones */
SetRasterFlags();
ComputeAlignmentZones();
@@ -2014,22 +2487,77 @@
ClearPSFakeStack();
ClearCallStack();
InitStems();
-
- currx = curry = 0;
+
+ /* reset variables */
+ currx = curry = 0.0;
+ hcurrx = hcurry = 0.0;
escapementX = escapementY = 0;
sidebearingX = sidebearingY = 0;
accentoffsetX = accentoffsetY = 0;
wsoffsetX = wsoffsetY = 0; /* No shift to preserve whitspace. */
wsset = 0; /* wsoffsetX,Y haven't been set yet. */
-
+
for (;;) {
if (!DoRead(&Code)) break;
Decode(Code);
if (errflag) break;
}
- FinitStems();
- /* Report a possible error: */
+ if ( decodeonly != 0 ) {
+ /* OK, character description is now on stack, finish ... */
+ return NULL;
+ }
+
+ /* We now have a point list in absolute charspace coordinates. Adjust
+ non-hinted points to suppress hinting artifacts and generate path. */
+ for ( i=0; i<numppoints; i++ ) {
+ if ( ppoints[i].type == PPOINT_BEZIER_D)
+ adjustBezier( i);
+ }
+ /* Create path elements */
+#if defined(DUMPDEBUGPATH) & defined(DUMPDEBUGPATHBOTH)
+ if ( env->fontInfoP[PAINTTYPE].value.data.integer == 0 ) {
+ /* For this special debug case, we generate both a filled and a stroked
+ path!. */
+ createStrokePath( strokewidth, SUBPATH_CLOSED);
+ createFillPath();
+ }
+ else if ( env->fontInfoP[PAINTTYPE].value.data.integer == 1 ) {
+ /* PaintType = 1 indicates stroked font. If strokewidth is 0.0f,
+ we stroke using the font's internal strokewidth. Otherwise, the
+ user supplied value is used. */
+ if ( strokewidth != 0.0f )
+ createStrokePath( strokewidth, SUBPATH_OPEN);
+ else
+ createStrokePath( env->fontInfoP[STROKEWIDTH].value.data.real, SUBPATH_OPEN);
+ }
+#else
+ if ( env->fontInfoP[PAINTTYPE].value.data.integer == 0 ) {
+ /* PaintType = 0 indicates filled font. Hence, a strokewidth value
+ other than 0.0 indicates the character is to be stroked instead
+ of to be filled. */
+ if ( strokewidth != 0.0f )
+ createStrokePath( strokewidth, SUBPATH_CLOSED);
+ else
+ createFillPath();
+ }
+ else if ( env->fontInfoP[PAINTTYPE].value.data.integer == 1 ) {
+ /* PaintType = 1 indicates stroked font. If strokewidth is 0.0f,
+ we stroke using the font's internal strokewidth. Otherwise, the
+ user supplied value is used. */
+ if ( strokewidth != 0.0f )
+ createStrokePath( strokewidth, SUBPATH_OPEN);
+ else
+ createStrokePath( env->fontInfoP[STROKEWIDTH].value.data.real, SUBPATH_OPEN);
+ }
+#endif
+
+ /* check and handle accented char */
+ if ( apath != NULL ) {
+ path = Join( apath, path);
+ }
+
+ /* Report a possible error: */
*modeP=errflag;
/* Clean up if an error has occurred */
@@ -2040,6 +2568,21 @@
}
}
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL ) {
+ PSDumpEpilog( psfile);
+ fclose( psfile);
+ psfile = 0;
+ }
+#endif
+
+ /* Cleanup ppoints */
+ if ( ppoints != NULL ) {
+ free( ppoints);
+ ppoints = NULL;
+ numppoints = 0;
+ }
+
return((struct xobject *) path);
}
@@ -2048,11 +2591,19 @@
struct xobject *Type1Line(psfont *env, struct XYspace *S,
float line_position,
float line_thickness,
- float line_length)
+ float line_length,
+ float strokewidth)
{
+
+ /* Reset point list */
+ ppoints = NULL;
+ numppoints = 0;
+ numppointchunks = 0;
- path = NULL;
+ path = NULL;
+ apath = NULL;
errflag = FALSE;
+
/* Make parameters available to all Type1 routines */
Environment = (char *)env;
@@ -2075,11 +2626,2060 @@
DoClosePath();
EndChar();
- /* De-Initialize the stems (of course there have not been
- defined any) */
- FinitStems();
+ /* Create path */
+ if ( strokewidth != 0.0f )
+ createStrokePath( strokewidth, SUBPATH_CLOSED);
+ else
+ createFillPath();
+ /* Cleanup ppoints */
+ if ( ppoints != NULL ) {
+ free( ppoints);
+ ppoints = NULL;
+ }
+
return((struct xobject *)path);
}
+
+/* Adjust the points of a given cubic Bezier Spline so that the
+ geometric relation of points B and C to A and D remain
+ qualitatively the same. This reduces hinting artifacts
+ at low resolutions.
+*/
+static void adjustBezier( long pindex)
+{
+ double deltax = 0.0; /* x distance between point A and D */
+ double deltay = 0.0; /* y distance between point A and D */
+ double adeltax = 0.0; /* x distance between hinted point A and D */
+ double adeltay = 0.0; /* y distance between hinted point A and D */
+
+ deltax = ppoints[pindex].x - ppoints[pindex-3].x;
+ deltay = ppoints[pindex].y - ppoints[pindex-3].y;
+ adeltax = ppoints[pindex].ax - ppoints[pindex-3].ax;
+ adeltay = ppoints[pindex].ay - ppoints[pindex-3].ay;
+
+ if ( deltax == 0 || deltay == 0 )
+ return;
+
+ ppoints[pindex-1].ax = ppoints[pindex-3].ax +
+ (adeltax / deltax * (ppoints[pindex-1].x - ppoints[pindex-3].x));
+ ppoints[pindex-1].ay = ppoints[pindex-3].ay +
+ (adeltay / deltay * (ppoints[pindex-1].y - ppoints[pindex-3].y));
+ ppoints[pindex-2].ax = ppoints[pindex-3].ax +
+ (adeltax / deltax * (ppoints[pindex-2].x - ppoints[pindex-3].x));
+ ppoints[pindex-2].ay = ppoints[pindex-3].ay +
+ (adeltay / deltay * (ppoints[pindex-2].y - ppoints[pindex-3].y));
+
+ return;
+
+}
+
+
+
+/* This function actually generates path segments. It is called
+ after all hinting and adjustments have been performed.
+*/
+static void handleCurrentSegment( long pindex)
+{
+ struct segment* B;
+ struct segment* C;
+ struct segment* D;
+ struct segment* tmpseg;
+ double dx1;
+ double dy1;
+ double dx2;
+ double dy2;
+ double dx3;
+ double dy3;
+ double adx1;
+ double ady1;
+ double adx2;
+ double ady2;
+ double adx3;
+ double ady3;
+
+
+ /* handle the different segment types in a switch-statement */
+ switch ( ppoints[pindex].type ) {
+
+ case PPOINT_MOVE:
+ /* handle a move segment */
+ dx1 = ppoints[pindex].x - ppoints[pindex-1].x;
+ dy1 = ppoints[pindex].y - ppoints[pindex-1].y;
+ adx1 = ppoints[pindex].ax - ppoints[pindex-1].ax;
+ ady1 = ppoints[pindex].ay - ppoints[pindex-1].ay;
+
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL )
+ fprintf( psfile, "%f %f t1rmoveto %% pindex = %ld\n", dx1*up, dy1*up, pindex);
+#endif
+ if ( ProcessHints ) {
+ IfTrace2((FontDebug), "RMoveTo(h) %f %f\n", adx1, ady1);
+ B = Loc(CharSpace, adx1, ady1);
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL ) {
+ fprintf( psfile, "%f %f t1hintedrmoveto %% pindex = %ld\n", adx1*up, ady1*up, pindex);
+ }
+#endif
+ }
+ else {
+ IfTrace2((FontDebug), "RMoveTo %f %f\n", dx1, dy1);
+ B = Loc(CharSpace, dx1, dy1);
+ }
+ path = Join(path, B);
+ break;
+
+
+ case PPOINT_LINE:
+ /* handle a line segment */
+ dx1 = ppoints[pindex].x - ppoints[pindex-1].x;
+ dy1 = ppoints[pindex].y - ppoints[pindex-1].y;
+ adx1 = ppoints[pindex].ax - ppoints[pindex-1].ax;
+ ady1 = ppoints[pindex].ay - ppoints[pindex-1].ay;
+
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL )
+ fprintf( psfile, "%f %f t1rlineto %% pindex = %ld\n", dx1*up, dy1*up, pindex);
+#endif
+ if ( ProcessHints ) {
+ IfTrace2((FontDebug), "RLineTo(h) %f %f\n", adx1, ady1);
+ B = Loc(CharSpace, adx1, ady1);
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL ) {
+ fprintf( psfile, "%f %f t1hintedrlineto %% pindex = %ld\n", adx1*up, ady1*up, pindex);
+ }
+#endif
+ }
+ else {
+ IfTrace2((FontDebug), "RLineTo %f %f\n", dx1, dy1);
+ B = Loc(CharSpace, dx1, dy1);
+ }
+ path = Join(path, Line(B));
+ break;
+
+
+ case PPOINT_BEZIER_B:
+ /* handle a bezier segment (given by this and the following points) */
+ dx1 = ppoints[pindex].x - ppoints[pindex-1].x;
+ dy1 = ppoints[pindex].y - ppoints[pindex-1].y;
+ adx1 = ppoints[pindex].ax - ppoints[pindex-1].ax;
+ ady1 = ppoints[pindex].ay - ppoints[pindex-1].ay;
+ dx2 = ppoints[pindex+1].x - ppoints[pindex].x;
+ dy2 = ppoints[pindex+1].y - ppoints[pindex].y;
+ adx2 = ppoints[pindex+1].ax - ppoints[pindex].ax;
+ ady2 = ppoints[pindex+1].ay - ppoints[pindex].ay;
+ dx3 = ppoints[pindex+2].x - ppoints[pindex+1].x;
+ dy3 = ppoints[pindex+2].y - ppoints[pindex+1].y;
+ adx3 = ppoints[pindex+2].ax - ppoints[pindex+1].ax;
+ ady3 = ppoints[pindex+2].ay - ppoints[pindex+1].ay;
+
+
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL )
+ fprintf( psfile, "%f %f %f %f %f %f t1rrcurveto %% pindex = %ld\n",
+ dx1*up, dy1*up,
+ dx2*up, dy2*up,
+ dx3*up, dy3*up,
+ pindex);
+#endif
+ if (ProcessHints) {
+ IfTrace4((FontDebug), "RRCurveTo %f %f %f %f ",
+ adx1, ady1, adx2, ady2);
+ IfTrace2((FontDebug), "%f %f\n", adx3, ady3);
+ B = Loc(CharSpace, adx1, ady1);
+ C = Loc(CharSpace, adx2, ady2);
+ D = Loc(CharSpace, adx3, ady3);
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL ) {
+ fprintf( psfile, "%f %f %f %f %f %f t1hintedrrcurveto %% pindex = %ld\n",
+ adx1*up, ady1*up,
+ adx2*up, ady2*up,
+ adx3*up, ady3*up,
+ pindex);
+ }
+#endif
+ }
+ else {
+ IfTrace4((FontDebug), "RRCurveTo %f %f %f %f ",
+ dx1, dy1, dx2, dy2);
+ IfTrace2((FontDebug), "%f %f\n", dx3, dy3);
+ B = Loc(CharSpace, dx1, dy1);
+ C = Loc(CharSpace, dx2, dy2);
+ D = Loc(CharSpace, dx3, dy3);
+ }
+
+ /* Since XIMAGER is not completely relative, */
+ /* we need to add up the delta values */
+ C = Join(C, (struct segment *)Dup(B));
+ D = Join(D, (struct segment *)Dup(C));
+ path = Join(path, (struct segment *)Bezier(B, C, D));
+ break;
+
+
+ case PPOINT_SBW:
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL )
+ fprintf( psfile, "%f %f %f %f t1sbw %% pindex = %ld\n",
+ ppoints[pindex].x*up, ppoints[pindex].y*up, /* sidebearings */
+ ppoints[pindex].ax*up, ppoints[pindex].ay*up, /* escapements */
+ pindex
+ );
+#endif
+ path = Join(path, Loc(CharSpace, ppoints[pindex].x, ppoints[pindex].y));
+ break;
+
+
+ case PPOINT_CLOSEPATH:
+ IfTrace0((FontDebug), "DoClosePath\n");
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL ) {
+ fprintf( psfile, "t1closepath %% pindex = %ld\n", pindex);
+ if ( ProcessHints )
+ fprintf( psfile, "t1hintedclosepath %% pindex = %ld\n", pindex);
+ }
+#endif
+
+ tmpseg = Phantom(path);
+ path = ClosePath(path);
+ path = Join(Snap(path), tmpseg);
+ break;
+
+
+ case PPOINT_ENDCHAR:
+ /* Perform a Closepath just in case the command was left out */
+ path = ClosePath(path);
+
+ /* Set character width / escapement. It is stored in the vars for
+ hinted coordinates. */
+ path = Join(Snap(path), Loc(CharSpace, ppoints[pindex].ax, ppoints[pindex].ay));
+
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL )
+ fprintf( psfile, "t1FinishPage\ngrestore %% pindex = %ld\n", pindex);
+#endif
+ break;
+
+
+ case PPOINT_SEAC:
+ /* return to origin of accent */
+ apath = Snap(path);
+ /* reset path to NULL */
+ path = NULL;
+ break;
+
+
+ default:
+ /* We must be at the beginning of the path, that is, there is
+ nothing to do! */
+ ;
+ }
+
+ return;
+
+}
+
+
+#ifdef DUMPDEBUGPATH
+static void PSDumpProlog( FILE* fp)
+{
+#include "t1chardump"
+}
+
+
+static void PSDumpEpilog( FILE* fp)
+{
+ fputs( "\nend\n", fp);
+}
+
+#endif /* #ifdef DUMPDEBUGPATH */
+
+
+
+/* Take the accumulated path point list and construct the path that is
+ to be filled. */
+static void createFillPath( void)
+{
+ long i;
+
+ for ( i=0; i<numppoints; i++ ) {
+ handleCurrentSegment( i);
+ }
+ return;
+}
+
+
+/* Take the accumulated path point list and construct a path so that the
+ character appears as a stroked outline, where the virtual pen has a diameter
+ of strokewidth (measured in big points [bp]). This function works analogously
+ to PostScripts charpath operator. */
+static void createStrokePath( double strokewidth, int subpathclosed)
+{
+ long pindex = 0;
+ long startind = 0;
+ long stopind = 0;
+
+
+ /* For each subpath in the path list (some sub path is closed!), we construct
+ one path interior and one path exterior to the path under consideration in
+ a way, that the resulting thick curve has a thickness of strokewidth. */
+
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "\ncreateStrokePath(strokewidth=%f, subpathclosed=%d): Searching partial paths ...\n\n",
+ strokewidth, subpathclosed);
+#endif
+ if ( subpathclosed == 0 ) {
+ /* We have a stroked font */
+ /* loop through all subpaths */
+ while ( pindex < numppoints ) {
+ /* First, handle any non-subpath commands. */
+ if ( handleNonSubPathSegments( pindex) != 0 ) {
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "PPoint %ld: (%f,%f), Type=%s\n", pindex,
+ ppoints[pindex].x, ppoints[pindex].y, pptypes[ppoints[pindex].type]);
+#endif
+ ++pindex;
+ continue;
+ }
+
+ if ( ppoints[pindex].type == PPOINT_LINE ||
+ ppoints[pindex].type == PPOINT_BEZIER_B ) {
+ if ( ppoints[pindex-1].type == PPOINT_MOVE ) {
+ /* A line or curve segment following a move segment indicates a
+ new subpath. */
+ startind = pindex - 1;
+ while ( (pindex < numppoints) &&
+ (ppoints[pindex].type != PPOINT_CLOSEPATH) &&
+ (ppoints[pindex].type != PPOINT_MOVE) &&
+ (ppoints[pindex].type != PPOINT_ENDCHAR)
+ ) {
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "PPoint %ld: (%f,%f), Type=%s\n", pindex,
+ ppoints[pindex].x, ppoints[pindex].y, pptypes[ppoints[pindex].type]);
+#endif
+ ++pindex;
+ }
+ if ( (ppoints[pindex].type == PPOINT_ENDCHAR) || /* for outline fonts */
+ (ppoints[pindex].type == PPOINT_MOVE) /* for stroked fonts */
+ ) {
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "PPoint %ld: (%f,%f), Type=%s\n", pindex,
+ ppoints[pindex].x, ppoints[pindex].y, pptypes[ppoints[pindex].type]);
+#endif
+ stopind = --pindex;
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "Found subpath from index %ld to %ld inclusively\n", startind, stopind);
+#endif
+ /* We have found a subpath defined by the path points indexed by
+ the interval from startind to stopind. */
+ createClosedStrokeSubPath( startind, stopind, strokewidth, subpathclosed);
+ }
+ }
+ }
+ ++pindex;
+ }
+ }
+ else {
+ /* We have a filled font */
+ /* loop through all subpaths */
+ while ( pindex < numppoints ) {
+ /* First, handle any non-subpath commands. */
+ if ( handleNonSubPathSegments( pindex) != 0 ) {
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "PPoint %ld: (%f,%f), Type=%s\n", pindex,
+ ppoints[pindex].x, ppoints[pindex].y, pptypes[ppoints[pindex].type]);
+#endif
+ ++pindex;
+ continue;
+ }
+
+ if ( ppoints[pindex].type == PPOINT_LINE ||
+ ppoints[pindex].type == PPOINT_BEZIER_B ) {
+ if ( ppoints[pindex-1].type == PPOINT_MOVE ) {
+ /* A line or curve segment following a move segment indicates a
+ new subpath. */
+ startind = --pindex;
+ while ( (pindex < numppoints) &&
+ (ppoints[pindex].type != PPOINT_CLOSEPATH)
+ ) {
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "PPoint %ld: (%f,%f), Type=%s\n", pindex,
+ ppoints[pindex].x, ppoints[pindex].y, pptypes[ppoints[pindex].type]);
+#endif
+ ++pindex;
+ }
+ if ( ppoints[pindex].type == PPOINT_CLOSEPATH ) {
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "PPoint %ld: (%f,%f), Type=%s\n", pindex,
+ ppoints[pindex].x, ppoints[pindex].y, pptypes[ppoints[pindex].type]);
+#endif
+ stopind = pindex;
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "Found subpath from index %ld to %ld inclusively\n", startind, stopind);
+#endif
+ /* We have found a subpath defined by the path points indexed by
+ the interval from startind to stopind. */
+ createClosedStrokeSubPath( startind, stopind, strokewidth, subpathclosed);
+ }
+ }
+ }
+ ++pindex;
+ }
+ }
+
+ return;
+
+}
+
+
+
+/* Create two closed paths that surround the the current subpath of the
+ charpath in a centered fashion. */
+static void createClosedStrokeSubPath( long startind, long stopind,
+ double strokewidth, int subpathclosed)
+{
+ long i;
+ long inext;
+ long iprev;
+ long ip = 0;
+ long in = 0;
+ long segstartind;
+ long segendind;
+
+ long lastind = 0; /* Index of last point whose location is different from first
+ point. After this point there may follow an explicit line-
+ or curveto to the starting point and also the ClosePath-point
+ may be and usually is identical to the starting point. */
+
+ double dx1;
+ double dy1;
+ double dx2;
+ double dy2;
+ double dx3;
+ double dy3;
+
+ struct segment* B;
+ struct segment* C;
+ struct segment* D;
+ struct segment* tmpseg;
+
+ int type;
+
+
+ /* The ClosePath operator is somewhat problematic, because it adds a point
+ to the defining points of a path, without actually having a distance to
+ the previous or the next point. This causes problems with the distance
+ handling. As a remedy, we check whether ClosePath is located at the first
+ point or the last point of the path. In the latter case, ClosePath causes
+ an additional line segment. */
+ if ( (ppoints[stopind].x == ppoints[startind].x) &&
+ (ppoints[stopind].y == ppoints[startind].y)
+ ) {
+ closepathatfirst = 1;
+ }
+ else {
+ closepathatfirst = 0;
+ }
+
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ if ( closepathatfirst == 1 ) {
+ fprintf( stderr, "createClosedStrokeSubPath(): Starting up, ClosePath is at first PPoint (does not cause a line segment) ...\n");
+ }
+ else {
+ fprintf( stderr, "createClosedStrokeSubPath(): Starting up, ClosePath is not at first PPoint (causes a closing line segment) ...\n");
+ }
+#endif
+
+
+ /* For each path point in the list, we have to define a set of points, to the
+ left and to the right of the current curve. The positions of these
+ new points depend on the coordinates of the previous path point, the current
+ path and the next path point. */
+
+ /* For the computations, the distance from the start and end points of curves
+ and lines to the neighbouring points is required. We start by calculating
+ these and by filling in the path point entries dist2prev and dist2next for
+ the respective points. */
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "Computing geometric distances between path points ...\n");
+#endif
+ lastind = computeDistances( startind, stopind, subpathclosed);
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "startind=%ld, lastind=%ld, stopind=%ld\n", startind, lastind, stopind);
+#endif
+
+
+ /********************************************************************************
+ ********************************************************************************
+ *****
+ ***** Path point transformation
+ *****
+ ********************************************************************************
+ ********************************************************************************/
+
+ /* Next we step through the path points of the current subpath and compute the
+ points' transformations. From these newly computed points,
+ the path is constructed. */
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "Computing geometric transformation points and resulting intersection points for right path ...\n\n");
+#endif
+ for ( i=startind; i<=lastind; ) {
+ /* Be aware of cycling! */
+ if ( i == startind ) {
+ iprev = lastind;
+ inext = i + 1;
+ }
+ else if ( i == lastind ) {
+ iprev = i - 1;
+ inext = startind;
+ }
+ else {
+ iprev = i - 1;
+ inext = i + 1;
+ }
+
+
+ switch ( ppoints[i].type ) {
+ case PPOINT_MOVE:
+ /* The first segment always is of type PPOINT_MOVE. It is defined by the first,
+ the second and the last point. */
+ transformOnCurvePathPoint( strokewidth, iprev, i, inext);
+
+ /* Compute one point which results from prolongating the linked segment and
+ and computing the intersection. The result values are stored in dxres,
+ dyres. */
+ if ( subpathclosed == 0 ) {
+ /* open subpath --> stroked font */
+ if ( i == startind ) {
+ intersectRight( i, 0.5*strokewidth, INTERSECT_NEXT);
+ }
+ else if ( i == lastind ) {
+ intersectRight( i, 0.5*strokewidth, INTERSECT_PREVIOUS);
+ }
+ else {
+ intersectRight( i, 0.5*strokewidth, INTERSECT_BOTH);
+ }
+ }
+ else {
+ intersectRight( i, 0.5*strokewidth, INTERSECT_BOTH);
+ }
+
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "\nCurrent PathPoint: PP %ld (%s): (%f,%f), shape=%s;\n", i, pptypes[ppoints[i].type],
+ ppoints[i].x, ppoints[i].y, ppshapes[ppoints[i].shape]);
+ fprintf( stderr, " RightPath: prev (%f,%f); next (%f,%f); res (%f,%f)\n",
+ ppoints[i].x+ppoints[i].dxpr, ppoints[i].y+ppoints[i].dypr,
+ ppoints[i].x+ppoints[i].dxnr, ppoints[i].y+ppoints[i].dynr,
+ ppoints[i].x+ppoints[i].dxir, ppoints[i].y+ppoints[i].dyir);
+ fprintf( stderr, " LeftPath: prev (%f,%f); next (%f,%f); res (%f,%f)\n\n",
+ ppoints[i].x-ppoints[i].dxpr, ppoints[i].y-ppoints[i].dypr,
+ ppoints[i].x-ppoints[i].dxnr, ppoints[i].y-ppoints[i].dynr,
+ ppoints[i].x-ppoints[i].dxir, ppoints[i].y-ppoints[i].dyir);
+#endif
+
+ break;
+
+
+ case PPOINT_LINE:
+ transformOnCurvePathPoint( strokewidth, iprev, i, inext);
+ if ( subpathclosed == 0 ) {
+ /* open subpath --> stroked font */
+ if ( i == startind )
+ intersectRight( i, 0.5*strokewidth, INTERSECT_NEXT);
+ else if ( i == lastind )
+ intersectRight( i, 0.5*strokewidth, INTERSECT_PREVIOUS);
+ else
+ intersectRight( i, 0.5*strokewidth, INTERSECT_BOTH);
+ }
+ else {
+ intersectRight( i, 0.5*strokewidth, INTERSECT_BOTH);
+ }
+
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "\nCurrent PathPoint: PP %ld (%s): (%f,%f), shape=%s;\n", i, pptypes[ppoints[i].type],
+ ppoints[i].x, ppoints[i].y, ppshapes[ppoints[i].shape]);
+ fprintf( stderr, " RightPath: prev (%f,%f); next (%f,%f); res (%f,%f)\n",
+ ppoints[i].x+ppoints[i].dxpr, ppoints[i].y+ppoints[i].dypr,
+ ppoints[i].x+ppoints[i].dxnr, ppoints[i].y+ppoints[i].dynr,
+ ppoints[i].x+ppoints[i].dxir, ppoints[i].y+ppoints[i].dyir);
+ fprintf( stderr, " LeftPath: prev (%f,%f); next (%f,%f); res (%f,%f)\n\n",
+ ppoints[i].x-ppoints[i].dxpr, ppoints[i].y-ppoints[i].dypr,
+ ppoints[i].x-ppoints[i].dxnr, ppoints[i].y-ppoints[i].dynr,
+ ppoints[i].x-ppoints[i].dxir, ppoints[i].y-ppoints[i].dyir);
+#endif
+
+ break;
+
+
+ case PPOINT_BEZIER_B:
+ break;
+
+ case PPOINT_BEZIER_C:
+ break;
+
+ case PPOINT_BEZIER_D:
+ transformOnCurvePathPoint( strokewidth, iprev, i, inext);
+ if ( subpathclosed == 0 ) {
+ /* open subpath --> stroked font */
+ if ( i == startind )
+ intersectRight( i, 0.5*strokewidth, INTERSECT_NEXT);
+ else if ( i == lastind )
+ intersectRight( i, 0.5*strokewidth, INTERSECT_PREVIOUS);
+ else
+ intersectRight( i, 0.5*strokewidth, INTERSECT_BOTH);
+ }
+ else {
+ intersectRight( i, 0.5*strokewidth, INTERSECT_BOTH);
+ }
+
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "\nCurrent PathPoint: PP %ld (%s): (%f,%f), shape=%s;\n", i, pptypes[ppoints[i].type],
+ ppoints[i].x, ppoints[i].y, ppshapes[ppoints[i].shape]);
+ fprintf( stderr, " RightPath: prev (%f,%f); next (%f,%f); res (%f,%f)\n",
+ ppoints[i].x+ppoints[i].dxpr, ppoints[i].y+ppoints[i].dypr,
+ ppoints[i].x+ppoints[i].dxnr, ppoints[i].y+ppoints[i].dynr,
+ ppoints[i].x+ppoints[i].dxir, ppoints[i].y+ppoints[i].dyir);
+ fprintf( stderr, " LeftPath: prev (%f,%f); next (%f,%f); res (%f,%f)\n\n",
+ ppoints[i].x-ppoints[i].dxpr, ppoints[i].y-ppoints[i].dypr,
+ ppoints[i].x-ppoints[i].dxnr, ppoints[i].y-ppoints[i].dynr,
+ ppoints[i].x-ppoints[i].dxir, ppoints[i].y-ppoints[i].dyir);
+#endif
+
+ /* transform the preceding two offCurve points */
+ transformOffCurvePathPoint( strokewidth, i-2);
+
+ break;
+
+ case PPOINT_CLOSEPATH:
+
+ break;
+
+ default:
+ break;
+ }
+ ++i;
+ }
+
+ /* copy the shift values from starting point to ending points that
+ have not yet been handled */
+ for ( ; i<=stopind; i++) {
+ ppoints[i].dxpr = ppoints[startind].dxpr;
+ ppoints[i].dypr = ppoints[startind].dypr;
+ ppoints[i].dxnr = ppoints[startind].dxnr;
+ ppoints[i].dynr = ppoints[startind].dynr;
+ ppoints[i].dxir = ppoints[startind].dxir;
+ ppoints[i].dyir = ppoints[startind].dyir;
+ ppoints[i].dist2prev = ppoints[startind].dist2prev;
+ ppoints[i].dist2next = ppoints[startind].dist2next;
+ if ( ppoints[i].type == PPOINT_BEZIER_D ) {
+ transformOffCurvePathPoint( strokewidth, i-2);
+ }
+ ppoints[i].shape = ppoints[startind].shape;
+ }
+
+
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "\nTransformation of PathPoints finished. Starting to construct paths ...\n\n");
+#endif
+
+ /* We now have computed the resulting shift values for each path point of the current
+ subpath's right path. The values for the left path follow by negation.
+ The path is still to be build!
+ */
+
+ /********************************************************************************
+ ********************************************************************************
+ *****
+ ***** Construction of right path
+ *****
+ ********************************************************************************
+ ********************************************************************************/
+
+ /* The leading move segment is treated separately. First check from which
+ point the leading Moveto was called. This is safe even in cases where
+ multiple moveto appear in a series. */
+ i = startind;
+ while ( ppoints[i].type == PPOINT_MOVE )
+ --i;
+ dx1 = ppoints[startind].x - (ppoints[i].x);
+ dy1 = ppoints[startind].y - (ppoints[i].y);
+ /* If the first node in the subpath is not concave, we may directly jump
+ to the intersection right path point. Otherwise, we remain at the onCurve
+ point because later, prolongation will happen. */
+ if ( ppoints[startind].shape != CURVE_CONCAVE ) {
+ dx1 += ppoints[startind].dxir;
+ dy1 += ppoints[startind].dyir;
+ }
+
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL )
+ fprintf( psfile, "%f %f t1srmoveto %% pindex = %ld\n", dx1*up, dy1*up, startind);
+#endif
+ B = Loc(CharSpace, dx1, dy1);
+ path = Join(path, B);
+
+
+ /* Now, handle the remaining path in a loop */
+ for ( i=startind+1; i<=stopind; ) {
+ switch ( ppoints[i].type ) {
+ case PPOINT_LINE:
+ /* handle a line segment */
+
+ /* 1. Check and handle starting node */
+ linkNode( i-1, PATH_START, PATH_RIGHT);
+
+ /* 2. Draw ideal isolated line segment */
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "RP: Line from point %ld to %ld\n", i-1, i);
+#endif
+ dx1 = ppoints[i].x + ppoints[i].dxpr - (ppoints[i-1].x + ppoints[i-1].dxnr);
+ dy1 = ppoints[i].y + ppoints[i].dypr - (ppoints[i-1].y + ppoints[i-1].dynr);
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL )
+ fprintf( psfile, "%f %f t1srlineto %% pindex = %ld\n", dx1*up, dy1*up, i);
+#endif
+ B = Loc(CharSpace, dx1, dy1);
+ path = Join(path, Line(B));
+
+ /* 3. Check and handle ending node */
+ linkNode( i, PATH_END, PATH_RIGHT);
+
+ break;
+
+ case PPOINT_BEZIER_B:
+ break;
+ case PPOINT_BEZIER_C:
+ break;
+ case PPOINT_BEZIER_D:
+ /* handle a bezier segment (given by this and the previous 3 path points)! */
+
+ /* 1. Check and handle starting node */
+ linkNode( i-3, PATH_START, PATH_RIGHT);
+
+ /* 2. Draw curve based on ideal point locations */
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "RP: Curve from PP %ld to PP %ld to PP %ld to PP %ld\n",
+ i-3, i-2, i-1, i);
+#endif
+ dx1 = ppoints[i-2].x + ppoints[i-2].dxir - (ppoints[i-3].x + ppoints[i-3].dxnr);
+ dy1 = ppoints[i-2].y + ppoints[i-2].dyir - (ppoints[i-3].y + ppoints[i-3].dynr);
+ dx2 = ppoints[i-1].x + ppoints[i-1].dxir - (ppoints[i-2].x + ppoints[i-2].dxir);
+ dy2 = ppoints[i-1].y + ppoints[i-1].dyir - (ppoints[i-2].y + ppoints[i-2].dyir);
+ dx3 = ppoints[i].x + ppoints[i].dxpr - (ppoints[i-1].x + ppoints[i-1].dxir);
+ dy3 = ppoints[i].y + ppoints[i].dypr - (ppoints[i-1].y + ppoints[i-1].dyir);
+
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL )
+ fprintf( psfile, "%f %f %f %f %f %f t1srrcurveto %% pindex = %ld\n",
+ dx1*up, dy1*up,
+ dx2*up, dy2*up,
+ dx3*up, dy3*up,
+ i);
+#endif
+ IfTrace4((FontDebug), "RRCurveTo %f %f %f %f ",
+ dx1, dy1, dx2, dy2);
+ IfTrace2((FontDebug), "%f %f\n", dx3, dy3);
+ B = Loc(CharSpace, dx1, dy1);
+ C = Loc(CharSpace, dx2, dy2);
+ D = Loc(CharSpace, dx3, dy3);
+
+ C = Join(C, (struct segment *)Dup(B));
+ D = Join(D, (struct segment *)Dup(C));
+ path = Join(path, (struct segment *)Bezier(B, C, D));
+
+ /* 3. Check and handle starting node */
+ linkNode( i, PATH_END, PATH_RIGHT);
+
+ break;
+
+
+ case PPOINT_CLOSEPATH:
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "RP: ClosePath command ignored\n");
+#endif
+
+ break;
+
+ default:
+ break;
+
+ }
+ ++i;
+ }
+
+ /********************************************************************************
+ ********************************************************************************
+ *****
+ ***** Close right path
+ *****
+ ********************************************************************************
+ ********************************************************************************/
+
+ if ( subpathclosed != 0 ) {
+ /* We are stroking an outline font to be filled */
+ if ( closepathatfirst == 0 ) {
+ /* Because of the concavity issue, we may not simply use
+ the closepath operator here. Instead we have to manage a possible
+ prolongation manually if the closepath would cause a line segment. */
+
+ /* 1. Check and handle starting node */
+ linkNode( lastind, PATH_START, PATH_RIGHT);
+
+ /* 2. Draw ideal isolated line segment */
+ dx1 = ppoints[startind].x + ppoints[startind].dxpr - (ppoints[lastind].x + ppoints[lastind].dxnr);
+ dy1 = ppoints[startind].y + ppoints[startind].dypr - (ppoints[lastind].y + ppoints[lastind].dynr);
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL )
+ fprintf( psfile, "%f %f t1srlineto %% pindex = %ld\n", dx1*up, dy1*up, startind);
+#endif
+ B = Loc(CharSpace, dx1, dy1);
+ path = Join(path, Line(B));
+
+ /* 3. Check and handle ending node */
+ linkNode( startind, PATH_END, PATH_RIGHT);
+
+ } /* if ( closepathatfirst == 0) */
+
+ /* Now close path formally. Anyhow, this won't cause a line segment! */
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL ) {
+ fprintf( psfile, "t1sclosepath %% Right Path finished, stepping to Left Path\n");
+ }
+#endif
+ tmpseg = Phantom(path);
+ path = ClosePath(path);
+ path = Join(Snap(path), tmpseg);
+
+
+ /********************************************************************************
+ ********************************************************************************
+ *****
+ ***** Stepping to beginning of left path
+ *****
+ ********************************************************************************
+ ********************************************************************************/
+
+ /* If curve is concave at the subpath's starting point, the location is onCurve
+ and the left path is convex, there. Conversely, if the curve is convex, the
+ location is at the right intersection point and the left path will be concave
+ so that the initial location must be onCurve. Hence, for both cases, we have
+ to translate back once the intersection shift.
+
+ If the curve is straight at the starting point, we directly jump from the right
+ intersection point ot he left intersection point.
+ */
+ if ( (ppoints[startind].shape == CURVE_CONCAVE) ||
+ (ppoints[startind].shape == CURVE_CONVEX) ) {
+ dx1 = - ppoints[startind].dxir;
+ dy1 = - ppoints[startind].dyir;
+ }
+ else {
+ dx1 = - 2.0 * ppoints[startind].dxir;
+ dy1 = - 2.0 * ppoints[startind].dyir;
+ }
+
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL )
+ fprintf( psfile, "%f %f t1srmoveto %% pindex = %ld\n", dx1*up, dy1*up, startind);
+#endif
+ B = Loc(CharSpace, dx1, dy1);
+ path = Join(path, B);
+ } /* if ( subpathclose != 0 */
+ else {
+ /* We have a stroked font. In this case, a line segment has to be drawn */
+ if ( (ppoints[stopind].shape == CURVE_CONCAVE) ||
+ (ppoints[stopind].shape == CURVE_CONVEX) ) {
+ dx1 = - ppoints[stopind].dxir;
+ dy1 = - ppoints[stopind].dyir;
+ }
+ else {
+ dx1 = - 2.0 * ppoints[stopind].dxir;
+ dy1 = - 2.0 * ppoints[stopind].dyir;
+ }
+
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL )
+ fprintf( psfile, "%f %f t1srlineto %% pindex = %ld\n", dx1*up, dy1*up, stopind);
+#endif
+ B = Loc(CharSpace, dx1, dy1);
+ path = Join(path, Line(B));
+
+ }
+
+
+ /********************************************************************************
+ ********************************************************************************
+ *****
+ ***** Construction of left path
+ *****
+ ********************************************************************************
+ ********************************************************************************/
+
+ /* Create left path. This is somewhat more complicated, because the
+ order/direction has to be exchanged. */
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "Constructing LeftPath: stopind=%ld, lastind=%ld, closepathatfirst=%d\n",
+ stopind, lastind, closepathatfirst);
+#endif
+ for ( i=stopind; i>=startind; ) {
+ if ( subpathclosed != 0 ) {
+ /* closed subpath --> filled font */
+ if ( i == stopind ) {
+ ip = startind;
+ if ( (closepathatfirst != 0) )
+ type = ppoints[ip].type;
+ else
+ type = PPOINT_NONE;
+ }
+ else if ( i == startind ) {
+ ip = startind + 1;
+ type = ppoints[ip].type;
+ }
+ else {
+ ip = i + 1;
+ type = ppoints[ip].type;
+ }
+ }
+ else {
+ /* open subpath --> stroked font */
+ type = ppoints[i].type;
+ in = i - 1;
+ }
+
+ /* Step through path in inverted direction.
+ Note: - ip is the index of the starting point, i the index of the
+ ending point of the current segment.
+ - If the path point is flagged "concave", then this reverts into
+ "convex" in the left path and vice versa!
+ - there is an index shift of 1 between closed and open subpaths.
+ */
+ switch ( type ) {
+ case PPOINT_MOVE:
+
+ break;
+
+ case PPOINT_LINE:
+
+ /* handle a line segment */
+ if ( subpathclosed != 0 ) {
+ segendind = i;
+ segstartind = ip;
+ }
+ else {
+ segstartind = i;
+ segendind = in;
+ }
+
+ /* 1. Check and handle starting node */
+ linkNode( segstartind, PATH_START, PATH_LEFT);
+
+ /* 2. Draw ideal isolated line segment */
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "LP: Line from point %ld to %ld\n", segstartind, segendind);
+#endif
+ dx1 = ppoints[segendind].x - ppoints[segendind].dxnr -
+ (ppoints[segstartind].x - ppoints[segstartind].dxpr);
+ dy1 = ppoints[segendind].y - ppoints[segendind].dynr -
+ (ppoints[segstartind].y - ppoints[segstartind].dypr);
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL )
+ fprintf( psfile, "%f %f t1srlineto %% pindex = %ld\n", dx1*up, dy1*up, segendind);
+#endif
+ B = Loc(CharSpace, dx1, dy1);
+ path = Join(path, Line(B));
+
+ /* 3. Check and handle ending node */
+ linkNode( segendind, PATH_END, PATH_LEFT);
+
+ break;
+
+
+ case PPOINT_BEZIER_B:
+ break;
+
+ case PPOINT_BEZIER_C:
+ break;
+
+ case PPOINT_BEZIER_D:
+ /* handle a bezier segment (given by this and the previous 3 path points)!
+ For bezier segments, we may not simply apply the intersection of previous
+ and next candidate because that would damage the curve's layout. Instead,
+ in cases where the candidate produced by intersection is not identical to
+ the ideal point, we prolongate and link the distance with a line segment.
+ */
+
+ /* 1. Check and handle starting node */
+ linkNode( ip, PATH_START, PATH_LEFT);
+
+ /* 2. Draw ideal curve segment */
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "LP: Curve from PP %ld to PP %ld to PP %ld to PP %ld\n",
+ ip, ip-1, ip-2, ip-3);
+#endif
+ /* Use ideal point locations for curve at starting and ending point: */
+ dx1 = ppoints[ip-1].x - ppoints[ip-1].dxir - (ppoints[ip].x - ppoints[ip].dxpr);
+ dy1 = ppoints[ip-1].y - ppoints[ip-1].dyir - (ppoints[ip].y - ppoints[ip].dypr);
+ dx2 = ppoints[ip-2].x - ppoints[ip-2].dxir - (ppoints[ip-1].x - ppoints[ip-1].dxir);
+ dy2 = ppoints[ip-2].y - ppoints[ip-2].dyir - (ppoints[ip-1].y - ppoints[ip-1].dyir);
+ dx3 = ppoints[ip-3].x - ppoints[ip-3].dxnr - (ppoints[ip-2].x - ppoints[ip-2].dxir);
+ dy3 = ppoints[ip-3].y - ppoints[ip-3].dynr - (ppoints[ip-2].y - ppoints[ip-2].dyir);
+
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL )
+ fprintf( psfile, "%f %f %f %f %f %f t1srrcurveto %% pindex = %ld\n",
+ dx1*up, dy1*up,
+ dx2*up, dy2*up,
+ dx3*up, dy3*up,
+ i);
+#endif
+ IfTrace4((FontDebug), "RRCurveTo %f %f %f %f ",
+ dx1, dy1, dx2, dy2);
+ IfTrace2((FontDebug), "%f %f\n", dx3, dy3);
+ B = Loc(CharSpace, dx1, dy1);
+ C = Loc(CharSpace, dx2, dy2);
+ D = Loc(CharSpace, dx3, dy3);
+
+ C = Join(C, (struct segment *)Dup(B));
+ D = Join(D, (struct segment *)Dup(C));
+ path = Join(path, (struct segment *)Bezier(B, C, D));
+
+ /* 3. Check and handle ending node */
+ linkNode( ip-3, PATH_END, PATH_LEFT);
+
+ break;
+
+
+ case PPOINT_CLOSEPATH:
+
+ /* Handle a ClosePath segment, if it had
+ caused a line segment. Hence, actually, we handle
+ a line segment here. */
+ if ( closepathatfirst == 1 ) {
+ /* ignore this command */
+ break;
+ }
+
+ /* 1. Check and handle starting node */
+ linkNode( startind, PATH_START, PATH_LEFT);
+
+ /* 2. Draw ideal isolated line segment */
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "LP: Inverted ClosePath from point %ld to %ld\n", startind, lastind);
+#endif
+ if ( subpathclosed != 0 ) {
+ dx1 = ppoints[lastind].x - ppoints[lastind].dxnr - (ppoints[startind].x - ppoints[startind].dxpr);
+ dy1 = ppoints[lastind].y - ppoints[lastind].dynr - (ppoints[startind].y - ppoints[startind].dypr);
+ }
+ else {
+ dx1 = -(ppoints[i].x - ppoints[i].dxnr - (ppoints[ip].x - ppoints[ip].dxpr));
+ dy1 = -(ppoints[i].y - ppoints[i].dynr - (ppoints[ip].y - ppoints[ip].dypr));
+ }
+
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL ) {
+ if ( subpathclosed != 0 ) {
+ fprintf( psfile, "%f %f t1srlineto %% (Inverted ClosePath, subpathclosed=1) pindex = %ld\n",
+ dx1*up, dy1*up, lastind);
+ }
+ else {
+ fprintf( psfile, "%f %f t1srlineto %% (Inverted ClosePath, subpathclosed=0) pindex = %ld\n",
+ dx1*up, dy1*up, i);
+ }
+ }
+#endif
+ B = Loc(CharSpace, dx1, dy1);
+ path = Join(path, Line(B));
+
+ /* 3. Check and handle ending node */
+ linkNode( lastind, PATH_END, PATH_LEFT);
+
+ break;
+
+ default:
+ break;
+
+ }
+ --i;
+ }
+
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL ) {
+ fprintf( psfile, "t1sclosepath\n");
+ }
+#endif
+ tmpseg = Phantom(path);
+ path = ClosePath(path);
+ path = Join(Snap(path), tmpseg);
+
+
+ /********************************************************************************
+ ********************************************************************************
+ *****
+ ***** Move to final position
+ *****
+ ********************************************************************************
+ ********************************************************************************/
+
+ /* Step to back to starting point of this subpath. If closepathatfirst==0, the
+ final closepath caused a line segment. In this case, we first have to step
+ back that segment and proceed from this point. */
+ if ( ppoints[startind].shape == CURVE_CONVEX ) {
+ /* In this case, left path is concave and the current location is at
+ the onCurve point */
+ dx1 = 0.0;
+ dy1 = 0.0;
+ }
+ else {
+ /* OK, it seems to be the intersection point */
+ dx1 = ppoints[startind].dxir;
+ dy1 = ppoints[startind].dyir;
+ }
+ /* We are now onCurve. If necessary step to the point where the closepath
+ appeared. */
+ if ( closepathatfirst == 0 ) {
+ dx1 += ppoints[lastind].x - ppoints[startind].x;
+ dy1 += ppoints[lastind].y - ppoints[startind].y;
+ }
+
+
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL )
+ fprintf( psfile, "%f %f t1srmoveto %% pindex = %ld\n", dx1*up, dy1*up, lastind);
+#endif
+ B = Loc(CharSpace, dx1, dy1);
+ path = Join(path, B);
+
+ return;
+
+}
+
+
+
+/* Compute distance from OnCurve-points to their neighbouring points, fill in
+ the respective entries dist2prev and dist2next in the ppoints[] structures
+ and return the index of the last point in the current subpath which has
+ a location different from the starting point of the subpath. */
+static long computeDistances( long startind, long stopind, int subpathclosed)
+{
+ long lastind = 0;
+ double dx = 0.0;
+ double dy = 0.0;
+ long i = 0;
+ int neighboured = 0;
+
+
+ /* Handle first point as a special case */
+ /* distance to previous point. First, get index of previous point. */
+ lastind = stopind;
+
+ if ( subpathclosed != 0 ) {
+ if ( (ppoints[startind].x == ppoints[stopind].x) &&
+ (ppoints[startind].y == ppoints[stopind].y) ) {
+ while ( (ppoints[lastind].x == ppoints[stopind].x) &&
+ (ppoints[lastind].y == ppoints[stopind].y))
+ --lastind;
+ }
+ else {
+ lastind = stopind - 1;
+ }
+ }
+
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr,
+ "computeDistance(): startind=%ld stopind=%ld, lastind=%ld, start.x=%f, start.y=%f, last.x=%f, last.y=%f\n",
+ startind, stopind, lastind, ppoints[startind].x, ppoints[startind].y,
+ ppoints[lastind].x, ppoints[lastind].y);
+#endif
+
+ dx = ppoints[startind].x - ppoints[lastind].x;
+ dy = ppoints[startind].y - ppoints[lastind].y;
+ ppoints[startind].dist2prev = sqrt( dx*dx + dy*dy );
+
+ /* distance to next point */
+ dx = ppoints[startind+1].x - ppoints[startind].x;
+ dy = ppoints[startind+1].y - ppoints[startind].y;
+ ppoints[startind].dist2next = sqrt( dx*dx + dy*dy );
+
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr,
+ "Pre: Distance at point %ld: Prev=%f Next=%f\n",
+ startind, ppoints[startind].dist2prev, ppoints[startind].dist2next);
+#endif
+
+ for ( i = startind+1; i < lastind; i++ ) {
+ if ( (ppoints[i].type == PPOINT_MOVE) ||
+ (ppoints[i].type == PPOINT_LINE) ||
+ (ppoints[i].type == PPOINT_BEZIER_D) ) {
+ if ( neighboured ) {
+ ppoints[i].dist2prev = ppoints[i-1].dist2next;
+ }
+ else {
+ /* distance to previous point */
+ dx = ppoints[i].x - ppoints[i-1].x;
+ dy = ppoints[i].y - ppoints[i-1].y;
+ /* Take care of degenerated curves */
+ if ( (dx == 0.0) && (dy == 0.0) ) {
+ dx = ppoints[i].x - ppoints[i-2].x;
+ dy = ppoints[i].y - ppoints[i-2].y;
+ if ( (dx == 0.0) && (dy == 0.0) ) {
+ dx = ppoints[i].x - ppoints[i-3].x;
+ dy = ppoints[i].y - ppoints[i-3].y;
+ }
+ }
+ ppoints[i].dist2prev = sqrt( dx*dx + dy*dy );
+ }
+ /* distance to next point */
+ dx = ppoints[i+1].x - ppoints[i].x;
+ dy = ppoints[i+1].y - ppoints[i].y;
+ /* Take care of degenerated curves */
+ if ( (dx == 0.0) && (dy == 0.0) ) {
+ dx = ppoints[i+2].x - ppoints[i].x;
+ dy = ppoints[i+2].y - ppoints[i].y;
+ if ( (dx == 0.0) && (dy == 0.0) ) {
+ dx = ppoints[i+3].x - ppoints[i].x;
+ dy = ppoints[i+3].y - ppoints[i].y;
+ }
+ }
+ ppoints[i].dist2next = sqrt( dx*dx + dy*dy );
+ neighboured = 1;
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, " Distance at point %ld: Prev=%f Next=%f\n",
+ i, ppoints[i].dist2prev, ppoints[i].dist2next);
+#endif
+ }
+ else {
+ neighboured = 0;
+ }
+
+ }
+ /* We still have to handle the last point */
+ /* distance to previous point */
+ dx = ppoints[lastind].x - ppoints[lastind-1].x;
+ dy = ppoints[lastind].y - ppoints[lastind-1].y;
+ /* Take care of degenerated curves */
+ if ( (dx == 0.0) && (dy == 0.0) ) {
+ dx = ppoints[lastind].x - ppoints[lastind-2].x;
+ dy = ppoints[lastind].y - ppoints[lastind-2].y;
+ if ( (dx == 0.0) && (dy == 0.0) ) {
+ dx = ppoints[lastind].x - ppoints[lastind-3].x;
+ dy = ppoints[lastind].y - ppoints[lastind-3].y;
+ }
+ }
+ ppoints[lastind].dist2prev = sqrt( dx*dx + dy*dy );
+ /* distance to next point */
+ ppoints[lastind].dist2next = ppoints[startind].dist2prev;
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "End: Distance at point %ld: Prev=%f Next=%f\n",
+ lastind, ppoints[lastind].dist2prev, ppoints[lastind].dist2next);
+#endif
+
+ return lastind;
+
+}
+
+
+
+/*
+
+ */
+static long handleNonSubPathSegments( long pindex)
+{
+
+ /* handle the different segment types in a switch-statement */
+ switch ( ppoints[pindex].type ) {
+
+ case PPOINT_SBW:
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL )
+ fprintf( psfile, "%f %f %f %f t1sbw %% pindex = %ld\n",
+ ppoints[pindex].x*up, ppoints[pindex].y*up, /* sidebearings */
+ ppoints[pindex].ax*up, ppoints[pindex].ay*up, /* escapements */
+ pindex
+ );
+#endif
+ path = Join(path, Loc(CharSpace, ppoints[pindex].x, ppoints[pindex].y));
+ return 1;
+ break;
+
+
+ case PPOINT_ENDCHAR:
+ /* Perform a Closepath just in case the command was left out */
+ path = ClosePath(path);
+
+ /* Set character width / escapement. It is stored in the vars for
+ hinted coordinates. */
+ path = Join(Snap(path), Loc(CharSpace, ppoints[pindex].ax, ppoints[pindex].ay));
+
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL )
+ fputs( "t1FinishPage\n", psfile);
+#endif
+ return 1;
+ break;
+
+
+ case PPOINT_SEAC:
+ /* return to origin of accent */
+ apath = Snap(path);
+ /* reset path to NULL */
+ path = NULL;
+ return 1;
+ break;
+
+
+ default:
+ /* not handled, return 0! */
+ ;
+ }
+
+ return 0;
+
+}
+
+
+
+/* Transform a path point according to the path's incoming angle, the path's
+ outgoing angle and the parameter strokewidth. The computation is based on
+ simple geometric considerations and makes use of the distance from the
+ current point to the previous point and the next point respectively.
+
+ Generally, each link to a path point induces its own candidate by simply
+ widening the respective link orthogonally to strokewidth/2. This yields
+ two displacement vectors (dx,dy) for the link from the previous point to the
+ point under consideration (dxp, dyp) and and for the link from the current
+ point to the next point (dxn, dyn).
+
+ Later on, the two candidates are used to compute the resulting displacement
+ as the intersection of the prolongated lines from before and behind the
+ current point.
+
+ Additionally, check whether the curve is concave or convex at this point.
+ This is required for prolongation in the context of stroking.
+*/
+static void transformOnCurvePathPoint( double strokewidth,
+ long prevind, long currind, long nextind)
+{
+ double distxp;
+ double distyp;
+ double distxn;
+ double distyn;
+ double det;
+
+ /*
+ distxp = (ppoints[currind].y - ppoints[prevind].y);
+ distyp = -(ppoints[currind].x - ppoints[prevind].x);
+ distxn = (ppoints[nextind].y - ppoints[currind].y);
+ distyn = -(ppoints[nextind].x - ppoints[currind].x);
+
+ ppoints[currind].dxpr = distxp * strokewidth * 0.5 / ppoints[currind].dist2prev;
+ ppoints[currind].dypr = distyp * strokewidth * 0.5 / ppoints[currind].dist2prev;
+
+ ppoints[currind].dxnr = distxn * strokewidth * 0.5 / ppoints[currind].dist2next;
+ ppoints[currind].dynr = distyn * strokewidth * 0.5 / ppoints[currind].dist2next;
+ */
+ /* Note: When computing transformations of OnCurve points, we consider two
+ special cases:
+
+ 1) The OnCurve beginning or end point is equal to the neighboring
+ control point of a Bezier-Segment.
+
+ 2) This holds for beginning *and* end point. In this case the curve
+ degenerates to a straight lines.
+
+ Although this is deprecated by Adobe, fonts that use such constructions
+ exist (e.g.m lower case 'n' of Univers 55). However, we do not care
+ for segments that do not any escapement at all!
+ */
+
+ distxp = (ppoints[currind].y - ppoints[prevind].y);
+ distyp = -(ppoints[currind].x - ppoints[prevind].x);
+ if ( (distxp == 0.0) && (distyp == 0.0) ) {
+ distxp = (ppoints[currind].y - ppoints[prevind-1].y);
+ distyp = -(ppoints[currind].x - ppoints[prevind-1].x);
+ if ( (distxp == 0.0) && (distyp == 0.0) ) {
+ distxp = (ppoints[currind].y - ppoints[prevind-2].y);
+ distyp = -(ppoints[currind].x - ppoints[prevind-2].x);
+ }
+ }
+ ppoints[currind].dxpr = distxp * strokewidth * 0.5 / ppoints[currind].dist2prev;
+ ppoints[currind].dypr = distyp * strokewidth * 0.5 / ppoints[currind].dist2prev;
+
+ distxn = (ppoints[nextind].y - ppoints[currind].y);
+ distyn = -(ppoints[nextind].x - ppoints[currind].x);
+ if ( (distxn == 0.0) && (distyn == 0.0) ) {
+ distxn = (ppoints[nextind+1].y - ppoints[currind].y);
+ distyn = -(ppoints[nextind+1].x - ppoints[currind].x);
+ if ( (distxn == 0.0) && (distyn == 0.0) ) {
+ distxn = (ppoints[nextind+2].y - ppoints[currind].y);
+ distyn = -(ppoints[nextind+2].x - ppoints[currind].x);
+ }
+ }
+ ppoints[currind].dxnr = distxn * strokewidth * 0.5 / ppoints[currind].dist2next;
+ ppoints[currind].dynr = distyn * strokewidth * 0.5 / ppoints[currind].dist2next;
+
+ /* Consider determinant of the two tangent vectors at this node in order to
+ decide whether the curve is convex or cancave at this point. */
+ if ( (det = ((distxp * distyn) - (distxn * distyp))) < 0.0 ) {
+ /* curve turns to the right */
+ ppoints[currind].shape = CURVE_CONCAVE;
+ }
+ else if ( det > 0.0 ) {
+ /* curve turns to the left */
+ ppoints[currind].shape = CURVE_CONVEX;
+ }
+ else {
+ /* curve is straight */
+ ppoints[currind].shape = CURVE_STRAIGHT;
+ }
+
+ return;
+}
+
+
+/* Compute a displacement for offCurve points, that is, for Bezier B and C points.
+
+ This computation is not as simple as it might appear at a first glance and,
+ depending on the actual curve parameters and the parameter strokewidth, it might
+ be necessary to subdivide the curve. My mathematical background is not actually
+ reliable in this context but it seems that in particular the angle that the curve
+ runs through is important in this context. Since the Adobe Type 1 recommendations
+ on font design include a rule which states that curves' end points should be located
+ at extreme values, and consequently, that the angle of a curve segment should not
+ be larger than 90 degrees, I have decided not to implement curve subdivision. This
+ might lead to some deviations if fonts do not adhere to the Adobe recommendations.
+ Anyways, I have never seen such fonts.
+
+ This function is called for Bezier_B points and computes displacements for the B
+ and C points at once. Fortunately, index cycling cannot happen here. When
+ computing the B' C' off-curve points, special care against numerical instability
+ is required. We assume that at least one of the two points can be computed
+ in a stable way.
+
+ The new Bezier B' and C' points can be considered as four degrees of freedom and we have
+ to find 4 equations to be able to compute them.
+
+ 1) We require the tangents slope at point A' to be identical to the slope at the
+ point A of the ideally thin mathematical curve.
+
+ 2) The same holds for the tangents slope at point D' with respect to point D.
+
+ 3) We compute the following points
+
+ P1: Equally subdivides the line A - B
+ P2: Equally subdivides the line B - C
+ P3: Equally subdivides the line C - D
+
+ P4: Equally subdivides the line P1 - P2
+ P5: Equally subdivides the line P1 - P3
+
+ P6: Equally subdivides the line P4 - P5
+
+ This latter point is part of the curve and, moreover, the line P4 - P5 is
+ tangent to the curve at that point.
+ From this point, we compute a displacement for P6, orthogonally to the curve
+ at that point and with length strokewidth/2. The resulting point is part of
+ the delimiting path that makes up the thick curve.
+
+ 4) We require that the tangent's slope at P6' equals the tangents slope at P6.
+
+ Then, under certain further constraints as mentioned above, we compute the points
+ B' and C' making use of the points A' and D' which have been transformed as onCurve
+ points. By definition, for offCurve points, there is only one candidate.
+
+ */
+static void transformOffCurvePathPoint( double strokewidth, long currind)
+{
+ double dtmp;
+ double diameter;
+ double dx;
+ double dy;
+
+ /* points defining the curve */
+ double pax;
+ double pay;
+ double pbx;
+ double pby;
+ double pcx;
+ double pcy;
+ double pdx;
+ double pdy;
+
+ /* auxiliary points from iterative Bezier construction */
+ double p1x;
+ double p1y;
+ double p2x;
+ double p2y;
+ double p3x;
+ double p3y;
+ double p4x;
+ double p4y;
+ double p5x;
+ double p5y;
+ double p6x;
+ double p6y;
+
+ /* already displaced / shifted onCurve points and the ones we are going
+ to compute. */
+ double paxs;
+ double pays;
+ double pbxs;
+ double pbys;
+ double pcxs;
+ double pcys;
+ double pdxs;
+ double pdys;
+
+ /* The normal vector on the curve at t=1/2 */
+ double nabs;
+ double nx;
+ double ny;
+
+ /* some variables for computations at point B' */
+ double bloc1x;
+ double bloc1y;
+ double bdir1x;
+ double bdir1y;
+ double bloc2x;
+ double bloc2y;
+ double bdir2x;
+ double bdir2y;
+ double bdet;
+ double binvdet;
+ double binvdir1x;
+ double binvdir1y; /**/
+ double binvdir2x;
+ double binvdir2y; /**/
+ double bmu;
+ double bnu; /**/
+
+ /* some variables for computations at point C' */
+ double cloc1x;
+ double cloc1y;
+ double cdir1x;
+ double cdir1y;
+ double cloc2x;
+ double cloc2y;
+ double cdir2x;
+ double cdir2y;
+ double cdet;
+ double cinvdet;
+ double cinvdir1x;
+ double cinvdir1y; /**/
+ double cinvdir2x;
+ double cinvdir2y; /**/
+ double cmu;
+ double cnu; /**/
+
+ diameter = strokewidth * 0.5;
+
+ pax = ppoints[currind-1].x;
+ pay = ppoints[currind-1].y;
+ pbx = ppoints[currind].x;
+ pby = ppoints[currind].y;
+ pcx = ppoints[currind+1].x;
+ pcy = ppoints[currind+1].y;
+ pdx = ppoints[currind+2].x;
+ pdy = ppoints[currind+2].y;
+
+ p1x = (pax + pbx) * 0.5;
+ p1y = (pay + pby) * 0.5;
+ p2x = (pbx + pcx) * 0.5;
+ p2y = (pby + pcy) * 0.5;
+ p3x = (pcx + pdx) * 0.5;
+ p3y = (pcy + pdy) * 0.5;
+ p4x = (p1x + p2x) * 0.5;
+ p4y = (p1y + p2y) * 0.5;
+ p5x = (p2x + p3x) * 0.5;
+ p5y = (p2y + p3y) * 0.5;
+ p6x = (p4x + p5x) * 0.5;
+ p6y = (p4y + p5y) * 0.5;
+
+
+ /* We start by computing the shift of the onCurve points. It is not possible
+ to use dxr / dyr of the ppoints-stucture entries. These values have been
+ computed by intersection of both links to a path point. Here we need the
+ ideal points of the thick isolated curve segment. We are aware that for
+ Bezier splines, control point and OnCurve point might be identical! */
+ dx = (ppoints[currind].y - ppoints[currind-1].y) * strokewidth * 0.5 / ppoints[currind-1].dist2next;
+ dy = - (ppoints[currind].x - ppoints[currind-1].x) * strokewidth * 0.5 / ppoints[currind-1].dist2next;
+ if ( (dx == 0.0) && (dy == 0.0) ) {
+ /* Bezier_A and Bezier_B are identical */
+ dx = (ppoints[currind+1].y - ppoints[currind-1].y) * strokewidth * 0.5 / ppoints[currind-1].dist2next;
+ dy = - (ppoints[currind+1].x - ppoints[currind-1].x) * strokewidth * 0.5 / ppoints[currind-1].dist2next;
+ }
+ paxs = ppoints[currind-1].x + dx;
+ pays = ppoints[currind-1].y + dy;
+ dx = (ppoints[currind+2].y - ppoints[currind+1].y) * strokewidth * 0.5 / ppoints[currind+2].dist2prev;
+ dy = - (ppoints[currind+2].x - ppoints[currind+1].x) * strokewidth * 0.5 / ppoints[currind+2].dist2prev;
+ if ( (dx == 0.0) && (dy == 0.0) ) {
+ /* Bezier_C and Bezier_D are identical */
+ dx = (ppoints[currind+2].y - ppoints[currind].y) * strokewidth * 0.5 / ppoints[currind+2].dist2prev;
+ dy = - (ppoints[currind+2].x - ppoints[currind].x) * strokewidth * 0.5 / ppoints[currind+2].dist2prev;
+ }
+ pdxs = ppoints[currind+2].x + dx;
+ pdys = ppoints[currind+2].y + dy;
+
+ /* Next, we compute the right side normal vector at the curve point t=1/2,
+ that is, at P6. */
+ nabs = diameter / sqrt(((p5x - p4x) * (p5x - p4x)) + ((p5y - p4y) * (p5y - p4y)));
+ nx = (p5y - p4y) * nabs;
+ ny = (p4x - p5x) * nabs;
+
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "transformOffCurvePathPoint():\n");
+ fprintf( stderr, " A=(%f,%f), B=(%f,%f), C=(%f,%f), D=(%f,%f)\n",
+ pax, pay, pbx, pby, pcx, pcy, pdx, pdy);
+ fprintf( stderr, " PathInfo: Curve from PP %ld ... PP %ld ... PP %ld ... PP %ld. StrokeWidth=%f.\n",
+ currind-1, currind, currind+1, currind+2, strokewidth);
+ /*
+ fprintf( stderr, "/xa %f def\n/ya %f def\n/xb %f def\n/yb %f def\n/xc %f def\n/yc %f def\n/xd %f def\n/yd %f def\n",
+ pax, pay, pbx, pby, pcx, pcy, pdx, pdy);
+ */
+ fprintf( stderr, " As=(%f,%f), Ds=(%f,%f)\n",
+ paxs, pays, pdxs, pdys);
+ fprintf( stderr, " p6=(%f,%f)\n", p6x, p6y);
+ fprintf( stderr, " nx=%f, ny=%f, nabs=%f\n", nx, ny, nabs);
+ fprintf( stderr, " p6s=(%f,%f)\n", p6x+nx, p6y+ny);
+#endif
+
+ /* Compute two lines whose intersection will define point B' */
+ bloc1x = (4.0 * (nx + p6x) - (2 * paxs) + pdxs) / 3.0;
+ bloc1y = (4.0 * (ny + p6y) - (2 * pays) + pdys) / 3.0;
+ bdir1x = pcx + pdx - pax - pbx;
+ bdir1y = pcy + pdy - pay - pby;
+ bloc2x = paxs;
+ bloc2y = pays;
+ bdir2x = pbx - pax;
+ bdir2y = pby - pay;
+ bdet = (bdir2x * bdir1y) - (bdir2y * bdir1x);
+
+#define DET_QUOTIENT_UPPER_THRESHOLD (1.05)
+#define DET_QUOTIENT_LOWER_THRESHOLD (1.0/DET_QUOTIENT_UPPER_THRESHOLD)
+
+ /* Life has shown, that the "reliability" of the determinant has to be
+ ensured. Otherwise, serious distortions might be introduced.
+ In order to ensure numerical stability, we do not only check whether
+ the detrminant is about zero, but we also check whether the two partial
+ expressions that are subtracted when computing the determinant are of
+ about the same size. If this is the case, we explicitly reset the
+ determinant and eventually compute this off-curve point based on the
+ other off-curve point later. */
+ if ( (bdir2x != 0.0) && (bdir1y != 0.0) ) {
+ dtmp = (bdir2y*bdir1x)/(bdir2x*bdir1y);
+ if ( (DET_QUOTIENT_LOWER_THRESHOLD < dtmp) &&
+ (DET_QUOTIENT_UPPER_THRESHOLD > dtmp)
+ ) {
+ /* Determinant appears to be unreliable, reset it exactly to zero. */
+ bdet = 0.0;
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, " Warning: Determinant quotient check for bdet failed: dtmp=%16.16f, lower limit=%f, upper limit=%f.\n --> Determinant does not seem to be stable, resetting to zero.\n",
+ dtmp, DET_QUOTIENT_LOWER_THRESHOLD, DET_QUOTIENT_UPPER_THRESHOLD);
+#endif
+ }
+ }
+ else if ( (bdir2y != 0.0) && (bdir1x != 0.0) ) {
+ dtmp = (bdir2x*bdir1y)/(bdir2y*bdir1x);
+ if ( (DET_QUOTIENT_LOWER_THRESHOLD < dtmp) &&
+ (DET_QUOTIENT_UPPER_THRESHOLD > dtmp)
+ ) {
+ /* Determinant appears to be unreliable, reset it exactly to zero. */
+ bdet = 0.0;
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, " Warning: Determinant quotient check for bdet failed: dtmp=%16.16f, lower limit=%f, upper limit=%f.\n --> Determinant does not seem to be stable, resetting to zero.\n",
+ dtmp, DET_QUOTIENT_LOWER_THRESHOLD, DET_QUOTIENT_UPPER_THRESHOLD);
+#endif
+ }
+ }
+
+
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, " bloc1x=%f, bloc1y=%f, bloc2x,=%f bloc2y=%f\n",
+ bloc1x, bloc1y, bloc2x, bloc2y);
+ fprintf( stderr, " bdir1x=%f, bdir1y=%f, bdir2x,=%f bdir2y=%f\n",
+ bdir1x, bdir1y, bdir2x, bdir2y);
+#endif
+
+ /* Switch if determinant is zero; we then actually have a straight line */
+ if ( fabs(bdet) < 0.001 ) {
+ pbxs = pbx + nx;
+ pbys = pby + ny;
+ bmu = 0.0;
+ bnu = 0.0;
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, " Warning: Determinant check for bdet failed: bdet=%16.16f. Computing Bs based on normal vector, resetting bmu, bnu.\n",
+ bdet);
+#endif
+ }
+ else {
+ /* Calculate required part of inverse matrix */
+ binvdet = 1.0 / bdet;
+ binvdir2x = bdir1y * binvdet;
+ binvdir2y = - bdir2y * binvdet; /**/
+ binvdir1x = - bdir1x * binvdet;
+ binvdir1y = bdir2x * binvdet; /**/
+
+ /* Calculate coefficient that describes intersection */
+ bmu = (binvdir2x * (bloc1x - bloc2x)) + (binvdir1x * (bloc1y - bloc2y));
+ bnu = (binvdir2y * (bloc1x - bloc2x)) + (binvdir1y * (bloc1y - bloc2y)); /**/
+
+ /* Calculate B' */
+ pbxs = bloc2x + (bmu * bdir2x);
+ pbys = bloc2y + (bmu * bdir2y);
+ }
+
+ /* Compute two lines whose intersection will define point C' */
+ cloc1x = (4.0 * (nx + p6x) - (2 * pdxs) + paxs) / 3.0;
+ cloc1y = (4.0 * (ny + p6y) - (2 * pdys) + pays) / 3.0;
+ cdir1x = bdir1x;
+ cdir1y = bdir1y;
+ cloc2x = pdxs;
+ cloc2y = pdys;
+ cdir2x = pcx - pdx;
+ cdir2y = pcy - pdy;
+ cdet = (cdir2x * cdir1y) - (cdir2y * cdir1x);
+
+ /* Life has shown, that the "reliability" of the determinant has to be
+ ensured. Otherwise, serious distortions might be introduced.
+ In order to ensure numerical stability, we do not only check whether
+ the detrminant is about zero, but we also check whether the two partial
+ expressions that are subtracted when computing the determinant are of
+ about the same size. If this is the case, we explicitly reset the
+ determinant and eventually compute this off-curve point based on the
+ other off-curve point later. */
+ if ( (cdir2x != 0.0) && (cdir1y != 0.0) ) {
+ dtmp = (cdir2y*cdir1x)/(cdir2x*cdir1y);
+ if ( (DET_QUOTIENT_LOWER_THRESHOLD < dtmp) &&
+ (DET_QUOTIENT_UPPER_THRESHOLD > dtmp)
+ ) {
+ /* Determinant appears to be unreliable, reset it exactly to zero. */
+ cdet = 0.0;
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, " Warning: Determinant quotient check for cdet failed: dtmp=%16.16f, lower limit=%f, upper limit=%f.\n --> Determinant does not seem to be stable, resetting to zero.\n",
+ dtmp, DET_QUOTIENT_LOWER_THRESHOLD, DET_QUOTIENT_UPPER_THRESHOLD);
+#endif
+ }
+ }
+ else if ( (cdir2y != 0.0) && (cdir1x != 0.0) ) {
+ dtmp = (cdir2x*cdir1y)/(cdir2y*cdir1x);
+ if ( (DET_QUOTIENT_LOWER_THRESHOLD < dtmp) &&
+ (DET_QUOTIENT_UPPER_THRESHOLD > dtmp)
+ ) {
+ /* Determinant appears to be unreliable, reset it exactly to zero. */
+ cdet = 0.0;
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, " Warning: Determinant quotient check for cdet failed: dtmp=%16.16f, lower limit=%f, upper limit=%f.\n --> Determinant does not seem to be stable, resetting to zero.\n",
+ dtmp, DET_QUOTIENT_LOWER_THRESHOLD, DET_QUOTIENT_UPPER_THRESHOLD);
+#endif
+ }
+ }
+
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, " cloc1x=%f, cloc1y=%f, cloc2x,=%f cloc2y=%f\n",
+ cloc1x, cloc1y, cloc2x, cloc2y);
+ fprintf( stderr, " cdir1x=%f, cdir1y=%f, cdir2x,=%f cdir2y=%f\n",
+ cdir1x, cdir1y, cdir2x, cdir2y);
+#endif
+
+ /* Switch if determinant is zero; we then actually have a straight line */
+ if ( fabs( cdet) < 0.001 ) {
+ pcxs = pcx + nx;
+ pcys = pcy + ny;
+ cmu = 0.0;
+ cnu = 0.0;
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, " Warning: Determinant check for cdet failed: cdet=%16.16f. Computing Cs based on normal vector, resetting cmu, cnu.\n",
+ cdet);
+#endif
+ }
+ else {
+ /* Calculate required part of inverse matrix */
+ cinvdet = 1.0 / cdet;
+ cinvdir2x = cdir1y * cinvdet;
+ cinvdir2y = - cdir2y * cinvdet; /**/
+ cinvdir1x = - cdir1x * cinvdet;
+ cinvdir1y = cdir2x * cinvdet; /**/
+
+ /* Calculate coefficient that describes intersection */
+ cmu = (cinvdir2x * (cloc1x - cloc2x)) + (cinvdir1x * (cloc1y - cloc2y));
+ cnu = (cinvdir2y * (cloc1x - cloc2x)) + (cinvdir1y * (cloc1y - cloc2y)); /**/
+
+ /* Calculate C' */
+ pcxs = cloc2x + (cmu * cdir2x);
+ pcys = cloc2y + (cmu * cdir2y);
+ }
+
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, " bdet=%f, cdet=%f, bmu=%f, bnu=%f, cmu=%f, cnu=%f\n",
+ bdet, cdet, bmu, bnu, cmu, cnu);
+#endif
+
+ /* Analyse coefficients and decide on numerical stability. If suggesting,
+ overwrite, using another relation. Here, we assume that at least the
+ solution at *one* end of the curve is stable. */
+ if ( fabs(bmu) < 0.1 ) {
+ pbxs = ((8 * (nx + p6x) - paxs - pdxs) / 3.0) - pcxs;
+ pbys = ((8 * (ny + p6y) - pays - pdys) / 3.0) - pcys;
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, " Warning: Coefficient check for bmu failed: bmu=%16.16f. Computing Bs based on Cs.\n",
+ bmu);
+#endif
+ }
+ if ( fabs(cmu) < 0.1 ) {
+ pcxs = ((8 * (nx + p6x) - paxs - pdxs) / 3.0) - pbxs;
+ pcys = ((8 * (ny + p6y) - pays - pdys) / 3.0) - pbys;
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, " Warning: Coefficient check for cmu failed: cmu=%16.16f. Computing Cs based on Bs.\n",
+ cmu);
+#endif
+ }
+
+
+ /* Store the resulting displacement values in the ppoints-struct so
+ they can be used for path construction. We use the "intersect" member
+ because in this case nothing is related to "previous" or "next".*/
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, " pbx=%f, pbxs=%f, bxshift=%f, pby=%f, pbys=%f, byshift=%f\n",
+ pbx, pbxs, pbxs-pbx, pby, pbys, pbys-pby);
+ fprintf( stderr, " pcx=%f, pcxs=%f, cxshift=%f, pcy=%f, pcys=%f, cyshift=%f\n",
+ pcx, pcxs, pcxs-pcx, pcy, pcys, pcys-pcy);
+ fprintf( stderr, " Summary: A =(%f,%f), B =(%f,%f), C =(%f,%f), D =(%f,%f)\n",
+ pax, pay, pbx, pby, pcx, pcy, pdx, pdy);
+ fprintf( stderr, " As=(%f,%f), Bs=(%f,%f), Cs=(%f,%f), Ds=(%f,%f)\n\n",
+ paxs, pays, pbxs, pbys, pcxs, pcys, pdxs, pdys);
+#endif
+ ppoints[currind].dxir = pbxs - pbx;
+ ppoints[currind].dyir = pbys - pby;
+ ppoints[currind+1].dxir = pcxs - pcx;
+ ppoints[currind+1].dyir = pcys - pcy;
+
+ return;
+
+}
+
+
+static void intersectRight( long index, double halfwidth, long flag)
+{
+ double r2 = 0.0;
+ double det = 0.0;
+ double dxprev;
+ double dyprev;
+ double dxnext;
+ double dynext;
+
+
+ /* In order to determine the intersection between the two
+ prolongations at the path point under consideration, we use
+ the Hesse Normal Form, multiplied with r.
+
+ dx * x + dy * y + r^2 = 0
+
+ Here, r is the distance from the origin, that is, from the path point
+ under consideration. */
+
+ /* Check for start and ending of non-closed paths */
+ if ( flag == INTERSECT_PREVIOUS ) {
+ ppoints[index].dxir = ppoints[index].dxpr;
+ ppoints[index].dyir = ppoints[index].dypr;
+ /* Correct shape to be "straight" at ending point! */
+ ppoints[index].shape = CURVE_STRAIGHT;
+ return;
+ }
+ if ( flag == INTERSECT_NEXT ) {
+ ppoints[index].dxir = ppoints[index].dxnr;
+ ppoints[index].dyir = ppoints[index].dynr;
+ /* Correct shape to be "straight" at starting point! */
+ ppoints[index].shape = CURVE_STRAIGHT;
+ return;
+ }
+
+ /* OK, we actually compute an intersection */
+ dxprev = ppoints[index].dxpr;
+ dyprev = ppoints[index].dypr;
+ dxnext = ppoints[index].dxnr;
+ dynext = ppoints[index].dynr;
+
+ /* Compute distance square */
+ r2 = halfwidth * halfwidth;
+
+ /* Check the determinant. If it is zero, the two lines are parallel
+ and also must touch at atleast one location,
+ so that there are an infinite number of solutions. In this case,
+ we compute the average position and are done. */
+ if ( fabs( (det = ((dyprev * dxnext) - (dynext * dxprev))) ) < 0.00001 ) {
+ ppoints[index].dxir = 0.5 * (dxprev + dxnext);
+ ppoints[index].dyir = 0.5 * (dyprev + dynext);
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "intersectRight(0):\n dxprev=%f, dxnext=%f, dxres=%f,\n dyprev=%f, dynext=%f, dyres=%f,\n det=%16.16f\n",
+ dxprev, dxnext, ppoints[index].dxir, dyprev, dynext, ppoints[index].dyir, det);
+ fprintf( stderr, " --> Computation based on averaging [dxprev,dyprev] and [dxnext,dynext]\n");
+ fprintf( stderr, " Right intersection point shift: (%f,%f), absolute shift length: %f.\n\n",
+ ppoints[index].dxir, ppoints[index].dyir,
+ sqrt(ppoints[index].dxir*ppoints[index].dxir + ppoints[index].dyir*ppoints[index].dyir));
+#endif
+ return;
+ }
+ /* OK, there seems to be a unique solution, compute it */
+ if ( dxprev != 0.0 ) {
+ ppoints[index].dyir = r2 * (dxnext - dxprev) / det;
+ ppoints[index].dxir = (r2 - (dyprev * ppoints[index].dyir)) / dxprev; /* - ? */
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "intersectRight(1):\n dxprev=%f, dxnext=%f, dxres=%f,\n dyprev=%f, dynext=%f, dyres=%f,\n det=%16.16f\n",
+ dxprev, dxnext, ppoints[index].dxir, dyprev, dynext, ppoints[index].dyir, det);
+ fprintf( stderr, " --> Computation based on previous path point.\n");
+ fprintf( stderr, " Right intersection point shift: (%f,%f), absolute shift length: %f.\n\n",
+ ppoints[index].dxir, ppoints[index].dyir,
+ sqrt(ppoints[index].dxir*ppoints[index].dxir + ppoints[index].dyir*ppoints[index].dyir));
+#endif
+ }
+ else {
+ ppoints[index].dyir = -r2 * (dxprev - dxnext) / det;
+ ppoints[index].dxir = (r2 - (dynext * ppoints[index].dyir)) / dxnext; /* - ? */
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "intersectRight(2):\n dxprev=%f, dxnext=%f, dxres=%f,\n dyprev=%f, dynext=%f, dyres=%f,\n det=%16.16f\n",
+ dxprev, dxnext, ppoints[index].dxir, dyprev, dynext, ppoints[index].dyir, det);
+ fprintf( stderr, " --> Computation based on next path point.\n");
+ fprintf( stderr, " Right intersection point shift: (%f,%f), absolute shift length: %f.\n\n",
+ ppoints[index].dxir, ppoints[index].dyir,
+ sqrt(ppoints[index].dxir*ppoints[index].dxir + ppoints[index].dyir*ppoints[index].dyir));
+#endif
+ }
+
+ return;
+
+}
+
+
+
+/* linkNode(): Insert prolongation lines at nodes. */
+static void linkNode( long index, int position, int orientation)
+{
+ struct segment* B;
+ double dx = 0.0;
+ double dy = 0.0;
+
+ if ( orientation == PATH_RIGHT ) {
+ /* We are constructing the right hand side path */
+ if ( position == PATH_START ) {
+ /* We are starting a new segment. Link from current point to ideally
+ next-shifted point of segment. */
+ if ( ppoints[index].shape == CURVE_CONCAVE ) {
+ /* prolongate from original curve point to ideally next-shifted point */
+ dx = ppoints[index].dxnr;
+ dy = ppoints[index].dynr;
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "RP: Concave at PP %ld. Prolongation from onCurve to ideal: (%f,%f)\n",
+ index, dx, dy);
+#endif
+ }
+ else if ( ppoints[index].shape == CURVE_CONVEX ) {
+ /* prolongate from intersecion point to ideally next-shifted point */
+ dx = ppoints[index].dxnr - ppoints[index].dxir;
+ dy = ppoints[index].dynr - ppoints[index].dyir;
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "RP: Convex at PP %ld. Prolongation from intersection to ideal: (%f,%f)\n",
+ index, dx, dy);
+#endif
+ }
+ }
+ else if ( position == PATH_END ) {
+ /* We are ending the current segment. Link from ideally prev-shifted point
+ to the appropriate ending point. */
+ if ( ppoints[index].shape == CURVE_CONCAVE ) {
+ /* prolongate from ideally prev-shifted point to original curve point. */
+ dx = - ppoints[index].dxpr;
+ dy = - ppoints[index].dypr;
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "RP: Concave at PP %ld. Prolongation from ideal to onCurve: (%f,%f)\n",
+ index, dx, dy);
+#endif
+ }
+ else if ( ppoints[index].shape == CURVE_CONVEX ) {
+ /* prolongate from ideally prev-shifted point to intersection point. */
+ dx = ppoints[index].dxir - ppoints[index].dxpr;
+ dy = ppoints[index].dyir - ppoints[index].dypr;
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "RP: Convex at PP %ld. Prolongation from ideal to intersection: (%f,%f)\n",
+ index, dx, dy);
+#endif
+ }
+ } /* if ( PATH_END ) */
+ } /* if ( PATH_RIGHT ) */
+ else if ( orientation == PATH_LEFT ) {
+
+ /* We are constructing the left hand side path. Some notions have to be
+ reverted (e.g. concavity vs. convexity and next vs. previous)! */
+ if ( position == PATH_START ) {
+ /* We are starting a new segment. Link from current point to ideally
+ next-shifted point of segment. */
+ if ( ppoints[index].shape == CURVE_CONVEX ) {
+ /* prolongate from original curve point to ideally next-shifted point.
+ Remember: next --> prev! */
+ dx = - (ppoints[index].dxpr);
+ dy = - (ppoints[index].dypr);
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "LP: Concave at PP %ld. Prolongation from onCurve to ideal: (%f,%f)\n",
+ index, dx, dy);
+#endif
+ }
+ else if ( ppoints[index].shape == CURVE_CONCAVE ) {
+ /* prolongate from intersecion point to ideally next-shifted point */
+ dx = - (ppoints[index].dxpr - ppoints[index].dxir);
+ dy = - (ppoints[index].dypr - ppoints[index].dyir);
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "LP: Convex at PP %ld. Prolongation from intersection to ideal: (%f,%f)\n",
+ index, dx, dy);
+#endif
+ }
+ }/* if ( PATH_START ) */
+ else if ( position == PATH_END ) {
+ /* We are ending the current segment. Link from ideally prev-shifted point
+ to the appropriate ending point. */
+ if ( ppoints[index].shape == CURVE_CONVEX ) {
+ /* prolongate from ideally prev-shifted point to original curve point. */
+ dx = ppoints[index].dxnr;
+ dy = ppoints[index].dynr;
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "LP: Concave at PP %ld. Prolongation from ideal to onCurve: (%f,%f)\n",
+ index, dx, dy);
+#endif
+ }
+ else if ( ppoints[index].shape == CURVE_CONCAVE ) {
+ /* prolongate from ideally prev-shifted point to intersection point. */
+ dx = - (ppoints[index].dxir - ppoints[index].dxnr);
+ dy = - (ppoints[index].dyir - ppoints[index].dynr);
+#ifdef DEBUG_OUTLINE_SURROUNDING
+ fprintf( stderr, "LP: Convex at PP %ld. Prolongation from ideal to intersection: (%f,%f)\n",
+ index, dx, dy);
+#endif
+ }
+ } /* if ( PATH_END ) */
+ } /* if ( PATH_LEFT ) */
+
+ if ( (dx != 0.0) || (dy != 0.0) ) {
+#ifdef DUMPDEBUGPATH
+ if ( psfile != NULL )
+ fprintf( psfile, "%f %f t1sprolongate %% pindex = %ld\n", dx*up, dy*up, index);
+#endif
+ B = Loc( CharSpace, dx, dy);
+ path = Join(path, Line(B));
+ }
+
+ return;
+
+}
+
+
+int T1int_Type1QuerySEAC( unsigned char* base,
+ unsigned char* accent)
+{
+ if ( isseac == 0 ) {
+ return 0;
+ }
+
+ *base = seacbase;
+ *accent = seacaccent;
+
+ return isseac;
+}
+
|