Revert back out the FreeType patch preventing ligatures of not-originally

Sat Jul 26 09:41:22 2003  Owen Taylor  <otaylor@redhat.com>

        * pango/opentype/ftxgsub.c (Lookup_LigatureSubst):
        Revert back out the FreeType patch preventing
        ligatures of not-originally adjacent glyphs;
        it doesn't work for all scripts. (#118472,
        Kailash C. Chowksey)

6 files changed, 48 insertions, 33 deletions

diff --git a/ChangeLog b/ChangeLog
index 3f8adf63..01163d70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,16 @@
+Sat Jul 26 09:41:22 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/opentype/ftxgsub.c (Lookup_LigatureSubst):
+	Revert back out the FreeType patch preventing
+	ligatures of not-originally adjacent glyphs;
+	it doesn't work for all scripts. (#118472,
+	Kailash C. Chowksey)
+
 Sat Jul 26 22:30:59 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/opentype/ftxgsub.c (Lookup_ChainContextSubst{1,2,3}):
 	Check for lookahead glyphs in the right place. (Patch
-	from #116860)
+	from Kailash C. Chowksey, #116860)
 
 	* pango/opentype/ftxgpos.c (Lookup_ChainContextPos{1,2,3}):
 	Same fix here.
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 3f8adf63..01163d70 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,8 +1,16 @@
+Sat Jul 26 09:41:22 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/opentype/ftxgsub.c (Lookup_LigatureSubst):
+	Revert back out the FreeType patch preventing
+	ligatures of not-originally adjacent glyphs;
+	it doesn't work for all scripts. (#118472,
+	Kailash C. Chowksey)
+
 Sat Jul 26 22:30:59 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/opentype/ftxgsub.c (Lookup_ChainContextSubst{1,2,3}):
 	Check for lookahead glyphs in the right place. (Patch
-	from #116860)
+	from Kailash C. Chowksey, #116860)
 
 	* pango/opentype/ftxgpos.c (Lookup_ChainContextPos{1,2,3}):
 	Same fix here.
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 3f8adf63..01163d70 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,8 +1,16 @@
+Sat Jul 26 09:41:22 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/opentype/ftxgsub.c (Lookup_LigatureSubst):
+	Revert back out the FreeType patch preventing
+	ligatures of not-originally adjacent glyphs;
+	it doesn't work for all scripts. (#118472,
+	Kailash C. Chowksey)
+
 Sat Jul 26 22:30:59 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/opentype/ftxgsub.c (Lookup_ChainContextSubst{1,2,3}):
 	Check for lookahead glyphs in the right place. (Patch
-	from #116860)
+	from Kailash C. Chowksey, #116860)
 
 	* pango/opentype/ftxgpos.c (Lookup_ChainContextPos{1,2,3}):
 	Same fix here.
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 3f8adf63..01163d70 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,8 +1,16 @@
+Sat Jul 26 09:41:22 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/opentype/ftxgsub.c (Lookup_LigatureSubst):
+	Revert back out the FreeType patch preventing
+	ligatures of not-originally adjacent glyphs;
+	it doesn't work for all scripts. (#118472,
+	Kailash C. Chowksey)
+
 Sat Jul 26 22:30:59 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/opentype/ftxgsub.c (Lookup_ChainContextSubst{1,2,3}):
 	Check for lookahead glyphs in the right place. (Patch
-	from #116860)
+	from Kailash C. Chowksey, #116860)
 
 	* pango/opentype/ftxgpos.c (Lookup_ChainContextPos{1,2,3}):
 	Same fix here.
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 3f8adf63..01163d70 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,8 +1,16 @@
+Sat Jul 26 09:41:22 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/opentype/ftxgsub.c (Lookup_LigatureSubst):
+	Revert back out the FreeType patch preventing
+	ligatures of not-originally adjacent glyphs;
+	it doesn't work for all scripts. (#118472,
+	Kailash C. Chowksey)
+
 Sat Jul 26 22:30:59 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/opentype/ftxgsub.c (Lookup_ChainContextSubst{1,2,3}):
 	Check for lookahead glyphs in the right place. (Patch
-	from #116860)
+	from Kailash C. Chowksey, #116860)
 
 	* pango/opentype/ftxgpos.c (Lookup_ChainContextPos{1,2,3}):
 	Same fix here.
diff --git a/pango/opentype/ftxgsub.c b/pango/opentype/ftxgsub.c
index e473ca95..d5850f31 100644
--- a/pango/opentype/ftxgsub.c
+++ b/pango/opentype/ftxgsub.c
@@ -1194,8 +1194,7 @@
     FT_UShort      index, property;
     FT_Error       error;
     FT_UShort      numlig, i, j, is_mark, first_is_mark = FALSE;
-    FT_UShort      first_ligID, first_comp;
-    FT_UShort      *s_in, *lig_in, *comp_in;
+    FT_UShort*     s_in;
     FT_UShort*     c;
 
     TTO_Ligature*  lig;
@@ -1223,12 +1222,8 @@
       if ( in->pos + lig->ComponentCount > in->length )
         continue;                         /* Not enough glyphs in input */
 
-      s_in        = &in->string[in->pos];
-      lig_in      = &in->ligIDs[in->pos];
-      comp_in     = &in->components[in->pos];
-      first_ligID = *lig_in;
-      first_comp  = *comp_in;
-      c           = lig->Component;
+      s_in = &in->string[in->pos];
+      c    = lig->Component;
 
       is_mark = first_is_mark;
 
@@ -1248,26 +1243,6 @@
             break;
         }
 
-        /* don't apply a ligature lookup to glyphs with different
-           ligature IDs.  Example:
-
-                                                       '
-                                  ^'              '    ^
-             f ^ l ' -> fl ^ ' -> fl  but not  fl ^ -> fl         */
-
-        if ( first_ligID != lig_in[j] )
-          break;
-
-        /* don't apply a ligature lookup to glyphs with different
-           component values.  Example:
-
-                                                            '
-                                     ^'                '    ^
-             f ^ f ' l -> ffl ^ ' -> ffl  but not  ffl ^ -> ffl   */
-
-        if ( first_comp != comp_in[j] )
-          break;
-
         if ( !( property == TTO_MARK || property & IGNORE_SPECIAL_MARKS ) )
           is_mark = FALSE;