Add ligatures to problem list

diff --git a/font/font.c b/font/font.c
index 911ca4ee3d9e8e97cd464e709c38784d3945a157..f39bd9e7ebb271bead4471dc31ef40241021cb98 100644 (file)
--- a/font/font.c
+++ b/font/font.c
@@ -1268,8 +1268,6 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
        case GRUB_UNICODE_COMB_HEBREW_QAMATS:
        case GRUB_UNICODE_COMB_HEBREW_TSERE:
        case GRUB_UNICODE_COMB_HEBREW_SEGOL:
-         /* , 
-            GRUB_UNICODE_COMB_HEBREW_DAGESH = 21*/
          /* TODO: placement in final kaf and under reish.  */
 
        case GRUB_UNICODE_COMB_HEBREW_HATAF_SEGOL:

diff --git a/normal/charset.c b/normal/charset.c
index 9ad1f7cb76d0d4789327de62a617d05d36fee571..55a9894a93f6de581f50d95375fc74eda1379e90 100644 (file)
--- a/normal/charset.c
+++ b/normal/charset.c
@@ -34,6 +34,7 @@
   - Private use characters (not really a problem)
   - Variations (no font support)
   - Vertical text
+  - Ligatures
   Font information ignored:
   - Kerning
   - Justification data

diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
index 9eee2a4882fe629b10a28a5ce37cde609ae076c7..09a03085a82de83da6ec4481648f7519a288e987 100644 (file)
--- a/util/grub-mkfont.c
+++ b/util/grub-mkfont.c
@@ -289,6 +289,8 @@ struct gsub_features
 #define FEATURE_INIT 0x696e6974
 #define FEATURE_MEDI 0x6d656469
 #define FEATURE_AALT 0x61616c74
+#define FEATURE_LIGA 0x6c696761
+#define FEATURE_RLIG 0x726c6967
     grub_uint32_t feature_tag;
     grub_uint16_t offset;
   } __attribute__ ((packed)) features[0];
@@ -517,6 +519,11 @@ add_font (struct grub_font_info *font_info, FT_Face face)
            case FEATURE_AALT:
              break;
 
+             /* FIXME: Add ligature support.  */
+           case FEATURE_LIGA:
+           case FEATURE_RLIG:
+             break;
+
              /* Cursive form variants.  */
            case FEATURE_FINA:
            case FEATURE_INIT: