Merge branch 'bilelmoussaoui/gi-annotations' into 'main'

pango: backport an old since annotation

See merge request GNOME/pango!488

4 files changed, 30 insertions, 0 deletions

diff --git a/pango/pango-attributes.c b/pango/pango-attributes.c
index a87c661e..c929a3d5 100644
--- a/pango/pango-attributes.c
+++ b/pango/pango-attributes.c
@@ -1644,6 +1644,8 @@ pango_attribute_as_float (PangoAttribute *attr)
  *
  * Returns: (nullable) (transfer none): The attribute as `PangoAttrString`,
  *   or %NULL if it's not a string attribute
+ *
+ * Since: 1.50
  */
 PangoAttrString *
 pango_attribute_as_string (PangoAttribute *attr)
diff --git a/pango/pango-attributes.h b/pango/pango-attributes.h
index 59183a60..51b9b077 100644
--- a/pango/pango-attributes.h
+++ b/pango/pango-attributes.h
@@ -232,6 +232,7 @@ typedef enum {
 
 /**
  * PangoBaselineShift:
+ * @PANGO_BASELINE_SHIFT_NONE: Leave the baseline unchanged
  * @PANGO_BASELINE_SHIFT_SUPERSCRIPT: Shift the baseline to the superscript position,
  *   relative to the previous run
  * @PANGO_BASELINE_SHIFT_SUBSCRIPT: Shift the baseline to the subscript position,
@@ -247,6 +248,17 @@ typedef enum {
   PANGO_BASELINE_SHIFT_SUBSCRIPT,
 } PangoBaselineShift;
 
+/**
+ * PangoFontScale:
+ * @PANGO_FONT_SCALE_NONE: Leave the font size unchanged
+ * @PANGO_FONT_SCALE_SUPERSCRIPT: Change the font to a size suitable for superscripts
+ * @PANGO_FONT_SCALE_SUBSCRIPT: Change the font to a size suitable for subscripts
+ *
+ * An enumeration that affects font sizes for superscript
+ * and subscript positioning.
+ *
+ * Since: 1.50
+ */
 typedef enum {
   PANGO_FONT_SCALE_NONE,
   PANGO_FONT_SCALE_SUPERSCRIPT,
diff --git a/pango/pango-glyph.h b/pango/pango-glyph.h
index fae7168c..82ee47c6 100644
--- a/pango/pango-glyph.h
+++ b/pango/pango-glyph.h
@@ -224,6 +224,8 @@ void                    pango_glyph_string_index_to_x_full      (PangoGlyphStrin
  * Flags influencing the shaping process.
  *
  * `PangoShapeFlags` can be passed to [func@Pango.shape_with_flags].
+ *
+ * Since: 1.44
  */
 typedef enum {
   PANGO_SHAPE_NONE            = 0,
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 6e761f2c..ba81adf6 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -7509,6 +7509,20 @@ pango_layout_iter_get_baseline (PangoLayoutIter *iter)
   return iter->line_extents[iter->line_index].baseline;
 }
 
+/**
+ * pango_layout_iter_get_run_baseline:
+ * @iter: a `PangoLayoutIter`
+ * 
+ * Gets the Y position of the current run's baseline, in layout
+ * coordinates.
+ *
+ * Layout coordinates have the origin at the top left of the entire layout.
+ *
+ * The run baseline can be different from the line baseline, for
+ * example due to superscript or subscript positioning.
+ *
+ * Since: 1.50
+ */
 int
 pango_layout_iter_get_run_baseline (PangoLayoutIter *iter)
 {