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

5 files changed, 120 insertions, 30 deletions

diff --git a/docs/pango-docs.sgml b/docs/pango-docs.sgml
index a9bfe030..1c916154 100644
--- a/docs/pango-docs.sgml
+++ b/docs/pango-docs.sgml
@@ -28,6 +28,7 @@
 <!ENTITY markup-format SYSTEM "pango_markup.sgml">
 <!ENTITY pango-querymodules SYSTEM "pango-querymodules.xml">
 <!ENTITY pango-Version SYSTEM "xml/pango-version.xml">
+<!ENTITY pango-Vertical-Text SYSTEM "xml/vertical.xml">
 <!ENTITY version SYSTEM "version.xml">
 ]>
 <book id="index">
@@ -46,6 +47,7 @@
     &markup-format;
     &pango-Layout-Objects;
     &pango-Scripts;
+    &pango-Vertical-Text;
   </chapter>
 
   <chapter id="rendering">
diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt
index 462eb458..64da609e 100644
--- a/docs/pango-sections.txt
+++ b/docs/pango-sections.txt
@@ -8,8 +8,6 @@ PangoAnalysis
 PANGO_ANALYSIS_FLAG_CENTERED_BASELINE
 PangoDirection
 PANGO_TYPE_DIRECTION
-PangoGravity
-PANGO_TYPE_GRAVITY
 <SUBSECTION>
 pango_itemize
 pango_itemize_with_base_dir
@@ -31,6 +29,8 @@ pango_context_set_base_dir
 pango_context_get_base_gravity
 pango_context_set_base_gravity
 pango_context_get_gravity
+pango_context_get_gravity_hint
+pango_context_set_gravity_hint
 pango_context_get_matrix
 pango_context_set_matrix
 pango_context_load_font
@@ -63,7 +63,6 @@ pango_shape
 <SUBSECTION Private>
 pango_direction_get_type
 pango_context_get_type
-pango_gravity_get_type
 pango_item_get_type
 </SECTION>
 
@@ -96,7 +95,6 @@ pango_matrix_transform_distance
 pango_matrix_transform_rectangle
 pango_matrix_transform_pixel_rectangle
 pango_matrix_get_font_scale_factor
-pango_matrix_to_gravity
 PangoGlyph
 PANGO_GLYPH_EMPTY
 PANGO_GLYPH_UNKNOWN_FLAG
@@ -993,3 +991,18 @@ pango_version
 pango_version_string
 pango_version_check
 </SECTION>
+
+<SECTION>
+<TITLE>Vertical Text</TITLE>
+<FILE>vertical</FILE>
+PangoGravity
+PANGO_TYPE_GRAVITY
+PangoGravityHint
+PANGO_TYPE_GRAVITY_HINT
+PANGO_GRAVITY_IS_VERTICAL
+pango_gravity_get_for_matrix
+pango_gravity_get_for_script
+<SUBSECTION Private>
+pango_gravity_get_type
+pango_gravity_hint_get_type
+</SECTION>
diff --git a/docs/tmpl/glyphs.sgml b/docs/tmpl/glyphs.sgml
index b0be55da..7b0f2dab 100644
--- a/docs/tmpl/glyphs.sgml
+++ b/docs/tmpl/glyphs.sgml
@@ -272,15 +272,6 @@ horizontal origin.
 @Returns: 
 
 
-<!-- ##### FUNCTION pango_matrix_to_gravity ##### -->
-<para>
-
-</para>
-
-@matrix: 
-@Returns: 
-
-
 <!-- ##### TYPEDEF PangoGlyph ##### -->
 <para>
 A #PangoGlyph represents a single glyph in the output form of a string.
diff --git a/docs/tmpl/main.sgml b/docs/tmpl/main.sgml
index dbd69100..865229f8 100644
--- a/docs/tmpl/main.sgml
+++ b/docs/tmpl/main.sgml
@@ -84,23 +84,6 @@ The #GObject type for #PangoDirection.
 
 
 
-<!-- ##### ENUM PangoGravity ##### -->
-<para>
-</para>
-
-@PANGO_GRAVITY_SOUTH: 
-@PANGO_GRAVITY_EAST: 
-@PANGO_GRAVITY_NORTH: 
-@PANGO_GRAVITY_WEST: 
-@PANGO_GRAVITY_AUTO: 
-
-<!-- ##### MACRO PANGO_TYPE_GRAVITY ##### -->
-<para>
-The #GObject type for #PangoGravity.
-</para>
-
-
-
 <!-- ##### FUNCTION pango_itemize ##### -->
 <para>
 
@@ -282,6 +265,24 @@ The #GObject type for #PangoGravity.
 @Returns: 
 
 
+<!-- ##### FUNCTION pango_context_get_gravity_hint ##### -->
+<para>
+
+</para>
+
+@context: 
+@Returns: 
+
+
+<!-- ##### FUNCTION pango_context_set_gravity_hint ##### -->
+<para>
+
+</para>
+
+@context: 
+@hint: 
+
+
 <!-- ##### FUNCTION pango_context_get_matrix ##### -->
 <para>
 
diff --git a/docs/tmpl/vertical.sgml b/docs/tmpl/vertical.sgml
new file mode 100644
index 00000000..ccbea1ea
--- /dev/null
+++ b/docs/tmpl/vertical.sgml
@@ -0,0 +1,83 @@
+<!-- ##### SECTION Title ##### -->
+Vertical Text
+
+<!-- ##### SECTION Short_Description ##### -->
+Laying text out in vertical directions
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+Since 1.16, Pango is able to correctly lay vertical text out.  In fact, it can
+set layouts of mixed vertical and non-vertical text.  This section describes
+the types used for setting vertical text parameters.
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### ENUM PangoGravity ##### -->
+<para>
+
+</para>
+
+@PANGO_GRAVITY_SOUTH: 
+@PANGO_GRAVITY_EAST: 
+@PANGO_GRAVITY_NORTH: 
+@PANGO_GRAVITY_WEST: 
+@PANGO_GRAVITY_AUTO: 
+
+<!-- ##### MACRO PANGO_TYPE_GRAVITY ##### -->
+<para>
+The #GObject type for #PangoGravity.
+</para>
+
+
+
+<!-- ##### ENUM PangoGravityHint ##### -->
+<para>
+
+</para>
+
+@PANGO_GRAVITY_HINT_NATURAL: 
+@PANGO_GRAVITY_HINT_STRONG: 
+@PANGO_GRAVITY_HINT_LINE: 
+
+<!-- ##### MACRO PANGO_TYPE_GRAVITY_HINT ##### -->
+<para>
+The #GObject type for #PangoGravity.
+</para>
+
+
+
+<!-- ##### MACRO PANGO_GRAVITY_IS_VERTICAL ##### -->
+<para>
+
+</para>
+
+@gravity: 
+
+
+<!-- ##### FUNCTION pango_gravity_get_for_matrix ##### -->
+<para>
+
+</para>
+
+@matrix: 
+@Returns: 
+
+
+<!-- ##### FUNCTION pango_gravity_get_for_script ##### -->
+<para>
+
+</para>
+
+@script: 
+@base_gravity: 
+@hint: 
+@Returns: 
+
+