Merge branch 'matthiasc/for-master' into 'master'

Handle new pango attribute type

See merge request GNOME/gtk!3866

demos/gtk-demo/fontify.c

@@ -269,6 +269,11 @@ insert_tags_for_attributes (GtkTextBuffer     *buffer,
         case PANGO_ATTR_BACKGROUND_ALPHA:
           break;
 
+#if PANGO_VERSION_CHECK(1,49,0)
+        case PANGO_ATTR_TEXT_TRANSFORM:
+          break;
+#endif
+
         case PANGO_ATTR_INVALID:
         default:
           g_assert_not_reached ();

gtk/gtkpango.c

@@ -258,6 +258,10 @@ attribute_from_text (GtkBuilder  *builder,
       if (gtk_builder_value_from_string_type (builder, G_TYPE_INT, value, &val, error))
         attribute = pango_attr_line_height_new_absolute (g_value_get_int (&val) * PANGO_SCALE);
       break;
+    case PANGO_ATTR_TEXT_TRANSFORM:
+      if (gtk_builder_value_from_string_type (builder, PANGO_TYPE_TEXT_TRANSFORM, value, &val, error))
+        attribute = pango_attr_text_transform_new (g_value_get_enum (&val));
+      break;
 #endif
     case PANGO_ATTR_INVALID:
     default:

gtk/gtktextbuffer.c

@@ -4711,6 +4711,11 @@ insert_tags_for_attributes (GtkTextBuffer     *buffer,
           INT_ATTR (insert_hyphens);
           break;
 
+#if PANGO_VERSION_CHECK(1, 49, 0)
+        case PANGO_ATTR_TEXT_TRANSFORM:
+          break;
+#endif
+
         case PANGO_ATTR_SHAPE:
         case PANGO_ATTR_ABSOLUTE_SIZE:
         case PANGO_ATTR_GRAVITY:

testsuite/gtk/label.c

@@ -43,6 +43,7 @@ print_attribute (PangoAttribute *attr, GString *string)
     case PANGO_ATTR_SHOW:
 #if PANGO_VERSION_CHECK(1, 49, 0)
     case PANGO_ATTR_ABSOLUTE_LINE_HEIGHT:
+    case PANGO_ATTR_TEXT_TRANSFORM:
 #endif
       g_string_append_printf (string, "%d", ((PangoAttrInt *)attr)->value);
       break;