Mercurial > emacs
comparison src/ftfont.c @ 111574:a92967e45167
merge trunk
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Wed, 17 Nov 2010 13:09:08 +0900 |
| parents | 1e95f3ea022d |
| children | a5a188ddc758 |
comparison
equal
deleted
inserted
replaced
| 111573:e89dd9c3633b | 111574:a92967e45167 |
|---|---|
| 2596 } | 2596 } |
| 2597 } | 2597 } |
| 2598 return intern ("unknown"); | 2598 return intern ("unknown"); |
| 2599 } | 2599 } |
| 2600 | 2600 |
| 2601 static const char *ftfont_booleans [] = { | 2601 static const char *const ftfont_booleans [] = { |
| 2602 ":antialias", | 2602 ":antialias", |
| 2603 ":hinting", | 2603 ":hinting", |
| 2604 ":verticallayout", | 2604 ":verticallayout", |
| 2605 ":autohint", | 2605 ":autohint", |
| 2606 ":globaladvance", | 2606 ":globaladvance", |
| 2609 ":minspace", | 2609 ":minspace", |
| 2610 ":embolden", | 2610 ":embolden", |
| 2611 NULL, | 2611 NULL, |
| 2612 }; | 2612 }; |
| 2613 | 2613 |
| 2614 static const char *ftfont_non_booleans [] = { | 2614 static const char *const ftfont_non_booleans [] = { |
| 2615 ":family", | 2615 ":family", |
| 2616 ":familylang", | 2616 ":familylang", |
| 2617 ":style", | 2617 ":style", |
| 2618 ":stylelang", | 2618 ":stylelang", |
| 2619 ":fullname", | 2619 ":fullname", |