Oops. Exchange west<->east and north<->south gravities. The gravity is the

2006-08-15  Behdad Esfahbod  <behdad@gnome.org>

        * docs/pango-sections.txt:
        * docs/tmpl/main.sgml:
        * examples/renderdemo.c (parse_gravity), (parse_options):
        * pango/pango-context.c (pango_context_init),
        (pango_context_get_base_gravity), (itemize_state_add_character):
        * pango/pango-types.h:
        * pango/pangocairo-fcfont.c (pango_cairo_fc_font_get_scaled_font):
        * pango/pangofc-fontmap.c (pango_fc_make_pattern):
        Oops.  Exchange west<->east and north<->south gravities.  The gravity
        is the side that the glyph sits on.  So, for normal Latin text for
        example, gravity is south, not north.

4 files changed, 23 insertions, 23 deletions

diff --git a/pango/pango-context.c b/pango/pango-context.c
index 34a91f4b..f0fae76d 100644
--- a/pango/pango-context.c
+++ b/pango/pango-context.c
@@ -59,7 +59,7 @@ static void
 pango_context_init (PangoContext *context)
 {
   context->base_dir = PANGO_DIRECTION_WEAK_LTR;
-  context->base_gravity = PANGO_GRAVITY_NORTH;
+  context->base_gravity = PANGO_GRAVITY_SOUTH;
   context->language = NULL;
   context->font_map = NULL;
 
@@ -435,7 +435,7 @@ pango_context_set_base_gravity (PangoContext  *context,
 PangoGravity
 pango_context_get_base_gravity (PangoContext *context)
 {
-  g_return_val_if_fail (context != NULL, PANGO_GRAVITY_NORTH);
+  g_return_val_if_fail (context != NULL, PANGO_GRAVITY_SOUTH);
 
   return context->base_gravity;
 }
@@ -887,12 +887,12 @@ itemize_state_add_character (ItemizeState     *state,
    */
   switch (state->item->analysis.gravity)
     {
-      case PANGO_GRAVITY_NORTH:
-      case PANGO_GRAVITY_WEST:
-      default:
-	break;
       case PANGO_GRAVITY_SOUTH:
       case PANGO_GRAVITY_EAST:
+      default:
+	break;
+      case PANGO_GRAVITY_NORTH:
+      case PANGO_GRAVITY_WEST:
 	state->item->analysis.level++;
     }
 
diff --git a/pango/pango-types.h b/pango/pango-types.h
index 4ab528cd..3c8233d5 100644
--- a/pango/pango-types.h
+++ b/pango/pango-types.h
@@ -183,21 +183,21 @@ typedef enum {
 
 /**
  * PangoGravity:
- * @PANGO_GRAVITY_NORTH: Glyphs stand upright (default)
- * @PANGO_GRAVITY_WEST: Glyphs are rotated 90 degrees clockwise
- * @PANGO_GRAVITY_SOUTH: Glyphs are upside-down
- * @PANGO_GRAVITY_EAST: Glyphs are rotated 90 degrees counter-clockwise
+ * @PANGO_GRAVITY_SOUTH: Glyphs stand upright (default)
+ * @PANGO_GRAVITY_EAST: Glyphs are rotated 90 degrees clockwise
+ * @PANGO_GRAVITY_NORTH: Glyphs are upside-down
+ * @PANGO_GRAVITY_WEST: Glyphs are rotated 90 degrees counter-clockwise
  * 
- * The #PangoGravity type represents the direction that the glyphs are
- * rotated.  This is useful when rendering vertical text layouts.  In
+ * The #PangoGravity type represents the orientation of glyphs in a segment
+ * of text.  This is useful when rendering vertical text layouts.  In
  * those situations, the layout is rotated using a non-identity PangoMatrix,
- * and then glyph rotation is controlled using #PangoGravity.
+ * and then glyph orientation is controlled using #PangoGravity.
  **/			  
 typedef enum {
-  PANGO_GRAVITY_NORTH,
-  PANGO_GRAVITY_WEST,
   PANGO_GRAVITY_SOUTH,
-  PANGO_GRAVITY_EAST
+  PANGO_GRAVITY_EAST,
+  PANGO_GRAVITY_NORTH,
+  PANGO_GRAVITY_WEST
 } PangoGravity;
 
 #define PANGO_TYPE_LANGUAGE (pango_language_get_type ())
diff --git a/pango/pangocairo-fcfont.c b/pango/pangocairo-fcfont.c
index 41699306..488dca0d 100644
--- a/pango/pangocairo-fcfont.c
+++ b/pango/pangocairo-fcfont.c
@@ -134,7 +134,7 @@ pango_cairo_fc_font_get_scaled_font (PangoCairoFont *font)
       if (!cffont->scaled_font)
         return NULL;
 
-      if (cffont->gravity != PANGO_GRAVITY_NORTH)
+      if (cffont->gravity != PANGO_GRAVITY_SOUTH)
         {
 	  cairo_font_extents_t metrics;
 	  cairo_matrix_t matrix;
@@ -147,16 +147,16 @@ pango_cairo_fc_font_get_scaled_font (PangoCairoFont *font)
 
 	  switch (cffont->gravity)
 	    {
-	      case PANGO_GRAVITY_NORTH:
+	      case PANGO_GRAVITY_SOUTH:
 	      default:
 	        break;
-	      case PANGO_GRAVITY_SOUTH:
+	      case PANGO_GRAVITY_NORTH:
 		cairo_matrix_rotate(&matrix, M_PI);
 		break;
-	      case PANGO_GRAVITY_WEST:
+	      case PANGO_GRAVITY_EAST:
 		cairo_matrix_rotate(&matrix, -M_PI_2);
 		break;
-	      case PANGO_GRAVITY_EAST:
+	      case PANGO_GRAVITY_WEST:
 		cairo_matrix_rotate(&matrix, +M_PI_2);
 		break;
 	    }
diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c
index a681eea2..93f4959e 100644
--- a/pango/pangofc-fontmap.c
+++ b/pango/pangofc-fontmap.c
@@ -814,13 +814,13 @@ pango_fc_make_pattern (const  PangoFontDescription *description,
 
   switch (gravity)
     {
-      case PANGO_GRAVITY_NORTH:
       case PANGO_GRAVITY_SOUTH:
+      case PANGO_GRAVITY_NORTH:
       default:
         vertical = FcFalse;
 	break;
-      case PANGO_GRAVITY_WEST:
       case PANGO_GRAVITY_EAST:
+      case PANGO_GRAVITY_WEST:
         vertical = FcTrue;
         break;
     }