diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-11-14 16:11:02 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-11-14 16:11:02 +0000 |
| commit | e6e7df5c4d77e8e9802cfe615b9265176be1314c (patch) | |
| tree | f14288f107b39a331854aacbb3d415428dfa5631 /pango/pangox-fontmap.c | |
| parent | 8c0b3b59674586d069dba895929f23ee6c9ea91b (diff) | |
| download | pango-e6e7df5c4d77e8e9802cfe615b9265176be1314c.tar.gz | |
Fix low underline code to deal with run_ink == NULL.
Tue Nov 14 11:10:24 2000 Owen Taylor <otaylor@redhat.com>
* pango/pango-layout.c (pango_layout_run_get_extents):
Fix low underline code to deal with run_ink == NULL.
* pango/pango-utils.c (pango_read_line): Return number
of lines read to allow decent parse errors line numbers.
* pango/pangox-fontmap.c (pango_x_font_map_read_alias_file):
Fix line number count.
* examples/pangox.aliases: Include extra international fonts
for all styles, not just roman, reindent so it looks
halfway legible.
Diffstat (limited to 'pango/pangox-fontmap.c')
| -rw-r--r-- | pango/pangox-fontmap.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pango/pangox-fontmap.c b/pango/pangox-fontmap.c index 1ea89428..1d0b476c 100644 --- a/pango/pangox-fontmap.c +++ b/pango/pangox-fontmap.c @@ -852,14 +852,15 @@ pango_x_font_map_read_alias_file (PangoXFontMap *xfontmap, { GString *line_buf = g_string_new (NULL); GString *tmp_buf = g_string_new (NULL); + gint lines_read; - while (pango_read_line (infile, line_buf)) + while ((lines_read = pango_read_line (infile, line_buf))) { PangoXFamilyEntry *family_entry; const char *p = line_buf->str; - lineno++; + lineno += lines_read; if (!pango_skip_space (&p)) continue; |