[pango/pango2: 38/201] Drop deprecated PangoDirection values




commit 6651eed2ea32221a2bd1971c9b1c040ab940131c
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Jun 10 21:45:06 2022 -0400

    Drop deprecated PangoDirection values

 pango/pango-bidi-type.c |  2 --
 pango/pango-direction.h | 11 +----------
 pango/pango-layout.c    |  4 ----
 tests/testrandom.c      |  2 --
 4 files changed, 1 insertion(+), 18 deletions(-)
---
diff --git a/pango/pango-bidi-type.c b/pango/pango-bidi-type.c
index 3b67ed55..8aa76983 100644
--- a/pango/pango-bidi-type.c
+++ b/pango/pango-bidi-type.c
@@ -71,11 +71,9 @@ pango_log2vis_get_embedding_levels (const gchar    *text,
   switch (*pbase_dir)
     {
     case PANGO_DIRECTION_LTR:
-    case PANGO_DIRECTION_TTB_RTL:
       fribidi_base_dir = FRIBIDI_PAR_LTR;
       break;
     case PANGO_DIRECTION_RTL:
-    case PANGO_DIRECTION_TTB_LTR:
       fribidi_base_dir = FRIBIDI_PAR_RTL;
       break;
     case PANGO_DIRECTION_WEAK_RTL:
diff --git a/pango/pango-direction.h b/pango/pango-direction.h
index 24d3c50e..c74e7f66 100644
--- a/pango/pango-direction.h
+++ b/pango/pango-direction.h
@@ -30,10 +30,6 @@ G_BEGIN_DECLS
  * PangoDirection:
  * @PANGO_DIRECTION_LTR: A strong left-to-right direction
  * @PANGO_DIRECTION_RTL: A strong right-to-left direction
- * @PANGO_DIRECTION_TTB_LTR: Deprecated value; treated the
- *   same as `PANGO_DIRECTION_RTL`.
- * @PANGO_DIRECTION_TTB_RTL: Deprecated value; treated the
- *   same as `PANGO_DIRECTION_LTR`
  * @PANGO_DIRECTION_WEAK_LTR: A weak left-to-right direction
  * @PANGO_DIRECTION_WEAK_RTL: A weak right-to-left direction
  * @PANGO_DIRECTION_NEUTRAL: No direction specified
@@ -48,10 +44,7 @@ G_BEGIN_DECLS
  * or has a strong direction; on the other hand `PANGO_DIRECTION_NEUTRAL`
  * doesn't make sense to pass to [func@itemize_with_base_dir].
  *
- * The `PANGO_DIRECTION_TTB_LTR`, `PANGO_DIRECTION_TTB_RTL` values come from
- * an earlier interpretation of this enumeration as the writing direction
- * of a block of text and are no longer used. See `PangoGravity` for how
- * vertical text is handled in Pango.
+ * See `PangoGravity` for how vertical text is handled in Pango.
  *
  * If you are interested in text direction, you should really use fribidi
  * directly. `PangoDirection` is only retained because it is used in some
@@ -60,8 +53,6 @@ G_BEGIN_DECLS
 typedef enum {
   PANGO_DIRECTION_LTR,
   PANGO_DIRECTION_RTL,
-  PANGO_DIRECTION_TTB_LTR,
-  PANGO_DIRECTION_TTB_RTL,
   PANGO_DIRECTION_WEAK_LTR,
   PANGO_DIRECTION_WEAK_RTL,
   PANGO_DIRECTION_NEUTRAL
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 66422397..695e4dc2 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -2755,11 +2755,9 @@ direction_simple (PangoDirection d)
     {
     case PANGO_DIRECTION_LTR :
     case PANGO_DIRECTION_WEAK_LTR :
-    case PANGO_DIRECTION_TTB_RTL :
       return 1;
     case PANGO_DIRECTION_RTL :
     case PANGO_DIRECTION_WEAK_RTL :
-    case PANGO_DIRECTION_TTB_LTR :
       return -1;
     case PANGO_DIRECTION_NEUTRAL :
       return 0;
@@ -4355,14 +4353,12 @@ line_set_resolved_dir (PangoLayoutLine *line,
     {
     default:
     case PANGO_DIRECTION_LTR:
-    case PANGO_DIRECTION_TTB_RTL:
     case PANGO_DIRECTION_WEAK_LTR:
     case PANGO_DIRECTION_NEUTRAL:
       line->resolved_dir = PANGO_DIRECTION_LTR;
       break;
     case PANGO_DIRECTION_RTL:
     case PANGO_DIRECTION_WEAK_RTL:
-    case PANGO_DIRECTION_TTB_LTR:
       line->resolved_dir = PANGO_DIRECTION_RTL;
       break;
     }
diff --git a/tests/testrandom.c b/tests/testrandom.c
index 332376b6..c321fb6a 100644
--- a/tests/testrandom.c
+++ b/tests/testrandom.c
@@ -41,8 +41,6 @@ random_word (PangoDirection dir)
         return ltr_words[g_test_rand_int_range (0, n_ltr_words)];
       case PANGO_DIRECTION_RTL:
         return rtl_words[g_test_rand_int_range (0, n_rtl_words)];
-      case PANGO_DIRECTION_TTB_LTR:
-      case PANGO_DIRECTION_TTB_RTL:
       case PANGO_DIRECTION_WEAK_LTR:
       case PANGO_DIRECTION_WEAK_RTL:
       case PANGO_DIRECTION_NEUTRAL:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]