diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-06-24 15:01:06 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-06-24 15:01:06 +0000 |
| commit | 9a4ef8e71582e6b2e650ab8e2718df7e8e60b41e (patch) | |
| tree | 7708e6866678b6dcbb1577c0c4c793e32d977cb0 | |
| parent | 0a49a346ba85ef740b4ba75fc91e001892642849 (diff) | |
| download | pango-9a4ef8e71582e6b2e650ab8e2718df7e8e60b41e.tar.gz | |
Fix a stray newline (#308887, Ryan Lortie)
2005-06-24 Owen Taylor <otaylor@redhat.com>
* docs/pango_markup.sgml (linkend): Fix a stray newline
(#308887, Ryan Lortie)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 5 | ||||
| -rw-r--r-- | docs/pango_markup.sgml | 3 | ||||
| -rw-r--r-- | modules/khmer/khmer-fc.c | 2 |
4 files changed, 13 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2005-06-24 Owen Taylor <otaylor@redhat.com> + + * docs/pango_markup.sgml (linkend): Fix a stray newline + (#308887, Ryan Lortie) + 2005-06-22 Owen Taylor <otaylor@redhat.com> * modules/khmer/khmer-fc.c (khmer_engine_shape): Add back diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 008b0e79..6d6a9090 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +2005-06-24 Owen Taylor <otaylor@redhat.com> + + * docs/pango_markup.sgml (linkend): Fix a stray newline + (#308887, Ryan Lortie) + 2005-06-22 Owen Taylor <otaylor@redhat.com> * modules/khmer/khmer-fc.c (khmer_engine_shape): Add back diff --git a/docs/pango_markup.sgml b/docs/pango_markup.sgml index 7bd81ac3..3b4c1a5c 100644 --- a/docs/pango_markup.sgml +++ b/docs/pango_markup.sgml @@ -127,8 +127,7 @@ One of 'single', 'double', 'low', 'none' </para></listitem> </varlistentry> -<varlistentry><term>underline_col -or</term> +<varlistentry><term>underline_color</term> <listitem><para> The color of underlines; an RGB color specification such as '#00FF00' or a color name such as 'red' diff --git a/modules/khmer/khmer-fc.c b/modules/khmer/khmer-fc.c index 6e4c4e12..4e772c75 100644 --- a/modules/khmer/khmer-fc.c +++ b/modules/khmer/khmer-fc.c @@ -505,6 +505,8 @@ khmer_engine_shape (PangoEngineShape *engine, KhmerCharClass charClass; glong cursor = 0; + buffer = pango_ot_buffer_new (fc_font); + face = pango_fc_font_lock_face (fc_font); g_assert (face); |