Check for lookahead glyphs in the right place. (Patch from #116860)

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)

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

diff --git a/src/ftxgpos.c b/src/ftxgpos.c
index 7a17e1c..f3ce13c 100644 (file)
--- a/src/ftxgpos.c
+++ b/src/ftxgpos.c
@@ -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;
 

diff --git a/src/ftxgsub.c b/src/ftxgsub.c
index e9b5548..e473ca9 100644 (file)
--- a/src/ftxgsub.c
+++ b/src/ftxgsub.c
@@ -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;