Commit 0142e6aff1f0836a7ec3902969491ab6ac7182aa

Wu, Chia-I (吳佳一) 2005-08-16T01:54:59

* src/truetype/ttinterp.c, src/truetype/ttinterp.h: Remove original TT_Done_Context and rename TT_Destroy_Context to TT_Done_Context with slight changes. * src/truetype/ttobjs.h (tt_slot_init): New function. * src/truetype/ttobjs.c (tt_driver_init): Initialize execution context here. (tt_slot_init): New function to create extra points for the internal glyph loader. We then use it directly, instead of face's glyph loader, when loading glyph. * src/truetype/ttdriver.c: Use tt_slot_init for glyph slot initialization. (TT_Load_Glyph): Load flag dependencies are handled here. Return error if size is NULL. * src/truetype/ttgload.c: Heavy cleanup and refactor. (TT_Hint_Glyph): New funcion to hint a zone, prepared by caller. (TT_Process_Simple_Glyph): Use loader->pp's instead of recalculating. Use TT_Hint_Glyph. No need to save/restore loader->stream before/after TT_Vary_Get_Glyph_Deltas now. (TT_LOADER_SET_PP): New macro to calculate and set the four phantom points. (TT_Process_Composite_Component, TT_Process_Composite_Glyph, load_truetype_glyph): Refactor load_truetype_glyph into these three functions. Never set exec->glyphSize to 0. (close #13107) Forget glyph frame before calling TT_Process_Simple_Glyph. (TT_Load_Glyph, load_sbit_image, tt_loader_init): Refactor TT_Load_Glyph into these three functions. Set various fields of `glyph' here, instead of in load_truetype_glyph and compute_glyph_metrics.

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
diff --git a/ChangeLog b/ChangeLog
index 6f8f9bf..22328c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+2005-08-16  Chia I Wu  <b90201047@ntu.edu.tw>
+
+	* src/truetype/ttinterp.c, src/truetype/ttinterp.h: Remove original
+	TT_Done_Context and rename TT_Destroy_Context to TT_Done_Context with
+	slight changes.
+
+	* src/truetype/ttobjs.h (tt_slot_init): New function.
+
+	* src/truetype/ttobjs.c (tt_driver_init): Initialize execution context
+	here.
+	(tt_slot_init): New function to create extra points for the internal
+	glyph loader. We then use it directly, instead of face's glyph loader,
+	when loading glyph.
+
+	* src/truetype/ttdriver.c: Use tt_slot_init for glyph slot
+	initialization.
+	(TT_Load_Glyph): Load flag dependencies are handled here.
+	Return error if size is NULL.
+
+	* src/truetype/ttgload.c: Heavy cleanup and refactor.
+	(TT_Hint_Glyph): New funcion to hint a zone, prepared by caller.
+	(TT_Process_Simple_Glyph): Use loader->pp's instead of recalculating.
+	Use TT_Hint_Glyph.
+	No need to save/restore loader->stream before/after
+	TT_Vary_Get_Glyph_Deltas now.
+	(TT_LOADER_SET_PP): New macro to calculate and set the four phantom points.
+	(TT_Process_Composite_Component, TT_Process_Composite_Glyph,
+	load_truetype_glyph): Refactor load_truetype_glyph into these three functions.
+	Never set exec->glyphSize to 0. (close #13107)
+	Forget glyph frame before calling TT_Process_Simple_Glyph.
+	(TT_Load_Glyph, load_sbit_image, tt_loader_init): Refactor TT_Load_Glyph into
+	these three functions.
+	Set various fields of `glyph' here, instead of in load_truetype_glyph
+	and compute_glyph_metrics.
+
 2005-08-08  Werner Lemberg  <wl@gnu.org>
 
 	* docs/INSTALL.ANY: Updated.
diff --git a/src/truetype/ttdriver.c b/src/truetype/ttdriver.c
index 1511e26..32803f6 100644
--- a/src/truetype/ttdriver.c
+++ b/src/truetype/ttdriver.c
@@ -283,25 +283,14 @@
     if ( !slot )
       return TT_Err_Invalid_Slot_Handle;
 
-    /* check whether we want a scaled outline or bitmap */
-    if ( !size )
-      load_flags |= FT_LOAD_NO_SCALE | FT_LOAD_NO_HINTING;
+    if ( !size || !size->ttmetrics.valid )
+      return TT_Err_Invalid_Size_Handle;
 
-    if ( load_flags & FT_LOAD_NO_SCALE )
-      size = NULL;
-
-    /* reset the size object if necessary */
-    if ( size )
+    if ( load_flags & ( FT_LOAD_NO_RECURSE | FT_LOAD_NO_SCALE ) )
     {
-      /* these two object must have the same parent */
-      if ( size->root.face != slot->face )
-        return TT_Err_Invalid_Face_Handle;
-
-      if ( !size->ttmetrics.valid )
-      {
-        if ( FT_SET_ERROR( tt_size_reset( size ) ) )
-          return error;
-      }
+      load_flags |= FT_LOAD_NO_HINTING |
+                    FT_LOAD_NO_BITMAP  |
+                    FT_LOAD_NO_SCALE;
     }
 
     /* now load the glyph outline if necessary */
@@ -409,8 +398,8 @@
     tt_face_done,
     tt_size_init,
     tt_size_done,
-    0,                      /* FT_Slot_InitFunc        */
-    0,                      /* FT_Slot_DoneFunc        */
+    tt_slot_init,
+    0,                      /* FT_Slot_DoneFunc */
 
     Set_Char_Sizes,
     Set_Pixel_Sizes,
diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c
index 2655958..c3dbcfd 100644
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@@ -312,13 +312,6 @@
   }
 
 
-#define cur_to_org( n, zone ) \
-          FT_ARRAY_COPY( (zone)->org, (zone)->cur, (n) )
-
-#define org_to_cur( n, zone ) \
-          FT_ARRAY_COPY( (zone)->cur, (zone)->org, (n) )
-
-
   /*************************************************************************/
   /*                                                                       */
   /* Translates an array of coordinates.                                   */
@@ -342,21 +335,6 @@
   }
 
 
-  static void
-  tt_prepare_zone( TT_GlyphZone  zone,
-                   FT_GlyphLoad  load,
-                   FT_UInt       start_point,
-                   FT_UInt       start_contour )
-  {
-    zone->n_points   = (FT_UShort)( load->outline.n_points - start_point );
-    zone->n_contours = (FT_Short) ( load->outline.n_contours - start_contour );
-    zone->org        = load->extra_points + start_point;
-    zone->cur        = load->outline.points + start_point;
-    zone->tags       = (FT_Byte*)load->outline.tags + start_point;
-    zone->contours   = (FT_UShort*)load->outline.contours + start_contour;
-  }
-
-
 #undef  IS_HINTED
 #define IS_HINTED( flags )  ( ( flags & FT_LOAD_NO_HINTING ) == 0 )
 
@@ -439,7 +417,6 @@
     FT_Int          n_contours = load->n_contours;
     FT_Outline*     outline;
     TT_Face         face       = (TT_Face)load->face;
-    TT_GlyphSlot    slot       = (TT_GlyphSlot)load->glyph;
     FT_UShort       n_ins;
     FT_Int          n, n_points;
     FT_Int          byte_len   = load->byte_len;
@@ -451,6 +428,11 @@
     FT_Short        *cont, *cont_limit;
 
 
+    /* check that we can add the contours to the glyph */
+    error = FT_GlyphLoader_CheckPoints( gloader, 0, n_contours );
+    if ( error )
+      goto Fail;
+
     /* reading the contours' endpoints & number of points */
     cont       = gloader->current.outline.contours;
     cont_limit = cont + n_contours;
@@ -467,6 +449,7 @@
     if ( n_contours > 0 )
       n_points = cont[-1] + 1;
 
+    /* note that we will add four phantom points later */
     error = FT_GlyphLoader_CheckPoints( gloader, n_points + 4, 0 );
     if ( error )
       goto Fail;
@@ -479,8 +462,8 @@
         goto Invalid_Outline;
 
     /* reading the bytecode instructions */
-    slot->control_len  = 0;
-    slot->control_data = 0;
+    load->glyph->control_len  = 0;
+    load->glyph->control_data = 0;
 
     n_ins = FT_GET_USHORT();
 
@@ -503,14 +486,12 @@
 
 #ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
 
-    if ( ( load->load_flags                        &
-         ( FT_LOAD_NO_SCALE | FT_LOAD_NO_HINTING ) ) == 0 &&
-           load->instructions )
+    if ( IS_HINTED( load->load_flags ) )
     {
-      slot->control_len  = n_ins;
-      slot->control_data = load->instructions;
+      load->glyph->control_len  = n_ins;
+      load->glyph->control_data = load->exec->glyphIns;
 
-      FT_MEM_COPY( load->instructions, stream->cursor, (FT_Long)n_ins );
+      FT_MEM_COPY( load->exec->glyphIns, stream->cursor, (FT_Long)n_ins );
     }
 
 #endif /* TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
@@ -723,6 +704,7 @@
     gloader->current.num_subglyphs = num_subglyphs;
 
 #ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+
     {
       /* we must undo the FT_FRAME_ENTER in order to point to the */
       /* composite instructions, if we find some.               */
@@ -731,6 +713,7 @@
       loader->ins_pos = (FT_ULong)( FT_STREAM_POS() +
                                     stream->cursor - stream->limit );
     }
+
 #endif
 
     loader->byte_len = byte_len;
@@ -755,106 +738,156 @@
   }
 
 
+  static void
+  tt_prepare_zone( TT_GlyphZone  zone,
+                   FT_GlyphLoad  load,
+                   FT_UInt       start_point,
+                   FT_UInt       start_contour )
+  {
+    zone->n_points   = (FT_UShort)( load->outline.n_points - start_point );
+    zone->n_contours = (FT_Short) ( load->outline.n_contours - start_contour );
+    zone->org        = load->extra_points + start_point;
+    zone->cur        = load->outline.points + start_point;
+    zone->tags       = (FT_Byte*)load->outline.tags + start_point;
+    zone->contours   = (FT_UShort*)load->outline.contours + start_contour;
+  }
+
+
   /*************************************************************************/
   /*                                                                       */
   /* <Function>                                                            */
-  /*    TT_Process_Simple_Glyph                                            */
+  /*    TT_Hint_Glyph                                                      */
   /*                                                                       */
   /* <Description>                                                         */
-  /*    Once a simple glyph has been loaded, it needs to be processed.     */
-  /*    Usually, this means scaling and hinting through bytecode           */
-  /*    interpretation.                                                    */
+  /*    Hint the glyph using the zone prepared by the caller.  Note that   */
+  /*    the zone is supposed to include four phantom points.               */
   /*                                                                       */
+#define cur_to_org( n, zone ) \
+          FT_ARRAY_COPY( (zone)->org, (zone)->cur, (n) )
   static FT_Error
-  TT_Process_Simple_Glyph( TT_Loader  load,
-                           FT_Bool    debug )
+  TT_Hint_Glyph( TT_Loader     loader,
+                 FT_Bool       is_composite )
   {
-    FT_GlyphLoader  gloader  = load->gloader;
-    FT_Outline*     outline  = &gloader->current.outline;
-    FT_UInt         n_points = outline->n_points;
+    TT_GlyphZone  zone = &loader->zone;
+    FT_Pos        origin;
+
 #ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-    FT_UInt         n_ins;
-#endif
-    TT_GlyphZone    zone     = &load->zone;
-    FT_Error        error    = TT_Err_Ok;
 
-    FT_UNUSED( debug );  /* used by truetype interpreter only */
+    FT_UInt       n_ins;
+
+
+    n_ins = loader->glyph->control_len;
 
+#endif
+
+    origin = zone->cur[zone->n_points - 4].x;
+    origin = FT_PIX_ROUND( origin ) - origin;
+    if ( origin )
+      translate_array( zone->n_points, zone->cur, origin, 0 );
 
 #ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-    n_ins = load->glyph->control_len;
+
+    /* save original point positioin in org */
+    if ( n_ins > 0 )
+      cur_to_org( zone->n_points, zone );
+
 #endif
 
-    /* add shadow points */
+    /* round pp2 and pp4 */
+    zone->cur[zone->n_points - 3].x = FT_PIX_ROUND( zone->cur[zone->n_points - 3].x );
+    zone->cur[zone->n_points - 1].y = FT_PIX_ROUND( zone->cur[zone->n_points - 1].y );
+
+#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+
+    if ( n_ins > 0 )
+    {
+      FT_Bool   debug;
+      FT_Error  error;
+
+
+      error = TT_Set_CodeRange( loader->exec, tt_coderange_glyph,
+                                loader->exec->glyphIns, n_ins );
+      if ( error )
+        return error;
+
+      loader->exec->is_composite     = is_composite;
+      loader->exec->pts              = *zone;
+
+      debug = !( loader->load_flags & FT_LOAD_NO_SCALE ) &&
+              ( (TT_Size)loader->size )->debug;
+
+      error = TT_Run_Context( loader->exec, debug );
+      if ( error && loader->exec->pedantic_hinting )
+        return error;
+    }
 
-    /* Add two horizontal shadow points at n and n+1.   */
-    /* We need the left side bearing and advance width. */
-    /* Add two vertical shadow points at n+2 and n+3.   */
-    /* We need the top side bearing and advance height. */
+#endif
 
+    /* save glyph phantom points */
+    if ( !loader->preserve_pps )
     {
-      FT_Vector*  pp1;
-      FT_Vector*  pp2;
-      FT_Vector*  pp3;
-      FT_Vector*  pp4;
-
-
-      /* pp1 = xMin - lsb */
-      pp1    = outline->points + n_points;
-      pp1->x = load->bbox.xMin - load->left_bearing;
-      pp1->y = 0;
-
-      /* pp2 = pp1 + aw */
-      pp2    = pp1 + 1;
-      pp2->x = pp1->x + load->advance;
-      pp2->y = 0;
-
-      /* pp3 = top side bearing */
-      pp3    = pp1 + 2;
-      pp3->x = 0;
-      pp3->y = load->top_bearing + load->bbox.yMax;
-
-      /* pp4 = pp3 - ah */
-      pp4    = pp1 + 3;
-      pp4->x = 0;
-      pp4->y = pp3->y - load->vadvance;
-
-      outline->tags[n_points    ] = 0;
-      outline->tags[n_points + 1] = 0;
-      outline->tags[n_points + 2] = 0;
-      outline->tags[n_points + 3] = 0;
+      loader->pp1 = zone->cur[zone->n_points - 4];
+      loader->pp2 = zone->cur[zone->n_points - 3];
+      loader->pp3 = zone->cur[zone->n_points - 2];
+      loader->pp4 = zone->cur[zone->n_points - 1];
     }
 
-    /* Note that we return four more points that are not */
-    /* part of the glyph outline.                        */
+    return TT_Err_Ok;
+  }
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    TT_Process_Simple_Glyph                                            */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Once a simple glyph has been loaded, it needs to be processed.     */
+  /*    Usually, this means scaling and hinting through bytecode           */
+  /*    interpretation.                                                    */
+  /*                                                                       */
+  static FT_Error
+  TT_Process_Simple_Glyph( TT_Loader  loader )
+  {
+    FT_GlyphLoader  gloader  = loader->gloader;
+    FT_Error        error    = TT_Err_Ok;
+    FT_Outline*     outline;
+    FT_UInt         n_points;
+
+
+    outline = &gloader->current.outline;
+    n_points = outline->n_points;
+
+    /* set phantom points */
+
+    outline->points[n_points    ] = loader->pp1;
+    outline->points[n_points + 1] = loader->pp2;
+    outline->points[n_points + 2] = loader->pp3;
+    outline->points[n_points + 3] = loader->pp4;
+
+    outline->tags[n_points    ] = 0;
+    outline->tags[n_points + 1] = 0;
+    outline->tags[n_points + 2] = 0;
+    outline->tags[n_points + 3] = 0;
 
     n_points += 4;
 
 #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
 
-    if ( ((TT_Face)load->face)->doblend )
+    if ( ((TT_Face)loader->face)->doblend )
     {
       /* Deltas apply to the unscaled data. */
       FT_Vector*    deltas;
-      FT_Memory     memory       = load->face->memory;
-      FT_StreamRec  saved_stream = *(load->stream);
+      FT_Memory     memory = loader->face->memory;
       FT_UInt       i;
 
 
-      /* TT_Vary_Get_Glyph_Deltas uses a frame, thus we have to save */
-      /* (and restore) the current one                               */
-      load->stream->cursor = 0;
-      load->stream->limit  = 0;
-
-      error = TT_Vary_Get_Glyph_Deltas( (TT_Face)(load->face),
-                                        load->glyph_index,
+      error = TT_Vary_Get_Glyph_Deltas( (TT_Face)(loader->face),
+                                        loader->glyph_index,
                                         &deltas,
                                         n_points );
-
-      *(load->stream) = saved_stream;
-
       if ( error )
-        goto Exit;
+        return error;
 
       for ( i = 0; i < n_points; ++i )
       {
@@ -867,84 +900,290 @@
 
 #endif /* TT_CONFIG_OPTION_GX_VAR_SUPPORT */
 
-    /* set up zone for hinting */
-    tt_prepare_zone( zone, &gloader->current, 0, 0 );
-
-    /* eventually scale the glyph */
-    if ( !( load->load_flags & FT_LOAD_NO_SCALE ) )
+    /* scale the glyph */
+    if ( ( loader->load_flags & FT_LOAD_NO_SCALE ) == 0 )
     {
-      FT_Vector*  vec     = zone->cur;
-      FT_Vector*  limit   = vec + n_points;
-      FT_Fixed    x_scale = ((TT_Size)load->size)->metrics.x_scale;
-      FT_Fixed    y_scale = ((TT_Size)load->size)->metrics.y_scale;
+      FT_Vector*  vec     = outline->points;
+      FT_Vector*  limit   = outline->points + n_points;
+      FT_Fixed    x_scale = ((TT_Size)loader->size)->metrics.x_scale;
+      FT_Fixed    y_scale = ((TT_Size)loader->size)->metrics.y_scale;
+
 
-      /* first scale the glyph points */
       for ( ; vec < limit; vec++ )
       {
         vec->x = FT_MulFix( vec->x, x_scale );
         vec->y = FT_MulFix( vec->y, y_scale );
       }
+
+      loader->pp1 = outline->points[n_points - 4];
+      loader->pp2 = outline->points[n_points - 3];
+      loader->pp3 = outline->points[n_points - 2];
+      loader->pp4 = outline->points[n_points - 1];
     }
 
-    cur_to_org( n_points, zone );
+    if ( IS_HINTED( loader->load_flags ) )
+    {
+      tt_prepare_zone( &loader->zone, &gloader->current, 0, 0 );
+      loader->zone.n_points += 4;
 
-    /* eventually hint the glyph */
-    if ( IS_HINTED( load->load_flags ) )
+      error = TT_Hint_Glyph( loader, 0 );
+    }
+
+    return error;
+  }
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    TT_Process_Composite_Component                                     */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Once a composite component has been loaded, it needs to be         */
+  /*    processed.  Usually, this means transforming and translating.      */
+  /*                                                                       */
+  static FT_Error
+  TT_Process_Composite_Component( TT_Loader    loader,
+                                  FT_SubGlyph  subglyph,
+                                  FT_UInt      start_point,
+                                  FT_UInt      num_base_points )
+  {
+    FT_GlyphLoader  gloader    = loader->gloader;
+    FT_Vector*      base_vec   = gloader->base.outline.points;
+    FT_UInt         num_points = gloader->base.outline.n_points;
+    FT_Bool         have_scale;
+    FT_Pos          x, y;
+    
+
+    have_scale = ( subglyph->flags & ( WE_HAVE_A_SCALE     |
+                                       WE_HAVE_AN_XY_SCALE |
+                                       WE_HAVE_A_2X2       ) );
+
+    /* perform the transform required for this subglyph */
+    if ( have_scale )
     {
-      FT_Pos  x = zone->org[n_points-4].x;
+      FT_UInt i;
 
 
-      x = FT_PIX_ROUND( x ) - x;
-      translate_array( n_points, zone->org, x, 0 );
+      for ( i = num_base_points; i < num_points; i++ )
+        FT_Vector_Transform( base_vec + i, &subglyph->transform );
+    }
 
-      org_to_cur( n_points, zone );
+    /* get offset */
+    if ( !( subglyph->flags & ARGS_ARE_XY_VALUES ) )
+    {
+      FT_UInt     k = subglyph->arg1;
+      FT_UInt     l = subglyph->arg2;
+      FT_Vector*  p1;
+      FT_Vector*  p2;
 
-      zone->cur[n_points - 3].x = FT_PIX_ROUND( zone->cur[n_points - 3].x );
-      zone->cur[n_points - 1].y = FT_PIX_ROUND( zone->cur[n_points - 1].y );
 
-#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+      /* match l-th point of the newly loaded component to the k-th point of  */
+      /* the previously loaded components.                                    */
 
-      /* now consider hinting */
-      if ( n_ins > 0 )
+      /* change to the point numbers used by our outline */
+      k += start_point;
+      l += num_base_points;
+      if ( k >= (FT_UInt)num_base_points ||
+           l >= (FT_UInt)num_points  )
       {
-        error = TT_Set_CodeRange( load->exec, tt_coderange_glyph,
-                                  load->exec->glyphIns, n_ins );
-        if ( error )
-          goto Exit;
+        return TT_Err_Invalid_Composite;
+      }
 
-        load->exec->is_composite     = FALSE;
-        load->exec->pts              = *zone;
-        load->exec->pts.n_points    += 4;
+      p1 = gloader->base.outline.points + k;
+      p2 = gloader->base.outline.points + l;
 
-        error = TT_Run_Context( load->exec, debug );
-        if ( error && load->exec->pedantic_hinting )
-          goto Exit;
+      x = p1->x - p2->x;
+      y = p1->y - p2->y;
+    }
+    else
+    {
+      x = subglyph->arg1;
+      y = subglyph->arg2;
+
+      if ( !x && !y )
+        return TT_Err_Ok;
+
+/* Use a default value dependent on                                     */
+/* TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED.  This is useful for old TT */
+/* fonts which don't set the xxx_COMPONENT_OFFSET bit.                  */
+
+      if ( have_scale &&
+#ifdef TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED
+           !( subglyph->flags & UNSCALED_COMPONENT_OFFSET ) )
+#else
+            ( subglyph->flags & SCALED_COMPONENT_OFFSET ) )
+#endif
+      {
+#if 0
+
+/*************************************************************************/
+/*                                                                       */
+/* This algorithm is what Apple documents.  But it doesn't work.         */
+/*                                                                       */
+        int  a = subglyph->transform.xx > 0 ?  subglyph->transform.xx
+                                            : -subglyph->transform.xx;
+        int  b = subglyph->transform.yx > 0 ?  subglyph->transform.yx
+                                            : -subglyph->transform.yx;
+        int  c = subglyph->transform.xy > 0 ?  subglyph->transform.xy
+                                            : -subglyph->transform.xy;
+        int  d = subglyph->transform.yy > 0 ? subglyph->transform.yy
+                                            : -subglyph->transform.yy;
+        int  m = a > b ? a : b;
+        int  n = c > d ? c : d;
+
+
+        if ( a - b <= 33 && a - b >= -33 )
+          m *= 2;
+        if ( c - d <= 33 && c - d >= -33 )
+          n *= 2;
+        x = FT_MulFix( x, m );
+        y = FT_MulFix( y, n );
+
+#else /* 0 */
+
+/*************************************************************************/
+/*                                                                       */
+/* This algorithm is a guess and works much better than the above.       */
+/*                                                                       */
+        FT_Fixed  mac_xscale = FT_SqrtFixed(
+                                 FT_MulFix( subglyph->transform.xx,
+                                            subglyph->transform.xx ) +
+                                 FT_MulFix( subglyph->transform.xy,
+                                            subglyph->transform.xy) );
+        FT_Fixed  mac_yscale = FT_SqrtFixed(
+                                 FT_MulFix( subglyph->transform.yy,
+                                            subglyph->transform.yy ) +
+                                 FT_MulFix( subglyph->transform.yx,
+                                            subglyph->transform.yx ) );
+
+
+        x = FT_MulFix( x, mac_xscale );
+        y = FT_MulFix( y, mac_yscale );
+
+#endif /* 0 */
 
-        error = TT_Err_Ok;  /* ignore bytecode errors in non-pedantic mode */
       }
 
-#endif /* TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
+      if ( !( loader->load_flags & FT_LOAD_NO_SCALE ) )
+      {
+        FT_Fixed    x_scale = ((TT_Size)loader->size)->metrics.x_scale;
+        FT_Fixed    y_scale = ((TT_Size)loader->size)->metrics.y_scale;
 
+
+        x = FT_MulFix( x, x_scale );
+        y = FT_MulFix( y, y_scale );
+
+        if ( subglyph->flags & ROUND_XY_TO_GRID )
+        {
+          x = FT_PIX_ROUND( x );
+          y = FT_PIX_ROUND( y );
+        }
+      }
     }
 
-    /* save glyph phantom points */
-    if ( !load->preserve_pps )
+    if ( x || y )
+      translate_array( num_points - num_base_points,
+                       base_vec + num_base_points,
+                       x, y );
+
+    return TT_Err_Ok;
+  }
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    TT_Process_Composite_Glyph                                         */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    This is slightly different from TT_Process_Simple_Glyph, in that   */
+  /*    it's sole purpose is to hint the glyph.  Thus this function is     */
+  /*    only available when bytecode interpreter is enabled.               */
+  /*                                                                       */
+  static FT_Error
+  TT_Process_Composite_Glyph( TT_Loader  loader,
+                              FT_UInt    start_point,
+                              FT_UInt    start_contour )
+  {
+    FT_Error     error;
+    FT_Outline*  outline;
+
+
+    outline = &loader->gloader->base.outline;
+
+    /* make room for phantom points */
+    error = FT_GlyphLoader_CheckPoints( loader->gloader, outline->n_points + 4, 0 );
+    if ( error )
+      return error;
+
+    outline->points[outline->n_points    ] = loader->pp1;
+    outline->points[outline->n_points + 1] = loader->pp2;
+    outline->points[outline->n_points + 2] = loader->pp3;
+    outline->points[outline->n_points + 3] = loader->pp4;
+
+    outline->tags[outline->n_points    ] = 0;
+    outline->tags[outline->n_points + 1] = 0;
+    outline->tags[outline->n_points + 2] = 0;
+    outline->tags[outline->n_points + 3] = 0;
+
+#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+
     {
-      load->pp1 = zone->cur[n_points - 4];
-      load->pp2 = zone->cur[n_points - 3];
-      load->pp3 = zone->cur[n_points - 2];
-      load->pp4 = zone->cur[n_points - 1];
+      FT_Stream  stream = loader->stream;
+      FT_UShort  n_ins;
+
+
+      /* TT_Load_Composite_Glyph only gives us the offset of instructions */
+      /* so we read them here */
+      if ( FT_STREAM_SEEK( loader->ins_pos ) ||
+           FT_READ_USHORT( n_ins ) )
+        return error;
+
+      FT_TRACE5(( "  Instructions size = %d\n", n_ins ));
+
+      /* check it */
+      if ( n_ins > ((TT_Face)loader->face)->max_profile.maxSizeOfInstructions )
+      {
+        FT_TRACE0(( "Too many instructions (%d)\n", n_ins ));
+
+        return TT_Err_Too_Many_Hints;
+      }
+      else if ( n_ins == 0 )
+        return TT_Err_Ok;
+
+      if ( FT_STREAM_READ( loader->exec->glyphIns, n_ins ) )
+        return error;
+
+      loader->glyph->control_data = loader->exec->glyphIns;
+      loader->glyph->control_len  = n_ins;
     }
 
-#if defined( TT_CONFIG_OPTION_BYTECODE_INTERPRETER ) || \
-    defined( TT_CONFIG_OPTION_GX_VAR_SUPPORT )
-  Exit:
 #endif
 
-    return error;
+    tt_prepare_zone( &loader->zone, &loader->gloader->base, start_point, start_contour );
+    loader->zone.n_points += 4;
+
+    return TT_Hint_Glyph( loader, 1 );
   }
 
 
+  /* Calculate the four phantom points.                     */
+  /* The first two stand for horizontal origin and advance. */
+  /* The last two stand for vertical origin and advance.    */
+#define TT_LOADER_SET_PP( loader )                                          \
+          do {                                                              \
+            (loader)->pp1.x = (loader)->bbox.xMin - (loader)->left_bearing; \
+            (loader)->pp1.y = 0;                                            \
+            (loader)->pp2.x = (loader)->pp1.x + (loader)->advance;          \
+            (loader)->pp2.y = 0;                                            \
+            (loader)->pp3.x = 0;                                            \
+            (loader)->pp3.y = (loader)->top_bearing + (loader)->bbox.yMax;  \
+            (loader)->pp4.x = 0;                                            \
+            (loader)->pp4.y = (loader)->pp3.y - (loader)->vadvance;         \
+          } while ( 0 )
+
+
   /*************************************************************************/
   /*                                                                       */
   /* <Function>                                                            */
@@ -959,28 +1198,25 @@
                        FT_UInt    glyph_index,
                        FT_UInt    recurse_count )
   {
-
-#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-    FT_Stream       stream = loader->stream;
-#endif
-
     FT_Error        error;
-    TT_Face         face = (TT_Face)loader->face;
-    FT_ULong        offset;
-    FT_Int          contours_count;
-    FT_UInt         num_points, count;
     FT_Fixed        x_scale, y_scale;
-    FT_GlyphLoader  gloader = loader->gloader;
+    FT_ULong        offset;
+    TT_Face         face         = (TT_Face)loader->face;
+    FT_GlyphLoader  gloader      = loader->gloader;
     FT_Bool         opened_frame = 0;
 
+#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
+
+    FT_Vector*      deltas       = NULL;
+
+#endif
+
 #ifdef FT_CONFIG_OPTION_INCREMENTAL
+
     FT_StreamRec    inc_stream;
     FT_Data         glyph_data;
     FT_Bool         glyph_data_loaded = 0;
-#endif
 
-#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
-    FT_Vector      *deltas;
 #endif
 
 
@@ -998,15 +1234,17 @@
     }
 
     loader->glyph_index = glyph_index;
-    num_points          = 0;
 
-    x_scale = 0x10000L;
-    y_scale = 0x10000L;
     if ( ( loader->load_flags & FT_LOAD_NO_SCALE ) == 0 )
     {
       x_scale = ((TT_Size)loader->size)->metrics.x_scale;
       y_scale = ((TT_Size)loader->size)->metrics.y_scale;
     }
+    else
+    {
+      x_scale = 0x10000L;
+      y_scale = 0x10000L;
+    }
 
     /* get metrics, horizontal and vertical */
     {
@@ -1045,16 +1283,9 @@
           goto Exit;
         left_bearing  = (FT_Short)metrics.bearing_x;
         advance_width = (FT_UShort)metrics.advance;
-      }
-
 # if 0
-      /* GWW: Do I do the same for vertical metrics ??? */
-      if ( face->root.internal->incremental_interface &&
-           face->root.internal->incremental_interface->funcs->get_glyph_metrics )
-      {
-        FT_Incremental_MetricsRec  metrics;
-
 
+      /* GWW: Do I do the same for vertical metrics ??? */
         metrics.bearing_x = 0;
         metrics.bearing_y = top_bearing;
         metrics.advance = advance_height;
@@ -1065,9 +1296,11 @@
           goto Exit;
         top_bearing  = (FT_Short)metrics.bearing_y;
         advance_height = (FT_UShort)metrics.advance;
-      }
+
 # endif
 
+      }
+
 #endif /* FT_CONFIG_OPTION_INCREMENTAL */
 
       loader->left_bearing = left_bearing;
@@ -1082,16 +1315,15 @@
       }
     }
 
+    /* Set `offset' to the start of the glyph relative to the start of */
+    /* the 'glyf' table, and `byte_len' to the length of the glyph in  */
+    /* bytes.                                                          */
+
 #ifdef FT_CONFIG_OPTION_INCREMENTAL
 
-    /* Set `offset' to the start of the glyph program relative to the  */
-    /* start of the 'glyf' table, and `count' to the length of the     */
-    /* glyph program in bytes.                                         */
-    /*                                                                 */
     /* If we are loading glyph data via the incremental interface, set */
     /* the loader stream to a memory stream reading the data returned  */
     /* by the interface.                                               */
-
     if ( face->root.internal->incremental_interface )
     {
       error = face->root.internal->incremental_interface->funcs->get_glyph_data(
@@ -1102,7 +1334,7 @@
 
       glyph_data_loaded = 1;
       offset            = 0;
-      count             = glyph_data.length;
+      byte_len          = glyph_data.length;
 
       FT_MEM_ZERO( &inc_stream, sizeof ( inc_stream ) );
       FT_Stream_OpenMemory( &inc_stream,
@@ -1114,23 +1346,21 @@
 
 #endif /* FT_CONFIG_OPTION_INCREMENTAL */
 
-    offset = tt_face_get_location( face, glyph_index, &count );
+      offset = tt_face_get_location( face, glyph_index, (FT_UInt*)&loader->byte_len );
 
-    if ( count == 0 )
+    if ( loader->byte_len == 0 )
     {
-      /* as described by Frederic Loyer, these are spaces, and */
-      /* not the unknown glyph.                                */
+      /* as described by Frederic Loyer, these are spaces or */
+      /* the unknown glyph.                                  */
       loader->bbox.xMin = 0;
       loader->bbox.xMax = 0;
       loader->bbox.yMin = 0;
       loader->bbox.yMax = 0;
 
-      loader->pp1.x = 0;
-      loader->pp2.x = loader->advance;
-      loader->pp3.y = 0;
-      loader->pp4.y = loader->pp3.y-loader->vadvance;
+      TT_LOADER_SET_PP( loader );
 
 #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
+
       if ( ((TT_Face)(loader->face))->doblend )
       {
         /* this must be done before scaling */
@@ -1149,31 +1379,24 @@
 
         FT_FREE( deltas );
       }
+
 #endif
 
       if ( ( loader->load_flags & FT_LOAD_NO_SCALE ) == 0 )
       {
+        loader->pp1.x = FT_MulFix( loader->pp1.x, x_scale );
         loader->pp2.x = FT_MulFix( loader->pp2.x, x_scale );
+        loader->pp3.y = FT_MulFix( loader->pp3.y, y_scale );
         loader->pp4.y = FT_MulFix( loader->pp4.y, y_scale );
       }
 
-#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-
-      if ( loader->exec )
-        loader->exec->glyphSize = 0;
-
-#endif
-
       error = TT_Err_Ok;
       goto Exit;
     }
 
-    loader->byte_len = (FT_Int)count;
-
-    offset = loader->glyf_offset + offset;
-
-    /* access glyph frame */
-    error = face->access_glyph_frame( loader, glyph_index, offset, count );
+    error = face->access_glyph_frame( loader, glyph_index,
+                                      loader->glyf_offset + offset,
+                                      loader->byte_len );
     if ( error )
       goto Exit;
 
@@ -1182,21 +1405,9 @@
     /* read first glyph header */
     error = face->read_glyph_header( loader );
     if ( error )
-      goto Fail;
-
-    contours_count = loader->n_contours;
-
-    count -= 10;
-
-    loader->pp1.x = loader->bbox.xMin - loader->left_bearing;
-    loader->pp1.y = 0;
-    loader->pp2.x = loader->pp1.x + loader->advance;
-    loader->pp2.y = 0;
+      goto Exit;
 
-    loader->pp3.x = 0;
-    loader->pp3.y = loader->top_bearing + loader->bbox.yMax;
-    loader->pp4.x = 0;
-    loader->pp4.y = loader->pp3.y - loader->vadvance;
+    TT_LOADER_SET_PP( loader );
 
     /***********************************************************************/
     /***********************************************************************/
@@ -1204,70 +1415,47 @@
 
     /* if it is a simple glyph, load it */
 
-    if ( contours_count >= 0 )
+    if ( loader->n_contours >= 0 )
     {
-      /* check that we can add the contours to the glyph */
-      error = FT_GlyphLoader_CheckPoints( gloader, 0, contours_count );
-      if ( error )
-        goto Fail;
-
       error = face->read_simple_glyph( loader );
       if ( error )
-        goto Fail;
+        goto Exit;
 
-#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+      /* all data have been read */
+      face->forget_glyph_frame( loader );
+      opened_frame = 0;
 
-      {
-        TT_Size  size = (TT_Size)loader->size;
+      error = TT_Process_Simple_Glyph( loader );
+      if ( error )
+        goto Exit;
 
-
-        error = TT_Process_Simple_Glyph( loader,
-                                         (FT_Bool)( size && size->debug ) );
-      }
-
-#else
-
-      error = TT_Process_Simple_Glyph( loader, 0 );
-
-#endif
-
-      if ( error )
-        goto Fail;
-
-      FT_GlyphLoader_Add( gloader );
-
-      /* Note: We could have put the simple loader source there */
-      /*       but the code is fat enough already :-)           */
-    }
+      FT_GlyphLoader_Add( gloader );
+    }
 
     /***********************************************************************/
     /***********************************************************************/
     /***********************************************************************/
 
     /* otherwise, load a composite! */
-    else if ( contours_count == -1 )
+    else if ( loader->n_contours == -1 )
     {
-      TT_GlyphSlot  glyph = (TT_GlyphSlot)loader->glyph;
       FT_UInt       start_point;
-#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
       FT_UInt       start_contour;
       FT_ULong      ins_pos;  /* position of composite instructions, if any */
-#endif
 
 
-      /* for each subglyph, read composite header */
       start_point   = gloader->base.outline.n_points;
-#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
       start_contour = gloader->base.outline.n_contours;
-#endif
 
+      /* for each subglyph, read composite header */
       error = face->read_composite_glyph( loader );
       if ( error )
-        goto Fail;
+        goto Exit;
 
-#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+      /* store the offset of instructions */
       ins_pos = loader->ins_pos;
-#endif
+
+      /* all data we need are read */
       face->forget_glyph_frame( loader );
       opened_frame = 0;
 
@@ -1290,7 +1478,6 @@
                         gloader->current.num_subglyphs + 4 )) != 0 )
           goto Exit;
 
-        /* Note: No subglyph reallocation here, our pointers are stable. */
         subglyph = gloader->current.subglyphs + gloader->base.num_subglyphs;
         limit    = gloader->current.num_subglyphs;
 
@@ -1327,12 +1514,8 @@
       /*                                                               */
       if ( loader->load_flags & FT_LOAD_NO_RECURSE )
       {
-        /* set up remaining glyph fields */
         FT_GlyphLoader_Add( gloader );
-
-        glyph->num_subglyphs = gloader->base.num_subglyphs;
-        glyph->format        = FT_GLYPH_FORMAT_COMPOSITE;
-        glyph->subglyphs     = gloader->base.subglyphs;
+        loader->glyph->format = FT_GLYPH_FORMAT_COMPOSITE;
 
         goto Exit;
       }
@@ -1341,21 +1524,21 @@
       /*********************************************************************/
       /*********************************************************************/
 
-      /* Now, read each subglyph independently. */
       {
-        FT_Int       n, num_base_points, num_new_points;
+        FT_Int       n, num_base_points;
         FT_SubGlyph  subglyph       = 0;
 
+        FT_UInt      num_points     = start_point;
         FT_UInt      num_subglyphs  = gloader->current.num_subglyphs;
         FT_UInt      num_base_subgs = gloader->base.num_subglyphs;
 
 
         FT_GlyphLoader_Add( gloader );
 
+        /* read each subglyph independently */
         for ( n = 0; n < (FT_Int)num_subglyphs; n++ )
         {
-          FT_Vector  pp1, pp2, pp3, pp4;
-          FT_Pos     x, y;
+          FT_Vector  pp[4];
 
 
           /* Each time we call load_truetype_glyph in this loop, the   */
@@ -1364,316 +1547,83 @@
           /* pointer on each iteration.                                */
           subglyph = gloader->base.subglyphs + num_base_subgs + n;
 
-          pp1 = loader->pp1;
-          pp2 = loader->pp2;
-          pp3 = loader->pp3;
-          pp4 = loader->pp4;
+          pp[0] = loader->pp1;
+          pp[1] = loader->pp2;
+          pp[2] = loader->pp3;
+          pp[3] = loader->pp4;
 
           num_base_points = gloader->base.outline.n_points;
 
           error = load_truetype_glyph( loader, subglyph->index,
                                        recurse_count + 1 );
           if ( error )
-            goto Fail;
+            goto Exit;
 
           /* restore subglyph pointer */
           subglyph = gloader->base.subglyphs + num_base_subgs + n;
 
-          if ( subglyph->flags & USE_MY_METRICS )
-          {
-            pp1 = loader->pp1;
-            pp2 = loader->pp2;
-            pp3 = loader->pp3;
-            pp4 = loader->pp4;
-          }
-          else
+          if ( !( subglyph->flags & USE_MY_METRICS ) )
           {
-            loader->pp1 = pp1;
-            loader->pp2 = pp2;
-            loader->pp3 = pp3;
-            loader->pp4 = pp4;
+            loader->pp1 = pp[0];
+            loader->pp2 = pp[1];
+            loader->pp3 = pp[2];
+            loader->pp4 = pp[3];
           }
 
           num_points = gloader->base.outline.n_points;
 
-          num_new_points = num_points - num_base_points;
-
-          /* now perform the transform required for this subglyph */
-
-          if ( subglyph->flags & ( WE_HAVE_A_SCALE     |
-                                   WE_HAVE_AN_XY_SCALE |
-                                   WE_HAVE_A_2X2       ) )
-          {
-            FT_Vector*  cur   = gloader->base.outline.points +
-                                  num_base_points;
-            FT_Vector*  org   = gloader->base.extra_points +
-                                  num_base_points;
-            FT_Vector*  limit = cur + num_new_points;
-
-
-            for ( ; cur < limit; cur++, org++ )
-            {
-              FT_Vector_Transform( cur, &subglyph->transform );
-              FT_Vector_Transform( org, &subglyph->transform );
-            }
-          }
-
-          /* apply offset */
-
-          if ( !( subglyph->flags & ARGS_ARE_XY_VALUES ) )
-          {
-            FT_UInt     k = subglyph->arg1;
-            FT_UInt     l = subglyph->arg2;
-            FT_Vector*  p1;
-            FT_Vector*  p2;
-
-
-            if ( start_point + k >= (FT_UInt)num_base_points ||
-                               l >= (FT_UInt)num_new_points  )
-            {
-              error = TT_Err_Invalid_Composite;
-              goto Fail;
-            }
-
-            l += num_base_points;
-
-            p1 = gloader->base.outline.points + start_point + k;
-            p2 = gloader->base.outline.points + start_point + l;
-
-            x = p1->x - p2->x;
-            y = p1->y - p2->y;
-          }
-          else
-          {
-            x = subglyph->arg1;
-            y = subglyph->arg2;
-
-  /* Use a default value dependent on                                     */
-  /* TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED.  This is useful for old TT */
-  /* fonts which don't set the xxx_COMPONENT_OFFSET bit.                  */
-
-#ifdef TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED
-            if ( !( subglyph->flags & UNSCALED_COMPONENT_OFFSET ) &&
-#else
-            if (  ( subglyph->flags & SCALED_COMPONENT_OFFSET ) &&
-#endif
-                  ( subglyph->flags & ( WE_HAVE_A_SCALE     |
-                                        WE_HAVE_AN_XY_SCALE |
-                                        WE_HAVE_A_2X2       )) )
-            {
-#if 0
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* This algorithm is what Apple documents.  But it doesn't work.         */
-  /*                                                                       */
-              int  a = subglyph->transform.xx > 0 ?  subglyph->transform.xx
-                                                  : -subglyph->transform.xx;
-              int  b = subglyph->transform.yx > 0 ?  subglyph->transform.yx
-                                                  : -subglyph->transform.yx;
-              int  c = subglyph->transform.xy > 0 ?  subglyph->transform.xy
-                                                  : -subglyph->transform.xy;
-              int  d = subglyph->transform.yy > 0 ? subglyph->transform.yy
-                                                  : -subglyph->transform.yy;
-              int  m = a > b ? a : b;
-              int  n = c > d ? c : d;
-
-
-              if ( a - b <= 33 && a - b >= -33 )
-                m *= 2;
-              if ( c - d <= 33 && c - d >= -33 )
-                n *= 2;
-              x = FT_MulFix( x, m );
-              y = FT_MulFix( y, n );
-
-#else /* 0 */
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* This algorithm is a guess and works much better than the above.       */
-  /*                                                                       */
-              FT_Fixed  mac_xscale = FT_SqrtFixed(
-                                       FT_MulFix( subglyph->transform.xx,
-                                                  subglyph->transform.xx ) +
-                                       FT_MulFix( subglyph->transform.xy,
-                                                  subglyph->transform.xy) );
-              FT_Fixed  mac_yscale = FT_SqrtFixed(
-                                       FT_MulFix( subglyph->transform.yy,
-                                                  subglyph->transform.yy ) +
-                                       FT_MulFix( subglyph->transform.yx,
-                                                  subglyph->transform.yx ) );
-
-
-              x = FT_MulFix( x, mac_xscale );
-              y = FT_MulFix( y, mac_yscale );
-#endif /* 0 */
-
-            }
-
-            if ( !( loader->load_flags & FT_LOAD_NO_SCALE ) )
-            {
-              x = FT_MulFix( x, x_scale );
-              y = FT_MulFix( y, y_scale );
-
-              if ( subglyph->flags & ROUND_XY_TO_GRID )
-              {
-                x = FT_PIX_ROUND( x );
-                y = FT_PIX_ROUND( y );
-              }
-            }
-          }
-
-          if ( x || y )
-          {
-            translate_array( num_new_points,
-                             gloader->base.outline.points + num_base_points,
-                             x, y );
-
-            translate_array( num_new_points,
-                             gloader->base.extra_points + num_base_points,
-                             x, y );
-          }
+          if ( num_points == num_base_points )
+            continue;
+
+          /* gloader->base.outline consists of three part:                  */
+          /* 0 -(1)-> start_point -(2)-> num_base_points -(3)-> n_points.   */
+          /*                                                                */
+          /* (1): exist from the beginning                                  */
+          /* (2): components that have been loaded so far                   */
+          /* (3): the newly loaded component                                */
+          TT_Process_Composite_Component( loader, subglyph, start_point,
+                                          num_base_points );
         }
 
-        /*******************************************************************/
-        /*******************************************************************/
-        /*******************************************************************/
 
-        /* we have finished loading all sub-glyphs; now, look for */
-        /* instructions for this composite!                       */
+        /* process the glyph */
+        loader->ins_pos = ins_pos;
+        if ( IS_HINTED( loader->load_flags ) &&
 
 #ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
 
-        if ( num_subglyphs > 0               &&
-             loader->exec                    &&
-             ins_pos > 0                     &&
-             subglyph->flags & WE_HAVE_INSTR )
-        {
-          FT_UShort       n_ins;
-          TT_ExecContext  exec = loader->exec;
-          TT_GlyphZone    pts;
-          FT_Vector*      pp1;
-
-
-          /* read size of instructions */
-          if ( FT_STREAM_SEEK( ins_pos ) ||
-               FT_READ_USHORT( n_ins ) )
-            goto Fail;
-          FT_TRACE5(( "  Instructions size = %d\n", n_ins ));
-
-          /* in some fonts? */
-          if ( n_ins == 0xFFFFU )
-            n_ins = 0;
+             subglyph->flags & WE_HAVE_INSTR &&
 
-          /* check it */
-          if ( n_ins > face->max_profile.maxSizeOfInstructions )
-          {
-            FT_TRACE0(( "Too many instructions (%d) in composite glyph %ld\n",
-                        n_ins, subglyph->index ));
-            error = TT_Err_Too_Many_Hints;
-            goto Fail;
-          }
-
-          /* read the instructions */
-          if ( FT_STREAM_READ( exec->glyphIns, n_ins ) )
-            goto Fail;
-
-          glyph->control_data = exec->glyphIns;
-          glyph->control_len  = n_ins;
-
-          error = TT_Set_CodeRange( exec,
-                                    tt_coderange_glyph,
-                                    exec->glyphIns,
-                                    n_ins );
-          if ( error )
-            goto Fail;
-
-          error = FT_GlyphLoader_CheckPoints( gloader, num_points + 4, 0 );
-          if ( error )
-            goto Fail;
-
-          /* prepare the execution context */
-          tt_prepare_zone( &exec->pts, &gloader->base,
-                           start_point, start_contour );
-          pts = &exec->pts;
-
-          pts->n_points   = (short)( num_points + 4 );
-          pts->n_contours = gloader->base.outline.n_contours;
-
-          /* add phantom points */
-          pp1    = pts->cur + num_points;
-          pp1[0] = loader->pp1;
-          pp1[1] = loader->pp2;
-          pp1[2] = loader->pp3;
-          pp1[3] = loader->pp4;
-
-          pts->tags[num_points    ] = 0;
-          pts->tags[num_points + 1] = 0;
-          pts->tags[num_points + 2] = 0;
-          pts->tags[num_points + 3] = 0;
-
-          /* if hinting, round the phantom points */
-          if ( IS_HINTED( loader->load_flags ) )
-          {
-            pp1[0].x = FT_PIX_ROUND( loader->pp1.x );
-            pp1[1].x = FT_PIX_ROUND( loader->pp2.x );
-            pp1[2].y = FT_PIX_ROUND( loader->pp3.y );
-            pp1[3].y = FT_PIX_ROUND( loader->pp4.y );
-          }
-
-          {
-            FT_UInt  k;
-
-
-            for ( k = 0; k < num_points; k++ )
-              pts->tags[k] &= FT_CURVE_TAG_ON;
-          }
-
-          cur_to_org( num_points + 4, pts );
-
-          /* now consider hinting */
-          if ( IS_HINTED( loader->load_flags ) && n_ins > 0 )
-          {
-            exec->is_composite     = TRUE;
-            error = TT_Run_Context( exec, ((TT_Size)loader->size)->debug );
-            if ( error && exec->pedantic_hinting )
-              goto Fail;
-          }
-
-          /* save glyph origin and advance points */
-          loader->pp1 = pp1[0];
-          loader->pp2 = pp1[1];
-          loader->pp3 = pp1[2];
-          loader->pp4 = pp1[3];
-        }
+#endif
 
-#endif /* TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
+             num_points > start_point )
+          TT_Process_Composite_Glyph( loader, start_point, start_contour );
 
       }
-      /* end of composite loading */
     }
     else
     {
       /* invalid composite count ( negative but not -1 ) */
       error = TT_Err_Invalid_Outline;
-      goto Fail;
+      goto Exit;
     }
 
     /***********************************************************************/
     /***********************************************************************/
     /***********************************************************************/
 
-  Fail:
+  Exit:
+
     if ( opened_frame )
       face->forget_glyph_frame( loader );
 
-  Exit:
-
 #ifdef FT_CONFIG_OPTION_INCREMENTAL
+
     if ( glyph_data_loaded )
       face->root.internal->incremental_interface->funcs->free_glyph_data(
         face->root.internal->incremental_interface->object,
         &glyph_data );
+
 #endif
 
     return error;
@@ -1696,18 +1646,7 @@
       y_scale = size->root.metrics.y_scale;
 
     if ( glyph->format != FT_GLYPH_FORMAT_COMPOSITE )
-    {
-      glyph->outline.flags &= ~FT_OUTLINE_SINGLE_PASS;
-
-      /* copy outline to our glyph slot */
-      FT_GlyphLoader_CopyPoints( glyph->internal->loader, loader->gloader );
-      glyph->outline = glyph->internal->loader->base.outline;
-
-      /* translate array so that (0,0) is the glyph's origin */
-      FT_Outline_Translate( &glyph->outline, -loader->pp1.x, 0 );
-
       FT_Outline_Get_CBox( &glyph->outline, &bbox );
-    }
     else
       bbox = loader->bbox;
 
@@ -1852,7 +1791,7 @@
     }
 
     /* adjust advance width to the value contained in the hdmx table */
-    if ( !face->postscript.isFixedPitch && size &&
+    if ( !face->postscript.isFixedPitch &&
          IS_HINTED( loader->load_flags )        )
     {
       FT_Byte*  widthp = Get_Advance_WidthPtr( face,
@@ -1875,6 +1814,153 @@
   }
 
 
+#ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
+  static FT_Error
+  load_sbit_image( TT_Size       size,
+                   TT_GlyphSlot  glyph,
+                   FT_UInt       glyph_index,
+                   FT_Int32      load_flags )
+  {
+    TT_Face             face;
+    SFNT_Service        sfnt;
+    FT_Stream           stream;
+    FT_Error            error;
+    TT_SBit_MetricsRec  metrics;
+
+    face   = (TT_Face)glyph->face;
+    sfnt   = (SFNT_Service)face->sfnt;
+    stream = face->root.stream;
+
+    error = sfnt->load_sbit_image( face,
+                                   (FT_ULong)size->strike_index,
+                                   glyph_index,
+                                   (FT_Int)load_flags,
+                                   stream,
+                                   &glyph->bitmap,
+                                   &metrics );
+    if ( !error )
+    {
+      glyph->outline.n_points   = 0;
+      glyph->outline.n_contours = 0;
+
+      glyph->metrics.width  = (FT_Pos)metrics.width  << 6;
+      glyph->metrics.height = (FT_Pos)metrics.height << 6;
+
+      glyph->metrics.horiBearingX = (FT_Pos)metrics.horiBearingX << 6;
+      glyph->metrics.horiBearingY = (FT_Pos)metrics.horiBearingY << 6;
+      glyph->metrics.horiAdvance  = (FT_Pos)metrics.horiAdvance  << 6;
+
+      glyph->metrics.vertBearingX = (FT_Pos)metrics.vertBearingX << 6;
+      glyph->metrics.vertBearingY = (FT_Pos)metrics.vertBearingY << 6;
+      glyph->metrics.vertAdvance  = (FT_Pos)metrics.vertAdvance  << 6;
+
+      glyph->format = FT_GLYPH_FORMAT_BITMAP;
+      if ( load_flags & FT_LOAD_VERTICAL_LAYOUT )
+      {
+        glyph->bitmap_left = metrics.vertBearingX;
+        glyph->bitmap_top  = metrics.vertBearingY;
+      }
+      else
+      {
+        glyph->bitmap_left = metrics.horiBearingX;
+        glyph->bitmap_top  = metrics.horiBearingY;
+      }
+    }
+
+    return error;
+  }
+#endif
+
+
+  static FT_Error
+  tt_loader_init( TT_Loader     loader,
+                  TT_Size       size,
+                  TT_GlyphSlot  glyph,
+                  FT_Int32      load_flags )
+  {
+    TT_Face         face;
+    FT_Stream       stream;
+
+
+    face = (TT_Face)glyph->face;
+    stream = face->root.stream;
+
+    FT_MEM_ZERO( loader, sizeof ( TT_LoaderRec ) );
+
+#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+
+    /* load execution context */
+    {
+      TT_ExecContext  exec;
+
+
+      /* query new execution context */
+      exec = size->debug ? size->context
+                         : ( (TT_Driver)FT_FACE_DRIVER( face ) )->context;
+      if ( !exec )
+        return TT_Err_Could_Not_Find_Context;
+
+      TT_Load_Context( exec, face, size );
+
+      /* see if the cvt program has disabled hinting */
+      if ( exec->GS.instruct_control & 1 )
+        load_flags |= FT_LOAD_NO_HINTING;
+
+      /* load default graphics state - if needed */
+      if ( exec->GS.instruct_control & 2 )
+        exec->GS = tt_default_graphics_state;
+
+      exec->pedantic_hinting = FT_BOOL( load_flags & FT_LOAD_PEDANTIC );
+      exec->grayscale =
+        FT_BOOL( FT_LOAD_TARGET_MODE( load_flags ) != FT_LOAD_TARGET_MONO );
+
+      loader->exec = exec;
+      loader->instructions = exec->glyphIns;
+    }
+
+#endif /* TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
+
+    /* seek to the beginning of the glyph table.  For Type 42 fonts      */
+    /* the table might be accessed from a Postscript stream or something */
+    /* else...                                                           */
+
+#ifdef FT_CONFIG_OPTION_INCREMENTAL
+
+    if ( face->root.internal->incremental_interface )
+      loader->glyf_offset = 0;
+    else
+
+#endif
+
+    {
+      FT_Error  error = face->goto_table( face, TTAG_glyf, stream, 0 );
+      if ( error )
+      {
+        FT_ERROR(( "TT_Load_Glyph: could not access glyph table\n" ));
+        return error;
+      }
+      loader->glyf_offset = FT_STREAM_POS();
+    }
+
+    /* get face's glyph loader */
+    {
+      FT_GlyphLoader  gloader = glyph->internal->loader;
+
+      FT_GlyphLoader_Rewind( gloader );
+      loader->gloader = gloader;
+    }
+
+    loader->load_flags    = load_flags;
+
+    loader->face   = (FT_Face)face;
+    loader->size   = (FT_Size)size;
+    loader->glyph  = (FT_GlyphSlot)glyph;
+    loader->stream = stream;
+
+    return TT_Err_Ok;
+  }
+
+
   /*************************************************************************/
   /*                                                                       */
   /* <Function>                                                            */
@@ -1908,7 +1994,6 @@
                  FT_UInt       glyph_index,
                  FT_Int32      load_flags )
   {
-    SFNT_Service  sfnt;
     TT_Face       face;
     FT_Stream     stream;
     FT_Error      error;
@@ -1916,194 +2001,65 @@
 
 
     face   = (TT_Face)glyph->face;
-    sfnt   = (SFNT_Service)face->sfnt;
     stream = face->root.stream;
     error  = TT_Err_Ok;
 
-    if ( !size || ( load_flags & FT_LOAD_NO_SCALE )   ||
-                  ( load_flags & FT_LOAD_NO_RECURSE ) )
-    {
-      size        = NULL;
-      load_flags |= FT_LOAD_NO_SCALE   |
-                    FT_LOAD_NO_HINTING |
-                    FT_LOAD_NO_BITMAP;
-    }
-
-    glyph->num_subglyphs = 0;
-
 #ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
 
     /* try to load embedded bitmap if any              */
     /*                                                 */
     /* XXX: The convention should be emphasized in     */
     /*      the documents because it can be confusing. */
-    if ( size                                    &&
-         size->strike_index != 0xFFFFU           &&
-         sfnt->load_sbits                        &&
+    if ( size->strike_index != 0xFFFFU &&
          ( load_flags & FT_LOAD_NO_BITMAP ) == 0 )
-
     {
-      TT_SBit_MetricsRec  metrics;
-
-
-      error = sfnt->load_sbit_image( face,
-                                     (FT_ULong)size->strike_index,
-                                     glyph_index,
-                                     (FT_Int)load_flags,
-                                     stream,
-                                     &glyph->bitmap,
-                                     &metrics );
+      error = load_sbit_image( size, glyph, glyph_index, load_flags );
       if ( !error )
-      {
-        glyph->outline.n_points   = 0;
-        glyph->outline.n_contours = 0;
-
-        glyph->metrics.width  = (FT_Pos)metrics.width  << 6;
-        glyph->metrics.height = (FT_Pos)metrics.height << 6;
-
-        glyph->metrics.horiBearingX = (FT_Pos)metrics.horiBearingX << 6;
-        glyph->metrics.horiBearingY = (FT_Pos)metrics.horiBearingY << 6;
-        glyph->metrics.horiAdvance  = (FT_Pos)metrics.horiAdvance  << 6;
-
-        glyph->metrics.vertBearingX = (FT_Pos)metrics.vertBearingX << 6;
-        glyph->metrics.vertBearingY = (FT_Pos)metrics.vertBearingY << 6;
-        glyph->metrics.vertAdvance  = (FT_Pos)metrics.vertAdvance  << 6;
-
-        glyph->format = FT_GLYPH_FORMAT_BITMAP;
-        if ( load_flags & FT_LOAD_VERTICAL_LAYOUT )
-        {
-          glyph->bitmap_left = metrics.vertBearingX;
-          glyph->bitmap_top  = metrics.vertBearingY;
-        }
-        else
-        {
-          glyph->bitmap_left = metrics.horiBearingX;
-          glyph->bitmap_top  = metrics.horiBearingY;
-        }
-        return error;
-      }
+        return TT_Err_Ok;
     }
 
 #endif /* TT_CONFIG_OPTION_EMBEDDED_BITMAPS */
 
-    /* return immediately if we only want the embedded bitmaps */
     if ( load_flags & FT_LOAD_SBITS_ONLY )
       return TT_Err_Invalid_Argument;
 
-    /* seek to the beginning of the glyph table.  For Type 42 fonts      */
-    /* the table might be accessed from a Postscript stream or something */
-    /* else...                                                           */
-
-#ifdef FT_CONFIG_OPTION_INCREMENTAL
-
-    /* Don't look for the glyph table if this is an incremental font. */
-    if ( !face->root.internal->incremental_interface )
-
-#endif
-
-    {
-      error = face->goto_table( face, TTAG_glyf, stream, 0 );
-      if ( error )
-      {
-        FT_ERROR(( "TT_Load_Glyph: could not access glyph table\n" ));
-        goto Exit;
-      }
-    }
-
-    FT_MEM_ZERO( &loader, sizeof ( loader ) );
-
-    /* update the glyph zone bounds */
-    {
-      FT_GlyphLoader  gloader = FT_FACE_DRIVER( face )->glyph_loader;
-
-
-      loader.gloader = gloader;
-
-      FT_GlyphLoader_Rewind( gloader );
-
-      tt_prepare_zone( &loader.zone, &gloader->base, 0, 0 );
-      tt_prepare_zone( &loader.base, &gloader->base, 0, 0 );
-    }
-
-#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-
-    if ( size )
-    {
-      /* query new execution context */
-      loader.exec = size->debug ? size->context : TT_New_Context( face );
-      if ( !loader.exec )
-        return TT_Err_Could_Not_Find_Context;
-
-      TT_Load_Context( loader.exec, face, size );
-      loader.instructions = loader.exec->glyphIns;
-
-      /* load default graphics state - if needed */
-      if ( size->GS.instruct_control & 2 )
-        loader.exec->GS = tt_default_graphics_state;
-
-      loader.exec->pedantic_hinting =
-         FT_BOOL( load_flags & FT_LOAD_PEDANTIC );
-
-      loader.exec->grayscale =
-         FT_BOOL( FT_LOAD_TARGET_MODE( load_flags ) != FT_LOAD_TARGET_MONO );
-    }
-
-#endif /* TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
-
-    /* clear all outline flags, except the `owner' one */
-    glyph->outline.flags = 0;
-
-    /* let's initialize the rest of our loader now */
-
-    loader.load_flags    = load_flags;
-
-    loader.face   = (FT_Face)face;
-    loader.size   = (FT_Size)size;
-    loader.glyph  = (FT_GlyphSlot)glyph;
-    loader.stream = stream;
-
-#ifdef FT_CONFIG_OPTION_INCREMENTAL
-
-    if ( face->root.internal->incremental_interface )
-      loader.glyf_offset = 0;
-    else
-
-#endif
-
-      loader.glyf_offset = FT_STREAM_POS();
-
-#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-
-    /* if the cvt program has disabled hinting, the argument */
-    /* is ignored.                                           */
-    if ( size && ( size->GS.instruct_control & 1 ) )
-      loader.load_flags |= FT_LOAD_NO_HINTING;
-
-#endif /* TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
+    error = tt_loader_init( &loader, size, glyph, load_flags );
+    if ( error )
+      return error;
 
-    /* Main loading loop */
     glyph->format        = FT_GLYPH_FORMAT_OUTLINE;
     glyph->num_subglyphs = 0;
+    glyph->outline.flags = 0;
 
+    /* Main loading loop */
     error = load_truetype_glyph( &loader, glyph_index, 0 );
     if ( !error )
-      compute_glyph_metrics( &loader, glyph_index );
-
-#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+    {
+      if ( glyph->format == FT_GLYPH_FORMAT_COMPOSITE )
+      {
+        glyph->num_subglyphs = loader.gloader->base.num_subglyphs;
+        glyph->subglyphs     = loader.gloader->base.subglyphs;
+      }
+      else
+      {
+        glyph->outline = loader.gloader->base.outline;
+        glyph->outline.flags &= ~FT_OUTLINE_SINGLE_PASS;
 
-    if ( !size || !size->debug )
-      TT_Done_Context( loader.exec );
+        /* translate array so that (0,0) is the glyph's origin */
+        if ( loader.pp1.x )
+          FT_Outline_Translate( &glyph->outline, -loader.pp1.x, 0 );
+      }
 
-#endif /* TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
+      compute_glyph_metrics( &loader, glyph_index );
+    }
 
     /* Set the `high precision' bit flag.                           */
     /* This is _critical_ to get correct output for monochrome      */
     /* TrueType glyphs at all sizes using the bytecode interpreter. */
     /*                                                              */
-    if ( size && size->root.metrics.y_ppem < 24 )
+    if ( size->root.metrics.y_ppem < 24 )
       glyph->outline.flags |= FT_OUTLINE_HIGH_PRECISION;
 
-  Exit:
     return error;
   }
 
diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c
index ec8daae..483bccc 100644
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -371,7 +371,7 @@
   /*************************************************************************/
   /*                                                                       */
   /* <Function>                                                            */
-  /*    TT_Destroy_Context                                                 */
+  /*    TT_Done_Context                                                    */
   /*                                                                       */
   /* <Description>                                                         */
   /*    Destroys a given context.                                          */
@@ -388,9 +388,11 @@
   /*    Only the glyph loader and debugger should call this function.      */
   /*                                                                       */
   FT_LOCAL_DEF( FT_Error )
-  TT_Destroy_Context( TT_ExecContext  exec,
-                      FT_Memory       memory )
+  TT_Done_Context( TT_ExecContext  exec )
   {
+    FT_Memory  memory = exec->memory;
+
+
     /* free composite load stack */
     FT_FREE( exec->loadStack );
     exec->loadSize = 0;
@@ -416,6 +418,7 @@
     exec->face = NULL;
 
     FT_FREE( exec );
+
     return TT_Err_Ok;
   }
 
@@ -431,8 +434,6 @@
   /* <Input>                                                               */
   /*    memory :: A handle to the parent memory object.                    */
   /*                                                                       */
-  /*    face   :: A handle to the source TrueType face object.             */
-  /*                                                                       */
   /* <InOut>                                                               */
   /*    exec   :: A handle to the target execution context.                */
   /*                                                                       */
@@ -441,14 +442,12 @@
   /*                                                                       */
   static FT_Error
   Init_Context( TT_ExecContext  exec,
-                TT_Face         face,
                 FT_Memory       memory )
   {
     FT_Error  error;
 
 
-    FT_TRACE1(( "Init_Context: new object at 0x%08p, parent = 0x%08p\n",
-                exec, face ));
+    FT_TRACE1(( "Init_Context: new object at 0x%08p\n", exec ));
 
     exec->memory   = memory;
     exec->callSize = 32;
@@ -469,7 +468,7 @@
     exec->loadStack = NULL;
     exec->glyphIns  = NULL;
 
-    exec->face = face;
+    exec->face = NULL;
     exec->size = NULL;
 
     return TT_Err_Ok;
@@ -477,7 +476,7 @@
   Fail_Memory:
     FT_ERROR(( "Init_Context: not enough memory for 0x%08lx\n",
                (FT_Long)exec ));
-    TT_Destroy_Context( exec, memory );
+    TT_Done_Context( exec );
 
     return error;
  }
@@ -770,18 +769,12 @@
   /* documentation is in ttinterp.h */
 
   FT_EXPORT_DEF( TT_ExecContext )
-  TT_New_Context( TT_Face  face )
+  TT_New_Context( TT_Driver  driver )
   {
-    TT_Driver       driver;
     TT_ExecContext  exec;
     FT_Memory       memory;
 
 
-    if ( !face )
-      return 0;
-
-    driver = (TT_Driver)face->root.driver;
-
     memory = driver->root.root.memory;
     exec   = driver->context;
 
@@ -795,7 +788,7 @@
         goto Exit;
 
       /* initialize it */
-      error = Init_Context( exec, face, memory );
+      error = Init_Context( exec, memory );
       if ( error )
         goto Fail;
 
@@ -815,34 +808,6 @@
 
   /*************************************************************************/
   /*                                                                       */
-  /* <Function>                                                            */
-  /*    TT_Done_Context                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Discards an execution context.                                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    exec :: A handle to the target execution context.                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Only the glyph loader and debugger should call this function.      */
-  /*                                                                       */
-  FT_LOCAL_DEF( FT_Error )
-  TT_Done_Context( TT_ExecContext  exec )
-  {
-    /* Nothing at all for now */
-    FT_UNUSED( exec );
-
-    return TT_Err_Ok;
-  }
-
-
-
-  /*************************************************************************/
-  /*                                                                       */
   /* Before an opcode is executed, the interpreter verifies that there are */
   /* enough arguments on the stack, with the help of the `Pop_Push_Count'  */
   /* table.                                                                */
diff --git a/src/truetype/ttinterp.h b/src/truetype/ttinterp.h
index 43f662c..257a7c1 100644
--- a/src/truetype/ttinterp.h
+++ b/src/truetype/ttinterp.h
@@ -263,17 +263,12 @@ FT_BEGIN_HEADER
   /*    Only the glyph loader and debugger should call this function.      */
   /*                                                                       */
   FT_EXPORT( TT_ExecContext )
-  TT_New_Context( TT_Face  face );
-
+  TT_New_Context( TT_Driver  driver );
 
   FT_LOCAL( FT_Error )
   TT_Done_Context( TT_ExecContext  exec );
 
   FT_LOCAL( FT_Error )
-  TT_Destroy_Context( TT_ExecContext  exec,
-                      FT_Memory       memory );
-
-  FT_LOCAL( FT_Error )
   TT_Load_Context( TT_ExecContext  exec,
                    TT_Face         face,
                    TT_Size         size );
diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
index 4ad4072..b61d50c 100644
--- a/src/truetype/ttobjs.c
+++ b/src/truetype/ttobjs.c
@@ -348,7 +348,7 @@
     if ( size->debug )
       exec = size->context;
     else
-      exec = TT_New_Context( face );
+      exec = ( (TT_Driver)FT_FACE_DRIVER( face ) )->context;
 
     if ( !exec )
       return TT_Err_Could_Not_Find_Context;
@@ -403,9 +403,6 @@
     if ( !error )
       TT_Save_Context( exec, size );
 
-    if ( !size->debug )
-      TT_Done_Context( exec );
-
     return error;
   }
 
@@ -436,7 +433,7 @@
     if ( size->debug )
       exec = size->context;
     else
-      exec = TT_New_Context( face );
+      exec = ( (TT_Driver)FT_FACE_DRIVER( face ) )->context;
 
     if ( !exec )
       return TT_Err_Could_Not_Find_Context;
@@ -470,9 +467,6 @@
 
     TT_Save_Context( exec, size );
 
-    if ( !size->debug )
-      TT_Done_Context( exec );
-
     return error;
   }
 
@@ -917,15 +911,24 @@
   /*    FreeType error code.  0 means success.                             */
   /*                                                                       */
   FT_LOCAL_DEF( FT_Error )
-  tt_driver_init( FT_Module  driver )       /* TT_Driver */
+  tt_driver_init( FT_Module  ttdriver )     /* TT_Driver */
   {
-    FT_Error  error;
 
+#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+
+    TT_Driver  driver = (TT_Driver)ttdriver;
 
-    /* set `extra' in glyph loader */
-    error = FT_GlyphLoader_CreateExtra( FT_DRIVER( driver )->glyph_loader );
 
-    return error;
+    if ( !TT_New_Context( driver ) )
+      return TT_Err_Could_Not_Find_Context;
+
+#else
+
+    FT_UNUSED( ttdriver );
+
+#endif
+
+    return TT_Err_Ok;
   }
 
 
@@ -950,7 +953,7 @@
     /* destroy the execution context */
     if ( driver->context )
     {
-      TT_Destroy_Context( driver->context, driver->root.root.memory );
+      TT_Done_Context( driver->context );
       driver->context = NULL;
     }
 #else
@@ -960,4 +963,25 @@
   }
 
 
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    tt_slot_init                                                       */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Initializes a new slot object.                                     */
+  /*                                                                       */
+  /* <InOut>                                                               */
+  /*    slot :: A handle to the slot object.                               */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0 means success.                             */
+  /*                                                                       */
+  FT_LOCAL_DEF( FT_Error )
+  tt_slot_init( FT_GlyphSlot  slot )
+  {
+    return FT_GlyphLoader_CreateExtra( slot->internal->loader );
+  }
+
+
 /* END */
diff --git a/src/truetype/ttobjs.h b/src/truetype/ttobjs.h
index c33c147..17491a0 100644
--- a/src/truetype/ttobjs.h
+++ b/src/truetype/ttobjs.h
@@ -442,6 +442,14 @@ FT_BEGIN_HEADER
   tt_driver_done( FT_Module  ttdriver );    /* TT_Driver */
 
 
+  /*************************************************************************/
+  /*                                                                       */
+  /* Slot functions                                                      */
+  /*                                                                       */
+  FT_LOCAL( FT_Error )
+  tt_slot_init( FT_GlyphSlot  slot );
+
+
 FT_END_HEADER
 
 #endif /* __TTOBJS_H__ */