(FontLayoutCmdOTF): Move back to font-flt.c.

(MGlyph): Delete member otf_cmd, add member bidi_sensitive.

diff --git a/src/internal-gui.h b/src/internal-gui.h
index 3b5fdc6..badbd8c 100644 (file)
--- a/src/internal-gui.h
+++ b/src/internal-gui.h
@@ -112,14 +112,6 @@ enum glyph_type
 
 typedef struct
 {
-  MSymbol script;
-  MSymbol langsys;
-  MSymbol gsub_features;
-  MSymbol gpos_features;
-} FontLayoutCmdOTF;
-
-typedef struct
-{
   int pos, to;
   int c;
   unsigned code;
@@ -127,14 +119,12 @@ typedef struct
   MRealizedFace *rface;
   short width, ascent, descent, lbearing, rbearing;
   short xoff, yoff;
-#ifdef HAVE_OTF
-  FontLayoutCmdOTF *otf_cmd;
-#endif
   unsigned enabled : 1;
   unsigned left_padding : 1;
   unsigned right_padding : 1;
   unsigned otf_encoded : 1;
   unsigned bidi_level : 6;
+  unsigned bidi_sensitive : 1;
   enum glyph_type type : 3;
   int combining_code;
 } MGlyph;