From c4ec74d7078905de7750ed1aea1966cce59fce13 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sun, 29 Sep 2002 19:06:58 +0000 Subject: ligatures can be also used in MarkBasePos lookups. (2001-03-17 Werner Sun Sep 29 14:55:36 2002 Owen Taylor * pango/opentype/ftxgpos.c: ligatures can be also used in MarkBasePos lookups. (2001-03-17 Werner Lemberg) --- ChangeLog | 9 ++++++--- ChangeLog.pre-1-10 | 9 ++++++--- ChangeLog.pre-1-2 | 9 ++++++--- ChangeLog.pre-1-4 | 9 ++++++--- ChangeLog.pre-1-6 | 9 ++++++--- ChangeLog.pre-1-8 | 9 ++++++--- pango/opentype/ftxgpos.c | 13 ++++++++++--- 7 files changed, 46 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1162e5d2..c5a12ac8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,14 @@ +Sun Sep 29 14:55:36 2002 Owen Taylor + + * pango/opentype/ftxgpos.c: ligatures can be also used in + MarkBasePos lookups. (2001-03-17 Werner Lemberg) + Sun Sep 29 14:51:25 2002 Owen Taylor 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. + More fixes for special marks. (2001-03-17 Werner Lemberg) 2002-09-28 Tor Lillqvist diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 1162e5d2..c5a12ac8 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,11 +1,14 @@ +Sun Sep 29 14:55:36 2002 Owen Taylor + + * pango/opentype/ftxgpos.c: ligatures can be also used in + MarkBasePos lookups. (2001-03-17 Werner Lemberg) + Sun Sep 29 14:51:25 2002 Owen Taylor 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. + More fixes for special marks. (2001-03-17 Werner Lemberg) 2002-09-28 Tor Lillqvist diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 1162e5d2..c5a12ac8 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,11 +1,14 @@ +Sun Sep 29 14:55:36 2002 Owen Taylor + + * pango/opentype/ftxgpos.c: ligatures can be also used in + MarkBasePos lookups. (2001-03-17 Werner Lemberg) + Sun Sep 29 14:51:25 2002 Owen Taylor 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. + More fixes for special marks. (2001-03-17 Werner Lemberg) 2002-09-28 Tor Lillqvist diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 1162e5d2..c5a12ac8 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,11 +1,14 @@ +Sun Sep 29 14:55:36 2002 Owen Taylor + + * pango/opentype/ftxgpos.c: ligatures can be also used in + MarkBasePos lookups. (2001-03-17 Werner Lemberg) + Sun Sep 29 14:51:25 2002 Owen Taylor 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. + More fixes for special marks. (2001-03-17 Werner Lemberg) 2002-09-28 Tor Lillqvist diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 1162e5d2..c5a12ac8 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,11 +1,14 @@ +Sun Sep 29 14:55:36 2002 Owen Taylor + + * pango/opentype/ftxgpos.c: ligatures can be also used in + MarkBasePos lookups. (2001-03-17 Werner Lemberg) + Sun Sep 29 14:51:25 2002 Owen Taylor 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. + More fixes for special marks. (2001-03-17 Werner Lemberg) 2002-09-28 Tor Lillqvist diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 1162e5d2..c5a12ac8 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,11 +1,14 @@ +Sun Sep 29 14:55:36 2002 Owen Taylor + + * pango/opentype/ftxgpos.c: ligatures can be also used in + MarkBasePos lookups. (2001-03-17 Werner Lemberg) + Sun Sep 29 14:51:25 2002 Owen Taylor 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. + More fixes for special marks. (2001-03-17 Werner Lemberg) 2002-09-28 Tor Lillqvist 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; -- cgit v1.2.1