diff options
| author | Havoc Pennington <hp@redhat.com> | 2001-04-27 23:50:03 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2001-04-27 23:50:03 +0000 |
| commit | 54fe82fbb797d6c72c81e629cba28fd803df7122 (patch) | |
| tree | fdc77f4e259a37146f30d96b9724477f9702b970 /modules | |
| parent | 374817f27422db4a5d4c68c423607ff560e53140 (diff) | |
| download | pango-54fe82fbb797d6c72c81e629cba28fd803df7122.tar.gz | |
Move some fontmap stuff to pangox-private.h to access fontmap->resolution
2001-04-27 Havoc Pennington <hp@redhat.com>
* pango/pangox-fontmap.c: Move some fontmap stuff to
pangox-private.h to access fontmap->resolution in pangox.c
* pango/pangox.c (get_font_metrics_from_subfonts): multiply
avg. width by PANGO_SCALE, and consider that avg width from X is
in decipoints
* modules/basic/basic-x.c: mark some chars unknown when shaping,
with a flag PANGO_X_UNKNOWN_FLAG
* pango/pangox.c (pango_x_font_get_metrics): use lookup_lang not
lang when calling get_font_metrics_from_string
(pango_x_render): render unknown chars
* pango/pango-layout.c:
(pango_layout_set_single_paragraph_mode): add mode where we don't
break on para separators, instead we shape them and display glyphs
(pango_layout_get_single_paragraph_mode): getter for above
(pango_layout_check_lines): handle single paragraph mode
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/basic/basic-x.c | 11 | ||||
| -rw-r--r-- | modules/hangul/hangul-x.c | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/modules/basic/basic-x.c b/modules/basic/basic-x.c index a37268b2..54417064 100644 --- a/modules/basic/basic-x.c +++ b/modules/basic/basic-x.c @@ -22,6 +22,7 @@ #include <glib.h> #include <string.h> #include "pangox.h" +#include "pangox-private.h" #include "pango-engine.h" #include "pango-utils.h" @@ -153,6 +154,16 @@ find_char (CharCache *cache, PangoFont *font, gunichar wc, const char *input) MaskTable *mask_table; int i; + switch (wc) + { + case '\n': + case '\r': + case 0x2028: /* Line separator */ + case 0x2029: /* Paragraph separator */ + return pango_x_font_get_unknown_glyph (font, wc); + break; + } + if (wc >= G_N_ELEMENTS (char_masks)) mask_index = 0; else diff --git a/modules/hangul/hangul-x.c b/modules/hangul/hangul-x.c index 1c2ac477..5dd43569 100644 --- a/modules/hangul/hangul-x.c +++ b/modules/hangul/hangul-x.c @@ -642,7 +642,7 @@ hangul_engine_shape (PangoFont *font, } else { - g_warning ("Unknown character 0x04%x", wc4); + g_warning ("Character not handled by Hangul shaper: 0x04%x", wc4); continue; } |