summaryrefslogtreecommitdiff
path: root/pango
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2002-09-29 19:06:58 +0000
committerOwen Taylor <otaylor@src.gnome.org>2002-09-29 19:06:58 +0000
commitc4ec74d7078905de7750ed1aea1966cce59fce13 (patch)
tree6b34a621ccf1747ceffdb09a678f536188609664 /pango
parent60c3018e3246171525eebbc91a40572d6755037d (diff)
downloadpango-c4ec74d7078905de7750ed1aea1966cce59fce13.tar.gz
ligatures can be also used in MarkBasePos lookups. (2001-03-17 Werner
Sun Sep 29 14:55:36 2002 Owen Taylor <otaylor@redhat.com> * pango/opentype/ftxgpos.c: ligatures can be also used in MarkBasePos lookups. (2001-03-17 Werner Lemberg)
Diffstat (limited to 'pango')
-rw-r--r--pango/opentype/ftxgpos.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/pango/opentype/ftxgpos.c b/pango/opentype/ftxgpos.c
index c51a6d1f..d611d7cb 100644
--- a/pango/opentype/ftxgpos.c
+++ b/pango/opentype/ftxgpos.c
@@ -1941,7 +1941,7 @@
/* Now comes the messiest part of the whole OpenType
specification. At first glance, cursive connections seem easy
- to understand, but there are pitfalls! The reason is, that
+ to understand, but there are pitfalls! The reason is that
the specs don't mention how to compute the advance values
resp. glyph offsets. I was told it would be an omission, to
be fixed in the next OpenType version... Again many thanks to
@@ -2343,7 +2343,7 @@
if ( error )
return error;
- /* now we search backwards for a base glyph */
+ /* now we search backwards for a non-mark glyph */
i = 1;
j = in->pos - 1;
@@ -2362,8 +2362,11 @@
j--;
}
+ /* The following assertion is too strong -- at least for mangal.ttf. */
+#if 0
if ( property != TTO_BASE_GLYPH )
return TTO_Err_Not_Covered;
+#endif
if ( i > in->pos )
return TTO_Err_Not_Covered;
@@ -2751,7 +2754,7 @@
if ( error )
return error;
- /* now we search backwards for a ligature */
+ /* now we search backwards for a non-mark glyph */
i = 1;
j = in->pos - 1;
@@ -2770,8 +2773,12 @@
j--;
}
+ /* Similar to Lookup_MarkBasePos(), I suspect that this assertion is
+ too strong, thus it is commented out. */
+#if 0
if ( property != TTO_LIGATURE )
return TTO_Err_Not_Covered;
+#endif
if ( i > in->pos )
return TTO_Err_Not_Covered;