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 Kailash C. Chowksey, #116860)

	* pango/opentype/ftxgpos.c (Lookup_ChainContextPos{1,2,3}):
	Same fix here.

Index: ftxgpos.c
===================================================================
RCS file: /cvs/gnome/pango/pango/opentype/ftxgpos.c,v
retrieving revision 1.16
diff -u -p -r1.16 ftxgpos.c
--- ftxgpos.c	26 Jul 2003 15:02:13 -0000	1.16
+++ ftxgpos.c	27 Jul 2003 02:38:47 -0000
@@ -5323,7 +5323,7 @@
       /* we are starting to check for lookahead glyphs right after the
          last context glyph                                            */
 
-      curr_pos = j;
+      curr_pos += j;
       s_in     = &in->string[curr_pos];
 
       for ( i = 0, j = 0; i < lgc; i++, j++ )
@@ -5521,7 +5521,7 @@
       /* we are starting to check for lookahead glyphs right after the
          last context glyph                                            */
 
-      curr_pos = j;
+      curr_pos += j;
       s_in     = &in->string[curr_pos];
       lc       = cpcr.Lookahead;
 
@@ -5669,7 +5669,7 @@
     /* we are starting to check for lookahead glyphs right after the
        last context glyph                                            */
 
-    curr_pos = j;
+    curr_pos += j;
     s_in     = &in->string[curr_pos];
     lc       = ccpf3->LookaheadCoverage;
 
Index: ftxgsub.c
===================================================================
RCS file: /cvs/gnome/pango/pango/opentype/ftxgsub.c,v
retrieving revision 1.13
diff -u -p -r1.13 ftxgsub.c
--- ftxgsub.c	27 Jul 2003 02:19:52 -0000	1.13
+++ ftxgsub.c	27 Jul 2003 02:38:48 -0000
@@ -3514,7 +3514,7 @@
       /* we are starting to check for lookahead glyphs right after the
          last context glyph                                            */
 
-      curr_pos = j;
+      curr_pos += j;
       s_in     = &in->string[curr_pos];
 
       for ( i = 0, j = 0; i < lgc; i++, j++ )
@@ -3712,7 +3712,7 @@
       /* we are starting to check for lookahead glyphs right after the
          last context glyph                                            */
 
-      curr_pos = j;
+      curr_pos += j;
       s_in     = &in->string[curr_pos];
       lc       = ccsr.Lookahead;
 
@@ -3859,7 +3859,7 @@
     /* we are starting for lookahead glyphs right after the last context
        glyph                                                             */
 
-    curr_pos = j;
+    curr_pos += j;
     s_in     = &in->string[curr_pos];
     lc       = ccsf3->LookaheadCoverage;