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 /examples | |
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 'examples')
-rw-r--r-- | examples/pangox.aliases | 262 |
1 files changed, 204 insertions, 58 deletions
diff --git a/examples/pangox.aliases b/examples/pangox.aliases index 99f05d17..7785a491 100644 --- a/examples/pangox.aliases +++ b/examples/pangox.aliases @@ -2,61 +2,207 @@ # # family style variant weight stretch XLFD -sans normal normal normal normal "-*-helvetica-medium-r-normal--*-*-*-*-*-*-*-*,\ - -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ - -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ - -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ - -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\ - -tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0,\ --*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\ --*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\ --*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\ --*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\ --*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\ --*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\ --*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\ --*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\ --daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0" - -sans italic normal normal normal "-*-helvetica-medium-o-normal--*-*-*-*-*-*-*-*" -sans normal normal bold normal "-*-helvetica-bold-r-normal--*-*-*-*-*-*-*-*" -sans italic normal bold normal "-*-helvetica-bold-o-normal--*-*-*-*-*-*-*-*" - -serif normal normal normal normal "-*-times-medium-r-normal--*-*-*-*-*-*-*-*,\ - -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ - -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ - -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ - -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\ - -tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0,\ --*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\ --*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\ --*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\ --*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\ --*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\ --*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\ --*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\ --*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\ --daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0" - -serif italic normal normal normal "-*-times-medium-i-normal--*-*-*-*-*-*-*-*" -serif normal normal bold normal "-*-times-bold-r-normal--*-*-*-*-*-*-*-*" -serif italic normal bold normal "-*-times-bold-i-normal--*-*-*-*-*-*-*-*" - -monospace normal normal normal normal "-*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ - -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ - -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ - -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\ - -tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0,\ --*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\ --*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\ --*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\ --*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\ --*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\ --*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\ --*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\ --*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\ --daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0" - -monospace italic normal normal normal "-*-fixed-medium-i-normal--*-*-*-*-*-*-*-*" -monospace normal normal bold normal "-*-fixed-bold-r-normal--*-*-*-*-*-*-*-*" -monospace italic normal bold normal "-*-fixed-bold-i-normal--*-*-*-*-*-*-*-*" +sans normal normal normal normal \ + "-*-helvetica-medium-r-normal--*-*-*-*-*-*-*-*,\ + -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ + -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ + -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ + -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\ + -tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0,\ + -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\ + -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\ + -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\ + -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\ + -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\ + -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\ + -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\ + -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\ + -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0" + +sans italic normal normal normal \ + "-*-helvetica-medium-o-normal--*-*-*-*-*-*-*-*,\ + -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ + -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ + -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ + -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\ + -tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0,\ + -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\ + -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\ + -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\ + -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\ + -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\ + -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\ + -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\ + -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\ + -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0" + +sans normal normal bold normal \ + "-*-helvetica-bold-r-normal--*-*-*-*-*-*-*-*,\ + -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ + -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ + -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ + -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\ + -tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0,\ + -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\ + -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\ + -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\ + -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\ + -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\ + -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\ + -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\ + -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\ + -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0" + +sans italic normal bold normal \ + "-*-helvetica-bold-o-normal--*-*-*-*-*-*-*-*,\ + -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ + -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ + -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ + -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\ + -tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0,\ + -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\ + -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\ + -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\ + -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\ + -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\ + -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\ + -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\ + -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\ + -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0" + + +serif normal normal normal normal \ + "-*-times-medium-r-normal--*-*-*-*-*-*-*-*,\ + -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ + -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ + -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ + -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\ + -tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0,\ + -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\ + -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\ + -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\ + -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\ + -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\ + -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\ + -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\ + -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\ + -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0" + +serif italic normal normal normal \ + "-*-times-medium-i-normal--*-*-*-*-*-*-*-*,\ + -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ + -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ + -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ + -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\ + -tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0,\ + -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\ + -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\ + -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\ + -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\ + -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\ + -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\ + -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\ + -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\ + -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0" + +serif normal normal bold normal \ + "-*-times-bold-r-normal--*-*-*-*-*-*-*-*,\ + -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ + -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ + -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ + -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\ + -tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0,\ + -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\ + -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\ + -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\ + -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\ + -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\ + -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\ + -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\ + -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\ + -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0" + +serif italic normal bold normal \ + "-*-times-bold-i-normal--*-*-*-*-*-*-*-*,\ + -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ + -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ + -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ + -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\ + -tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0,\ + -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\ + -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\ + -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\ + -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\ + -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\ + -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\ + -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\ + -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\ + -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0" + +monospace normal normal normal normal \ + "-*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ + -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ + -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ + -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ + -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\ + -tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0,\ + -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\ + -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\ + -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\ + -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\ + -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\ + -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\ + -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\ + -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\ + -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0" + +monospace italic normal normal normal \ + "-*-fixed-medium-i-normal--*-*-*-*-*-*-*-*,\ + -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ + -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ + -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ + -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\ + -tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0,\ + -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\ + -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\ + -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\ + -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\ + -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\ + -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\ + -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\ + -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\ + -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0" + +monospace normal normal bold normal \ + "-*-fixed-bold-r-normal--*-*-*-*-*-*-*-*,\ + -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ + -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ + -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ + -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\ + -tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0,\ + -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\ + -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\ + -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\ + -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\ + -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\ + -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\ + -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\ + -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\ + -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0" + +monospace italic normal bold normal \ + "-*-fixed-bold-i-normal--*-*-*-*-*-*-*-*,\ + -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ + -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ + -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ + -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\ + -tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0,\ + -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\ + -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\ + -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\ + -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\ + -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\ + -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\ + -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\ + -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\ + -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0" |