summaryrefslogtreecommitdiff
path: root/pango/opentype/ftxgsub.c
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2002-09-29 19:05:01 +0000
committerOwen Taylor <otaylor@src.gnome.org>2002-09-29 19:05:01 +0000
commit60c3018e3246171525eebbc91a40572d6755037d (patch)
tree38bc576e03b16f27ecc8a844f00dcc6bbe58e8e0 /pango/opentype/ftxgsub.c
parent12d0958d835e729540cdffc4f9b7ef8f012d493b (diff)
downloadpango-60c3018e3246171525eebbc91a40572d6755037d.tar.gz
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.
Diffstat (limited to 'pango/opentype/ftxgsub.c')
-rw-r--r--pango/opentype/ftxgsub.c4
1 files changed, 2 insertions, 2 deletions
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] )