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

Matthiasc/for master

See merge request GNOME/gtk!3317

gtk/gtktextattributes.h

@@ -142,12 +142,19 @@ struct _GtkTextAttributes
 {
   guint refcount;
 
-  GtkTextAppearance appearance;
-
   GtkJustification justification;
   GtkTextDirection direction;
+  GtkWrapMode wrap_mode;
+
+  GtkTextAppearance appearance;
 
   PangoFontDescription *font;
+  char *font_features;
+
+  GdkRGBA *pg_bg_rgba;
+
+  PangoTabArray *tabs;
+  PangoLanguage *language;
 
   double font_scale;
 
@@ -159,11 +166,7 @@ struct _GtkTextAttributes
   int pixels_below_lines;
   int pixels_inside_wrap;
 
-  PangoTabArray *tabs;
-
-  GtkWrapMode wrap_mode;
-
-  PangoLanguage *language;
+  int letter_spacing;
 
   guint invisible : 1;
   guint bg_full_height : 1;
@@ -171,14 +174,7 @@ struct _GtkTextAttributes
   guint no_fallback: 1;
   guint no_breaks : 1;
   guint show_spaces : 3; /* PangoShowFlags */
-  int   no_hyphens : 1;
-
-
-  GdkRGBA *pg_bg_rgba;
-
-  int letter_spacing;
-
-  char *font_features;
+  guint no_hyphens : 1;
 };
 
 GtkTextAttributes* gtk_text_attributes_new         (void);

gtk/gtktextlayoutprivate.h

@@ -113,19 +113,11 @@ struct _GtkTextLayout
   int width;
   int height;
 
-  /* Pixel offsets from the left and from the top to be used when we
-   * draw; these allow us to create left/top margins. We don't need
-   * anything special for bottom/right margins, because those don't
-   * affect drawing.
-   */
-  /* int left_edge; */
-  /* int top_edge; */
-
-  GtkTextBuffer *buffer;
-
   int left_padding;
   int right_padding;
 
+  GtkTextBuffer *buffer;
+
   /* Default style used if no tags override it */
   GtkTextAttributes *default_style;
 
@@ -140,7 +132,7 @@ struct _GtkTextLayout
 
   /* Whether we are allowed to wrap right now */
   int wrap_loop_count;
-  
+
   /* Whether to show the insertion cursor */
   guint cursor_visible : 1;
 

gtk/gtktexttag.c

@@ -643,7 +643,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                        GTK_PARAM_READWRITE));
 
   /**
-   * GtkTextTag:oerline:
+   * GtkTextTag:overline:
    *
    * Style of overline for this text.
    */

make-release.sh

@@ -10,8 +10,8 @@ if [ -d ${release_build_dir} ]; then
 fi
 
 # make the release tarball
-meson setup ${release_build_dir} || exit
-meson dist -C${release_build_dir} || exit
+meson setup --force-fallback-for gi-docgen ${release_build_dir} || exit
+meson dist -C${release_build_dir} --include-subprojects || exit
 
 # now build the docs
 meson configure ${release_build_dir} -Dintrospection=enabled -Dgtk_doc=true || exit