diff options
| author | Behdad Esfahbod <behdad@src.gnome.org> | 2007-01-07 05:54:05 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2007-01-07 05:54:05 +0000 |
| commit | 6dfa8050e8394b2ead16f1607fc69b85995b1e57 (patch) | |
| tree | aadd768044c8aa7c09461931d9b5455c54b78f01 | |
| parent | d938d6264ef146ea0c71bdbb2eecd0d1fa285a70 (diff) | |
| download | pango-6dfa8050e8394b2ead16f1607fc69b85995b1e57.tar.gz | |
Spell-check the docs.
svn path=/branches/pango-1-14/; revision=2131
52 files changed, 199 insertions, 146 deletions
@@ -1,3 +1,58 @@ +2007-01-07 Behdad Esfahbod <behdad@gnome.org> + + * docs/tmpl/engines.sgml: + * docs/tmpl/fonts.sgml: + * docs/tmpl/freetype-fonts.sgml: + * docs/tmpl/layout.sgml: + * docs/tmpl/main.sgml: + * docs/tmpl/modules.sgml: + * docs/tmpl/opentype.sgml: + * docs/tmpl/pango-renderer.sgml: + * docs/tmpl/pangofc-font.sgml: + * docs/tmpl/pangofc-fontmap.sgml: + * docs/tmpl/text-attributes.sgml: + * docs/tmpl/win32-fonts.sgml: + * docs/tmpl/x-fonts.sgml: + * docs/tmpl/xft-fonts.sgml: + * pango/ellipsize.c: + * pango/fonts.c: + * pango/glyphstring.c: + * pango/modules.c: + * pango/pango-attributes.c: + * pango/pango-context.c: + * pango/pango-context.h: + * pango/pango-coverage.c: + * pango/pango-glyph-item.c: + * pango/pango-layout.c: + * pango/pango-layout.h: + * pango/pango-markup.c: + * pango/pango-matrix.c: + * pango/pango-ot-buffer.c: + * pango/pango-ot-info.c: + * pango/pango-ot-ruleset.c: + * pango/pango-renderer.c: + * pango/pango-script.c: + * pango/pango-utils.c: + * pango/pangoatsui-fontmap.c: + * pango/pangocairo-fontmap.c: + * pango/pangofc-font.c: + * pango/pangofc-font.h: + * pango/pangofc-fontmap.c: + * pango/pangofc-fontmap.h: + * pango/pangoft2-fontmap.c: + * pango/pangoft2-render.c: + * pango/pangoft2.c: + * pango/pangowin32-fontcache.c: + * pango/pangowin32-fontmap.c: + * pango/pangowin32.c: + * pango/pangox-fontmap.c: + * pango/pangox.c: + * pango/pangoxft-font.c: + * pango/pangoxft-fontmap.c: + * pango/pangoxft-render.c: + * pango/reorder-items.c: + Spell-check the docs. + 2007-01-07 Tor Lillqvist <tml@novell.com> * modules/basic/Makefile.am: Fix build on Win32 outside diff --git a/docs/tmpl/engines.sgml b/docs/tmpl/engines.sgml index 2f8efcae..20de439f 100644 --- a/docs/tmpl/engines.sgml +++ b/docs/tmpl/engines.sgml @@ -45,7 +45,7 @@ engine. It contains the following fields: <!-- ##### STRUCT PangoEngineScriptInfo ##### --> <para> -The PangoEngineScriptInfo structure contains +The #PangoEngineScriptInfo structure contains information about how the shaper covers a particular script. </para> diff --git a/docs/tmpl/fonts.sgml b/docs/tmpl/fonts.sgml index a1009747..1b96dcb1 100644 --- a/docs/tmpl/fonts.sgml +++ b/docs/tmpl/fonts.sgml @@ -9,7 +9,7 @@ Structures representing abstract fonts Pango supports a flexible architecture where a particular rendering architecture can supply an implementation of fonts. The #PangoFont structure -represents an abstract rendering-system-indepent font. +represents an abstract rendering-system-independent font. Pango provides routines to list available fonts, and to load a font of a given description. </para> @@ -532,9 +532,9 @@ The #GObject type for #PangoFontMetrics. The #PangoFont structure is used to represent a font in a rendering-system-independent matter. To create an implementation of a #PangoFont, -the rendering-system specific code should malloc +the rendering-system specific code should allocate a larger structure that contains a nested -#PangoFont, fill in the klass member of +#PangoFont, fill in the <structfield>klass</structfield> member of the nested #PangoFont with a pointer to a appropriate #PangoFontClass, then call pango_font_init() on the structure. @@ -760,8 +760,8 @@ The #PangoFontMap represents the set of fonts available for a particular rendering system. This is a virtual object with implementations being specific to particular rendering systems. To create an implementation of a #PangoFontMap, the rendering-system -specific code should malloc a larger structure that contains a nested -#PangoFontMap, fill in the klass member of the nested #PangoFontMap with a +specific code should allocate a larger structure that contains a nested +#PangoFontMap, fill in the <structfield>klass</structfield> member of the nested #PangoFontMap with a pointer to a appropriate #PangoFontMapClass, then call pango_font_map_init() on the structure. </para> diff --git a/docs/tmpl/freetype-fonts.sgml b/docs/tmpl/freetype-fonts.sgml index cbe92eb7..06f5006c 100644 --- a/docs/tmpl/freetype-fonts.sgml +++ b/docs/tmpl/freetype-fonts.sgml @@ -64,7 +64,7 @@ with the FreeType backend. See %PANGO_RENDER_TYPE_FC for the replacement. Function type for doing final config tweaking on prepared FcPatterns. </para> -@pattern: the FcPattern to tweak. +@pattern: the <type>FcPattern</type> to tweak. @data: user data. diff --git a/docs/tmpl/layout.sgml b/docs/tmpl/layout.sgml index 8dd4b695..30bdf49e 100644 --- a/docs/tmpl/layout.sgml +++ b/docs/tmpl/layout.sgml @@ -2,7 +2,7 @@ Layout Objects <!-- ##### SECTION Short_Description ##### --> -Highlevel layout driver objects +High-level layout driver objects <!-- ##### SECTION Long_Description ##### --> <para> @@ -212,7 +212,7 @@ has no user-visible fields. <!-- ##### ENUM PangoWrapMode ##### --> <para> -A PangoWrapMode describes how to wrap the lines of a #PangoLayout to the desired width. +A #PangoWrapMode describes how to wrap the lines of a #PangoLayout to the desired width. </para> @PANGO_WRAP_WORD: wrap lines at word boundaries. @@ -390,7 +390,7 @@ The #GObject type for #PangoEllipsizeMode. <!-- ##### ENUM PangoAlignment ##### --> <para> -A PangoAlignment describes how to align the lines of a #PangoLayout within the +A #PangoAlignment describes how to align the lines of a #PangoLayout within the available space. If the #PangoLayout is set to justify using pango_layout_set_justify(), this only has effect for partial lines. </para> diff --git a/docs/tmpl/main.sgml b/docs/tmpl/main.sgml index ab47b4df..aec4f3ab 100644 --- a/docs/tmpl/main.sgml +++ b/docs/tmpl/main.sgml @@ -49,7 +49,7 @@ fields: @shape_engine: the engine for doing rendering-system-dependent processing. @lang_engine: the engine for doing rendering-system-independent processing. @font: the font for this segment. -@level: the bidrectional level for this segment. +@level: the bidirectional level for this segment. @language: the detected language for this segment. @extra_attrs: extra attributes for this segment. @@ -382,7 +382,7 @@ about the attributes of a single character. and @is_word_end set for some character. @is_sentence_boundary: is a sentence boundary. There are two ways to divide sentences. The first assigns all - intersentence whitespace/control/format chars to some sentence, + inter-sentence whitespace/control/format chars to some sentence, so all chars are in some sentence; @is_sentence_boundary denotes the boundaries there. The second way doesn't assign between-sentence spaces, etc. to any sentence, so diff --git a/docs/tmpl/modules.sgml b/docs/tmpl/modules.sgml index 003840a0..0fe8c42f 100644 --- a/docs/tmpl/modules.sgml +++ b/docs/tmpl/modules.sgml @@ -27,7 +27,7 @@ loaded module. @list: a function that lists the engines defined in this module. @init: a function to initialize the module. -@exit: a function to finilize the module. +@exit: a function to finalize the module. @create: a function to create an engine, given the engine name. <!-- ##### STRUCT PangoMap ##### --> diff --git a/docs/tmpl/opentype.sgml b/docs/tmpl/opentype.sgml index 141d71c3..f1a304fe 100644 --- a/docs/tmpl/opentype.sgml +++ b/docs/tmpl/opentype.sgml @@ -70,7 +70,7 @@ set of features selected from the tables in an OpenType font. (A feature is an operation such as adjusting glyph positioning that should be applied to a text feature such as a certain type of accent.) A #PangoOTRuleSet -is created with pango_ot_ruleset_new(), features are addded +is created with pango_ot_ruleset_new(), features are added to it with pango_ot_ruleset_add_feature(), then it is applied to a #PangoGlyphString with pango_ot_ruleset_shape(). </para> diff --git a/docs/tmpl/pango-renderer.sgml b/docs/tmpl/pango-renderer.sgml index c7e76813..181986f0 100644 --- a/docs/tmpl/pango-renderer.sgml +++ b/docs/tmpl/pango-renderer.sgml @@ -7,8 +7,8 @@ Rendering driver base class <!-- ##### SECTION Long_Description ##### --> <para> #PangoRenderer is a base class that contains the necessary logic for -rendering a PangoLayout or PangoLayoutLine. By subclassing -PangoRenderer and overriding operations such as @draw_glyphs and +rendering a #PangoLayout or #PangoLayoutLine. By subclassing +#PangoRenderer and overriding operations such as @draw_glyphs and @draw_rectangle, renderers for particular font backends and destinations can be created. </para> diff --git a/docs/tmpl/pangofc-font.sgml b/docs/tmpl/pangofc-font.sgml index 6bea63f4..95ac1dd3 100644 --- a/docs/tmpl/pangofc-font.sgml +++ b/docs/tmpl/pangofc-font.sgml @@ -6,8 +6,8 @@ Base font class for Fontconfig-based backends <!-- ##### SECTION Long_Description ##### --> <para> -PangoFcFont is a base class for font implementation using the -FontConfig and FreeType libraries. It is used in the +#PangoFcFont is a base class for font implementation using the +Fontconfig and FreeType libraries. It is used in the <link linkend="pango-Xft-Fonts-and-Rendering">Xft</link> and <link linkend="pango-FreeType-Fonts-and-Rendering">FreeType</link> backends shipped with Pango, but can also be used when creating diff --git a/docs/tmpl/pangofc-fontmap.sgml b/docs/tmpl/pangofc-fontmap.sgml index 7e3c0ae1..340ad03a 100644 --- a/docs/tmpl/pangofc-fontmap.sgml +++ b/docs/tmpl/pangofc-fontmap.sgml @@ -7,7 +7,7 @@ Base fontmap class for Fontconfig-based backends <!-- ##### SECTION Long_Description ##### --> <para> PangoFcFontMap is a base class for font map implementations using the -FontConfig and FreeType libraries. It is used in the +Fontconfig and FreeType libraries. It is used in the <link linkend="pango-Xft-Fonts-and-Rendering">Xft</link> and <link linkend="pango-FreeType-Fonts-and-Rendering">FreeType</link> backends shipped with Pango, but can also be used when creating diff --git a/docs/tmpl/text-attributes.sgml b/docs/tmpl/text-attributes.sgml index 871494fb..7823d88e 100644 --- a/docs/tmpl/text-attributes.sgml +++ b/docs/tmpl/text-attributes.sgml @@ -513,7 +513,7 @@ The scale factor for three magnification steps (1.2 * 1.2 * 1.2). <!-- ##### STRUCT PangoColor ##### --> <para> The #PangoColor structure is used to -represent a color in an uncalibrated RGB colorspace. +represent a color in an uncalibrated RGB color-space. </para> @red: The red component of the color. This is a value between 0 and 65535, diff --git a/docs/tmpl/win32-fonts.sgml b/docs/tmpl/win32-fonts.sgml index e4a95d7f..3896e33a 100644 --- a/docs/tmpl/win32-fonts.sgml +++ b/docs/tmpl/win32-fonts.sgml @@ -147,7 +147,7 @@ g_quark_from_string()) is used to identify the renderer in pango_find_map(). <!-- ##### STRUCT PangoWin32FontCache ##### --> <para> A #PangoWin32FontCache caches -#HFONTs by their #LOGFONT descriptions. +HFONTs by their LOGFONT descriptions. </para> diff --git a/docs/tmpl/x-fonts.sgml b/docs/tmpl/x-fonts.sgml index 7d358f25..ca76af76 100644 --- a/docs/tmpl/x-fonts.sgml +++ b/docs/tmpl/x-fonts.sgml @@ -271,7 +271,7 @@ glyph index. <!-- ##### STRUCT PangoXFontCache ##### --> <para> A #PangoXFontCache caches -#XFontStructs for a single display by their XLFD name. +<type>XFontStructs</type> for a single display by their XLFD name. </para> diff --git a/docs/tmpl/xft-fonts.sgml b/docs/tmpl/xft-fonts.sgml index 9be166db..80c10207 100644 --- a/docs/tmpl/xft-fonts.sgml +++ b/docs/tmpl/xft-fonts.sgml @@ -17,7 +17,7 @@ Using the Xft backend is generally straightforward; pango_xft_get_context() creates a context for a specified display and screen. You can then create a #PangoLayout with that context and render it with pango_xft_render_layout(). At a more advanced -level, the lowlevel fontconfig options used for rendering fonts +level, the low-level fontconfig options used for rendering fonts can be affected using pango_xft_set_default_substitute(), and pango_xft_substitute_changed(). </para> @@ -30,7 +30,7 @@ is useful to derive from #PangoXftRenderer. Deriving from support custom attributes by overriding #PangoRendererClass virtual functions like 'prepare_run' or 'draw_shape'. The reason is to customize exactly how the final bits are drawn to the destination by -overring the #PangoXftRendererClass virtual functions +overriding the #PangoXftRendererClass virtual functions 'composite_glyphs' and 'composite_trapezoids'. </para> diff --git a/pango/ellipsize.c b/pango/ellipsize.c index 22f6e4b4..b1523afe 100644 --- a/pango/ellipsize.c +++ b/pango/ellipsize.c @@ -48,7 +48,7 @@ typedef struct _LineIter LineIter; * us to use a gap position at x=line_width and still have it be part of * of a run. * - * We grow the grap out one "span" at a time, where a span is simply a + * We grow the gap out one "span" at a time, where a span is simply a * consecutive run of clusters that we can't interrupt with an ellipsis. * * When choosing whether to grow the gap at the start or the end, we @@ -236,7 +236,7 @@ line_iter_prev_cluster (EllipsizeState *state, * - Starts a grapheme - checked here * * In the future we'd also like to add a check for cursive connectivity here. - * This should be an addition to PangoGlyphVisAttr + * This should be an addition to #PangoGlyphVisAttr * */ @@ -715,7 +715,7 @@ current_width (EllipsizeState *state) * @line: a #PangoLayoutLine * @attrs: Attributes being used for itemization/shaping * - * Given a PangoLayoutLine with the runs still in logical order, ellipsize + * Given a #PangoLayoutLine with the runs still in logical order, ellipsize * it according the layout's policy to fit within the set width of the layout. **/ void diff --git a/pango/fonts.c b/pango/fonts.c index 88632feb..f6bc9fc8 100644 --- a/pango/fonts.c +++ b/pango/fonts.c @@ -206,7 +206,7 @@ pango_font_description_set_style (PangoFontDescription *desc, * * Return value: the style field for the font description. * Use pango_font_description_get_set_fields() to find out if - * the field was explicitely set or not. + * the field was explicitly set or not. **/ PangoStyle pango_font_description_get_style (const PangoFontDescription *desc) @@ -243,7 +243,7 @@ pango_font_description_set_variant (PangoFontDescription *desc, * * Return value: the variant field for the font description. Use * pango_font_description_get_set_fields() to find out if - * the field was explicitely set or not. + * the field was explicitly set or not. **/ PangoVariant pango_font_description_get_variant (const PangoFontDescription *desc) @@ -282,7 +282,7 @@ pango_font_description_set_weight (PangoFontDescription *desc, * * Return value: the weight field for the font description. Use * pango_font_description_get_set_fields() to find out if - * the field was explicitely set or not. + * the field was explicitly set or not. **/ PangoWeight pango_font_description_get_weight (const PangoFontDescription *desc) @@ -319,7 +319,7 @@ pango_font_description_set_stretch (PangoFontDescription *desc, * * Return value: the stretch field for the font description. Use * pango_font_description_get_set_fields() to find out if - * the field was explicitely set or not. + * the field was explicitly set or not. **/ PangoStretch pango_font_description_get_stretch (const PangoFontDescription *desc) @@ -367,7 +367,7 @@ pango_font_description_set_size (PangoFontDescription *desc, * to find out which is the case. Returns 0 if the size field has not * previously been set or it has been set to 0 explicitly. * Use pango_font_description_get_set_fields() to - * find out if the field was explicitely set or not. + * find out if the field was explicitly set or not. **/ gint pango_font_description_get_size (const PangoFontDescription *desc) @@ -410,7 +410,7 @@ pango_font_description_set_absolute_size (PangoFontDescription *desc, * * Return value: whether the size for the font description is in * points or device units. Use pango_font_description_get_set_fields() to - * find out if the size field of the font description was explicitely set or not. + * find out if the size field of the font description was explicitly set or not. * * Since: 1.8 **/ @@ -622,7 +622,7 @@ pango_font_description_copy (const PangoFontDescription *desc) * * Like pango_font_description_copy(), but only a shallow copy is made * of the family name and other allocated fields. The result can only - * be used until @desc is modififed or freed. This is meant to be used + * be used until @desc is modified or freed. This is meant to be used * when the copy is only needed temporarily. * * Return value: the newly allocated #PangoFontDescription, which should @@ -647,8 +647,8 @@ pango_font_description_copy_static (const PangoFontDescription *desc) * * Compares two font descriptions for equality. Two font descriptions * are considered equal if the fonts they describe are provably identical. - * This means that their maskd do not have to match, as long as other fields - * are all the same. (Two font descrptions may result in identical fonts + * This means that their masks do not have to match, as long as other fields + * are all the same. (Two font descriptions may result in identical fonts * being loaded, but still compare %FALSE.) * * Return value: %TRUE if the two font descriptions are identical, diff --git a/pango/glyphstring.c b/pango/glyphstring.c index 353fa2a4..2964d803 100644 --- a/pango/glyphstring.c +++ b/pango/glyphstring.c @@ -28,7 +28,7 @@ /** * pango_glyph_string_new: * - * Create a new PangoGlyphString. + * Create a new #PangoGlyphString. * * Return value: the newly allocated #PangoGlyphString, which * should be freed with pango_glyph_string_free(). @@ -48,7 +48,7 @@ pango_glyph_string_new (void) /** * pango_glyph_string_set_size: - * @string: a PangoGlyphString. + * @string: a #PangoGlyphString. * @new_len: the new length of the string. * * Resize a glyph string to the given length. @@ -92,7 +92,7 @@ pango_glyph_string_get_type (void) /** * pango_glyph_string_copy: - * @string: a PangoGlyphString. + * @string: a #PangoGlyphString. * * Copy a glyph string and associated storage. * @@ -116,7 +116,7 @@ pango_glyph_string_copy (PangoGlyphString *string) /** * pango_glyph_string_free: - * @string: a PangoGlyphString. + * @string: a #PangoGlyphString. * * Free a glyph string and associated storage. */ diff --git a/pango/modules.c b/pango/modules.c index ab396e10..c72d2a18 100644 --- a/pango/modules.c +++ b/pango/modules.c @@ -684,7 +684,7 @@ append_engines (GSList **engine_list, * handle this script. * * Finds engines in the map that handle the given script. The returned - * lists should be fred with g_slist_free, but the engines in the + * lists should be freed with g_slist_free, but the engines in the * lists are owned by GLib and will be kept around permanently, so * they should not be unref'ed. * diff --git a/pango/pango-attributes.c b/pango/pango-attributes.c index a44d499d..eef62ea2 100644 --- a/pango/pango-attributes.c +++ b/pango/pango-attributes.c @@ -951,9 +951,9 @@ pango_attr_shape_new_with_data (const PangoRectangle *ink_rect, * @logical_rect: logical rectangle to assign to each character * * Create a new shape attribute. A shape is used to impose a - * particular ink and logical rect on the result of shaping a + * particular ink and logical rectangle on the result of shaping a * particular glyph. This might be used, for instance, for - * embedding a picture or a widget inside a PangoLayout. + * embedding a picture or a widget inside a #PangoLayout. * * Return value: the newly allocated #PangoAttribute, which should be * freed with pango_attribute_destroy(). @@ -1410,7 +1410,7 @@ pango_attr_list_change (PangoAttrList *list, * of each attribute in @other in sequence (offset in position by @pos). * * This operation proves useful for, for instance, inserting - * a preedit string in the middle of an edit buffer. + * a pre-edit string in the middle of an edit buffer. **/ void pango_attr_list_splice (PangoAttrList *list, @@ -1820,7 +1820,7 @@ pango_attr_iterator_get_font (PangoAttrIterator *iterator, /** * pango_attr_list_filter: * @list: a #PangoAttrList - * @func: callback function; returns %TRUE if an atttribute + * @func: callback function; returns %TRUE if an attribute * should be filtered out. * @data: Data to be passed to @func * diff --git a/pango/pango-context.c b/pango/pango-context.c index 390d23a0..aba02847 100644 --- a/pango/pango-context.c +++ b/pango/pango-context.c @@ -103,8 +103,8 @@ pango_context_finalize (GObject *object) * This function is only useful when implementing a new backend * for Pango, something applications won't do. You should use * the context creation function for the backend you are using, - * for example, pango_xft_get_context(), pango_win32_get_context() - * or, pango_ft2_font_map_create_context(). + * for example, pango_cairo_font_map_create_context(), pango_xft_get_context(), + * pango_win32_get_context() or, pango_ft2_font_map_create_context(). * * If you are using Pango as part of a higher-level system, * that system may have it's own ways of create a #PangoContext. @@ -134,7 +134,7 @@ pango_context_new (void) * Sets the transformation matrix that will be applied when rendering * with this context. Note that reported metrics are in the user space * coordinates before the application of the matrix, not device-space - * coordiantes after the application of the matrix. So, they don't scale + * coordinates after the application of the matrix. So, they don't scale * with the matrix, though they may change slightly for different * matrices, depending on how the text is fit to the pixel grid. * @@ -223,7 +223,7 @@ pango_context_get_font_map (PangoContext *context) /** * pango_context_list_families: * @context: a #PangoContext - * @families: location to store a pointer to an array of PangoFontFamily *. + * @families: location to store a pointer to an array of #PangoFontFamily *. * This array should be freed with g_free(). * @n_families: location to store the number of elements in @descs * @@ -1167,9 +1167,9 @@ itemize_state_finish (ItemizeState *state) * * Like pango_itemize(), but the base direction to use when * computing bidirectional levels (see pango_context_set_base_dir ()), - * is specified explicitely rather than gotten from the #PangoContext. + * is specified explicitly rather than gotten from the #PangoContext. * - * Return value: a GList of PangoItem structures. + * Return value: a #GList of #PangoItem structures. * * Since: 1.4 */ @@ -1251,7 +1251,7 @@ itemize_with_font (PangoContext *context, * the range covering the position just after @start_index + @length. * (i.e. if itemizing in a loop, just keep passing in the same @cached_iter). * - * Return value: a GList of PangoItem structures. + * Return value: a #GList of #PangoItem structures. */ GList * pango_itemize (PangoContext *context, @@ -1358,7 +1358,7 @@ update_metrics_from_items (PangoFontMetrics *metrics, * @desc: a #PangoFontDescription structure * @language: language tag used to determine which script to get the metrics * for. %NULL means that the language tag from the context will - * be used. If no language tag is set on the ccontext, metrics + * be used. If no language tag is set on the context, metrics * large enough to cover a range of languages will be returned. * The process of determining such metrics is slow, so it is best * to always make sure some real language tag will be used. diff --git a/pango/pango-context.h b/pango/pango-context.h index 385c2d93..001db9e0 100644 --- a/pango/pango-context.h +++ b/pango/pango-context.h @@ -44,7 +44,7 @@ typedef struct _PangoContextClass PangoContextClass; /* The PangoContext and PangoContextClass structs are private; if you - * need to create a subclass of these, mail otaylor@redhat.com + * need to create a subclass of these, file a bug. */ GType pango_context_get_type (void) G_GNUC_CONST; @@ -85,7 +85,7 @@ G_CONST_RETURN PangoMatrix *pango_context_get_matrix (PangoContext *context /* Break a string of Unicode characters into segments with * consistent shaping/language engine and bidrectional level. - * Returns a GList of PangoItem's + * Returns a #GList of #PangoItem's */ GList *pango_itemize (PangoContext *context, const char *text, diff --git a/pango/pango-coverage.c b/pango/pango-coverage.c index 360bfe3a..90b67333 100644 --- a/pango/pango-coverage.c +++ b/pango/pango-coverage.c @@ -73,9 +73,8 @@ pango_coverage_new (void) * pango_coverage_copy: * @coverage: a #PangoCoverage * - * Copy an existing #PangoCoverage. (This function may now be unecessary - * since we refcount the structure. Mail otaylor@redhat.com if you - * use it.) + * Copy an existing #PangoCoverage. (This function may now be unnecessary + * since we refcount the structure. File a bug if you use it.) * * Return value: the newly allocated #PangoCoverage, * with a reference count of one, which @@ -357,7 +356,7 @@ pango_coverage_max (PangoCoverage *coverage, * @bytes: location to store result (must be freed with g_free()) * @n_bytes: location to store size of result * - * Convert a PangoCoverage structure into a flat binary format + * Convert a #PangoCoverage structure into a flat binary format **/ void pango_coverage_to_bytes (PangoCoverage *coverage, diff --git a/pango/pango-glyph-item.c b/pango/pango-glyph-item.c index 858dadad..6ca256c9 100644 --- a/pango/pango-glyph-item.c +++ b/pango/pango-glyph-item.c @@ -235,7 +235,7 @@ _pango_glyph_item_iter_next_cluster (PangoGlyphItemIter *iter) * * Moves the iterator to the preceding cluster in the glyph item. * - * Return value: %TRUE if the iterator was movedn, %FALSE if we were already on the + * Return value: %TRUE if the iterator was moved, %FALSE if we were already on the * first cluster. **/ gboolean @@ -313,14 +313,14 @@ _pango_glyph_item_iter_prev_cluster (PangoGlyphItemIter *iter) /** * _pango_glyph_item_iter_init_start: * @iter: pointer to a #PangoGlyphItemIter structure - * @glyph_item: the glyph item that the iter points into + * @glyph_item: the glyph item that @iter points into * @text: text corresponding to the glyph item * * Initializes a #PangoGlyphItemIter structure to point to the * first cluster in a glyph item. * * Return value: %FALSE if there are no clusters in the glyph item; - * in this case, the state of the iter is undefined. + * in this case, the state of @iter is undefined. **/ gboolean _pango_glyph_item_iter_init_start (PangoGlyphItemIter *iter, @@ -345,14 +345,14 @@ _pango_glyph_item_iter_init_start (PangoGlyphItemIter *iter, /** * _pango_glyph_item_iter_init_start: * @iter: pointer to a #PangoGlyphItemIter structure - * @glyph_item: the glyph item that the iter points into + * @glyph_item: the glyph item that @iter points into * @text: text corresponding to the glyph item * * Initializes a #PangoGlyphItemIter structure to point to the * last cluster in a glyph item. * * Return value: %FALSE if there are no clusters in the glyph item; - * in this case, the state of the iter is undefined. + * in this case, the state of @iter is undefined. **/ gboolean _pango_glyph_item_iter_init_end (PangoGlyphItemIter *iter, @@ -391,7 +391,7 @@ append_attrs (PangoGlyphItem *glyph_item, g_slist_concat (glyph_item->item->analysis.extra_attrs, attrs); } -/* Make a deep copy of a GSlist of PangoAttribute +/* Make a deep copy of a #GSList of PangoAttribute */ static GSList * attr_slist_copy (GSList *attrs) @@ -447,7 +447,7 @@ split_before_cluster_start (ApplyAttrsState *state) * * All attributes that start or end inside a cluster are applied * to that cluster; for instance, if half of a cluster is underlined - * and the other-half strikethough, then the cluster will end + * and the other-half strikethrough, then the cluster will end * up with both underline and strikethrough attributes. In these * cases, it may happen that item->extra_attrs for some of the * result items can have multiple attributes of the same type. diff --git a/pango/pango-layout.c b/pango/pango-layout.c index 420b42e2..023d2eea 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -1,5 +1,5 @@ /* Pango - * pango-layout.c: Highlevel layout driver + * pango-layout.c: High-level layout driver * * Copyright (C) 2000, 2001 Red Hat Software * @@ -570,7 +570,7 @@ pango_layout_get_font_description (PangoLayout *layout) * the justification may be done in more complex ways, like extending * the characters. * - * Note that as of Pango-1.10, this functionality is not yet implemented. + * Note that as of Pango-1.16, this functionality is not yet implemented. **/ void pango_layout_set_justify (PangoLayout *layout, @@ -836,7 +836,7 @@ pango_layout_get_ellipsize (PangoLayout *layout) * @length: maximum length of @text, in bytes. -1 indicates that * the string is nul-terminated and the length should be * calculated. The text will also be truncated on - * encountaring a nul-termination even when @length is + * encountering a nul-termination even when @length is * positive. * * Sets the text of the layout. @@ -944,8 +944,8 @@ pango_layout_set_markup (PangoLayout *layout, * the current text and attribute list. * * If @accel_marker is nonzero, the given character will mark the - * character following it as an accelerator. For example, the accel - * marker might be an ampersand or underscore. All characters marked + * character following it as an accelerator. For example, @accel_marker + * might be an ampersand or underscore. All characters marked * as an accelerator will receive a %PANGO_UNDERLINE_LOW attribute, * and the first character so marked will be returned in @accel_char. * Two @accel_marker characters following each other produce a single @@ -1329,7 +1329,7 @@ pango_layout_index_to_line_x (PangoLayout *layout, * value indicates motion to the left. * @new_index: location to store the new cursor byte index. A value of -1 * indicates that the cursor has been moved off the beginning - * of the layout. A value of G_MAXINT indicates that + * of the layout. A value of %G_MAXINT indicates that * the cursor has been moved off the end of the layout. * @new_trailing: number of characters to move forward from the location returned * for @new_index to get the position where the cursor should @@ -2957,7 +2957,7 @@ process_item (PangoLayout *layout, goto retry_break; } - if (force_fit || break_width <= state->remaining_width) /* Succesfully broke the item */ + if (force_fit || break_width <= state->remaining_width) /* Successfully broke the item */ { if (state->remaining_width >= 0) { @@ -4266,14 +4266,14 @@ is_tab_run (PangoLayout *layout, /* When doing shaping, we add the letter spacing value for a * run after every grapheme in the run. This produces ugly - * asymetrical results, so what this routine is redistributes + * asymmetrical results, so what this routine is redistributes * that space to the beginning and the end of the run. * * We also trim the letter spacing from runs adjacent to * tabs and from the outside runs of the lines so that things * line up properly. The line breaking and tab positioning * were computed without this trimming so they are no longer - * exactly correct, but this won't be very noticable in most + * exactly correct, but this won't be very noticeable in most * cases. */ static void diff --git a/pango/pango-layout.h b/pango/pango-layout.h index 06db0244..a9f3d6d9 100644 --- a/pango/pango-layout.h +++ b/pango/pango-layout.h @@ -1,5 +1,5 @@ /* Pango - * pango-layout.h: Highlevel layout driver + * pango-layout.h: High-level layout driver * * Copyright (C) 2000 Red Hat Software * @@ -86,7 +86,7 @@ struct _PangoLayoutLine #define PANGO_LAYOUT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_LAYOUT, PangoLayoutClass)) /* The PangoLayout and PangoLayoutClass structs are private; if you - * need to create a subclass of these, mail otaylor@redhat.com + * need to create a subclass of these, file a bug. */ GType pango_layout_get_type (void) G_GNUC_CONST; diff --git a/pango/pango-markup.c b/pango/pango-markup.c index afe8a933..8f925830 100644 --- a/pango/pango-markup.c +++ b/pango/pango-markup.c @@ -559,11 +559,11 @@ static const GMarkupParser pango_markup_parser = { * * Parses marked-up text (see * <link linkend="PangoMarkupFormat">markup format</link>) to create - * a plaintext string and an attribute list. + * a plain-text string and an attribute list. * * If @accel_marker is nonzero, the given character will mark the - * character following it as an accelerator. For example, the accel - * marker might be an ampersand or underscore. All characters marked + * character following it as an accelerator. For example, @accel_marker + * might be an ampersand or underscore. All characters marked * as an accelerator will receive a %PANGO_UNDERLINE_LOW attribute, * and the first character so marked will be returned in @accel_char. * Two @accel_marker characters following each other produce a single diff --git a/pango/pango-matrix.c b/pango/pango-matrix.c index 58be83e1..0bc2879e 100644 --- a/pango/pango-matrix.c +++ b/pango/pango-matrix.c @@ -138,7 +138,7 @@ pango_matrix_scale (PangoMatrix *matrix, * * Changes the transformation represented by @matrix to be the * transformation given by first rotating by @degrees degrees - * counter-clokwise then applying the original transformation. + * counter-clockwise then applying the original transformation. * * Since: 1.6 **/ diff --git a/pango/pango-ot-buffer.c b/pango/pango-ot-buffer.c index fef5a0c0..eef1f0e8 100644 --- a/pango/pango-ot-buffer.c +++ b/pango/pango-ot-buffer.c @@ -140,7 +140,7 @@ pango_ot_buffer_set_rtl (PangoOTBuffer *buffer, * * Sets whether characters with a mark class should be forced to zero width. * This setting is needed for proper positioning of Arabic accents, - * but will produce incorrect results with standard OpenType indic + * but will produce incorrect results with standard OpenType Indic * fonts. * * Since: 1.6 diff --git a/pango/pango-ot-info.c b/pango/pango-ot-info.c index 2eebc5f1..f675f648 100644 --- a/pango/pango-ot-info.c +++ b/pango/pango-ot-info.c @@ -110,7 +110,7 @@ pango_ot_info_finalizer (void *object) /** * pango_ot_info_get: - * @face: a #FT_Face. + * @face: a <type>FT_Face</type>. * * Returns the #PangoOTInfo structure for the given FreeType font. * @@ -210,7 +210,7 @@ set_unicode_charmap (FT_Face face) } /* Synthesize a GDEF table using the font's charmap and the - * unicode property database. We'll fill in class definitions + * Unicode property database. We'll fill in class definitions * for glyphs not in the charmap as we walk through the tables. */ static void @@ -629,7 +629,7 @@ pango_ot_info_list_languages (PangoOTInfo *info, * @table_type: the table type to obtain information about. * @tag: unused parameter. * @script_index: the index of the script to obtain information about. - * @language_index: the indes of the language to list features for, or + * @language_index: the index of the language to list features for, or * %PANGO_OT_DEFAULT_LANGUAGE, to list features for the default * language of the script. * diff --git a/pango/pango-ot-ruleset.c b/pango/pango-ot-ruleset.c index 449dfd0b..9473a7ae 100644 --- a/pango/pango-ot-ruleset.c +++ b/pango/pango-ot-ruleset.c @@ -196,7 +196,7 @@ pango_ot_ruleset_substitute (PangoOTRuleset *ruleset, * @ruleset: a #PangoOTRuleset. * @buffer: a #PangoOTBuffer. * - * Performs the OpenType GPOS positionoing on @buffer using the features + * Performs the OpenType GPOS positioning on @buffer using the features * in @ruleset * * Since: 1.4 diff --git a/pango/pango-renderer.c b/pango/pango-renderer.c index 5bf37a8e..e6fc83f2 100644 --- a/pango/pango-renderer.c +++ b/pango/pango-renderer.c @@ -1096,7 +1096,7 @@ pango_renderer_get_color (PangoRenderer *renderer, * @renderer: a #PangoRenderer * @part: the part for which rendering has changed. * - * Informs Pango that the way that the renderering is done + * Informs Pango that the way that the rendering is done * for @part has changed in a way that would prevent multiple * pieces being joined together into one drawing call. For * instance, if a subclass of #PangoRenderer was to add a stipple @@ -1131,7 +1131,7 @@ pango_renderer_part_changed (PangoRenderer *renderer, * @renderer: a #PangoRenderer * @run: a #PangoLayoutRun * - * Set up the state of the PangoRenderer for rendering @run. + * Set up the state of the #PangoRenderer for rendering @run. * * Since: 1.8 **/ diff --git a/pango/pango-script.c b/pango/pango-script.c index 52824799..133b0b6c 100644 --- a/pango/pango-script.c +++ b/pango/pango-script.c @@ -269,11 +269,11 @@ get_pair_index (gunichar ch) * pango_script_iter_next: * @iter: a #PangoScriptIter * - * Advances a #PangoScriptIter to the next range. If the iter + * Advances a #PangoScriptIter to the next range. If @iter * is already at the end, it is left unchanged and %FALSE * is returned. * - * Return value: %TRUE if the iter was succesfully advanced. + * Return value: %TRUE if @iter was successfully advanced. * * Since: 1.4 **/ @@ -419,7 +419,7 @@ script_for_lang_compare (gconstpointer key, /** * pango_language_includes_script: - * @language: a PangoLanguage + * @language: a #PangoLanguage * @script: a #PangoScript * * Determines if @script is one of the scripts used to @@ -477,7 +477,7 @@ pango_language_includes_script (PangoLanguage *language, * representative of that script. This will usually be the * most widely spoken or used language written in that script: * for instance, the sample language for %PANGO_SCRIPT_CYRILLIC - * is <literal>ru</literal> (Russian), the sample lanugage + * is <literal>ru</literal> (Russian), the sample language * for %PANGO_SCRIPT_ARABIC is <literal>ar</literal>. * * For some diff --git a/pango/pango-utils.c b/pango/pango-utils.c index 63976aed..7d5093b2 100644 --- a/pango/pango-utils.c +++ b/pango/pango-utils.c @@ -85,10 +85,10 @@ pango_trim_string (const char *str) /** * pango_split_file_list: - * @str: a G_SEARCHPATH_SEPARATOR separated list of filenames + * @str: a %G_SEARCHPATH_SEPARATOR separated list of filenames * - * Splits a G_SEARCHPATH_SEPARATOR-separated list of files, stripping - * white space and subsituting ~/ with $HOME/. + * Splits a %G_SEARCHPATH_SEPARATOR-separated list of files, stripping + * white space and substituting ~/ with $HOME/. * * Return value: a list of strings to be freed with g_strfreev() **/ @@ -286,7 +286,7 @@ pango_skip_space (const char **pos) * of [A-Za-z_] followed by zero or more [A-Za-z_0-9] * Leading white space is skipped. * - * Return value: %FALSE if a parse error occured. + * Return value: %FALSE if a parse error occurred. **/ gboolean pango_scan_word (const char **pos, GString *out) @@ -329,7 +329,7 @@ pango_scan_word (const char **pos, GString *out) * string with '"'. Instead a quoted string, '\"' represents * a literal quote. Leading white space outside of quotes is skipped. * - * Return value: %FALSE if a parse error occured. + * Return value: %FALSE if a parse error occurred. **/ gboolean pango_scan_string (const char **pos, GString *out) @@ -415,7 +415,7 @@ pango_scan_string (const char **pos, GString *out) * Scans an integer. * Leading white space is skipped. * - * Return value: %FALSE if a parse error occured. + * Return value: %FALSE if a parse error occurred. **/ gboolean pango_scan_int (const char **pos, int *out) @@ -1092,7 +1092,7 @@ lang_info_compare (const void *key, const void *val) /* The following array is supposed to contain enough text to tickle all necessary fonts for each * of the languages in the following. Yes, it's pretty lame. Not all of the languages - * in the following have sufficient text to excercise all the accents for the language, and + * in the following have sufficient text to exercise all the accents for the language, and * there are obviously many more languages to include as well. */ static const LangInfo lang_texts[] = { @@ -1166,7 +1166,7 @@ pango_language_get_sample_string (PangoLanguage *language) * pango_log2vis_get_embedding_levels: * @text: the text to itemize. * @length: the number of bytes (not characters) to process, or -1 - * if @text is nul-terminated and the legnth should be calculated. + * if @text is nul-terminated and the length should be calculated. * @pbase_dir: input base direction, and output resolved direction. * * This will return the bidirectional embedding levels of the input paragraph diff --git a/pango/pangoatsui-fontmap.c b/pango/pangoatsui-fontmap.c index 059731da..ce35e527 100644 --- a/pango/pangoatsui-fontmap.c +++ b/pango/pangoatsui-fontmap.c @@ -1,5 +1,5 @@ /* Pango - * pangatsui-fontmap.c + * pangoatsui-fontmap.c * * Copyright (C) 2000-2003 Red Hat, Inc. * Copyright (C) 2005 Imendio AB diff --git a/pango/pangocairo-fontmap.c b/pango/pangocairo-fontmap.c index a41cb9b4..e6983135 100644 --- a/pango/pangocairo-fontmap.c +++ b/pango/pangocairo-fontmap.c @@ -103,7 +103,7 @@ pango_cairo_font_map_new (void) * * Gets a default font map to use with Cairo. * - * Return value: the default Cairo fontmap for Pango. This + * Return value: the default Cairo fontmap for #Pango. This * object is owned by Pango and must not be freed. * * Since: 1.10 @@ -186,7 +186,7 @@ pango_cairo_font_map_create_context (PangoCairoFontMap *fontmap) * _pango_cairo_font_map_get_renderer: * @fontmap: a #PangoCairoFontmap * - * Gets the singleton PangoCairoRenderer for this fontmap. + * Gets the singleton #PangoCairoRenderer for this fontmap. * * Return value: the singleton renderer **/ diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c index 5f62f428..5a339763 100644 --- a/pango/pangofc-font.c +++ b/pango/pangofc-font.c @@ -578,11 +578,11 @@ pango_fc_font_real_get_glyph (PangoFcFont *font, * pango_fc_font_lock_face: * @font: a #PangoFcFont. * - * Gets the FreeType FT_Face associated with a font, + * Gets the FreeType <type>FT_Face</type> associated with a font, * This face will be kept around until you call * pango_fc_font_unlock_face(). * - * Return value: the FreeType FT_Face associated with @font. + * Return value: the FreeType <type>FT_Face</type> associated with @font. * * Since: 1.4 **/ diff --git a/pango/pangofc-font.h b/pango/pangofc-font.h index 7b5bc4a3..9b198ed8 100644 --- a/pango/pangofc-font.h +++ b/pango/pangofc-font.h @@ -59,7 +59,7 @@ typedef struct _PangoFcFontClass PangoFcFontClass; * PangoFcFont: * * #PangoFcFont is a base class for font implementations - * using the FontConfig and FreeType libraries and is used in + * using the Fontconfig and FreeType libraries and is used in * conjunction with #PangoFcFontMap. When deriving from this * class, you need to implement all of its virtual functions * other than shutdown() along with the get_glyph_extents() diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index df008446..9ff4369a 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -881,7 +881,7 @@ pango_fc_font_map_new_font (PangoFontMap *fontmap, { FcMatrix fc_matrix; - /* FontConfig has the Y axis pointing up, Pango, down. + /* Fontconfig has the Y axis pointing up, Pango, down. */ fc_matrix.xx = pango_matrix->xx; fc_matrix.xy = - pango_matrix->xy; @@ -1436,7 +1436,7 @@ cleanup_font (gpointer key, * * Clears all cached information for the fontmap and marks * all fonts open for the fontmap as dead. (See the shutdown() - * virtual function of PangoFcFont.) This function might be used + * virtual function of #PangoFcFont.) This function might be used * by a backend when the underlying windowing system for the font * map exits. This function is only intended to be called from * only for backend implementations deriving from #PangoFcFontmap. diff --git a/pango/pangofc-fontmap.h b/pango/pangofc-fontmap.h index 7e339542..ff540b5d 100644 --- a/pango/pangofc-fontmap.h +++ b/pango/pangofc-fontmap.h @@ -47,7 +47,7 @@ typedef struct _PangoFcFontMapPrivate PangoFcFontMapPrivate; * PangoFcFontMap: * * #PangoFcFontMap is a base class for font map implementations - * using the FontConfig and FreeType libraries. To create a new + * using the Fontconfig and FreeType libraries. To create a new * backend using Fontconfig and FreeType, you derive from this class * and implement a new_font() virtual function that creates an * instance deriving from #PangoFcFont. diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c index aee61af1..42e67f6a 100644 --- a/pango/pangoft2-fontmap.c +++ b/pango/pangoft2-fontmap.c @@ -176,7 +176,7 @@ pango_ft2_font_map_set_default_substitute (PangoFT2FontMap *fontmap, * Call this function any time the results of the * default substitution function set with * pango_ft2_font_map_set_default_substitute() change. - * That is, if your subsitution function will return different + * That is, if your substitution function will return different * results for the same input pattern, you must call this function. * * Since: 1.2 @@ -230,8 +230,8 @@ pango_ft2_font_map_create_context (PangoFT2FontMap *fontmap) /** * pango_ft2_get_context: - * @dpi_x: the horizontal dpi of the target device - * @dpi_y: the vertical dpi of the target device + * @dpi_x: the horizontal DPI of the target device + * @dpi_y: the vertical DPI of the target device * * Retrieves a #PangoContext for the default PangoFT2 fontmap * (see pango_ft2_fontmap_get_for_display()) and sets the resolution diff --git a/pango/pangoft2-render.c b/pango/pangoft2-render.c index 30763d7b..72104ec3 100644 --- a/pango/pangoft2-render.c +++ b/pango/pangoft2-render.c @@ -546,7 +546,7 @@ pango_ft2_renderer_draw_trapezoid (PangoRenderer *renderer, /** * pango_ft2_render_layout_subpixel: - * @bitmap: a FT_Bitmap to render the layout onto + * @bitmap: a <type>FT_Bitmap</type> to render the layout onto * @layout: a #PangoLayout * @x: the X position of the left of the layout (in Pango units) * @y: the Y position of the top of the layout (in Pango units) @@ -583,7 +583,7 @@ pango_ft2_render_layout_subpixel (FT_Bitmap *bitmap, /** * pango_ft2_render_layout: - * @bitmap: a FT_Bitmap to render the layout onto + * @bitmap: a <type>FT_Bitmap</type> to render the layout onto * @layout: a #PangoLayout * @x: the X position of the left of the layout (in pixels) * @y: the Y position of the top of the layout (in pixels) @@ -601,7 +601,7 @@ pango_ft2_render_layout (FT_Bitmap *bitmap, /** * pango_ft2_render_layout_line_subpixel: - * @bitmap: a FT_Bitmap to render the line onto + * @bitmap: a <type>FT_Bitmap</type> to render the line onto * @line: a #PangoLayoutLine * @x: the x position of start of string (in Pango units) * @y: the y position of baseline (in Pango units) @@ -638,7 +638,7 @@ pango_ft2_render_layout_line_subpixel (FT_Bitmap *bitmap, /** * pango_ft2_render_layout_line: - * @bitmap: a FT_Bitmap to render the line onto + * @bitmap: a <type>FT_Bitmap</type> to render the line onto * @line: a #PangoLayoutLine * @x: the x position of start of string (in pixels) * @y: the y position of baseline (in pixels) diff --git a/pango/pangoft2.c b/pango/pangoft2.c index 35960a43..0c77ca4f 100644 --- a/pango/pangoft2.c +++ b/pango/pangoft2.c @@ -153,14 +153,14 @@ set_transform (PangoFT2Font *ft2font) * pango_ft2_font_get_face: * @font: a #PangoFont * - * Returns the native FreeType2 FT_Face structure used for this PangoFont. + * Returns the native FreeType2 <type>FT_Face</type> structure used for this #PangoFont. * This may be useful if you want to use FreeType2 functions directly. * * Use pango_fc_font_lock_face() instead; when you are done with a * face from pango_fc_font_lock_face() you must call * pango_fc_font_unlock_face(). * - * Return value: a pointer to a #FT_Face structure, with the size set correctly + * Return value: a pointer to a <type>FT_Face<type> structure, with the size set correctly **/ FT_Face pango_ft2_font_get_face (PangoFont *font) diff --git a/pango/pangowin32-fontcache.c b/pango/pangowin32-fontcache.c index 1fd64e19..cec852f2 100644 --- a/pango/pangowin32-fontcache.c +++ b/pango/pangowin32-fontcache.c @@ -162,7 +162,7 @@ cache_entry_unref (PangoWin32FontCache *cache, * @cache: a #PangoWin32FontCache * @logfont: a pointer to a LOGFONT structure describing the font to load. * - * Creates a #HFONT from a LOGFONT. The + * Creates a HFONT from a LOGFONT. The * result may be newly loaded, or it may have been previously * stored * diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c index e0073a23..44f09d19 100644 --- a/pango/pangowin32-fontmap.c +++ b/pango/pangowin32-fontmap.c @@ -703,13 +703,13 @@ get_family_name (const LOGFONT *lfp) * The face name, italicness and weight fields in the LOGFONT are used * to set up the resulting #PangoFontDescription. If the face name in * the LOGFONT contains non-ASCII characters the font is temporarily - * loaded (using CreateFontIndirect) and an ASCII (usually English) + * loaded (using CreateFontIndirect()) and an ASCII (usually English) * name for it is looked up from the font name tables in the font * data. If that doesn't work, the face name is converted from the * system codepage to UTF-8 and that is used. * * Return value: the newly allocated #PangoFontDescription, which - * should be freed using pango_font_desciption_free() + * should be freed using pango_font_description_free() * * Since: 1.12 */ diff --git a/pango/pangowin32.c b/pango/pangowin32.c index 71f2ddeb..2fc734be 100644 --- a/pango/pangowin32.c +++ b/pango/pangowin32.c @@ -179,7 +179,7 @@ pango_win32_get_dc (void) /** * pango_win32_get_debug_flag: * - * Returns wether debugging is turned on. + * Returns whether debugging is turned on. * * Return value: %TRUE if debugging is turned on. * @@ -245,7 +245,7 @@ pango_win32_font_new (PangoFontMap *fontmap, * @x: the x position of start of string (in pixels) * @y: the y position of baseline (in pixels) * - * Render a PangoGlyphString onto a Windows DC + * Render a #PangoGlyphString onto a Windows DC */ void pango_win32_render (HDC hdc, @@ -676,7 +676,7 @@ pango_win32_font_real_get_metrics_factor (PangoFont *font) * pango_win32_font_logfont: * @font: a #PangoFont which must be from the Win32 backend * - * Determine the LOGFONT struct for the specified bfont. + * Determine the LOGFONT struct for the specified font. * * Return value: A newly allocated LOGFONT struct. It must be * freed with g_free(). @@ -704,7 +704,7 @@ pango_win32_font_logfont (PangoFont *font) * Selects the font into the specified DC and changes the mapping mode * and world transformation of the DC appropriately for the font. * You may want to surround the use of this function with calls - * to SaveDC and RestoreDC. Call pango_win32_font_done_font() when + * to SaveDC() and RestoreDC(). Call pango_win32_font_done_font() when * you are done using the DC to release allocated resources. * * See pango_win32_font_get_metrics_factor() for information about diff --git a/pango/pangox-fontmap.c b/pango/pangox-fontmap.c index c6f14fb8..6fbde435 100644 --- a/pango/pangox-fontmap.c +++ b/pango/pangox-fontmap.c @@ -524,11 +524,11 @@ pango_x_font_map_load_font (PangoFontMap *fontmap, /* We need to be robust against errors accessing the coverage * cache window, since it is not our window. So we temporarily - * set this error handler while accessing it. The error_occured - * global allows us to tell whether an error occured for + * set this error handler while accessing it. The error_occurred + * global allows us to tell whether an error occurred for * XChangeProperty */ -static gboolean error_occured; +static gboolean error_occurred; static int ignore_error (Display *d, @@ -601,7 +601,7 @@ pango_x_real_get_coverage_win (Display *display) return retval; } -/* Find or create the peristant window for caching font coverage +/* Find or create the persistent window for caching font coverage * information. * * To assure atomic creation, we first look for the window, then if we @@ -756,7 +756,7 @@ pango_x_store_cached_coverage (PangoXFontMap *xfontmap, break; old_handler = XSetErrorHandler (ignore_error); - error_occured = False; + error_occurred = False; XChangeProperty (xfontmap->display, coverage_win, @@ -768,7 +768,7 @@ pango_x_store_cached_coverage (PangoXFontMap *xfontmap, XSync (xfontmap->display, False); XSetErrorHandler (old_handler); - if (!error_occured) + if (!error_occurred) break; else { @@ -1221,7 +1221,7 @@ match_end (const char *a, const char *b) return (strcmp (a + len_a - len_b, b) == 0); } -/* Given a xlfd, charset and size, find the best matching installed X font. +/* Given a XLFD, charset and size, find the best matching installed X font. * The XLFD must be a full XLFD (14 fields) */ char * diff --git a/pango/pangox.c b/pango/pangox.c index d39499a0..40c08cd2 100644 --- a/pango/pangox.c +++ b/pango/pangox.c @@ -315,7 +315,7 @@ pango_x_font_new (PangoFontMap *fontmap, const char *spec, int size) * * Loads up a logical font based on a "fontset" style text * specification. This is not remotely useful (Pango API's generally - * work in terms of PangoFontDescription) and the result may not + * work in terms of #PangoFontDescription) and the result may not * work correctly in all circumstances. Use of this function should * be avoided. * @@ -1450,7 +1450,7 @@ pango_x_find_glyph (PangoFont *font, * you should generally use PANGO_GET_UNKNOWN_GLYPH() instead, * since that may return a glyph that provides a better representation * of a particular char. (E.g., by showing hex digits, or a glyph - * representive of a certain Unicode range.) + * representative of a certain Unicode range.) * * Return value: a glyph index into @font. **/ diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c index 51fa7fcf..477cc62c 100644 --- a/pango/pangoxft-font.c +++ b/pango/pangoxft-font.c @@ -114,7 +114,7 @@ _pango_xft_font_new (PangoXftFontMap *xftfontmap, * Gets the font used for drawing the digits in the * missing-character hex squares * - * Return value: the PangoFont used for the digits; this + * Return value: the #PangoFont used for the digits; this * value is associated with the main font and will be freed * along with the main font. **/ @@ -528,13 +528,13 @@ pango_xft_font_get_unknown_glyph (PangoFont *font, * pango_xft_font_lock_face: * @font: a #PangoFont. * - * Gets the FreeType FT_Face associated with a font, + * Gets the FreeType <type>FT_Face</type> associated with a font, * This face will be kept around until you call * pango_xft_font_unlock_face(). * * Use pango_fc_font_lock_face() instead. * - * Return value: the FreeType FT_Face associated with @font. + * Return value: the FreeType <type>FT_Face</type> associated with @font. * * Since: 1.2 **/ diff --git a/pango/pangoxft-fontmap.c b/pango/pangoxft-fontmap.c index a033268c..2e6f8996 100644 --- a/pango/pangoxft-fontmap.c +++ b/pango/pangoxft-fontmap.c @@ -282,7 +282,7 @@ pango_xft_set_default_substitute (Display *display, * Call this function any time the results of the * default substitution function set with * pango_xft_set_default_substitute() change. - * That is, if your subsitution function will return different + * That is, if your substitution function will return different * results for the same input pattern, you must call this function. * * Since: 1.2 @@ -335,7 +335,7 @@ pango_xft_get_context (Display *display, * _pango_xft_font_map_get_renderer: * @fontmap: a #PangoXftFontmap * - * Gets the singleton PangoXFTRenderer for this fontmap. + * Gets the singleton #PangoXFTRenderer for this fontmap. * * Return value: **/ diff --git a/pango/pangoxft-render.c b/pango/pangoxft-render.c index 7651cb61..0d104191 100644 --- a/pango/pangoxft-render.c +++ b/pango/pangoxft-render.c @@ -642,7 +642,7 @@ release_renderer (PangoRenderer *renderer) * pango_xft_render_layout: * @draw: an #XftDraw * @color: the foreground color in which to draw the layout - * (may be overriden by color attributes) + * (may be overridden by color attributes) * @layout: a #PangoLayout * @x: the X position of the left of the layout (in Pango units) * @y: the Y position of the top of the layout (in Pango units) @@ -679,7 +679,7 @@ pango_xft_render_layout (XftDraw *draw, * pango_xft_render_layout_line: * @draw: an #XftDraw * @color: the foreground color in which to draw the layout line - * (may be overriden by color attributes) + * (may be overridden by color attributes) * @line: a #PangoLayoutLine * @x: the x position of start of string (in Pango units) * @y: the y position of baseline (in Pango units) @@ -792,7 +792,7 @@ pango_xft_render (XftDraw *draw, * pango_xft_picture_render: * @display: an X display * @src_picture: the source picture to draw the string with - * @dest_picture: the destination picture to draw the strign onto + * @dest_picture: the destination picture to draw the string onto * @font: the font in which to draw the string * @glyphs: the glyph string to draw * @x: the x position of start of string (in pixels) diff --git a/pango/reorder-items.c b/pango/reorder-items.c index 41fb370d..aa9bd8c0 100644 --- a/pango/reorder-items.c +++ b/pango/reorder-items.c @@ -31,18 +31,17 @@ static GList *reorder_items_recurse (GList *items, int n_items); /** * pango_reorder_items: - * @logical_items: a GList of #PangoItem in logical order. + * @logical_items: a #GList of #PangoItem in logical order. * * From a list of items in logical order and the associated * directional levels, produce a list in visual order. * The original list is unmodified. * - * Returns a GList of PangoItem structures in visual order. + * Returns a #GList of #PangoItem structures in visual order. * - * (Please mail otaylor@redhat.com if you use this function. + * (Please open a bug if you use this function. * It is not a particularly convenient interface, and the code * is duplicated elsewhere in Pango for that reason.) - * */ GList * pango_reorder_items (GList *logical_items) |