[pango/pango2] Undo excessive search/replace
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango/pango2] Undo excessive search/replace
- Date: Sun, 26 Jun 2022 15:48:02 +0000 (UTC)
commit ba459a48b8fc27111cf8688f8c23368a1df3d9a3
Author: Matthias Clasen <mclasen redhat com>
Date: Sun Jun 26 11:38:30 2022 -0400
Undo excessive search/replace
We still refer to the project as 'Pango' in docs
and comments, even though the prefix now is 'Pango2'.
docs/pango_cairo.md | 2 +-
examples/cairosimple.c | 2 +-
examples/pangowin32tobmp.c | 2 +-
pango2/ellipsize.c | 10 +++++-----
pango2/glyphstring.c | 2 +-
pango2/pango-attr-list.c | 2 +-
pango2/pango-attr-list.h | 2 +-
pango2/pango-attr.c | 4 ++--
pango2/pango-attributes.c | 8 ++++----
pango2/pango-attributes.h | 4 ++--
pango2/pango-context.c | 12 ++++++------
pango2/pango-font-description.c | 8 ++++----
pango2/pango-font-metrics.c | 20 +++++++++----------
pango2/pango-fontmap.c | 8 ++++----
pango2/pango-glyph-item.c | 2 +-
pango2/pango-hbface.c | 10 +++++-----
pango2/pango-language-sample-table.h | 2 +-
pango2/pango-language.c | 10 +++++-----
pango2/pango-layout.c | 30 ++++++++++++++--------------
pango2/pango-line-breaker.c | 4 ++--
pango2/pango-line.c | 14 ++++++-------
pango2/pango-lines.c | 14 ++++++-------
pango2/pango-markup.c | 12 ++++++------
pango2/pango-matrix.c | 8 ++++----
pango2/pango-renderer.c | 38 ++++++++++++++++++------------------
pango2/pango-renderer.h | 2 +-
pango2/pango-tabs.c | 12 ++++++------
pango2/pango-types.h | 24 +++++++++++------------
pango2/pango-userface.c | 4 ++--
pango2/pango-utils.c | 28 +++++++++++++-------------
pango2/pango-utils.h | 22 ++++++++++-----------
pango2/pango-version-macros.h | 12 ++++++------
pango2/pangocairo-render.c | 4 ++--
pango2/pangocoretext-fontmap.c | 2 +-
pango2/pangofc-fontmap.c | 2 +-
pango2/serializer.c | 4 ++--
tests/markup-parse.c | 2 +-
tests/test-break.c | 2 +-
tests/test-ellipsize.c | 2 +-
tests/test-harfbuzz.c | 2 +-
tests/test-itemize.c | 2 +-
tests/test-layout.c | 2 +-
tests/test-shape.c | 2 +-
utils/pango-segmentation.c | 2 +-
utils/viewer-pangocairo.c | 2 +-
utils/viewer-render.c | 10 +++++-----
46 files changed, 187 insertions(+), 187 deletions(-)
---
diff --git a/docs/pango_cairo.md b/docs/pango_cairo.md
index afd59ae97..2f7bd4d75 100644
--- a/docs/pango_cairo.md
+++ b/docs/pango_cairo.md
@@ -72,7 +72,7 @@ draw_text (cairo_t *cr)
cairo_rotate (cr, angle * G_PI / 180.);
- /* Inform Pango2 to re-layout the text with the new transformation */
+ /* Inform Pango to re-layout the text with the new transformation */
pango2_cairo_update_layout (cr, layout);
lines = pango2_layout_get_lines (layout);
diff --git a/examples/cairosimple.c b/examples/cairosimple.c
index 70c0098ce..baf5604df 100644
--- a/examples/cairosimple.c
+++ b/examples/cairosimple.c
@@ -39,7 +39,7 @@ draw_text (cairo_t *cr)
cairo_rotate (cr, angle * G_PI / 180.);
- /* Inform Pango2 to re-layout the text with the new transformation */
+ /* Inform Pango to re-layout the text with the new transformation */
pango2_cairo_update_layout (cr, layout);
lines = pango2_layout_get_lines (layout);
diff --git a/examples/pangowin32tobmp.c b/examples/pangowin32tobmp.c
index 0708d026a..204467024 100644
--- a/examples/pangowin32tobmp.c
+++ b/examples/pangowin32tobmp.c
@@ -75,7 +75,7 @@ int main (int argc, char **argv)
GTimeVal tv0, tv1;
int my_font_size = 12;
- printf ("# Pango2 Font Test\n"
+ printf ("# Pango Font Test\n"
"# Language: %s\n"
"#\n", pango2_language_to_string (lang));
diff --git a/pango2/ellipsize.c b/pango2/ellipsize.c
index a5f741310..3863365bc 100644
--- a/pango2/ellipsize.c
+++ b/pango2/ellipsize.c
@@ -73,7 +73,7 @@ struct _RunInfo
{
Pango2GlyphItem *run;
int start_offset; /* Character offset of run start */
- int width; /* Width of run in Pango2 units */
+ int width; /* Width of run in Pango units */
};
/* Iterator to a position within the ellipsized line */
@@ -95,11 +95,11 @@ struct _EllipsizeState
RunInfo *run_info; /* Array of information about each run */
int n_runs;
- int total_width; /* Original width of line in Pango2 units */
+ int total_width; /* Original width of line in Pango units */
int gap_center; /* Goal for center of gap */
Pango2GlyphItem *ellipsis_run; /* Run created to hold ellipsis */
- int ellipsis_width; /* Width of ellipsis, in Pango2 units */
+ int ellipsis_width; /* Width of ellipsis, in Pango units */
int ellipsis_is_cjk; /* Whether the first character in the ellipsized
* is wide; this triggers us to try to use a
* mid-line ellipsis instead of a baseline
@@ -108,12 +108,12 @@ struct _EllipsizeState
Pango2AttrIterator *line_start_attr; /* Cached Pango2AttrIterator for the start of the run */
LineIter gap_start_iter; /* Iteratator pointig to the first cluster in gap */
- int gap_start_x; /* x position of start of gap, in Pango2 units */
+ int gap_start_x; /* x position of start of gap, in Pango units */
Pango2AttrIterator *gap_start_attr; /* Attribute iterator pointing to a range containing
* the first character in gap */
LineIter gap_end_iter; /* Iterator pointing to last cluster in gap */
- int gap_end_x; /* x position of end of gap, in Pango2 units */
+ int gap_end_x; /* x position of end of gap, in Pango units */
Pango2ShapeFlags shape_flags;
};
diff --git a/pango2/glyphstring.c b/pango2/glyphstring.c
index 9ae86b939..318ec4aef 100644
--- a/pango2/glyphstring.c
+++ b/pango2/glyphstring.c
@@ -625,7 +625,7 @@ fallback:
* @text: the text for the run
* @length: the number of bytes (not characters) in text.
* @analysis: the analysis information return from [func@itemize]
- * @x_pos: the x offset (in Pango2 units)
+ * @x_pos: the x offset (in Pango units)
* @index_: (out): location to store calculated byte index within @text
* @trailing: (out): location to store a boolean indicating whether the
* user clicked on the leading or trailing edge of the character
diff --git a/pango2/pango-attr-list.c b/pango2/pango-attr-list.c
index 6f0f47d0f..fb0d24715 100644
--- a/pango2/pango-attr-list.c
+++ b/pango2/pango-attr-list.c
@@ -875,7 +875,7 @@ attr_print (GString *str,
* Serializes a `Pango2AttrList` to a string.
*
* No guarantees are made about the format of the string,
- * it may change between Pango2 versions.
+ * it may change between Pango versions.
*
* The intended use of this function is testing and
* debugging. The format is not meant as a permanent
diff --git a/pango2/pango-attr-list.h b/pango2/pango-attr-list.h
index e51dc5ff0..69b3293ff 100644
--- a/pango2/pango-attr-list.h
+++ b/pango2/pango-attr-list.h
@@ -75,7 +75,7 @@ void pango2_attr_list_update (Pango2AttrList
/**
* Pango2AttrFilterFunc:
- * @attribute: a Pango2 attribute
+ * @attribute: a Pango attribute
* @user_data: user data passed to the function
*
* Callback to filter a list of attributes.
diff --git a/pango2/pango-attr.c b/pango2/pango-attr.c
index 5f7876d3f..c06e16023 100644
--- a/pango2/pango-attr.c
+++ b/pango2/pango-attr.c
@@ -161,7 +161,7 @@ is_valid_attr_type (guint type)
* by using [func@Pango2.AttrType.get_name].
*
* The callbacks are only needed if @type is `PANGO2_ATTR_VALUE_POINTER`,
- * Pango2 knows how to handle other value types and will only use the
+ * Pango knows how to handle other value types and will only use the
* callbacks for generic pointer values.
*
* If @name and @serialize are provided, they will be used
@@ -484,7 +484,7 @@ pango2_attribute_equal (const Pango2Attribute *attr1,
* The type must be one of the `Pango2AttrType` values, or
* have been registered with [func@Pango2.AttrType.register].
*
- * Pango2 will initialize @start_index and @end_index to an
+ * Pango will initialize @start_index and @end_index to an
* all-inclusive range of `[0,G_MAXUINT]`. The value is copied.
*
* Return value: (transfer full): the newly allocated
diff --git a/pango2/pango-attributes.c b/pango2/pango-attributes.c
index ea782a07f..1318451fb 100644
--- a/pango2/pango-attributes.c
+++ b/pango2/pango-attributes.c
@@ -409,7 +409,7 @@ pango2_attr_strikethrough_color_new (Pango2Color *color)
/**
* pango2_attr_rise_new:
* @rise: the amount that the text should be displaced vertically,
- * in Pango2 units. Positive values displace the text upwards.
+ * in Pango units. Positive values displace the text upwards.
*
* Create a new baseline displacement attribute.
*
@@ -426,7 +426,7 @@ pango2_attr_rise_new (int rise)
/**
* pango2_attr_baseline_shift_new:
* @shift: either a `Pango2BaselineShift` enumeration value or an absolute value (> 1024)
- * in Pango2 units, relative to the baseline of the previous run.
+ * in Pango units, relative to the baseline of the previous run.
* Positive values displace the text upwards.
*
* Create a new baseline displacement attribute.
@@ -513,7 +513,7 @@ pango2_attr_fallback_new (gboolean enable_fallback)
/**
* pango2_attr_letter_spacing_new:
* @letter_spacing: amount of extra space to add between
- * graphemes of the text, in Pango2 units
+ * graphemes of the text, in Pango units
*
* Create a new letter-spacing attribute.
*
@@ -608,7 +608,7 @@ pango2_attr_allow_breaks_new (gboolean allow_breaks)
*
* Create a new insert-hyphens attribute.
*
- * Pango2 will insert hyphens when breaking lines in
+ * Pango will insert hyphens when breaking lines in
* the middle of a word. This attribute can be used
* to suppress the hyphen.
*
diff --git a/pango2/pango-attributes.h b/pango2/pango-attributes.h
index 98e89d7ba..d7c7661c6 100644
--- a/pango2/pango-attributes.h
+++ b/pango2/pango-attributes.h
@@ -50,7 +50,7 @@ G_BEGIN_DECLS
* @PANGO2_ATTR_RISE: baseline displacement
* @PANGO2_ATTR_SCALE: font size scale factor
* @PANGO2_ATTR_FALLBACK: whether font fallback is enabled
- * @PANGO2_ATTR_LETTER_SPACING: letter spacing in Pango2 units
+ * @PANGO2_ATTR_LETTER_SPACING: letter spacing in Pango units
* @PANGO2_ATTR_UNDERLINE_COLOR: underline color
* @PANGO2_ATTR_STRIKETHROUGH_COLOR: strikethrough color
* @PANGO2_ATTR_ABSOLUTE_SIZE: font size in pixels scaled by `PANGO2_SCALE`
@@ -63,7 +63,7 @@ G_BEGIN_DECLS
* @PANGO2_ATTR_OVERLINE: whether the text has an overline
* @PANGO2_ATTR_OVERLINE_COLOR: overline color
* @PANGO2_ATTR_LINE_HEIGHT: line height factor
- * @PANGO2_ATTR_ABSOLUTE_LINE_HEIGHT: line height in Pango2 units
+ * @PANGO2_ATTR_ABSOLUTE_LINE_HEIGHT: line height in Pango units
* @PANGO2_ATTR_WORD: mark the range of the attribute as a single word
* @PANGO2_ATTR_SENTENCE: mark the range of the attribute as a single sentence
* @PANGO2_ATTR_PARAGRAPH: mark the range of the attribute as a single paragraph
diff --git a/pango2/pango-context.c b/pango2/pango-context.c
index fcffe9220..371c8405f 100644
--- a/pango2/pango-context.c
+++ b/pango2/pango-context.c
@@ -335,7 +335,7 @@ pango2_context_finalize (GObject *object)
* the default one, you should use [ctor@Pango2.Context.new_with_font_map]
* instead.
*
- * If you are using Pango2 as part of a higher-level system,
+ * If you are using Pango as part of a higher-level system,
* that system may have it's own way of create a `Pango2Context`.
* Pango2's own cairo support for instance, has [func@Pango2.cairo_create_context],
* and the GTK toolkit has, among others, gtk_widget_get_pango2_context().
@@ -357,7 +357,7 @@ pango2_context_new (void)
*
* Creates a new `Pango2Context` with the given font map.
*
- * If you are using Pango2 as part of a higher-level system,
+ * If you are using Pango as part of a higher-level system,
* that system may have it's own way of create a `Pango2Context`.
* Pango2's own cairo support for instance, has [func@Pango2.cairo_create_context],
* and the GTK toolkit has, among others, gtk_widget_get_pango2_context().
@@ -434,7 +434,7 @@ pango2_context_set_matrix (Pango2Context *context,
*
* Return value: (nullable): the matrix, or %NULL if no matrix has
* been set (which is the same as the identity matrix). The returned
- * matrix is owned by Pango2 and must not be modified or freed.
+ * matrix is owned by Pango and must not be modified or freed.
*/
const Pango2Matrix *
pango2_context_get_matrix (Pango2Context *context)
@@ -452,7 +452,7 @@ pango2_context_get_matrix (Pango2Context *context)
* Sets the font map to be searched when fonts are looked-up
* in this context.
*
- * This is only for internal use by Pango2 backends, a `Pango2Context`
+ * This is only for internal use by Pango backends, a `Pango2Context`
* obtained via one of the recommended methods should already have a
* suitable font map.
*/
@@ -487,7 +487,7 @@ pango2_context_set_font_map (Pango2Context *context,
* Gets the `Pango2FontMap` used to look up fonts for this context.
*
* Return value: (transfer none): the font map for the `Pango2Context`.
- * This value is owned by Pango2 and should not be unreferenced.
+ * This value is owned by Pango and should not be unreferenced.
*/
Pango2FontMap *
pango2_context_get_font_map (Pango2Context *context)
@@ -1018,7 +1018,7 @@ pango2_context_get_serial (Pango2Context *context)
* positioning of glyphs.
*
* The default value is to round glyph positions, to remain
- * compatible with previous Pango2 behavior.
+ * compatible with previous Pango behavior.
*/
void
pango2_context_set_round_glyph_positions (Pango2Context *context,
diff --git a/pango2/pango-font-description.c b/pango2/pango-font-description.c
index db22853b9..20421c893 100644
--- a/pango2/pango-font-description.c
+++ b/pango2/pango-font-description.c
@@ -182,7 +182,7 @@ pango2_font_description_get_family (const Pango2FontDescription *desc)
* %PANGO2_STYLE_NORMAL, %PANGO2_STYLE_ITALIC, or %PANGO2_STYLE_OBLIQUE.
*
* Most fonts will either have a italic style or an oblique style,
- * but not both, and font matching in Pango2 will match italic
+ * but not both, and font matching in Pango will match italic
* specifications with oblique fonts and vice-versa if an exact
* match is not found.
*/
@@ -394,7 +394,7 @@ pango2_font_description_get_size (const Pango2FontDescription *desc)
/**
* pango2_font_description_set_absolute_size:
* @desc: a `Pango2FontDescription`
- * @size: the new size, in Pango2 units. There are %PANGO2_SCALE Pango2 units
+ * @size: the new size, in Pango units. There are %PANGO2_SCALE Pango units
* in one device unit. For an output backend where a device unit is a pixel,
* a @size value of 10 * PANGO2_SCALE gives a 10 pixel font.
*
@@ -547,7 +547,7 @@ pango2_font_description_set_variations_static (Pango2FontDescription *desc,
* and each VALUE a floating point number. Unknown axes are ignored,
* and values are clamped to their allowed range.
*
- * Pango2 does not currently have a way to find supported axes of
+ * Pango does not currently have a way to find supported axes of
* a font. Both harfbuzz and freetype have API for this. See
* for example
[hb_ot_var_get_axis_infos](https://harfbuzz.github.io/harfbuzz-hb-ot-var.html#hb-ot-var-get-axis-infos).
*/
@@ -1705,7 +1705,7 @@ pango2_font_description_set_faceid_static (Pango2FontDescription *desc,
* the same font they started with, if possible.
*
* Font descriptions originating from [method@Pango2.FontFace.describe]
- * should ideally include a faceid. Pango2 takes the faceid
+ * should ideally include a faceid. Pango takes the faceid
* into account when looking for the best matching face while
* loading a fontset or font.
*
diff --git a/pango2/pango-font-metrics.c b/pango2/pango-font-metrics.c
index d2b61d44c..9a0311884 100644
--- a/pango2/pango-font-metrics.c
+++ b/pango2/pango-font-metrics.c
@@ -33,7 +33,7 @@ G_DEFINE_BOXED_TYPE (Pango2FontMetrics, pango2_font_metrics,
*
* Creates a new `Pango2FontMetrics` structure.
*
- * This is only for internal use by Pango2 backends and there is
+ * This is only for internal use by Pango backends and there is
* no public way to set the fields of the structure.
*
* Return value: a newly-created `Pango2FontMetrics` structure
@@ -83,7 +83,7 @@ pango2_font_metrics_free (Pango2FontMetrics *metrics)
* of the actual drawn ink. It is necessary to lay out the text to
* figure where the ink will be.)
*
- * Return value: the ascent, in Pango2 units.
+ * Return value: the ascent, in Pango units.
*/
int
pango2_font_metrics_get_ascent (Pango2FontMetrics *metrics)
@@ -104,7 +104,7 @@ pango2_font_metrics_get_ascent (Pango2FontMetrics *metrics)
* bottom of the actual drawn ink. It is necessary to lay out the text
* to figure where the ink will be.)
*
- * Return value: the descent, in Pango2 units.
+ * Return value: the descent, in Pango units.
*/
int
pango2_font_metrics_get_descent (Pango2FontMetrics *metrics)
@@ -125,7 +125,7 @@ pango2_font_metrics_get_descent (Pango2FontMetrics *metrics)
*
* If the line height is not available, 0 is returned.
*
- * Return value: the height, in Pango2 units
+ * Return value: the height, in Pango units
*/
int
pango2_font_metrics_get_height (Pango2FontMetrics *metrics)
@@ -145,7 +145,7 @@ pango2_font_metrics_get_height (Pango2FontMetrics *metrics)
* determining the initial size for a window. Actual characters in
* text will be wider and narrower than this.
*
- * Return value: the character width, in Pango2 units.
+ * Return value: the character width, in Pango units.
*/
int
pango2_font_metrics_get_approximate_char_width (Pango2FontMetrics *metrics)
@@ -167,7 +167,7 @@ pango2_font_metrics_get_approximate_char_width (Pango2FontMetrics *metrics)
* is generally somewhat more accurate than the result of
* pango2_font_metrics_get_approximate_char_width() for digits.
*
- * Return value: the digit width, in Pango2 units.
+ * Return value: the digit width, in Pango units.
*/
int
pango2_font_metrics_get_approximate_digit_width (Pango2FontMetrics *metrics)
@@ -187,7 +187,7 @@ pango2_font_metrics_get_approximate_digit_width (Pango2FontMetrics *metrics)
* of the underline. Since most fonts have underline positions beneath
* the baseline, this value is typically negative.
*
- * Return value: the suggested underline position, in Pango2 units.
+ * Return value: the suggested underline position, in Pango units.
*/
int
pango2_font_metrics_get_underline_position (Pango2FontMetrics *metrics)
@@ -203,7 +203,7 @@ pango2_font_metrics_get_underline_position (Pango2FontMetrics *metrics)
*
* Gets the suggested thickness to draw for the underline.
*
- * Return value: the suggested underline thickness, in Pango2 units.
+ * Return value: the suggested underline thickness, in Pango units.
*/
int
pango2_font_metrics_get_underline_thickness (Pango2FontMetrics *metrics)
@@ -222,7 +222,7 @@ pango2_font_metrics_get_underline_thickness (Pango2FontMetrics *metrics)
* The value returned is the distance *above* the
* baseline of the top of the strikethrough.
*
- * Return value: the suggested strikethrough position, in Pango2 units.
+ * Return value: the suggested strikethrough position, in Pango units.
*/
int
pango2_font_metrics_get_strikethrough_position (Pango2FontMetrics *metrics)
@@ -238,7 +238,7 @@ pango2_font_metrics_get_strikethrough_position (Pango2FontMetrics *metrics)
*
* Gets the suggested thickness to draw for the strikethrough.
*
- * Return value: the suggested strikethrough thickness, in Pango2 units.
+ * Return value: the suggested strikethrough thickness, in Pango units.
*/
int
pango2_font_metrics_get_strikethrough_thickness (Pango2FontMetrics *metrics)
diff --git a/pango2/pango-fontmap.c b/pango2/pango-fontmap.c
index 6b2a374be..275eb0822 100644
--- a/pango2/pango-fontmap.c
+++ b/pango2/pango-fontmap.c
@@ -1190,7 +1190,7 @@ static GPrivate default_font_map = G_PRIVATE_INIT (g_object_unref); /* MT-safe *
* Creates a new `Pango2FontMap` object.
*
* Note that the type of the returned object will depend
- * on the platform that Pango2 is used on. If you want to
+ * on the platform that Pango is used on. If you want to
* explicitly create an instance of `Pango2FontMap` itself
* (and not a platform-specific subclass), see [ctor Pango2 FontMap new].
*
@@ -1224,17 +1224,17 @@ pango2_font_map_new_default (void)
* Gets the default `Pango2FontMap`.
*
* The type of the returned object will depend on the
- * platform that Pango2 is used on.
+ * platform that Pango is used on.
*
* Note that the default fontmap is per-thread. Each thread gets
- * its own default fontmap. In this way, Pango2 can be used safely
+ * its own default fontmap. In this way, Pango can be used safely
* from multiple threads.
*
* The default fontmap can be changed by using
* [method@Pango2.FontMap.set_default].
*
* Return value: (transfer none): the default fontmap
- * for the current thread. This object is owned by Pango2 and must
+ * for the current thread. This object is owned by Pango and must
* not be freed.
*/
Pango2FontMap *
diff --git a/pango2/pango-glyph-item.c b/pango2/pango-glyph-item.c
index 6ba759619..b74943b07 100644
--- a/pango2/pango-glyph-item.c
+++ b/pango2/pango-glyph-item.c
@@ -707,7 +707,7 @@ pango2_glyph_item_apply_attrs (Pango2GlyphItem *glyph_item,
* (the first logical attribute refers to the position
* before the first character in the item)
* @letter_spacing: amount of letter spacing to add
- * in Pango2 units. May be negative, though too large
+ * in Pango units. May be negative, though too large
* negative values will give ugly results.
*
* Adds spacing between the graphemes of @glyph_item to
diff --git a/pango2/pango-hbface.c b/pango2/pango-hbface.c
index f549b41a5..5f8486b21 100644
--- a/pango2/pango-hbface.c
+++ b/pango2/pango-hbface.c
@@ -681,11 +681,11 @@ pango2_hb_face_set_matrix (Pango2HbFace *self,
* the returned `Pango2HbFace`.
*
* If @name is provided, it is used as the name for the face.
- * Otherwise, Pango2 will use the named instance subfamily name
+ * Otherwise, Pango will use the named instance subfamily name
* or `HB_OT_NAME_ID_TYPOGRAPHIC_SUBFAMILY`.
*
* If @description is provided, it is used as the font description
- * for the face. Otherwise, Pango2 creates a description using
+ * for the face. Otherwise, Pango creates a description using
* `HB_OT_NAME_ID_TYPOGRAPHIC_FAMILY` and the name of the face.
*
* Returns: a newly created `Pango2HbFace`
@@ -742,11 +742,11 @@ pango2_hb_face_new_from_hb_face (hb_face_t *face,
* the returned `Pango2HbFace`.
*
* If @name is provided, it is used as the name for the face.
- * Otherwise, Pango2 will use the named instance subfamily name
+ * Otherwise, Pango will use the named instance subfamily name
* or `HB_OT_NAME_ID_TYPOGRAPHIC_SUBFAMILY`.
*
* If @description is provided, it is used as the font description
- * for the face. Otherwise, Pango2 creates a description using
+ * for the face. Otherwise, Pango creates a description using
* `HB_OT_NAME_ID_TYPOGRAPHIC_FAMILY` and the name of the face.
*
* If @desc and @name are provided, then the returned `Pango2HbFace`
@@ -799,7 +799,7 @@ pango2_hb_face_new_from_file (const char *file,
* @transform can be used to specify a non-trivial font matrix for creating
* synthetic italics or synthetic condensed variants of an existing face.
*
- * If @embolden is `TRUE`, Pango2 will render the glyphs bolder, creating
+ * If @embolden is `TRUE`, Pango will render the glyphs bolder, creating
* a synthetic bold variant of the face.
*
* If a @name is not specified, the name for the face will be derived
diff --git a/pango2/pango-language-sample-table.h b/pango2/pango-language-sample-table.h
index 595132094..e92427ba4 100644
--- a/pango2/pango-language-sample-table.h
+++ b/pango2/pango-language-sample-table.h
@@ -1,4 +1,4 @@
-/* Pango2 Language Sample Table
+/* Pango Language Sample Table
*
* Each entry is of the form:
*
diff --git a/pango2/pango-language.c b/pango2/pango-language.c
index 71af5a83e..3d4abc7cf 100644
--- a/pango2/pango-language.c
+++ b/pango2/pango-language.c
@@ -180,7 +180,7 @@ _pango2_get_lc_ctype (void)
* Control Panel. Setting these env vars won't have any affect on
* locale-dependent C library functions like ctime(). But just for
* kicks, do obey LC_ALL, LC_CTYPE and LANG in Pango2. (This also makes
- * it easier to test GTK and Pango2 in various default languages, you
+ * it easier to test GTK and Pango in various default languages, you
* don't have to clickety-click in the Control Panel, you can simply
* start the program with LC_ALL=something on the command line.)
*/
@@ -573,7 +573,7 @@ static const LangInfo lang_texts[] = {
* If @language is %NULL, the default language as found by
* [func@Pango2.Language.get_default] is used.
*
- * If Pango2 does not have a sample string for @language, the classic
+ * If Pango does not have a sample string for @language, the classic
* "The quick brown fox..." is returned. This can be detected by
* comparing the returned pointer value to that returned for (non-existent)
* language code "xx". That is, compare to:
@@ -638,7 +638,7 @@ pango2_language_get_sample_string (Pango2Language *language)
*
* Return value: (transfer none) (array length=num_scripts) (nullable):
* An array of `GUnicodeScript` values, with the number of entries in
- * the array stored in @num_scripts, or %NULL if Pango2 does not have
+ * the array stored in @num_scripts, or %NULL if Pango does not have
* any information about this particular language tag (also the case
* if @language is %NULL).
*/
@@ -685,7 +685,7 @@ pango2_language_get_scripts (Pango2Language *language,
*
* The returned value is conservative; if nothing is known about
* the language tag @language, %TRUE will be returned, since, as
- * far as Pango2 knows, @script might be used to write @language.
+ * far as Pango knows, @script might be used to write @language.
*
* This routine is used in Pango2's itemization process when
* determining if a supplied language tag is relevant to
@@ -881,7 +881,7 @@ pango2_language_get_preferred (void)
* is tested using [method@Pango2.Language.includes_script]. This can
* be used to control Pango2's font selection for non-primary
* languages. For example, a `PANGO2_LANGUAGE` enviroment variable
- * set to "en:fa" makes Pango2 choose fonts suitable for Persian (fa)
+ * set to "en:fa" makes Pango choose fonts suitable for Persian (fa)
* instead of Arabic (ar) when a segment of Arabic text is found
* in an otherwise non-Arabic text. The same trick can be used to
* choose a default language for %G_UNICODE_SCRIPT_HAN when setting
diff --git a/pango2/pango-layout.c b/pango2/pango-layout.c
index 9a01b4907..b037c54b5 100644
--- a/pango2/pango-layout.c
+++ b/pango2/pango-layout.c
@@ -12,7 +12,7 @@
*
* A `Pango2Layout` structure represents an entire paragraph of text.
*
- * While complete access to the layout capabilities of Pango2 is provided
+ * While complete access to the layout capabilities of Pango is provided
* using the detailed interfaces for itemization, segmentation and shaping,
* using that functionality directly involves writing a fairly large amount
* of code. `Pango2Layout` provides a high-level driver for formatting entire
@@ -35,7 +35,7 @@
*
* <picture>
* <source srcset="layout-dark.png" media="(prefers-color-scheme: dark)">
- * <img alt="Pango2 Layout Parameters" src="layout-light.png">
+ * <img alt="Pango Layout Parameters" src="layout-light.png">
* </picture>
*
* The following images demonstrate the effect of alignment and justification
@@ -369,7 +369,7 @@ pango2_layout_class_init (Pango2LayoutClass *class)
*
* Spacing to add between the lines of the `Pango2Layout`.
*
- * The spacing is specified in Pango2 units.
+ * The spacing is specified in Pango units.
*
* The default value is 0.
*/
@@ -382,7 +382,7 @@ pango2_layout_class_init (Pango2LayoutClass *class)
*
* The width to which the text of `Pango2Layout` will be broken.
*
- * The width is specified in Pango2 units, with -1 meaning unlimited.
+ * The width is specified in Pango units, with -1 meaning unlimited.
*
* The default value is -1.
*/
@@ -455,7 +455,7 @@ pango2_layout_class_init (Pango2LayoutClass *class)
*
* The wrap mode of this `Pango2Layout`.
*
- * The wrap mode influences how Pango2 chooses line breaks
+ * The wrap mode influences how Pango chooses line breaks
* when text needs to be wrapped.
*
* The default value is `PANGO2_WRAP_WORD`.
@@ -470,7 +470,7 @@ pango2_layout_class_init (Pango2LayoutClass *class)
*
* The indent of this `Pango2Layout`.
*
- * The indent is specified in Pango2 units.
+ * The indent is specified in Pango units.
*
* A negative value of @indent will produce a hanging indentation.
* That is, the first line will have the full width, and subsequent
@@ -1106,11 +1106,11 @@ pango2_layout_get_line_height (Pango2Layout *layout)
/**
* pango2_layout_set_spacing:
* @layout: a `Pango2Layout`
- * @spacing: the amount of spacing, in Pango2 units
+ * @spacing: the amount of spacing, in Pango units
*
* Sets the amount of spacing between the lines of the layout.
*
- * When placing lines with spacing, Pango2 arranges things so that
+ * When placing lines with spacing, Pango arranges things so that
*
* line2.top = line1.bottom + spacing
*
@@ -1140,7 +1140,7 @@ pango2_layout_set_spacing (Pango2Layout *layout,
*
* Gets the amount of spacing between the lines of the layout.
*
- * Return value: the spacing in Pango2 units
+ * Return value: the spacing in Pango units
*/
int
pango2_layout_get_spacing (Pango2Layout *layout)
@@ -1153,7 +1153,7 @@ pango2_layout_get_spacing (Pango2Layout *layout)
/**
* pango2_layout_set_width:
* @layout: a `Pango2Layout`.
- * @width: the desired width in Pango2 units, or -1 to indicate that no
+ * @width: the desired width in Pango units, or -1 to indicate that no
* wrapping or ellipsization should be performed
*
* Sets the width to which the lines of the layout should
@@ -1185,7 +1185,7 @@ pango2_layout_set_width (Pango2Layout *layout,
*
* Gets the width to which the lines of the layout should wrap.
*
- * Return value: the width in Pango2 units, or -1 if no width set.
+ * Return value: the width in Pango units, or -1 if no width set.
*/
int
pango2_layout_get_width (Pango2Layout *layout)
@@ -1388,7 +1388,7 @@ pango2_layout_get_wrap (Pango2Layout *layout)
* @layout: a `Pango2Layout`
* @indent: the amount by which to indent
*
- * Sets the width in Pango2 units to indent each paragraph.
+ * Sets the width in Pango units to indent each paragraph.
*
* A negative value of @indent will produce a hanging indentation.
* That is, the first line will have the full width, and subsequent
@@ -1415,11 +1415,11 @@ pango2_layout_set_indent (Pango2Layout *layout,
* pango2_layout_get_indent:
* @layout: a `Pango2Layout`
*
- * Gets the paragraph indent width in Pango2 units.
+ * Gets the paragraph indent width in Pango units.
*
* A negative value indicates a hanging indentation.
*
- * Return value: the indent in Pango2 units
+ * Return value: the indent in Pango units
*/
int
pango2_layout_get_indent (Pango2Layout *layout)
@@ -1592,7 +1592,7 @@ pango2_layout_get_auto_dir (Pango2Layout *layout)
*
* Sets the layout text and attribute list from marked-up text.
*
- * See [Pango2 Markup](pango2_markup.html)).
+ * See [Pango Markup](pango2_markup.html)).
*
* Replaces the current text and attributes.
*/
diff --git a/pango2/pango-line-breaker.c b/pango2/pango-line-breaker.c
index 1049fe5e5..6f068a9f2 100644
--- a/pango2/pango-line-breaker.c
+++ b/pango2/pango-line-breaker.c
@@ -2467,8 +2467,8 @@ pango2_line_breaker_has_line (Pango2LineBreaker *self)
/**
* pango2_line_breaker_next_line:
* @self: a `Pango2LineBreaker`
- * @x: the X position for the line, in Pango2 units
- * @width: the width for the line, or -1 for no limit, in Pango2 units
+ * @x: the X position for the line, in Pango units
+ * @width: the width for the line, or -1 for no limit, in Pango units
* @wrap: how to wrap the text
* @ellipsize: whether to ellipsize the text
*
diff --git a/pango2/pango-line.c b/pango2/pango-line.c
index 992a29fea..9016e6f23 100644
--- a/pango2/pango-line.c
+++ b/pango2/pango-line.c
@@ -647,7 +647,7 @@ pango2_line_get_run_count (Pango2Line *line)
* Gets the runs of the line.
*
* Note that the returned list and its contents
- * are owned by Pango2 and must not be modified.
+ * are owned by Pango and must not be modified.
*
* The length of the returned array can be obtained
* with [method Pango2 Line.get_run_count].
@@ -954,14 +954,14 @@ pango2_line_justify (Pango2Line *line,
*
* Note that the origin is at the left end of the baseline.
*
- * Pango2 is following CSS in splitting the external leading, and giving one half of it
+ * Pango is following CSS in splitting the external leading, and giving one half of it
* to the line above, and the other half the the line below. Unless the line height is set
* via attributes, the external leading is determined as the difference between the
* height and ascent + descent in font metrics:
*
* <picture>
* <source srcset="line-height1-dark.png" media="(prefers-color-scheme: dark)">
- * <img alt="Pango2 Font Metrics" src="line-height1-light.png">
+ * <img alt="Pango Font Metrics" src="line-height1-light.png">
* </picture>
*
* If spacing is set, it also gets split, for the purpose of determining the
@@ -969,14 +969,14 @@ pango2_line_justify (Pango2Line *line,
*
* <picture>
* <source srcset="line-height2-dark.png" media="(prefers-color-scheme: dark)">
- * <img alt="Pango2 Extents and Spacing" src="line-height2-light.png">
+ * <img alt="Pango Extents and Spacing" src="line-height2-light.png">
* </picture>
*
* If line height is set, it determines the logical extents.
*
* <picture>
* <source srcset="line-height3-dark.png" media="(prefers-color-scheme: dark)">
- * <img alt="Pango2 Extents and Line Height" src="line-height3-light.png">
+ * <img alt="Pango Extents and Line Height" src="line-height3-light.png">
* </picture>
*/
void
@@ -1102,7 +1102,7 @@ pango2_line_index_to_pos (Pango2Line *line,
* @trailing: an integer indicating the edge of the grapheme to retrieve
* the position of. If > 0, the trailing edge of the grapheme,
* if 0, the leading of the grapheme
- * @x_pos: (out): location to store the x_offset (in Pango2 units)
+ * @x_pos: (out): location to store the x_offset (in Pango units)
*
* Converts an index within a `Pango2Line` to a X position.
*
@@ -1171,7 +1171,7 @@ pango2_line_index_to_x (Pango2Line *line,
/**
* pango2_line_x_to_index:
* @line: a `Pango2Line`
- * @x: the X offset (in Pango2 units) from the left edge of the line
+ * @x: the X offset (in Pango units) from the left edge of the line
* @idx: (out): location to store calculated byte index for the grapheme
* in which the user clicked
* @trailing: (out): location to store an integer indicating where in the
diff --git a/pango2/pango-lines.c b/pango2/pango-lines.c
index e528ec056..3c46e2e42 100644
--- a/pango2/pango-lines.c
+++ b/pango2/pango-lines.c
@@ -504,7 +504,7 @@ pango2_lines_is_hyphenated (Pango2Lines *lines)
* bug that shows up as right-to-left layouts not being correctly positioned
* in a layout with a set width.
*
- * The extents are given in layout coordinates and in Pango2 units; layout
+ * The extents are given in layout coordinates and in Pango units; layout
* coordinates begin at the top left corner.
*/
void
@@ -575,7 +575,7 @@ pango2_lines_get_extents (Pango2Lines *lines,
* @height: (out) (optional): location to store the logical height
*
* Determines the logical width and height of a `Pango2Lines`
- * in Pango2 units.
+ * in Pango units.
*
* This is simply a convenience function around
* [method@Pango2.Lines.get_extents].
@@ -639,7 +639,7 @@ pango2_lines_get_baseline (Pango2Lines *lines)
* `2*n_ranges`, with each range starting at `(*ranges)[2*n]` and of
* width `(*ranges)[2*n + 1] - (*ranges)[2*n]`. This array must be freed
* with [GLib.free]. The coordinates are relative to the layout and are in
- * Pango2 units.
+ * Pango units.
* @n_ranges: The number of ranges stored in @ranges
*
* Gets a list of visual ranges corresponding to a given logical range.
@@ -849,8 +849,8 @@ pango2_lines_index_to_line (Pango2Lines *lines,
/**
* pango2_lines_pos_to_line:
* @lines: a `Pango2Lines` object
- * @x: the X position (in Pango2 units)
- * @y: the Y position (in Pango2 units)
+ * @x: the X position (in Pango units)
+ * @y: the Y position (in Pango units)
* @line_x: (out) (optional): return location for the X offset of the line
* @line_y: (out) (optional): return location for the Y offset of the line
*
@@ -944,8 +944,8 @@ pango2_lines_index_to_pos (Pango2Lines *lines,
/**
* pango2_lines_pos_to_index:
* @lines: a `Pango2Lines` object
- * @x: the X offset (in Pango2 units) from the left edge of the layout
- * @y: the Y offset (in Pango2 units) from the top edge of the layout
+ * @x: the X offset (in Pango units) from the left edge of the layout
+ * @y: the Y offset (in Pango units) from the top edge of the layout
* @idx: (out): location to store calculated byte index
* @trailing: (out): location to store a integer indicating where
* in the grapheme the user clicked. It will either be zero, or the
diff --git a/pango2/pango-markup.c b/pango2/pango-markup.c
index c03196e84..72d2d2e84 100644
--- a/pango2/pango-markup.c
+++ b/pango2/pango-markup.c
@@ -772,7 +772,7 @@ pango2_markup_parser_new_internal (char accel_marker,
/**
* pango2_parse_markup:
- * @markup_text: markup to parse (see the [Pango2 Markup](pango2_markup.html) docs)
+ * @markup_text: markup to parse (see the [Pango Markup](pango2_markup.html) docs)
* @length: length of @markup_text, or -1 if nul-terminated
* @accel_marker: character that precedes an accelerator, or 0 for none
* @attr_list: (out) (optional): address of return location for a `Pango2AttrList`
@@ -782,7 +782,7 @@ pango2_markup_parser_new_internal (char accel_marker,
*
* Parses marked-up text to create a plain-text string and an attribute list.
*
- * See the [Pango2 Markup](pango2_markup.html) docs for details about the
+ * See the [Pango Markup](pango2_markup.html) docs for details about the
* supported markup.
*
* If @accel_marker is nonzero, the given character will mark the
@@ -856,7 +856,7 @@ pango2_parse_markup (const char *markup_text,
* Incrementally parses marked-up text to create a plain-text string
* and an attribute list.
*
- * See the [Pango2 Markup](pango2_markup.html) docs for details about the
+ * See the [Pango Markup](pango2_markup.html) docs for details about the
* supported markup.
*
* If @accel_marker is nonzero, the given character will mark the
@@ -872,8 +872,8 @@ pango2_parse_markup (const char *markup_text,
* to the parser, use [func@markup_parser_finish] to get the data out
* of it, and then use [method GLib MarkupParseContext free] to free it.
*
- * This function is designed for applications that read Pango2 markup
- * from streams. To simply parse a string containing Pango2 markup,
+ * This function is designed for applications that read Pango markup
+ * from streams. To simply parse a string containing Pango markup,
* the [func@Pango2.parse_markup] API is recommended instead.
*
* Return value: (transfer none): a `GMarkupParseContext` that should be
@@ -895,7 +895,7 @@ pango2_markup_parser_new (gunichar accel_marker)
*
* Finishes parsing markup.
*
- * After feeding a Pango2 markup parser some data with [method@GLib.MarkupParseContext.parse],
+ * After feeding a Pango markup parser some data with [method@GLib.MarkupParseContext.parse],
* use this function to get the list of attributes and text out of the
* markup. This function will not free @context, use [method GLib MarkupParseContext free]
* to do so.
diff --git a/pango2/pango-matrix.c b/pango2/pango-matrix.c
index 9381ffcd5..99766cb11 100644
--- a/pango2/pango-matrix.c
+++ b/pango2/pango-matrix.c
@@ -372,7 +372,7 @@ pango2_matrix_transform_point (const Pango2Matrix *matrix,
/**
* pango2_matrix_transform_rectangle:
* @matrix: (nullable): a `Pango2Matrix`
- * @rect: (inout) (optional): in/out bounding box in Pango2 units
+ * @rect: (inout) (optional): in/out bounding box in Pango units
*
* First transforms @rect using @matrix, then calculates the bounding box
* of the transformed rectangle.
@@ -384,13 +384,13 @@ pango2_matrix_transform_point (const Pango2Matrix *matrix,
* If you have a rectangle in device units (pixels), use
* [method@Pango2.Matrix.transform_pixel_rectangle].
*
- * If you have the rectangle in Pango2 units and want to convert to
+ * If you have the rectangle in Pango units and want to convert to
* transformed pixel bounding box, it is more accurate to transform it first
* (using this function) and pass the result to pango2_extents_to_pixels(),
* first argument, for an inclusive rounded rectangle.
* However, there are valid reasons that you may want to convert
* to pixels first and then transform, for example when the transformed
- * coordinates may overflow in Pango2 units (large matrix translation for
+ * coordinates may overflow in Pango units (large matrix translation for
* example).
*/
void
@@ -460,7 +460,7 @@ pango2_matrix_transform_rectangle (const Pango2Matrix *matrix,
* should be and how much you should shift the layout when rendering.
*
* For better accuracy, you should use [method@Pango2.Matrix.transform_rectangle]
- * on original rectangle in Pango2 units and convert to pixels afterward
+ * on original rectangle in Pango units and convert to pixels afterward
* using [func@extents_to_pixels]'s first argument.
*/
void
diff --git a/pango2/pango-renderer.c b/pango2/pango-renderer.c
index 5f1d3de66..d3badbc7b 100644
--- a/pango2/pango-renderer.c
+++ b/pango2/pango-renderer.c
@@ -598,9 +598,9 @@ draw_shaped_glyphs (Pango2Renderer *renderer,
* @renderer: a `Pango2Renderer`
* @line: a `Pango2Line`
* @x: X position of left edge of baseline, in user space coordinates
- * in Pango2 units.
+ * in Pango units.
* @y: Y position of left edge of baseline, in user space coordinates
- * in Pango2 units.
+ * in Pango units.
*
* Draws @line with the specified `Pango2Renderer`.
*
@@ -648,9 +648,9 @@ pango2_renderer_draw_line (Pango2Renderer *renderer,
* @renderer: a `Pango2Renderer`
* @lines: a `Pango2Lines` object
* @x: X position of left edge of baseline, in user space coordinates
- * in Pango2 units.
+ * in Pango units.
* @y: Y position of left edge of baseline, in user space coordinates
- * in Pango2 units.
+ * in Pango units.
*
* Draws @lines with the specified `Pango2Renderer`.
*/
@@ -873,9 +873,9 @@ pango2_renderer_draw_runs (Pango2Renderer *renderer,
* @font: a `Pango2Font`
* @glyphs: a `Pango2GlyphString`
* @x: X position of left edge of baseline, in user space coordinates
- * in Pango2 units.
+ * in Pango units.
* @y: Y position of left edge of baseline, in user space coordinates
- * in Pango2 units.
+ * in Pango units.
*
* Draws the glyphs in @glyphs with the specified `Pango2Renderer`.
*/
@@ -928,9 +928,9 @@ pango2_renderer_default_draw_glyphs (Pango2Renderer *renderer,
* @text: (nullable): the UTF-8 text that @glyph_item refers to
* @run: a `Pango2Run`
* @x: X position of left edge of baseline, in user space coordinates
- * in Pango2 units
+ * in Pango units
* @y: Y position of left edge of baseline, in user space coordinates
- * in Pango2 units
+ * in Pango units
*
* Draws the glyphs in @run with the specified `Pango2Renderer`,
* embedding the text associated with the glyphs in the output if the
@@ -994,11 +994,11 @@ pango2_renderer_default_draw_run (Pango2Renderer *renderer,
* @renderer: a `Pango2Renderer`
* @part: type of object this rectangle is part of
* @x: X position at which to draw rectangle, in user space coordinates
- * in Pango2 units
+ * in Pango units
* @y: Y position at which to draw rectangle, in user space coordinates
- * in Pango2 units
- * @width: width of rectangle in Pango2 units
- * @height: height of rectangle in Pango2 units
+ * in Pango units
+ * @width: width of rectangle in Pango units
+ * @height: height of rectangle in Pango units
*
* Draws an axis-aligned rectangle in user space coordinates with the
* specified `Pango2Renderer`.
@@ -1137,10 +1137,10 @@ pango2_renderer_default_draw_rectangle (Pango2Renderer *renderer,
* @renderer: a `Pango2Renderer`
* @part: type of object this rectangle is part of
* @style: the line style
- * @x: X coordinate of line, in Pango2 units in user coordinate system
- * @y: Y coordinate of line, in Pango2 units in user coordinate system
- * @width: width of line, in Pango2 units in user coordinate system
- * @height: height of line, in Pango2 units in user coordinate system
+ * @x: X coordinate of line, in Pango units in user coordinate system
+ * @y: Y coordinate of line, in Pango units in user coordinate system
+ * @width: width of line, in Pango units in user coordinate system
+ * @height: height of line, in Pango units in user coordinate system
*
* Draw a line in the given style.
*
@@ -1494,7 +1494,7 @@ pango2_renderer_get_color (Pango2Renderer *renderer,
* @renderer: a `Pango2Renderer`
* @part: the part for which rendering has changed.
*
- * Informs Pango2 that the way that the rendering is done
+ * Informs Pango that the way that the rendering is done
* for @part has changed.
*
* This should be called if the rendering changes in a way that would
@@ -1507,7 +1507,7 @@ pango2_renderer_get_color (Pango2Renderer *renderer,
* ```
*
* When the stipple changes or underlines with different stipples
- * might be joined together. Pango2 automatically calls this for
+ * might be joined together. Pango automatically calls this for
* changes to colors. (See [method@Pango2.Renderer.set_color])
*/
void
@@ -1656,7 +1656,7 @@ pango2_renderer_set_matrix (Pango2Renderer *renderer,
*
* Return value: (nullable): the matrix, or %NULL if no matrix has
* been set (which is the same as the identity matrix). The returned
- * matrix is owned by Pango2 and must not be modified or freed.
+ * matrix is owned by Pango and must not be modified or freed.
*/
const Pango2Matrix *
pango2_renderer_get_matrix (Pango2Renderer *renderer)
diff --git a/pango2/pango-renderer.h b/pango2/pango-renderer.h
index e641bb3ed..fcafb741c 100644
--- a/pango2/pango-renderer.h
+++ b/pango2/pango-renderer.h
@@ -88,7 +88,7 @@ struct _Pango2Renderer
*
* Class structure for `Pango2Renderer`.
*
- * The following vfuncs take user space coordinates in Pango2 units
+ * The following vfuncs take user space coordinates in Pango units
* and have default implementations:
* - draw_glyphs
* - draw_rectangle
diff --git a/pango2/pango-tabs.c b/pango2/pango-tabs.c
index 71fdfe2ff..3801f62c4 100644
--- a/pango2/pango-tabs.c
+++ b/pango2/pango-tabs.c
@@ -71,7 +71,7 @@ init_tabs (Pango2TabArray *array, int start, int end)
* Creates an array of @initial_size tab stops.
*
* Tab stops are specified in pixel units if @positions_in_pixels is %TRUE,
- * otherwise in Pango2 units. All stops are initially at position 0.
+ * otherwise in Pango units. All stops are initially at position 0.
*
* Return value: the newly allocated `Pango2TabArray`, which should
* be freed with [method Pango2 TabArray free].
@@ -265,7 +265,7 @@ pango2_tab_array_resize (Pango2TabArray *tab_array,
* @tab_array: a `Pango2TabArray`
* @tab_index: the index of a tab stop
* @alignment: tab alignment
- * @location: tab location in Pango2 units
+ * @location: tab location in Pango units
*
* Sets the alignment and location of a tab stop.
*/
@@ -358,7 +358,7 @@ pango2_tab_array_get_tabs (Pango2TabArray *tab_array,
* @tab_array: a `Pango2TabArray`
*
* Returns %TRUE if the tab positions are in pixels,
- * %FALSE if they are in Pango2 units.
+ * %FALSE if they are in Pango units.
*
* Return value: whether positions are in pixels.
*/
@@ -394,7 +394,7 @@ pango2_tab_array_set_positions_in_pixels (Pango2TabArray *tab_array,
* Serializes a `Pango2TabArray` to a string.
*
* No guarantees are made about the format of the string,
- * it may change between Pango2 versions.
+ * it may change between Pango versions.
*
* The intended use of this function is testing and
* debugging. The format is not meant as a permanent
@@ -551,7 +551,7 @@ success:
* which align content at the first occurrence of the decimal point
* character.
*
- * By default, Pango2 uses the decimal point according
+ * By default, Pango uses the decimal point according
* to the current locale.
*/
void
@@ -579,7 +579,7 @@ pango2_tab_array_set_decimal_point (Pango2TabArray *tab_array,
* which align content at the first occurrence of the decimal point
* character.
*
- * The default value of 0 means that Pango2 will use the
+ * The default value of 0 means that Pango will use the
* decimal point according to the current locale.
*/
gunichar
diff --git a/pango2/pango-types.h b/pango2/pango-types.h
index 003dec8e7..56cf3dbfd 100644
--- a/pango2/pango-types.h
+++ b/pango2/pango-types.h
@@ -58,7 +58,7 @@ typedef struct _Pango2LineIter Pango2LineIter;
/**
* PANGO2_SCALE:
*
- * The scale between dimensions used for Pango2 distances and device units.
+ * The scale between dimensions used for Pango distances and device units.
*
* The definition of device units is dependent on the output device; it will
* typically be pixels for a screen, and points for a printer. %PANGO2_SCALE is
@@ -69,7 +69,7 @@ typedef struct _Pango2LineIter Pango2LineIter;
*/
/**
* PANGO2_PIXELS:
- * @d: a dimension in Pango2 units.
+ * @d: a dimension in Pango units.
*
* Converts a dimension to device units by rounding.
*
@@ -77,7 +77,7 @@ typedef struct _Pango2LineIter Pango2LineIter;
*/
/**
* PANGO2_PIXELS_FLOOR:
- * @d: a dimension in Pango2 units.
+ * @d: a dimension in Pango units.
*
* Converts a dimension to device units by flooring.
*
@@ -85,7 +85,7 @@ typedef struct _Pango2LineIter Pango2LineIter;
*/
/**
* PANGO2_PIXELS_CEIL:
- * @d: a dimension in Pango2 units.
+ * @d: a dimension in Pango units.
*
* Converts a dimension to device units by ceiling.
*
@@ -106,36 +106,36 @@ typedef struct _Pango2LineIter Pango2LineIter;
/**
* PANGO2_UNITS_FLOOR:
- * @d: a dimension in Pango2 units.
+ * @d: a dimension in Pango units.
*
* Rounds a dimension down to whole device units, but does not
* convert it to device units.
*
- * Return value: rounded down dimension in Pango2 units.
+ * Return value: rounded down dimension in Pango units.
*/
#define PANGO2_UNITS_FLOOR(d) \
((d) & ~(PANGO2_SCALE - 1))
/**
* PANGO2_UNITS_CEIL:
- * @d: a dimension in Pango2 units.
+ * @d: a dimension in Pango units.
*
* Rounds a dimension up to whole device units, but does not
* convert it to device units.
*
- * Return value: rounded up dimension in Pango2 units.
+ * Return value: rounded up dimension in Pango units.
*/
#define PANGO2_UNITS_CEIL(d) \
(((d) + (PANGO2_SCALE - 1)) & ~(PANGO2_SCALE - 1))
/**
* PANGO2_UNITS_ROUND:
- * @d: a dimension in Pango2 units.
+ * @d: a dimension in Pango units.
*
* Rounds a dimension to whole device units, but does not
* convert it to device units.
*
- * Return value: rounded dimension in Pango2 units.
+ * Return value: rounded dimension in Pango units.
*/
#define PANGO2_UNITS_ROUND(d) \
(((d) + (PANGO2_SCALE >> 1)) & ~(PANGO2_SCALE - 1))
@@ -264,8 +264,8 @@ typedef enum
* `Pango2WrapMode` describes how to wrap the lines of a `Pango2Layout`
* to the desired width.
*
- * For @PANGO2_WRAP_WORD, Pango2 uses break opportunities that are determined
- * by the Unicode line breaking algorithm. For @PANGO2_WRAP_CHAR, Pango2 allows
+ * For @PANGO2_WRAP_WORD, Pango uses break opportunities that are determined
+ * by the Unicode line breaking algorithm. For @PANGO2_WRAP_CHAR, Pango allows
* breaking at grapheme boundaries that are determined by the Unicode text
* segmentation algorithm.
*/
diff --git a/pango2/pango-userface.c b/pango2/pango-userface.c
index d4cb60f5a..d9239172d 100644
--- a/pango2/pango-userface.c
+++ b/pango2/pango-userface.c
@@ -366,7 +366,7 @@ pango2_user_face_class_init (Pango2UserFaceClass *class)
* Callback to shape a segment of text with a user font.
*
* This callback is optional when creating a user font. If it isn't
- * provided, Pango2 will rely on the `Pango2UserFaceUnicodeToGlyphFunc`
+ * provided, Pango will rely on the `Pango2UserFaceUnicodeToGlyphFunc`
* and the `Pango2UserFaceGetGlyphInfo` callback to translate Unicode
* characters to glyphs 1-1, and position the glyphs according to their
* advance widths.
@@ -427,7 +427,7 @@ pango2_user_face_class_init (Pango2UserFaceClass *class)
* but instead uses callbacks to determine glyph extents, positions
* and rendering.
*
- * If @shape_func is `NULL`, Pango2 will rely on @glyph_func and
+ * If @shape_func is `NULL`, Pango will rely on @glyph_func and
* @glyph_info_func to find and position a glyph for each character.
*
* If @render_func is `NULL`, the font will not produce any visible
diff --git a/pango2/pango-utils.c b/pango2/pango-utils.c
index 89e20dac4..3632ab3ec 100644
--- a/pango2/pango-utils.c
+++ b/pango2/pango-utils.c
@@ -50,13 +50,13 @@
/**
* pango2_version:
*
- * Returns the encoded version of Pango2 available at run-time.
+ * Returns the encoded version of Pango available at run-time.
*
* This is similar to the macro %PANGO2_VERSION except that the macro
* returns the encoded version available at compile-time. A version
* number can be encoded into an integer using PANGO2_VERSION_ENCODE().
*
- * Returns: The encoded version of Pango2 library available at run time.
+ * Returns: The encoded version of Pango library available at run time.
*/
int
pango2_version (void)
@@ -67,13 +67,13 @@ pango2_version (void)
/**
* pango2_version_string:
*
- * Returns the version of Pango2 available at run-time.
+ * Returns the version of Pango available at run-time.
*
* This is similar to the macro %PANGO2_VERSION_STRING except that the
* macro returns the version available at compile-time.
*
- * Returns: A string containing the version of Pango2 library available
- * at run time. The returned string is owned by Pango2 and should not
+ * Returns: A string containing the version of Pango library available
+ * at run time. The returned string is owned by Pango and should not
* be modified or freed.
*/
const char *
@@ -88,13 +88,13 @@ pango2_version_string (void)
* @required_minor: the required minor version
* @required_micro: the required major version
*
- * Checks that the Pango2 library in use is compatible with the
+ * Checks that the Pango library in use is compatible with the
* given version.
*
* Generally you would pass in the constants %PANGO2_VERSION_MAJOR,
* %PANGO2_VERSION_MINOR, %PANGO2_VERSION_MICRO as the three arguments
* to this function; that produces a check that the library in use at
- * run-time is compatible with the version of Pango2 the application or
+ * run-time is compatible with the version of Pango the application or
* module was compiled against.
*
* Compatibility is defined by two things: first the version
@@ -106,9 +106,9 @@ pango2_version_string (void)
*
* For compile-time version checking use PANGO2_VERSION_CHECK().
*
- * Return value: (nullable): %NULL if the Pango2 library is compatible
+ * Return value: (nullable): %NULL if the Pango library is compatible
* with the given version, or a string describing the version
- * mismatch. The returned string is owned by Pango2 and should not
+ * mismatch. The returned string is owned by Pango and should not
* be modified or freed.
*/
const char *
@@ -192,12 +192,12 @@ pango2_is_zero_width (gunichar ch)
* pango2_units_from_double:
* @d: double floating-point value
*
- * Converts a floating-point number to Pango2 units.
+ * Converts a floating-point number to Pango units.
*
* The conversion is done by multiplying @d by %PANGO2_SCALE and
* rounding the result to nearest integer.
*
- * Return value: the value in Pango2 units.
+ * Return value: the value in Pango units.
*/
int
pango2_units_from_double (double d)
@@ -207,9 +207,9 @@ pango2_units_from_double (double d)
/**
* pango2_units_to_double:
- * @i: value in Pango2 units
+ * @i: value in Pango units
*
- * Converts a number in Pango2 units to floating-point.
+ * Converts a number in Pango units to floating-point.
*
* The conversion is done by dividing @i by %PANGO2_SCALE.
*
@@ -226,7 +226,7 @@ pango2_units_to_double (int i)
* @inclusive: (nullable): rectangle to round to pixels inclusively
* @nearest: (nullable): rectangle to round to nearest pixels
*
- * Converts extents from Pango2 units to device units.
+ * Converts extents from Pango units to device units.
*
* The conversion is done by dividing by the %PANGO2_SCALE factor and
* performing rounding.
diff --git a/pango2/pango-utils.h b/pango2/pango-utils.h
index 56ba36edf..c5b5e3725 100644
--- a/pango2/pango-utils.h
+++ b/pango2/pango-utils.h
@@ -35,8 +35,8 @@ void pango2_find_paragraph_boundary (const char *text,
int *paragraph_delimiter_index,
int *next_paragraph_start);
-/* Encode a Pango2 version as an integer */
-/* Pango2 version checking */
+/* Encode a Pango version as an integer */
+/* Pango version checking */
/**
* PANGO2_VERSION_ENCODE:
@@ -44,7 +44,7 @@ void pango2_find_paragraph_boundary (const char *text,
* @minor: the minor component of the version number
* @micro: the micro component of the version number
*
- * This macro encodes the given Pango2 version into an integer. The numbers
+ * This macro encodes the given Pango version into an integer. The numbers
* returned by %PANGO2_VERSION and pango2_version() are encoded using this macro.
* Two encoded version numbers can be compared as integers.
*/
@@ -53,33 +53,33 @@ void pango2_find_paragraph_boundary (const char *text,
+ ((minor) * 100) \
+ ((micro) * 1))
-/* Encoded version of Pango2 at compile-time */
+/* Encoded version of Pango at compile-time */
/**
* PANGO2_VERSION:
*
- * The version of Pango2 available at compile-time, encoded using PANGO2_VERSION_ENCODE().
+ * The version of Pango available at compile-time, encoded using PANGO2_VERSION_ENCODE().
*/
/**
* PANGO2_VERSION_STRING:
*
- * A string literal containing the version of Pango2 available at compile-time.
+ * A string literal containing the version of Pango available at compile-time.
*/
/**
* PANGO2_VERSION_MAJOR:
*
- * The major component of the version of Pango2 available at compile-time.
+ * The major component of the version of Pango available at compile-time.
*/
/**
* PANGO2_VERSION_MINOR:
*
- * The minor component of the version of Pango2 available at compile-time.
+ * The minor component of the version of Pango available at compile-time.
*/
/**
* PANGO2_VERSION_MICRO:
*
- * The micro component of the version of Pango2 available at compile-time.
+ * The micro component of the version of Pango available at compile-time.
*/
#define PANGO2_VERSION PANGO2_VERSION_ENCODE( \
PANGO2_VERSION_MAJOR, \
@@ -87,14 +87,14 @@ void pango2_find_paragraph_boundary (const char *text,
PANGO2_VERSION_MICRO)
-/* Check that compile-time Pango2 is as new as required */
+/* Check that compile-time Pango is as new as required */
/**
* PANGO2_VERSION_CHECK:
* @major: the major component of the version number
* @minor: the minor component of the version number
* @micro: the micro component of the version number
*
- * Checks that the version of Pango2 available at compile-time is not older than
+ * Checks that the version of Pango available at compile-time is not older than
* the provided version number.
*/
#define PANGO2_VERSION_CHECK(major,minor,micro) \
diff --git a/pango2/pango-version-macros.h b/pango2/pango-version-macros.h
index bce4e3140..3771f1111 100644
--- a/pango2/pango-version-macros.h
+++ b/pango2/pango-version-macros.h
@@ -70,10 +70,10 @@
*
* A macro that should be defined by the user prior to including
* the pango.h header.
- * The definition should be one of the predefined Pango2 version
+ * The definition should be one of the predefined Pango version
* macros: %PANGO2_VERSION_2_0,…
*
- * This macro defines the earliest version of Pango2 that the package is
+ * This macro defines the earliest version of Pango that the package is
* required to be able to compile against.
*
* If the compiler is configured to warn about the use of deprecated
@@ -97,10 +97,10 @@
*
* A macro that should be defined by the user prior to including
* the glib.h header.
- * The definition should be one of the predefined Pango2 version
+ * The definition should be one of the predefined Pango version
* macros: %PANGO2_VERSION_2_0,…
*
- * This macro defines the latest version of the Pango2 API that the
+ * This macro defines the latest version of the Pango API that the
* package is allowed to make use of.
*
* If the compiler is configured to warn about the use of deprecated
@@ -108,7 +108,7 @@
* %PANGO2_VERSION_MAX_ALLOWED will cause warnings.
*
* Unless you are using PANGO2_VERSION_CHECK() or the like to compile
- * different code depending on the Pango2 version, then this should be
+ * different code depending on the Pango version, then this should be
* set to the same value as %PANGO2_VERSION_MIN_REQUIRED.
*/
#if !defined (PANGO2_VERSION_MAX_ALLOWED) || (PANGO2_VERSION_MAX_ALLOWED == 0)
@@ -127,7 +127,7 @@
#error "PANGO2_VERSION_MIN_REQUIRED must be >= PANGO2_VERSION_0_90"
#endif
-/* These macros are used to mark deprecated functions in Pango2 headers,
+/* These macros are used to mark deprecated functions in Pango headers,
* and thus have to be exposed in installed headers.
*/
#ifdef PANGO2_DISABLE_DEPRECATION_WARNINGS
diff --git a/pango2/pangocairo-render.c b/pango2/pangocairo-render.c
index b5189bee2..e4cfefa1b 100644
--- a/pango2/pangocairo-render.c
+++ b/pango2/pangocairo-render.c
@@ -1132,7 +1132,7 @@ pango2_cairo_show_lines (cairo_t *cr,
/**
* pango2_cairo_show_layout:
* @cr: a Cairo context
- * @layout: a Pango2 layout
+ * @layout: a `Pango2Layout`
*
* Draws a `Pango2Layout` in the specified cairo context.
*
@@ -1215,7 +1215,7 @@ pango2_cairo_line_path (cairo_t *cr,
/**
* pango2_cairo_layout_path:
* @cr: a Cairo context
- * @layout: a Pango2 layout
+ * @layout: a `Pango2Layout`
*
* Adds the text in a `Pango2Layout` to the current path in the
* specified cairo context.
diff --git a/pango2/pangocoretext-fontmap.c b/pango2/pangocoretext-fontmap.c
index 0ee648954..6b75b7263 100644
--- a/pango2/pangocoretext-fontmap.c
+++ b/pango2/pangocoretext-fontmap.c
@@ -47,7 +47,7 @@
/**
* PANGO2_HAS_CORE_TEXT_FONTMAP:
*
- * Defined to 1 at compile time if Pango2 was built with CoreText support.
+ * Defined to 1 at compile time if Pango was built with CoreText support.
*/
struct _Pango2CoreTextFontMap
diff --git a/pango2/pangofc-fontmap.c b/pango2/pangofc-fontmap.c
index d3be561d1..d07cac5dd 100644
--- a/pango2/pangofc-fontmap.c
+++ b/pango2/pangofc-fontmap.c
@@ -613,7 +613,7 @@ pango2_fc_font_map_set_config (Pango2FcFontMap *self,
*
* Returns: (nullable): the `FcConfig` object attached to
* @self, which might be `NULL`. The return value is
- * owned by Pango2 and should not be freed.
+ * owned by Pango and should not be freed.
*/
FcConfig *
pango2_fc_font_map_get_config (Pango2FcFontMap *self)
diff --git a/pango2/serializer.c b/pango2/serializer.c
index 4e7e8a39c..7f719a06b 100644
--- a/pango2/serializer.c
+++ b/pango2/serializer.c
@@ -1,5 +1,5 @@
/* Pango2
- * serializer.c: Code to serialize various Pango2 objects
+ * serializer.c: Code to serialize various Pango objects
*
* Copyright (C) 2021 Red Hat, Inc
*
@@ -1592,7 +1592,7 @@ json_parser_load_font (GtkJsonParser *parser,
* Serializes the @layout for later deserialization via [func@Pango2.Layout.deserialize].
*
* There are no guarantees about the format of the output across different
- * versions of Pango2 and [func@Pango2.Layout.deserialize] will reject data
+ * versions of Pango and [func@Pango2.Layout.deserialize] will reject data
* that it cannot parse.
*
* The intended use of this function is testing, benchmarking and debugging.
diff --git a/tests/markup-parse.c b/tests/markup-parse.c
index 35ea03b25..277609b56 100644
--- a/tests/markup-parse.c
+++ b/tests/markup-parse.c
@@ -1,5 +1,5 @@
/* Pango2
- * markup-parse.c: Test Pango2 markup
+ * markup-parse.c: Test Pango markup
*
* Copyright (C) 2014 Red Hat, Inc
*
diff --git a/tests/test-break.c b/tests/test-break.c
index 933c20cfc..0bdc65423 100644
--- a/tests/test-break.c
+++ b/tests/test-break.c
@@ -1,5 +1,5 @@
/* Pango2
- * test-break.c: Test Pango2 line breaking
+ * test-break.c: Test Pango line breaking
*
* Copyright (C) 2019 Red Hat, Inc
*
diff --git a/tests/test-ellipsize.c b/tests/test-ellipsize.c
index b01a94414..741121928 100644
--- a/tests/test-ellipsize.c
+++ b/tests/test-ellipsize.c
@@ -1,5 +1,5 @@
/* Pango2
- * test-ellipsize.c: Test Pango2 harfbuzz apis
+ * test-ellipsize.c: Test Pango harfbuzz apis
*
* Copyright (C) 2019 Red Hat, Inc.
*
diff --git a/tests/test-harfbuzz.c b/tests/test-harfbuzz.c
index dcd7ca4bc..43dd74892 100644
--- a/tests/test-harfbuzz.c
+++ b/tests/test-harfbuzz.c
@@ -1,5 +1,5 @@
/* Pango2
- * test-harfbuzz.c: Test Pango2 harfbuzz apis
+ * test-harfbuzz.c: Test Pango harfbuzz apis
*
* Copyright (C) 2019 Red Hat, Inc.
*
diff --git a/tests/test-itemize.c b/tests/test-itemize.c
index a13ceaeed..f3f0c906b 100644
--- a/tests/test-itemize.c
+++ b/tests/test-itemize.c
@@ -1,5 +1,5 @@
/* Pango2
- * test-break.c: Test Pango2 line breaking
+ * test-break.c: Test Pango line breaking
*
* Copyright (C) 2019 Red Hat, Inc
*
diff --git a/tests/test-layout.c b/tests/test-layout.c
index 5146416a7..f47712cc4 100644
--- a/tests/test-layout.c
+++ b/tests/test-layout.c
@@ -1,5 +1,5 @@
/* Pango2
- * test-layout.c: Test Pango2 Layout
+ * test-layout.c: Test Pango Layout
*
* Copyright (C) 2014 Red Hat, Inc
*
diff --git a/tests/test-shape.c b/tests/test-shape.c
index dc4f01af9..e8299f3a3 100644
--- a/tests/test-shape.c
+++ b/tests/test-shape.c
@@ -1,5 +1,5 @@
/* Pango2
- * test-shape.c: Test Pango2 shaping
+ * test-shape.c: Test Pango shaping
*
* Copyright (C) 2019 Red Hat, Inc
*
diff --git a/utils/pango-segmentation.c b/utils/pango-segmentation.c
index 42c5d3e8d..96bb2ca80 100644
--- a/utils/pango-segmentation.c
+++ b/utils/pango-segmentation.c
@@ -1,5 +1,5 @@
/* Pango2
- * pango-segmentation.c: Test Pango2 line breaking
+ * pango-segmentation.c: Test Pango line breaking
*
* Copyright (C) 2021 Red Hat, Inc
*
diff --git a/utils/viewer-pangocairo.c b/utils/viewer-pangocairo.c
index 252e57443..d51b20552 100644
--- a/utils/viewer-pangocairo.c
+++ b/utils/viewer-pangocairo.c
@@ -1,4 +1,4 @@
-/* viewer-pangocairo.c: Pango2Cairo viewer backend.
+/* viewer-pangocairo.c: PangoCairo viewer backend.
*
* Copyright (C) 1999,2004,2005 Red Hat, Inc.
* Copyright (C) 2001 Sun Microsystems
diff --git a/utils/viewer-render.c b/utils/viewer-render.c
index 4e60cbf6b..478d8fcb2 100644
--- a/utils/viewer-render.c
+++ b/utils/viewer-render.c
@@ -798,7 +798,7 @@ backends_get_count (void)
static char *
backend_description (void)
{
- GString *description = g_string_new("Pango2 backend to use for rendering ");
+ GString *description = g_string_new("Pango backend to use for rendering ");
int backends_count = backends_get_count ();
if (backends_count > 1)
@@ -853,7 +853,7 @@ show_version(const char *name G_GNUC_UNUSED,
g_printf("%s (%s) %s\n", g_get_prgname (), PACKAGE_NAME, PACKAGE_VERSION);
if (PANGO2_VERSION != pango2_version())
- g_printf("Linked Pango2 library has a different version: %s\n", pango2_version_string ());
+ g_printf("Linked Pango library has a different version: %s\n", pango2_version_string ());
exit(0);
}
@@ -913,7 +913,7 @@ parse_options (int argc, char *argv[])
{"margin", 0, 0, G_OPTION_ARG_CALLBACK, &parse_margin,
"Set the margin on the output in pixels", "CSS-style numbers in pixels"},
{"markup", 0, 0, G_OPTION_ARG_NONE, &opt_markup,
- "Interpret text as Pango2 markup", NULL},
+ "Interpret text as Pango markup", NULL},
{"output", 'o', 0, G_OPTION_ARG_STRING, &opt_output,
"Save rendered image to output file", "file"},
{"pangorc", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, &opt_pangorc,
@@ -921,13 +921,13 @@ parse_options (int argc, char *argv[])
{"pixels", 0, 0, G_OPTION_ARG_NONE, &opt_pixels,
"Use pixel units instead of points (sets dpi to 72)", NULL},
{"pango-units", 0, 0, G_OPTION_ARG_NONE, &opt_pango2_units,
- "Use Pango2 units instead of points", NULL},
+ "Use Pango units instead of points", NULL},
{"rtl", 0, 0, G_OPTION_ARG_NONE, &opt_rtl,
"Set base direction to right-to-left", NULL},
{"rotate", 0, 0, G_OPTION_ARG_DOUBLE, &opt_rotate,
"Angle at which to rotate results", "degrees"},
{"runs", 'n', 0, G_OPTION_ARG_INT, &opt_runs,
- "Run Pango2 layout engine this many times", "integer"},
+ "Run Pango layout engine this many times", "integer"},
{"single-par", 0, 0, G_OPTION_ARG_NONE, &opt_single_par,
"Enable single-paragraph mode", NULL},
{"text", 't', 0, G_OPTION_ARG_STRING, &opt_text,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
