Mercurial > emacs
comparison src/ftfont.c @ 108561:23f4cd23ea89
merge trunk
| author | Kenichi Handa <handa@etlken> |
|---|---|
| date | Fri, 14 May 2010 13:15:58 +0900 |
| parents | e5f3704cf67a |
| children | bcae1f83a33e |
comparison
equal
deleted
inserted
replaced
| 108552:03ab6621f67d | 108561:23f4cd23ea89 |
|---|---|
| 1576 return gsub_gpos; | 1576 return gsub_gpos; |
| 1577 } | 1577 } |
| 1578 | 1578 |
| 1579 #ifdef HAVE_M17N_FLT | 1579 #ifdef HAVE_M17N_FLT |
| 1580 | 1580 |
| 1581 #if ((LIBOTF_MAJOR_VERSION > 1) || (LIBOTF_RELEASE_NUMBER >= 10) \ | 1581 #if (((LIBOTF_MAJOR_VERSION > 1) || (LIBOTF_RELEASE_NUMBER >= 10)) \ |
| 1582 && (M17NLIB_MAJOR_VERSION > 1) || (M17NLIB_MINOR_VERSION >= 6)) | 1582 && ((M17NLIB_MAJOR_VERSION > 1) || (M17NLIB_MINOR_VERSION >= 6))) |
| 1583 /* We can use the new feature of libotf and m17n-flt to handle the | 1583 /* We can use the new feature of libotf and m17n-flt to handle the |
| 1584 character encoding scheme introduced in Unicode 5.1 and 5.2 for | 1584 character encoding scheme introduced in Unicode 5.1 and 5.2 for |
| 1585 some Agian scripts. */ | 1585 some Agian scripts. */ |
| 1586 #define M17N_FLT_USE_NEW_FEATURE | 1586 #define M17N_FLT_USE_NEW_FEATURE |
| 1587 #endif | 1587 #endif |