Start of merges from freetype1 of OpenType fixes.

Sun Sep 29 14:51:25 2002  Owen Taylor  <otaylor@redhat.com>

        Start of merges from freetype1 of OpenType fixes.

        (2001-03-17  Werner Lemberg)

        * pango/opentype/ftxgdef.c pango/opentype/ftxgpos.c pango/opentype/ftxg\sub.c:
        More fixes for special marks.

9 files changed, 73 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index af1cb6a0..1162e5d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sun Sep 29 14:51:25 2002  Owen Taylor  <otaylor@redhat.com>
+
+	Start of merges from freetype1 of OpenType fixes.
+
+	(2001-03-17  Werner Lemberg)
+
+	* pango/opentype/ftxgdef.c pango/opentype/ftxgpos.c pango/opentype/ftxgsub.c:
+	More fixes for special marks.
+
 2002-09-28  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32-fontmap.c (pango_win32_insert_font): Revert
@@ -223,6 +232,7 @@ Wed Aug 28 15:22:14 2002  Eric Mader   <mader@jtcsv.com>
 	* pango/modules/indic/indic-ot-class-tables.c:
 	Change Punjabi script ('punj') to Gurmukhi ('guru')
 	
+>>>>>>> 1.602
 Tue Aug 20 17:31:39 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* Released 1.1.1.
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index af1cb6a0..1162e5d2 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,12 @@
+Sun Sep 29 14:51:25 2002  Owen Taylor  <otaylor@redhat.com>
+
+	Start of merges from freetype1 of OpenType fixes.
+
+	(2001-03-17  Werner Lemberg)
+
+	* pango/opentype/ftxgdef.c pango/opentype/ftxgpos.c pango/opentype/ftxgsub.c:
+	More fixes for special marks.
+
 2002-09-28  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32-fontmap.c (pango_win32_insert_font): Revert
@@ -223,6 +232,7 @@ Wed Aug 28 15:22:14 2002  Eric Mader   <mader@jtcsv.com>
 	* pango/modules/indic/indic-ot-class-tables.c:
 	Change Punjabi script ('punj') to Gurmukhi ('guru')
 	
+>>>>>>> 1.602
 Tue Aug 20 17:31:39 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* Released 1.1.1.
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index af1cb6a0..1162e5d2 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,12 @@
+Sun Sep 29 14:51:25 2002  Owen Taylor  <otaylor@redhat.com>
+
+	Start of merges from freetype1 of OpenType fixes.
+
+	(2001-03-17  Werner Lemberg)
+
+	* pango/opentype/ftxgdef.c pango/opentype/ftxgpos.c pango/opentype/ftxgsub.c:
+	More fixes for special marks.
+
 2002-09-28  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32-fontmap.c (pango_win32_insert_font): Revert
@@ -223,6 +232,7 @@ Wed Aug 28 15:22:14 2002  Eric Mader   <mader@jtcsv.com>
 	* pango/modules/indic/indic-ot-class-tables.c:
 	Change Punjabi script ('punj') to Gurmukhi ('guru')
 	
+>>>>>>> 1.602
 Tue Aug 20 17:31:39 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* Released 1.1.1.
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index af1cb6a0..1162e5d2 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,12 @@
+Sun Sep 29 14:51:25 2002  Owen Taylor  <otaylor@redhat.com>
+
+	Start of merges from freetype1 of OpenType fixes.
+
+	(2001-03-17  Werner Lemberg)
+
+	* pango/opentype/ftxgdef.c pango/opentype/ftxgpos.c pango/opentype/ftxgsub.c:
+	More fixes for special marks.
+
 2002-09-28  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32-fontmap.c (pango_win32_insert_font): Revert
@@ -223,6 +232,7 @@ Wed Aug 28 15:22:14 2002  Eric Mader   <mader@jtcsv.com>
 	* pango/modules/indic/indic-ot-class-tables.c:
 	Change Punjabi script ('punj') to Gurmukhi ('guru')
 	
+>>>>>>> 1.602
 Tue Aug 20 17:31:39 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* Released 1.1.1.
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index af1cb6a0..1162e5d2 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,12 @@
+Sun Sep 29 14:51:25 2002  Owen Taylor  <otaylor@redhat.com>
+
+	Start of merges from freetype1 of OpenType fixes.
+
+	(2001-03-17  Werner Lemberg)
+
+	* pango/opentype/ftxgdef.c pango/opentype/ftxgpos.c pango/opentype/ftxgsub.c:
+	More fixes for special marks.
+
 2002-09-28  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32-fontmap.c (pango_win32_insert_font): Revert
