diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2007-01-16 00:23:59 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2007-01-16 00:23:59 +0000 |
| commit | 7a102793913cb7a1a0eefbbfc9d5c0d04c9eb868 (patch) | |
| tree | d614b6941c83927af97a818fde59841499dd7917 /pango/pango-layout.c | |
| parent | fd7ecbb0203d89f31e9b9b7c10147fa2a3864513 (diff) | |
| download | pango-7a102793913cb7a1a0eefbbfc9d5c0d04c9eb868.tar.gz | |
Bug 323173 – Add layout of mixed direction text for vertical layout
2007-01-15 Behdad Esfahbod <behdad@gnome.org>
Bug 323173 – Add layout of mixed direction text for vertical layout
* pango/pango-gravity.h:
* pango/pango-gravity.c:
Moved gravity stuff here. New public API:
PangoGravityHint
pango_gravity_get_for_matrix()
pango_gravity_get_for_script()
* pango/pango-context.h:
* pango/pango-context.c (pango_context_init),
(update_resolved_gravity), (itemize_state_update_for_new_run):
Support gravity hint. New public API:
pango_context_set_gravity_hint()
pango_context_get_gravity_hint()
* pango/pango-utils.c:
* pango/pango-matrix.c:
* pango/pango-matrix.h:
* pango/pango-types.h:
Moved gravity and matrix stuff into its own header. pango-types.h
includes both pango-matrix.h and pango-gravity.h
* pango/pango.h:
Include new headers.
* pango/pango.def:
* pango/Makefile.am:
Update.
* docs/pango-docs.sgml:
* docs/pango-sections.txt:
* docs/tmpl/glyphs.sgml:
* docs/tmpl/main.sgml:
* docs/tmpl/vertical.sgml:
Add a section for Vertical Text.
* examples/renderdemo.c (do_output), (parse_gravity_hint),
(parse_options):
Support gravity hint.
* examples/test-mixed.txt:
New test, mixed Latin, Arabic, Chinese text.
svn path=/trunk/; revision=2144
Diffstat (limited to 'pango/pango-layout.c')
| -rw-r--r-- | pango/pango-layout.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pango/pango-layout.c b/pango/pango-layout.c index eab30f8a..52b9dccf 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -1,7 +1,7 @@ /* Pango * pango-layout.c: High-level layout driver * - * Copyright (C) 2000, 2001 Red Hat Software + * Copyright (C) 2000, 2001, 2006 Red Hat Software * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -3138,6 +3138,7 @@ line_set_resolved_dir (PangoLayoutLine *line, { switch (direction) { + default: case PANGO_DIRECTION_LTR: case PANGO_DIRECTION_TTB_RTL: case PANGO_DIRECTION_WEAK_LTR: @@ -3166,8 +3167,9 @@ line_set_resolved_dir (PangoLayoutLine *line, */ switch (pango_context_get_gravity (line->layout->context)) { - case PANGO_GRAVITY_SOUTH: default: + case PANGO_GRAVITY_AUTO: + case PANGO_GRAVITY_SOUTH: break; case PANGO_GRAVITY_NORTH: line->resolved_dir = PANGO_DIRECTION_LTR |