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.

7 files changed, 51 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index a6748ca4..11635aa0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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.
+
 Sat Jul 26 22:12:46 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/opentype/ftxgsub.c (Do_String_Lookup,
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index a6748ca4..11635aa0 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,12 @@
+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.
+
 Sat Jul 26 22:12:46 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/opentype/ftxgsub.c (Do_String_Lookup,
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index a6748ca4..11635aa0 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,12 @@
+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.
+
 Sat Jul 26 22:12:46 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/opentype/ftxgsub.c (Do_String_Lookup,
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index a6748ca4..11635aa0 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,12 @@
+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.
+
 Sat Jul 26 22:12:46 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/opentype/ftxgsub.c (Do_String_Lookup,
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index a6748ca4..11635aa0 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,12 @@
+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.
+
 Sat Jul 26 22:12:46 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/opentype/ftxgsub.c (Do_String_Lookup,
diff --git a/pango/opentype/ftxgpos.c b/pango/opentype/ftxgpos.c
index 7a17e1cc..f3ce13cd 100644
--- a/pango/opentype/ftxgpos.c
+++ b/pango/opentype/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/pango/opentype/ftxgsub.c b/pango/opentype/ftxgsub.c
index e9b5548a..e473ca95 100644
--- a/pango/opentype/ftxgsub.c
+++ b/pango/opentype/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;