@@ -223,6 +232,7 @@ Wed Aug 28 15:22:14 2002  Eric Mader   <mader@jtcsv.com>
 	* pango/modules/indic/indic-ot-class-tables.c:
 	Change Punjabi script ('punj') to Gurmukhi ('guru')
 	
+>>>>>>> 1.602
 Tue Aug 20 17:31:39 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* Released 1.1.1.
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index af1cb6a0..1162e5d2 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,12 @@
+Sun Sep 29 14:51:25 2002  Owen Taylor  <otaylor@redhat.com>
+
+	Start of merges from freetype1 of OpenType fixes.
+
+	(2001-03-17  Werner Lemberg)
+
+	* pango/opentype/ftxgdef.c pango/opentype/ftxgpos.c pango/opentype/ftxgsub.c:
+	More fixes for special marks.
+
 2002-09-28  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32-fontmap.c (pango_win32_insert_font): Revert
@@ -223,6 +232,7 @@ Wed Aug 28 15:22:14 2002  Eric Mader   <mader@jtcsv.com>
 	* pango/modules/indic/indic-ot-class-tables.c:
 	Change Punjabi script ('punj') to Gurmukhi ('guru')
 	
+>>>>>>> 1.602
 Tue Aug 20 17:31:39 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* Released 1.1.1.
diff --git a/pango/opentype/ftxgdef.c b/pango/opentype/ftxgdef.c
index e585286f..67b268e9 100644
--- a/pango/opentype/ftxgdef.c
+++ b/pango/opentype/ftxgdef.c
@@ -1152,14 +1152,17 @@
       if ( error )
         return error;
 
-      /* This is OpenType 1.2 */
-
       if ( flags & IGNORE_SPECIAL_MARKS )
+      {
+        /* This is OpenType 1.2 */
+
         if ( (flags & 0xFF00) != *property )
           return TTO_Err_Not_Covered;
-
-      if ( flags & *property )
-        return TTO_Err_Not_Covered;
+      }
+      else {
+        if ( flags & *property )
+          return TTO_Err_Not_Covered;
+      }
     }
 
     return TT_Err_Ok;
diff --git a/pango/opentype/ftxgpos.c b/pango/opentype/ftxgpos.c
index f9ba1679..c51a6d1f 100644
--- a/pango/opentype/ftxgpos.c
+++ b/pango/opentype/ftxgpos.c
@@ -1694,7 +1694,7 @@
     TTO_GPOSHeader*  gpos = gpi->gpos;
 
 
-    if ( in->pos >= in->length )
+    if ( in->pos >= in->length - 1 )
       return TTO_Err_Not_Covered;           /* Not enough glyphs in stream */
 
     if ( context_length != 0xFFFF && context_length < 2 )
@@ -2355,7 +2355,7 @@
       if ( error )
         return error;
 
-      if ( property != TTO_MARK )
+      if ( !( property == TTO_MARK || property & IGNORE_SPECIAL_MARKS ) )
         break;
 
       i++;
@@ -2763,7 +2763,7 @@
       if ( error )
         return error;
 
-      if ( property != TTO_MARK )
+      if ( !( property == TTO_MARK || property & IGNORE_SPECIAL_MARKS ) )
         break;
 
       i++;
diff --git a/pango/opentype/ftxgsub.c b/pango/opentype/ftxgsub.c
index 6b9d4faf..43a0181b 100644
--- a/pango/opentype/ftxgsub.c
+++ b/pango/opentype/ftxgsub.c
@@ -1203,7 +1203,7 @@
     if ( CHECK_Property( gdef, in->string[in->pos], flags, &property ) )
       return error;
 
-    if ( property == TTO_MARK )
+    if ( property == TTO_MARK || property & IGNORE_SPECIAL_MARKS )
       first_is_mark = TRUE;
 
     error = Coverage_Index( &ls->Coverage, in->string[in->pos], &index );
@@ -1243,7 +1243,7 @@
             break;
         }
 
-        if ( property != TTO_MARK )
+        if ( !( property == TTO_MARK || property & IGNORE_SPECIAL_MARKS ) )
           is_mark = FALSE;
 
         if ( s_in[j] != c[i - 1] )