summaryrefslogtreecommitdiff
path: root/pango
diff options
context:
space:
mode:
Diffstat (limited to 'pango')
-rw-r--r--pango/break.c46
-rw-r--r--pango/ellipsize.c48
-rw-r--r--pango/fonts.c264
-rw-r--r--pango/glyphstring.c34
-rw-r--r--pango/mapping.c30
-rw-r--r--pango/modules.c88
-rw-r--r--pango/pango-attributes.c258
-rw-r--r--pango/pango-attributes.h4
-rw-r--r--pango/pango-break.h16
-rw-r--r--pango/pango-color-table.h2
-rw-r--r--pango/pango-color.c26
-rw-r--r--pango/pango-context.c178
-rw-r--r--pango/pango-coverage.c88
-rw-r--r--pango/pango-engine.c14
-rw-r--r--pango/pango-engine.h16
-rw-r--r--pango/pango-font.h16
-rw-r--r--pango/pango-fontmap.c36
-rw-r--r--pango/pango-fontmap.h4
-rw-r--r--pango/pango-fontset.c44
-rw-r--r--pango/pango-fontset.h4
-rw-r--r--pango/pango-glyph-item-private.h2
-rw-r--r--pango/pango-glyph-item.c96
-rw-r--r--pango/pango-glyph.h4
-rw-r--r--pango/pango-gravity.c4
-rw-r--r--pango/pango-gravity.h8
-rw-r--r--pango/pango-impl-utils.h4
-rw-r--r--pango/pango-item.c24
-rw-r--r--pango/pango-layout-private.h8
-rw-r--r--pango/pango-layout.c740
-rw-r--r--pango/pango-layout.h4
-rw-r--r--pango/pango-markup.c94
-rw-r--r--pango/pango-matrix.c36
-rw-r--r--pango/pango-ot-buffer.c50
-rw-r--r--pango/pango-ot-info.c78
-rw-r--r--pango/pango-ot-private.h2
-rw-r--r--pango/pango-ot-ruleset.c22
-rw-r--r--pango/pango-ot.h2
-rw-r--r--pango/pango-renderer.c144
-rw-r--r--pango/pango-renderer.h10
-rw-r--r--pango/pango-script-table.h2
-rw-r--r--pango/pango-script.c50
-rw-r--r--pango/pango-script.h2
-rw-r--r--pango/pango-tabs.c62
-rw-r--r--pango/pango-types.h4
-rw-r--r--pango/pango-utils.c238
-rw-r--r--pango/pangoatsui-fontmap.c58
-rw-r--r--pango/pangoatsui.c2
-rw-r--r--pango/pangocairo-atsuifont.c16
-rw-r--r--pango/pangocairo-atsuifontmap.c6
-rw-r--r--pango/pangocairo-fcfont.c48
-rw-r--r--pango/pangocairo-fcfontmap.c20
-rw-r--r--pango/pangocairo-font.c28
-rw-r--r--pango/pangocairo-fontmap.c76
-rw-r--r--pango/pangocairo-private.h2
-rw-r--r--pango/pangocairo-render.c108
-rw-r--r--pango/pangocairo-win32font.c72
-rw-r--r--pango/pangocairo-win32fontmap.c6
-rw-r--r--pango/pangocairo.h8
-rw-r--r--pango/pangofc-decoder.h4
-rw-r--r--pango/pangofc-font.c88
-rw-r--r--pango/pangofc-font.h6
-rw-r--r--pango/pangofc-fontmap.c184
-rw-r--r--pango/pangofc-fontmap.h10
-rw-r--r--pango/pangoft2-fontmap.c54
-rw-r--r--pango/pangoft2-private.h2
-rw-r--r--pango/pangoft2-render.c36
-rw-r--r--pango/pangoft2.c62
-rw-r--r--pango/pangowin32-fontcache.c46
-rw-r--r--pango/pangowin32-fontmap.c112
-rw-r--r--pango/pangowin32-private.h8
-rw-r--r--pango/pangowin32.c182
-rw-r--r--pango/pangowin32.h8
-rw-r--r--pango/pangox-fontcache.c44
-rw-r--r--pango/pangox-fontmap.c204
-rw-r--r--pango/pangox-private.h6
-rw-r--r--pango/pangox.c238
-rw-r--r--pango/pangox.h20
-rw-r--r--pango/pangoxft-font.c68
-rw-r--r--pango/pangoxft-fontmap.c52
-rw-r--r--pango/pangoxft-private.h2
-rw-r--r--pango/pangoxft-render.c72
-rw-r--r--pango/pangoxft-render.h6
-rw-r--r--pango/querymodules.c34
-rw-r--r--pango/reorder-items.c2
-rw-r--r--pango/shape.c10
85 files changed, 2458 insertions, 2458 deletions
diff --git a/pango/break.c b/pango/break.c
index c6cf024d..d3c033d3 100644
--- a/pango/break.c
+++ b/pango/break.c
@@ -27,7 +27,7 @@
#define PARAGRAPH_SEPARATOR 0x2029
#define PARAGRAPH_SEPARATOR_STRING "\xE2\x80\xA9"
-
+
/* See http://www.unicode.org/unicode/reports/tr14/ if you hope
* to understand the line breaking code.
*/
@@ -550,7 +550,7 @@ pango_default_break (const gchar *text,
g_return_if_fail (attrs != NULL);
next = text;
-
+
prev_type = (GUnicodeType) -1;
prev_break_type = G_UNICODE_BREAK_UNKNOWN;
prev_was_break_space = FALSE;
@@ -602,7 +602,7 @@ pango_default_break (const gchar *text,
}
else
next_wc = g_utf8_get_char (next);
-
+
next_break_type = g_unichar_break_type (next_wc);
next_break_type = BREAK_TYPE_SAFE (next_break_type);
}
@@ -617,7 +617,7 @@ pango_default_break (const gchar *text,
{
JamoType prev_end = HangulJamoProps[prev_jamo].end ;
JamoType this_start = HangulJamoProps[ jamo].start;
-
+
/* See comments before IS_JAMO */
makes_hangul_syllable = (prev_end == this_start) || (prev_end + 1 == this_start);
}
@@ -724,7 +724,7 @@ pango_default_break (const gchar *text,
break;
}
}
-
+
/* If this is a grapheme boundary, we have to decide if backspace
* deletes a character or the whole grapheme cluster */
if (attrs[i].is_cursor_position)
@@ -740,7 +740,7 @@ pango_default_break (const gchar *text,
attrs[i].is_line_break = FALSE;
attrs[i].is_mandatory_break = FALSE;
-
+
if (attrs[i].is_cursor_position) /* If it's not a grapheme boundary,
* it's not a line break either
*/
@@ -751,13 +751,13 @@ pango_default_break (const gchar *text,
if (break_type == G_UNICODE_BREAK_SPACE &&
next_break_type == G_UNICODE_BREAK_COMBINING_MARK)
break_type = G_UNICODE_BREAK_IDEOGRAPHIC;
-
+
/* Unicode doesn't specify char wrap; we wrap around all chars
* except where a line break is prohibited, which means we
* effectively break everywhere except inside runs of spaces.
*/
- attrs[i].is_char_break = TRUE;
-
+ attrs[i].is_char_break = TRUE;
+
/* Make any necessary replacements first */
switch (prev_break_type)
{
@@ -902,13 +902,13 @@ pango_default_break (const gchar *text,
switch (break_op)
{
case BREAK_PROHIBITED:
- /* can't break here */
+ /* can't break here */
attrs[i].is_char_break = FALSE;
break;
case BREAK_IF_SPACES:
/* break if prev char was space */
- if (prev_was_break_space)
+ if (prev_was_break_space)
attrs[i].is_line_break = TRUE;
break;
@@ -922,7 +922,7 @@ pango_default_break (const gchar *text,
}
}
}
-
+
if (break_type != G_UNICODE_BREAK_SPACE)
{
prev_break_type = break_type;
@@ -1035,7 +1035,7 @@ pango_default_break (const gchar *text,
}
/* ---- Sentence breaks ---- */
-
+
/* The Unicode spec specifies sentence breakpoints, so that a piece of
* text would be partitioned into sentences, and all characters would
* be inside some sentence. This code implements that for is_sentence_boundary,
@@ -1065,14 +1065,14 @@ pango_default_break (const gchar *text,
attrs[i].is_sentence_start = TRUE; \
break; \
}
-
+
/* No sentence break at the start of the text */
/* default to not a sentence breakpoint */
attrs[i].is_sentence_boundary = FALSE;
attrs[i].is_sentence_start = FALSE;
attrs[i].is_sentence_end = FALSE;
-
+
/* FIXME the Unicode spec lumps control/format chars with
* line/para separators in descriptive text, but not in the
* character class specs, in table 5-6, so who knows whether you
@@ -1390,7 +1390,7 @@ pango_default_break (const gchar *text,
possible_sentence_boundary = -1;
MAYBE_START_NEW_SENTENCE;
-
+
break;
}
break;
@@ -1458,8 +1458,8 @@ pango_default_break (const gchar *text,
/* wc might not be a valid Unicode base character, but really all we
* need to know is the last non-combining character */
- if (type != G_UNICODE_COMBINING_MARK &&
- type != G_UNICODE_ENCLOSING_MARK &&
+ if (type != G_UNICODE_COMBINING_MARK &&
+ type != G_UNICODE_ENCLOSING_MARK &&
type != G_UNICODE_NON_SPACING_MARK)
base_character = wc;
}
@@ -1506,7 +1506,7 @@ pango_break (const gchar *text,
{
g_return_if_fail (analysis != NULL);
g_return_if_fail (attrs != NULL);
-
+
pango_default_break (text, length, analysis, attrs, attrs_len);
tailor_break (text, length, analysis, attrs, attrs_len);
}
@@ -1517,7 +1517,7 @@ pango_break (const gchar *text,
* @length: length of @text in bytes, or -1 if nul-terminated
* @paragraph_delimiter_index: return location for index of delimiter
* @next_paragraph_start: return location for start of next paragraph
- *
+ *
* Locates a paragraph boundary in @text. A boundary is caused by
* delimiter characters, such as a newline, carriage return, carriage
* return-newline pair, or Unicode paragraph separator character. The
@@ -1586,7 +1586,7 @@ pango_find_paragraph_boundary (const gchar *text,
break;
}
}
-
+
if (*p == '\n' ||
*p == '\r' ||
!strncmp(p, PARAGRAPH_SEPARATOR_STRING,
@@ -1598,7 +1598,7 @@ pango_find_paragraph_boundary (const gchar *text,
}
else
prev_sep = 0;
-
+
p = g_utf8_next_char (p);
}
@@ -1729,7 +1729,7 @@ pango_get_log_attrs (const char *text,
chars_broken += tailor_segment (range_start, range_end, range_engine, chars_broken, &analysis, log_attrs);
if (chars_broken + 1 < attrs_len)
- g_warning ("pango_get_log_attrs: attrs_len should have been at least %d, but was %d. Expect corrupted memory.",
+ g_warning ("pango_get_log_attrs: attrs_len should have been at least %d, but was %d. Expect corrupted memory.",
chars_broken + 1,
attrs_len);
}
diff --git a/pango/ellipsize.c b/pango/ellipsize.c
index 052ae5d8..fb2bce60 100644
--- a/pango/ellipsize.c
+++ b/pango/ellipsize.c
@@ -35,7 +35,7 @@ typedef struct _LineIter LineIter;
* gap center position until:
*
* line_width - gap_width + ellipsize_width <= goal_width
- *
+ *
* Line: [-------------------------------------------]
* Runs: [------)[---------------)[------------------]
* Gap center: *
@@ -81,27 +81,27 @@ struct _EllipsizeState
{
PangoLayout *layout; /* Layout being ellipsized */
PangoAttrList *attrs; /* Attributes used for itemization/shaping */
-
+
RunInfo *run_info; /* Array of information about each run */
int n_runs;
int total_width; /* Original width of line in Pango units */
int gap_center; /* Goal for center of gap */
-
+
PangoGlyphItem *ellipsis_run; /* Run created to hold ellipsis */
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
*/
-
+
PangoAttrIterator *line_start_attr; /* Cached PangoAttrIterator 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 Pango units */
PangoAttrIterator *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 Pango units */
};
@@ -119,7 +119,7 @@ init_state (EllipsizeState *state,
state->layout = line->layout;
state->attrs = attrs;
-
+
state->n_runs = g_slist_length (line->runs);
state->run_info = g_new (RunInfo, state->n_runs);
@@ -170,7 +170,7 @@ get_cluster_width (LineIter *iter)
PangoGlyphString *glyphs = run_iter->glyph_item->glyphs;
int width = 0;
int i;
-
+
if (run_iter->start_glyph < run_iter->end_glyph) /* LTR */
{
for (i = run_iter->start_glyph; i < run_iter->end_glyph; i++)
@@ -264,7 +264,7 @@ ends_at_ellipsization_boundary (EllipsizeState *state,
if (iter->run_iter.end_char == run_info->run->item->num_chars && iter->run_index == state->n_runs - 1)
return TRUE;
-
+
return state->layout->log_attrs[run_info->start_offset + iter->run_iter.end_char + 1].is_cursor_position;
}
@@ -316,7 +316,7 @@ shape_ellipsis (EllipsizeState *state)
pango_item_free (state->ellipsis_run->item);
state->ellipsis_run->item = NULL;
}
-
+
/* Create an attribute list
*/
run_attrs = pango_attr_iterator_get_attrs (state->gap_start_attr);
@@ -352,17 +352,17 @@ shape_ellipsis (EllipsizeState *state)
item->analysis.language, g_utf8_get_char (ellipsis_text)))
{
pango_item_free (item);
-
+
/* Modify the fallback iter while it is inside the PangoAttrList; Don't try this at home
*/
- ((PangoAttrInt *)fallback)->value = TRUE;
+ ((PangoAttrInt *)fallback)->value = TRUE;
ellipsis_text = "...";
item = itemize_text (state, ellipsis_text, attrs);
}
-
+
pango_attr_list_unref (attrs);
-
+
state->ellipsis_run->item = item;
/* Now shape
@@ -385,7 +385,7 @@ advance_iterator_to (PangoAttrIterator *iter,
int new_index)
{
int start, end;
-
+
do
{
pango_attr_iterator_range (iter, &start, &end);
@@ -428,7 +428,7 @@ update_ellipsis_shape (EllipsizeState *state)
/* See if the current attribute range contains the new start position
*/
int start, end;
-
+
pango_attr_iterator_range (state->gap_start_attr, &start, &end);
if (state->gap_start_iter.run_iter.start_index < start)
@@ -445,7 +445,7 @@ update_ellipsis_shape (EllipsizeState *state)
state->gap_start_attr = pango_attr_iterator_copy (state->line_start_attr);
advance_iterator_to (state->gap_start_attr,
state->run_info[state->gap_start_iter.run_index].run->item->offset);
-
+
recompute = TRUE;
}
@@ -476,7 +476,7 @@ find_initial_span (EllipsizeState *state)
int i;
int x;
int cluster_width;
-
+
switch (state->layout->ellipsize)
{
case PANGO_ELLIPSIZE_NONE:
@@ -509,7 +509,7 @@ find_initial_span (EllipsizeState *state)
i--;
x -= state->run_info[i].width;
}
-
+
/* Find the cluster containing the gap center
*/
state->gap_start_iter.run_index = i;
@@ -538,7 +538,7 @@ find_initial_span (EllipsizeState *state)
state->gap_end_x = x + cluster_width;
/* Expand the gap to a full span
- */
+ */
while (!starts_at_ellipsization_boundary (state, &state->gap_start_iter))
{
line_iter_prev_cluster (state, &state->gap_start_iter);
@@ -594,7 +594,7 @@ remove_one_span (EllipsizeState *state)
if (state->gap_end_x == new_gap_end_x && state->gap_start_x == new_gap_start_x)
return FALSE;
-
+
/* In the case where we could remove a span from either end of the
* gap, we look at which causes the smaller increase in the
* MAX (gap_end - gap_center, gap_start - gap_center)
@@ -605,7 +605,7 @@ remove_one_span (EllipsizeState *state)
{
state->gap_start_iter = new_gap_start_iter;
state->gap_start_x = new_gap_start_x;
-
+
update_ellipsis_shape (state);
}
else
@@ -719,7 +719,7 @@ current_width (EllipsizeState *state)
* _pango_layout_line_ellipsize:
* @line: a #PangoLayoutLine
* @attrs: Attributes being used for itemization/shaping
- *
+ *
* 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.
*
@@ -755,7 +755,7 @@ _pango_layout_line_ellipsize (PangoLayoutLine *line,
}
fixup_ellipsis_run (&state);
-
+
g_slist_free (line->runs);
line->runs = get_run_list (&state);
is_ellipsized = TRUE;
diff --git a/pango/fonts.c b/pango/fonts.c
index 43f1dfb6..e34b1df7 100644
--- a/pango/fonts.c
+++ b/pango/fonts.c
@@ -44,7 +44,7 @@ struct _PangoFontDescription
guint16 mask;
guint static_family : 1;
guint size_is_absolute : 1;
-
+
int size;
};
@@ -52,7 +52,7 @@ GType
pango_font_description_get_type (void)
{
static GType our_type = 0;
-
+
if (our_type == 0)
our_type = g_boxed_type_register_static (I_("PangoFontDescription"),
(GBoxedCopyFunc)pango_font_description_copy,
@@ -80,9 +80,9 @@ static const PangoFontDescription pfd_defaults = {
/**
* pango_font_description_new:
- *
+ *
* Creates a new font description structure with all fields unset.
- *
+ *
* Return value: the newly allocated #PangoFontDescription, which
* should be freed using pango_font_description_free().
**/
@@ -100,7 +100,7 @@ pango_font_description_new (void)
* pango_font_description_set_family:
* @desc: a #PangoFontDescription.
* @family: a string representing the family name.
- *
+ *
* Sets the family name field of a font description. The family
* name represents a family of related font styles, and will
* resolve to a particular #PangoFontFamily. In some uses of
@@ -122,7 +122,7 @@ pango_font_description_set_family (PangoFontDescription *desc,
* pango_font_description_set_family_static:
* @desc: a #PangoFontDescription
* @family: a string representing the family name.
- *
+ *
* Like pango_font_description_set_family(), except that no
* copy of @family is made. The caller must make sure that the
* string passed in stays around until @desc has been freed
@@ -138,7 +138,7 @@ pango_font_description_set_family_static (PangoFontDescription *desc,
if (desc->family_name == family)
return;
-
+
if (desc->family_name && !desc->static_family)
g_free (desc->family_name);
@@ -159,10 +159,10 @@ pango_font_description_set_family_static (PangoFontDescription *desc,
/**
* pango_font_description_get_family:
* @desc: a #PangoFontDescription.
- *
+ *
* Gets the family name field of a font description. See
* pango_font_description_set_family().
- *
+ *
* Return value: the family name field for the font description, or
* %NULL if not previously set. This has the same life-time
* as the font description itself and should not be freed.
@@ -179,13 +179,13 @@ pango_font_description_get_family (const PangoFontDescription *desc)
* pango_font_description_set_style:
* @desc: a #PangoFontDescription
* @style: the style for the font description
- *
+ *
* Sets the style field of a #PangoFontDescription. The
* #PangoStyle enumeration describes whether the font is slanted and
* the manner in which it is slanted; it can be either
* #PANGO_STYLE_NORMAL, #PANGO_STYLE_ITALIC, or #PANGO_STYLE_OBLIQUE.
* Most fonts will either have a italic style or an oblique
- * style, but not both, and font matching in Pango will
+ * style, 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.
**/
@@ -202,11 +202,11 @@ pango_font_description_set_style (PangoFontDescription *desc,
/**
* pango_font_description_get_style:
* @desc: a #PangoFontDescription
- *
+ *
* Gets the style field of a #PangoFontDescription. See
* pango_font_description_set_style().
- *
- * Return value: the style field for the font description.
+ *
+ * Return value: the style field for the font description.
* Use pango_font_description_get_set_fields() to find out if
* the field was explicitly set or not.
**/
@@ -222,7 +222,7 @@ pango_font_description_get_style (const PangoFontDescription *desc)
* pango_font_description_set_variant:
* @desc: a #PangoFontDescription
* @variant: the variant type for the font description.
- *
+ *
* Sets the variant field of a font description. The #PangoVariant
* can either be %PANGO_VARIANT_NORMAL or %PANGO_VARIANT_SMALL_CAPS.
**/
@@ -231,7 +231,7 @@ pango_font_description_set_variant (PangoFontDescription *desc,
PangoVariant variant)
{
g_return_if_fail (desc != NULL);
-
+
desc->variant = variant;
desc->mask |= PANGO_FONT_MASK_VARIANT;
}
@@ -239,10 +239,10 @@ pango_font_description_set_variant (PangoFontDescription *desc,
/**
* pango_font_description_get_variant:
* @desc: a #PangoFontDescription.
- *
+ *
* Gets the variant field of a #PangoFontDescription. See
* pango_font_description_set_variant().
- *
+ *
* Return value: the variant field for the font description. Use
* pango_font_description_get_set_fields() to find out if
* the field was explicitly set or not.
@@ -251,7 +251,7 @@ PangoVariant
pango_font_description_get_variant (const PangoFontDescription *desc)
{
g_return_val_if_fail (desc != NULL, pfd_defaults.variant);
-
+
return desc->variant;
}
@@ -259,7 +259,7 @@ pango_font_description_get_variant (const PangoFontDescription *desc)
* pango_font_description_set_weight:
* @desc: a #PangoFontDescription
* @weight: the weight for the font description.
- *
+ *
* Sets the weight field of a font description. The weight field
* specifies how bold or light the font should be. In addition
* to the values of the #PangoWeight enumeration, other intermediate
@@ -278,10 +278,10 @@ pango_font_description_set_weight (PangoFontDescription *desc,
/**
* pango_font_description_get_weight:
* @desc: a #PangoFontDescription
- *
+ *
* Gets the weight field of a font description. See
* pango_font_description_set_weight().
- *
+ *
* Return value: the weight field for the font description. Use
* pango_font_description_get_set_fields() to find out if
* the field was explicitly set or not.
@@ -290,7 +290,7 @@ PangoWeight
pango_font_description_get_weight (const PangoFontDescription *desc)
{
g_return_val_if_fail (desc != NULL, pfd_defaults.weight);
-
+
return desc->weight;
}
@@ -298,7 +298,7 @@ pango_font_description_get_weight (const PangoFontDescription *desc)
* pango_font_description_set_stretch:
* @desc: a #PangoFontDescription
* @stretch: the stretch for the font description
- *
+ *
* Sets the stretch field of a font description. The stretch field
* specifies how narrow or wide the font should be.
**/
@@ -307,7 +307,7 @@ pango_font_description_set_stretch (PangoFontDescription *desc,
PangoStretch stretch)
{
g_return_if_fail (desc != NULL);
-
+
desc->stretch = stretch;
desc->mask |= PANGO_FONT_MASK_STRETCH;
}
@@ -315,10 +315,10 @@ pango_font_description_set_stretch (PangoFontDescription *desc,
/**
* pango_font_description_get_stretch:
* @desc: a #PangoFontDescription.
- *
+ *
* Gets the stretch field of a font description.
* See pango_font_description_set_stretch().
- *
+ *
* Return value: the stretch field for the font description. Use
* pango_font_description_get_set_fields() to find out if
* the field was explicitly set or not.
@@ -341,9 +341,9 @@ pango_font_description_get_stretch (const PangoFontDescription *desc)
* common, in which case a 10 point font corresponds to a 10 * (96 / 72) = 13.3
* pixel font. Use pango_font_description_set_absolute_size() if you need
* a particular size in device units.
- *
+ *
* Sets the size field of a font description in fractional points. This is mutually
- * exclusive with pango_font_description_set_absolute_size().
+ * exclusive with pango_font_description_set_absolute_size().
**/
void
pango_font_description_set_size (PangoFontDescription *desc,
@@ -351,7 +351,7 @@ pango_font_description_set_size (PangoFontDescription *desc,
{
g_return_if_fail (desc != NULL);
g_return_if_fail (size >= 0);
-
+
desc->size = size;
desc->size_is_absolute = FALSE;
desc->mask |= PANGO_FONT_MASK_SIZE;
@@ -360,10 +360,10 @@ pango_font_description_set_size (PangoFontDescription *desc,
/**
* pango_font_description_get_size:
* @desc: a #PangoFontDescription
- *
+ *
* Gets the size field of a font description.
* See pango_font_description_set_size().
- *
+ *
* Return value: the size field for the font description in points or device units.
* You must call pango_font_description_get_size_is_absolute()
* to find out which is the case. Returns 0 if the size field has not
@@ -385,7 +385,7 @@ pango_font_description_get_size (const PangoFontDescription *desc)
* @size: the new size, in Pango units. There are %PANGO_SCALE Pango units in one
* device unit. For an output backend where a device unit is a pixel, a @size
* value of 10 * PANGO_SCALE gives a 10 pixel font.
- *
+ *
* Sets the size field of a font description, in device units. This is mutually
* exclusive with pango_font_description_set_size().
*
@@ -397,7 +397,7 @@ pango_font_description_set_absolute_size (PangoFontDescription *desc,
{
g_return_if_fail (desc != NULL);
g_return_if_fail (size >= 0);
-
+
desc->size = size;
desc->size_is_absolute = TRUE;
desc->mask |= PANGO_FONT_MASK_SIZE;
@@ -406,10 +406,10 @@ pango_font_description_set_absolute_size (PangoFontDescription *desc,
/**
* pango_font_description_get_size_is_absolute:
* @desc: a #PangoFontDescription
- *
+ *
* Determines whether the size of the font is in points or device units.
* See pango_font_description_set_size() and pango_font_description_set_absolute_size().
- *
+ *
* 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 explicitly set or not.
@@ -428,7 +428,7 @@ pango_font_description_get_size_is_absolute (const PangoFontDescription *desc)
* pango_font_description_set_gravity:
* @desc: a #PangoFontDescription
* @gravity: the gravity for the font description.
- *
+ *
* Sets the gravity field of a font description. The gravity field
* specifies how the glyphs should be rotated. If @gravity is
* %PANGO_GRAVITY_AUTO, this actually unsets the gravity mask on
@@ -458,10 +458,10 @@ pango_font_description_set_gravity (PangoFontDescription *desc,
/**
* pango_font_description_get_gravity:
* @desc: a #PangoFontDescription
- *
+ *
* Gets the gravity field of a font description. See
* pango_font_description_set_gravity().
- *
+ *
* Return value: the gravity field for the font description. Use
* pango_font_description_get_set_fields() to find out if
* the field was explicitly set or not.
@@ -472,16 +472,16 @@ PangoGravity
pango_font_description_get_gravity (const PangoFontDescription *desc)
{
g_return_val_if_fail (desc != NULL, pfd_defaults.gravity);
-
+
return desc->gravity;
}
/**
* pango_font_description_get_set_fields:
* @desc: a #PangoFontDescription
- *
+ *
* Determines which fields in a font description have been set.
- *
+ *
* Return value: a bitmask with bits set corresponding to the
* fields in @desc that have been set.
**/
@@ -497,7 +497,7 @@ pango_font_description_get_set_fields (const PangoFontDescription *desc)
* pango_font_description_unset_fields:
* @desc: a #PangoFontDescription
* @to_unset: bitmask of fields in the @desc to unset.
- *
+ *
* Unsets some of the fields in a #PangoFontDescription. The unset
* fields will get back to their default values.
**/
@@ -506,7 +506,7 @@ pango_font_description_unset_fields (PangoFontDescription *desc,
PangoFontMask to_unset)
{
PangoFontDescription unset_desc;
-
+
g_return_if_fail (desc != NULL);
unset_desc = pfd_defaults;
@@ -524,7 +524,7 @@ pango_font_description_unset_fields (PangoFontDescription *desc,
* @replace_existing: if %TRUE, replace fields in @desc with the
* corresponding values from @desc_to_merge, even if they
* are already exist.
- *
+ *
* Merges the fields that are set in @desc_to_merge into the fields in
* @desc. If @replace_existing is %FALSE, only fields in @desc that
* are not already set are affected. If %TRUE, then fields that are
@@ -565,7 +565,7 @@ pango_font_description_merge_static (PangoFontDescription *desc,
gboolean replace_existing)
{
PangoFontMask new_mask;
-
+
g_return_if_fail (desc != NULL);
if (replace_existing)
@@ -618,12 +618,12 @@ compute_distance (const PangoFontDescription *a,
* @desc: a #PangoFontDescription
* @old_match: a #PangoFontDescription, or %NULL
* @new_match: a #PangoFontDescription
- *
+ *
* Determines if the style attributes of @new_match are a closer match
* for @desc than @old_match, or if @old_match is %NULL, determines if
* @new_match is a match at all. Approximate matching is done for
* weight and style; other attributes must match exactly.
- *
+ *
* Return value: %TRUE if @new_match is a better match
**/
gboolean
@@ -633,7 +633,7 @@ pango_font_description_better_match (const PangoFontDescription *desc,
{
g_return_val_if_fail (desc != NULL, G_MAXINT);
g_return_val_if_fail (new_match != NULL, G_MAXINT);
-
+
if (new_match->variant == desc->variant &&
new_match->stretch == desc->stretch &&
new_match->gravity == desc->gravity)
@@ -651,9 +651,9 @@ pango_font_description_better_match (const PangoFontDescription *desc,
/**
* pango_font_description_copy:
* @desc: a #PangoFontDescription
- *
+ *
* Make a copy of a #PangoFontDescription.
- *
+ *
* Return value: the newly allocated #PangoFontDescription, which should
* be freed with pango_font_description_free().
**/
@@ -676,12 +676,12 @@ pango_font_description_copy (const PangoFontDescription *desc)
/**
* pango_font_description_copy_static:
* @desc: a #PangoFontDescription
- *
+ *
* 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 modified or freed. This is meant to be used
* when the copy is only needed temporarily.
- *
+ *
* Return value: the newly allocated #PangoFontDescription, which should
* be freed with pango_font_description_free().
**/
@@ -701,13 +701,13 @@ pango_font_description_copy_static (const PangoFontDescription *desc)
* pango_font_description_equal:
* @desc1: a #PangoFontDescription
* @desc2: another #PangoFontDescription
- *
+ *
* Compares two font descriptions for equality. Two font descriptions
* are considered equal if the fonts they describe are provably identical.
* 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,
* %FALSE otherwise.
**/
@@ -750,11 +750,11 @@ case_insensitive_hash (const char *key)
/**
* pango_font_description_hash:
* @desc: a #PangoFontDescription
- *
+ *
* Computes a hash of a #PangoFontDescription structure suitable
* to be used, for example, as an argument to g_hash_table_new().
* The hash value is independent of @desc->mask.
- *
+ *
* Return value: the hash value.
**/
guint
@@ -778,10 +778,10 @@ pango_font_description_hash (const PangoFontDescription *desc)
/**
* pango_font_description_free:
* @desc: a #PangoFontDescription
- *
+ *
* Frees a font description.
**/
-void
+void
pango_font_description_free (PangoFontDescription *desc)
{
if (desc)
@@ -797,7 +797,7 @@ pango_font_description_free (PangoFontDescription *desc)
* pango_font_descriptions_free:
* @descs: a pointer to an array of #PangoFontDescription
* @n_descs: number of font descriptions in @descs
- *
+ *
* Frees a list of font descriptions from pango_font_map_list_fonts()
**/
void
@@ -869,7 +869,7 @@ static gboolean
find_field (const FieldMap *map, int n_elements, const char *str, int len, int *val)
{
int i;
-
+
for (i=0; i<n_elements; i++)
{
if (map[i].str[0] && g_ascii_strncasecmp (map[i].str, str, len) == 0 &&
@@ -891,7 +891,7 @@ find_field_any (const char *str, int len, PangoFontDescription *desc)
if (g_ascii_strcasecmp (str, "Normal") == 0)
return TRUE;
-
+
#define FIELD(NAME, MASK) \
G_STMT_START { \
if (find_field (NAME##_map, G_N_ELEMENTS (NAME##_map), str, len, \
@@ -918,7 +918,7 @@ static const char *
getword (const char *str, const char *last, size_t *wordlen)
{
const char *result;
-
+
while (last > str && g_ascii_isspace (*(last - 1)))
last--;
@@ -927,7 +927,7 @@ getword (const char *str, const char *last, size_t *wordlen)
result--;
*wordlen = last - result;
-
+
return result;
}
@@ -960,7 +960,7 @@ parse_size (const char *word,
/**
* pango_font_description_from_string:
* @str: string representation of a font description.
- *
+ *
* Creates a new font description from a string representation in the
* form "[FAMILY-LIST] [STYLE-OPTIONS] [SIZE]", where FAMILY-LIST is a
* comma separated list of families optionally terminated by a comma,
@@ -973,8 +973,8 @@ parse_size (const char *word,
* STYLE-OPTIONS is missing, then all style options will be set to the
* default values. If SIZE is missing, the size in the resulting font
* description will be set to 0.
- *
- * Return value: a new #PangoFontDescription.
+ *
+ * Return value: a new #PangoFontDescription.
**/
PangoFontDescription *
pango_font_description_from_string (const char *str)
@@ -991,7 +991,7 @@ pango_font_description_from_string (const char *str)
PANGO_FONT_MASK_WEIGHT |
PANGO_FONT_MASK_VARIANT |
PANGO_FONT_MASK_STRETCH;
-
+
len = strlen (str);
last = str + len;
p = getword (str, last, &wordlen);
@@ -1041,7 +1041,7 @@ pango_font_description_from_string (const char *str)
if (str != last)
{
desc->family_name = g_strndup (str, last - str);
- desc->mask |= PANGO_FONT_MASK_FAMILY;
+ desc->mask |= PANGO_FONT_MASK_FAMILY;
}
return desc;
@@ -1064,7 +1064,7 @@ append_field (GString *str, const FieldMap *map, int n_elements, int val)
return;
}
}
-
+
if (str->len > 0 || str->str[str->len -1] != ' ')
g_string_append_c (str, ' ');
g_string_append_printf (str, "%d", val);
@@ -1073,13 +1073,13 @@ append_field (GString *str, const FieldMap *map, int n_elements, int val)
/**
* pango_font_description_to_string:
* @desc: a #PangoFontDescription
- *
+ *
* Creates a string representation of a font description. See
* pango_font_description_from_string() for a description of the
* format of the string representation. The family list in the
* string description will only have a terminating comma if the
* last word of the list is a valid style option.
- *
+ *
* Return value: a new string that must be freed with g_free().
**/
char *
@@ -1123,7 +1123,7 @@ pango_font_description_to_string (const PangoFontDescription *desc)
if (desc->mask & PANGO_FONT_MASK_SIZE)
{
char buf[G_ASCII_DTOSTR_BUF_SIZE];
-
+
if (result->len > 0 || result->str[result->len -1] != ' ')
g_string_append_c (result, ' ');
@@ -1133,14 +1133,14 @@ pango_font_description_to_string (const PangoFontDescription *desc)
if (desc->size_is_absolute)
g_string_append (result, "px");
}
-
+
return g_string_free (result, FALSE);
}
/**
* pango_font_description_to_filename:
* @desc: a #PangoFontDescription
- *
+ *
* Creates a filename representation of a font description. The
* filename is identical to the result from calling
* pango_font_description_to_string(), but with underscores instead of
@@ -1165,7 +1165,7 @@ pango_font_description_to_filename (const PangoFontDescription *desc)
}
return result;
-}
+}
G_DEFINE_TYPE (PangoFont, pango_font, G_TYPE_OBJECT)
@@ -1182,11 +1182,11 @@ pango_font_init (PangoFont *font)
/**
* pango_font_describe:
* @font: a #PangoFont
- *
+ *
* Returns a description of the font, with font size set in points.
* Use pango_font_describe_with_absolute_size() if you want the font
* size in device units.
- *
+ *
* Return value: a newly-allocated #PangoFontDescription object.
**/
PangoFontDescription *
@@ -1200,11 +1200,11 @@ pango_font_describe (PangoFont *font)
/**
* pango_font_describe_with_absolute_size:
* @font: a #PangoFont
- *
+ *
* Returns a description of the font, with absolute font size set
* (in device units). Use pango_font_describe() if you want the font
* size in points.
- *
+ *
* Return value: a newly-allocated #PangoFontDescription object.
*
* Since: 1.14
@@ -1227,9 +1227,9 @@ pango_font_describe_with_absolute_size (PangoFont *font)
* pango_font_get_coverage:
* @font: a #PangoFont
* @language: the language tag
- *
+ *
* Computes the coverage map for a given font and language tag.
- *
+ *
* Return value: a newly-allocated #PangoCoverage object.
**/
PangoCoverage *
@@ -1246,10 +1246,10 @@ pango_font_get_coverage (PangoFont *font,
* @font: a #PangoFont
* @language: the language tag
* @ch: a Unicode character.
- *
+ *
* Finds the best matching shaper for a font for a particular
* language tag and character point.
- *
+ *
* Return value: the best matching shaper.
**/
PangoEngineShape *
@@ -1258,7 +1258,7 @@ pango_font_find_shaper (PangoFont *font,
guint32 ch)
{
PangoEngineShape* shaper;
-
+
g_return_val_if_fail (font != NULL, NULL);
shaper = PANGO_FONT_GET_CLASS (font)->find_shaper (font, language, ch);
@@ -1274,7 +1274,7 @@ pango_font_find_shaper (PangoFont *font,
* or %NULL to indicate that the result is not needed.
* @logical_rect: rectangle used to store the logical extents of the glyph
* or %NULL to indicate that the result is not needed.
- *
+ *
* Gets the logical and ink extents of a glyph within a font. The
* coordinate system for each rectangle has its origin at the
* base line and horizontal origin of the character with increasing
@@ -1291,7 +1291,7 @@ pango_font_get_glyph_extents (PangoFont *font,
{
if (G_UNLIKELY (!font))
{
-
+
if (!_pango_warning_history.get_glyph_extents)
{
_pango_warning_history.get_glyph_extents = TRUE;
@@ -1323,7 +1323,7 @@ pango_font_get_glyph_extents (PangoFont *font,
* @language: language tag used to determine which script to get the metrics
* for, or %NULL to indicate to get the metrics for the entire
* font.
- *
+ *
* Gets overall metric information for a font. Since the metrics may be
* substantially different for different scripts, a language tag can
* be provided to indicate that the metrics should be retrieved that
@@ -1338,7 +1338,7 @@ pango_font_get_metrics (PangoFont *font,
{
if (G_UNLIKELY (!PANGO_IS_FONT (font)))
{
-
+
if (!_pango_warning_history.get_metrics)
{
_pango_warning_history.get_metrics = TRUE;
@@ -1353,7 +1353,7 @@ pango_font_get_metrics (PangoFont *font,
/**
* pango_font_get_font_map:
* @font: a #PangoFont
- *
+ *
* Gets the font map for which the font was created.
*
* Return value: the #PangoFontMap for the font
@@ -1365,7 +1365,7 @@ pango_font_get_font_map (PangoFont *font)
{
if (G_UNLIKELY (!PANGO_IS_FONT (font)))
{
-
+
if (!_pango_warning_history.get_font_map)
{
_pango_warning_history.get_font_map = TRUE;
@@ -1384,7 +1384,7 @@ GType
pango_font_metrics_get_type (void)
{
static GType our_type = 0;
-
+
if (our_type == 0)
our_type = g_boxed_type_register_static (I_("PangoFontMetrics"),
(GBoxedCopyFunc)pango_font_metrics_ref,
@@ -1396,11 +1396,11 @@ pango_font_metrics_get_type (void)
/**
* pango_font_metrics_new:
- *
+ *
* Creates a new #PangoFontMetrics structure. 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 #PangoFontMetrics structure
* with a reference count of 1.
**/
@@ -1416,9 +1416,9 @@ pango_font_metrics_new (void)
/**
* pango_font_metrics_ref:
* @metrics: a #PangoFontMetrics structure
- *
+ *
* Increase the reference count of a font metrics structure by one.
- *
+ *
* Return value: @metrics
**/
PangoFontMetrics *
@@ -1426,7 +1426,7 @@ pango_font_metrics_ref (PangoFontMetrics *metrics)
{
if (!metrics)
return NULL;
-
+
metrics->ref_count++;
return metrics;
@@ -1435,7 +1435,7 @@ pango_font_metrics_ref (PangoFontMetrics *metrics)
/**
* pango_font_metrics_unref:
* @metrics: a #PangoFontMetrics structure
- *
+ *
* Decrease the reference count of a font metrics structure by one. If
* the result is zero, frees the structure and any associated
* memory.
@@ -1446,9 +1446,9 @@ pango_font_metrics_unref (PangoFontMetrics *metrics)
if (!metrics)
return;
g_return_if_fail (metrics->ref_count > 0 );
-
+
metrics->ref_count--;
-
+
if (metrics->ref_count == 0)
g_slice_free (PangoFontMetrics, metrics);
}
@@ -1456,13 +1456,13 @@ pango_font_metrics_unref (PangoFontMetrics *metrics)
/**
* pango_font_metrics_get_ascent:
* @metrics: a #PangoFontMetrics structure
- *
+ *
* Gets the ascent from a font metrics structure. The ascent is
* the distance from the baseline to the logical top of a line
* of text. (The logical top may be above or below the top 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 Pango units. (1 point == %PANGO_SCALE Pango units.)
**/
int
@@ -1476,13 +1476,13 @@ pango_font_metrics_get_ascent (PangoFontMetrics *metrics)
/**
* pango_font_metrics_get_descent:
* @metrics: a #PangoFontMetrics structure
- *
+ *
* Gets the descent from a font metrics structure. The descent is
* the distance from the baseline to the logical bottom of a line
* of text. (The logical bottom may be above or below the 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 Pango units. (1 point == %PANGO_SCALE Pango units.)
**/
int
@@ -1496,12 +1496,12 @@ pango_font_metrics_get_descent (PangoFontMetrics *metrics)
/**
* pango_font_metrics_get_approximate_char_width:
* @metrics: a #PangoFontMetrics structure
- *
+ *
* Gets the approximate character width for a font metrics structure.
* This is merely a representative value useful, for example, for
* determining the initial size for a window. Actual characters in
* text will be wider and narrower than this.
- *
+ *
* Return value: the character width, in Pango units. (1 point == %PANGO_SCALE Pango units.)
**/
int
@@ -1515,14 +1515,14 @@ pango_font_metrics_get_approximate_char_width (PangoFontMetrics *metrics)
/**
* pango_font_metrics_get_approximate_digit_width:
* @metrics: a #PangoFontMetrics structure
- *
+ *
* Gets the approximate digit width for a font metrics structure.
* This is merely a representative value useful, for example, for
* determining the initial size for a window. Actual digits in
* text can be wider or narrower than this, though this value
* is generally somewhat more accurate than the result of
* pango_font_metrics_get_approximate_char_width() for digits.
- *
+ *
* Return value: the digit width, in Pango units. (1 point == %PANGO_SCALE Pango units.)
**/
int
@@ -1536,13 +1536,13 @@ pango_font_metrics_get_approximate_digit_width (PangoFontMetrics *metrics)
/**
* pango_font_metrics_get_underline_position:
* @metrics: a #PangoFontMetrics structure
- *
+ *
* Gets the suggested position to draw the underline.
* The value returned is the distance <emphasis>above</emphasis> the
* baseline of the top of the underline. Since most fonts have
* underline positions beneath the baseline, this value is typically
* negative.
- *
+ *
* Return value: the suggested underline position, in Pango units.
*
* Since: 1.6
@@ -1558,9 +1558,9 @@ pango_font_metrics_get_underline_position (PangoFontMetrics *metrics)
/**
* pango_font_metrics_get_underline_thickness:
* @metrics: a #PangoFontMetrics structure
- *
+ *
* Gets the suggested thickness to draw for the underline.
- *
+ *
* Return value: the suggested underline thickness, in Pango units.
*
* Since: 1.6
@@ -1576,11 +1576,11 @@ pango_font_metrics_get_underline_thickness (PangoFontMetrics *metrics)
/**
* pango_font_metrics_get_strikethrough_position:
* @metrics: a #PangoFontMetrics structure
- *
+ *
* Gets the suggested position to draw the strikethrough.
* The value returned is the distance <emphasis>above</emphasis> the
* baseline of the top of the strikethrough.
- *
+ *
* Return value: the suggested strikethrough position, in Pango units.
*
* Since: 1.6
@@ -1596,9 +1596,9 @@ pango_font_metrics_get_strikethrough_position (PangoFontMetrics *metrics)
/**
* pango_font_metrics_get_strikethrough_thickness:
* @metrics: a #PangoFontMetrics structure
- *
+ *
* Gets the suggested thickness to draw for the strikethrough.
- *
+ *
* Return value: the suggested strikethrough thickness, in Pango units.
*
* Since: 1.6
@@ -1630,11 +1630,11 @@ pango_font_family_init (PangoFontFamily *family)
/**
* pango_font_family_get_name:
* @family: a #PangoFontFamily
- *
+ *
* Gets the name of the family. The name is unique among all
* fonts for the font backend and can be used in a #PangoFontDescription
* to specify that a face from this family is desired.
- *
+ *
* Return value: the name of the family. This string is owned
* by the family object and must not be modified or freed.
**/
@@ -1653,12 +1653,12 @@ pango_font_family_get_name (PangoFontFamily *family)
* objects, or %NULL. This array should be freed with g_free()
* when it is no longer needed.
* @n_faces: location to store number of elements in @faces.
- *
+ *
* Lists the different font faces that make up @family. The faces
* in a family share a common design, but differ in slant, weight,
* width and other aspects.
**/
-void
+void
pango_font_family_list_faces (PangoFontFamily *family,
PangoFontFace ***faces,
int *n_faces)
@@ -1679,17 +1679,17 @@ pango_font_family_list_faces (PangoFontFamily *family,
* double-width characters: characters that occupy two grid cells.
* g_unichar_iswide() returns a result that indicates whether a
* character is typically double-width in a monospace font.
- *
+ *
* The best way to find out the grid-cell size is to call
* pango_font_metrics_get_approximate_digit_width(), since the results
* of pango_font_metrics_get_approximate_char_width() may be affected
- * by double-width characters.
- *
+ * by double-width characters.
+ *
* Return value: %TRUE if the family is monospace.
*
* Since: 1.4
**/
-gboolean
+gboolean
pango_font_family_is_monospace (PangoFontFamily *family)
{
g_return_val_if_fail (PANGO_IS_FONT_FAMILY (family), FALSE);
@@ -1719,11 +1719,11 @@ pango_font_face_init (PangoFontFace *face)
/**
* pango_font_face_describe:
* @face: a #PangoFontFace
- *
+ *
* Returns the family, style, variant, weight and stretch of
* a #PangoFontFace. The size field of the resulting font description
- * will be unset.
- *
+ * will be unset.
+ *
* Return value: a newly-created #PangoFontDescription structure
* holding the description of the face. Use pango_font_description_free()
* to free the result.
@@ -1739,12 +1739,12 @@ pango_font_face_describe (PangoFontFace *face)
/**
* pango_font_face_get_face_name:
* @face: a #PangoFontFace.
- *
+ *
* Gets a name representing the style of this face among the
* different faces in the #PangoFontFamily for the face. This
* name is unique among all faces in the family and is suitable
* for displaying to users.
- *
+ *
* Return value: the face name for the face. This string is
* owned by the face object and must not be modified or freed.
**/
@@ -1762,7 +1762,7 @@ pango_font_face_get_face_name (PangoFontFace *face)
* @sizes: location to store a pointer to an array of int. This array
* should be freed with g_free().
* @n_sizes: location to store the number of elements in @sizes
- *
+ *
* List the available sizes for a font. This is only applicable to bitmap
* fonts. For scalable fonts, stores %NULL at the location pointed to by
* @sizes and 0 at the location pointed to by @n_sizes. The sizes returned
@@ -1771,8 +1771,8 @@ pango_font_face_get_face_name (PangoFontFace *face)
* Since: 1.4
**/
void
-pango_font_face_list_sizes (PangoFontFace *face,
- int **sizes,
+pango_font_face_list_sizes (PangoFontFace *face,
+ int **sizes,
int *n_sizes)
{
g_return_if_fail (PANGO_IS_FONT_FACE (face));
diff --git a/pango/glyphstring.c b/pango/glyphstring.c
index 691e8c00..e079a6e2 100644
--- a/pango/glyphstring.c
+++ b/pango/glyphstring.c
@@ -64,14 +64,14 @@ pango_glyph_string_set_size (PangoGlyphString *string, gint new_len)
string->space = 1;
else
string->space *= 2;
-
+
if (string->space < 0)
{
g_warning ("glyph string length overflows maximum integer size, truncated");
new_len = string->space = G_MAXINT - 8;
}
}
-
+
string->glyphs = g_realloc (string->glyphs, string->space * sizeof (PangoGlyphInfo));
string->log_clusters = g_realloc (string->log_clusters, string->space * sizeof (gint));
string->num_glyphs = new_len;
@@ -81,7 +81,7 @@ GType
pango_glyph_string_get_type (void)
{
static GType our_type = 0;
-
+
if (our_type == 0)
our_type = g_boxed_type_register_static (I_("PangoGlyphString"),
(GBoxedCopyFunc)pango_glyph_string_copy,
@@ -176,7 +176,7 @@ pango_glyph_string_extents_range (PangoGlyphString *glyphs,
ink_rect->width = 0;
ink_rect->height = 0;
}
-
+
if (logical_rect)
{
logical_rect->x = 0;
@@ -184,12 +184,12 @@ pango_glyph_string_extents_range (PangoGlyphString *glyphs,
logical_rect->width = 0;
logical_rect->height = 0;
}
-
+
for (i = start; i < end; i++)
{
PangoRectangle glyph_ink;
PangoRectangle glyph_logical;
-
+
PangoGlyphGeometry *geometry = &glyphs->glyphs[i].geometry;
pango_font_get_glyph_extents (font, glyphs->glyphs[i].glyph,
@@ -208,12 +208,12 @@ pango_glyph_string_extents_range (PangoGlyphString *glyphs,
else
{
int new_x, new_y;
-
+
new_x = MIN (ink_rect->x, x_pos + glyph_ink.x + geometry->x_offset);
ink_rect->width = MAX (ink_rect->x + ink_rect->width,
x_pos + glyph_ink.x + glyph_ink.width + geometry->x_offset) - new_x;
ink_rect->x = new_x;
-
+
new_y = MIN (ink_rect->y, glyph_ink.y + geometry->y_offset);
ink_rect->height = MAX (ink_rect->y + ink_rect->height,
glyph_ink.y + glyph_ink.height + geometry->y_offset) - new_y;
@@ -242,7 +242,7 @@ pango_glyph_string_extents_range (PangoGlyphString *glyphs,
x_pos += geometry->width;
}
}
-
+
/**
* pango_glyph_string_extents:
* @glyphs: a #PangoGlyphString
@@ -251,12 +251,12 @@ pango_glyph_string_extents_range (PangoGlyphString *glyphs,
* or %NULL to indicate that the result is not needed.
* @logical_rect: rectangle used to store the logical extents of the glyph string
* or %NULL to indicate that the result is not needed.
- *
+ *
* Compute the logical and ink extents of a glyph string. See the documentation
* for pango_font_get_glyph_extents() for details about the interpretation
* of the rectangles.
*/
-void
+void
pango_glyph_string_extents (PangoGlyphString *glyphs,
PangoFont *font,
PangoRectangle *ink_rect,
@@ -269,7 +269,7 @@ pango_glyph_string_extents (PangoGlyphString *glyphs,
/**
* pango_glyph_string_get_width:
* @glyphs: a #PangoGlyphString
- *
+ *
* Computes the logical width of the glyph string as can also be computed
* using pango_glyph_string_extents(). However, since this only computes the
* width, it's much faster. This is in fact only a convenience function that
@@ -317,7 +317,7 @@ pango_glyph_string_get_logical_widths (PangoGlyphString *glyphs,
int width = 0;
int last_cluster_width = 0;
const char *p = text; /* Points to start of current cluster */
-
+
for (i=0; i<=glyphs->num_glyphs; i++)
{
int glyph_index = (embedding_level % 2 == 0) ? i : glyphs->num_glyphs - i - 1;
@@ -328,7 +328,7 @@ pango_glyph_string_get_logical_widths (PangoGlyphString *glyphs,
if (i == glyphs->num_glyphs || p != text + glyphs->log_clusters[glyph_index])
{
int next_cluster = last_cluster;
-
+
if (i < glyphs->num_glyphs)
{
while (p < text + glyphs->log_clusters[glyph_index])
@@ -345,14 +345,14 @@ pango_glyph_string_get_logical_widths (PangoGlyphString *glyphs,
p = g_utf8_next_char (p);
}
}
-
+
for (j = last_cluster; j < next_cluster; j++)
logical_widths[j] = (width - last_cluster_width) / (next_cluster - last_cluster);
-
+
last_cluster = next_cluster;
last_cluster_width = width;
}
-
+
if (i < glyphs->num_glyphs)
width += glyphs->glyphs[glyph_index].geometry.width;
}
diff --git a/pango/mapping.c b/pango/mapping.c
index a85e5cb5..7000b69c 100644
--- a/pango/mapping.c
+++ b/pango/mapping.c
@@ -69,14 +69,14 @@ pango_glyph_string_index_to_x (PangoGlyphString *glyphs,
int cluster_offset = 0;
char *p;
-
+
g_return_if_fail (glyphs != NULL);
g_return_if_fail (length >= 0);
g_return_if_fail (length == 0 || text != NULL);
if (!x_pos) /* Allow the user to do the useless */
return;
-
+
if (glyphs->num_glyphs == 0)
{
*x_pos = 0;
@@ -125,7 +125,7 @@ pango_glyph_string_index_to_x (PangoGlyphString *glyphs,
start_index = glyphs->log_clusters[i];
start_xpos = width;
}
-
+
width += glyphs->glyphs[i].geometry.width;
}
}
@@ -146,7 +146,7 @@ pango_glyph_string_index_to_x (PangoGlyphString *glyphs,
cluster_chars++;
p = g_utf8_next_char (p);
}
-
+
if (trailing)
cluster_offset += 1;
@@ -173,13 +173,13 @@ pango_glyph_string_index_to_x (PangoGlyphString *glyphs,
* position; the caller must combine the result with the logical
* attributes for the text to compute the valid cursor position.
*/
-void
+void
pango_glyph_string_x_to_index (PangoGlyphString *glyphs,
char *text,
int length,
PangoAnalysis *analysis,
int x_pos,
- int *index,
+ int *index,
gboolean *trailing)
{
int i;
@@ -245,10 +245,10 @@ pango_glyph_string_x_to_index (PangoGlyphString *glyphs,
start_xpos = width;
}
}
-
+
if (width <= x_pos && x_pos < width + glyphs->glyphs[i].geometry.width)
found = TRUE;
-
+
width += glyphs->glyphs[i].geometry.width;
}
}
@@ -266,7 +266,7 @@ pango_glyph_string_x_to_index (PangoGlyphString *glyphs,
p = g_utf8_next_char (p);
cluster_chars++;
}
-
+
if (start_xpos == end_xpos)
{
if (index)
@@ -289,16 +289,16 @@ pango_glyph_string_x_to_index (PangoGlyphString *glyphs,
{
char *p = text + start_index;
int i = 0;
-
+
while (i + 1 <= cp)
{
p = g_utf8_next_char (p);
i++;
}
-
+
*index = (p - text);
}
-
+
if (trailing)
*trailing = (cp - (int)cp >= 0.5) ? 1 : 0;
}
@@ -308,16 +308,16 @@ pango_glyph_string_x_to_index (PangoGlyphString *glyphs,
{
char *p = text + start_index;
int i = 0;
-
+
while (i + 1 < cp)
{
p = g_utf8_next_char (p);
i++;
}
-
+
*index = (p - text);
}
-
+
if (trailing)
{
double cp_flip = cluster_chars - cp;
diff --git a/pango/modules.c b/pango/modules.c
index 7b2993ae..4b48af20 100644
--- a/pango/modules.c
+++ b/pango/modules.c
@@ -49,7 +49,7 @@ struct _PangoMap
GArray *entries;
};
-struct _PangoMapEntry
+struct _PangoMapEntry
{
GSList *exact;
GSList *fallback;
@@ -83,7 +83,7 @@ struct _PangoModule
PangoEngine *(*create) (const gchar *id);
};
-struct _PangoModuleClass
+struct _PangoModuleClass
{
GTypeModuleClass parent_class;
};
@@ -105,11 +105,11 @@ static GType pango_module_get_type (void);
* @language: the language tag for which to find the map
* @engine_type_id: the engine type for the map to find
* @render_type_id: the render type for the map to find
- *
+ *
* Locate a #PangoMap for a particular engine type and render
* type. The resulting map can be used to determine the engine
* for each character.
- *
+ *
* Return value: the suitable #PangoMap.
**/
PangoMap *
@@ -158,7 +158,7 @@ pango_find_map (PangoLanguage *language,
maps = g_list_prepend(maps, tmp_list->data);
g_list_free_1(tmp_list);
}
-
+
return map_info->map;
}
@@ -175,24 +175,24 @@ pango_module_load (GTypeModule *module)
g_warning ("%s", g_module_error());
return FALSE;
}
-
+
/* extract symbols from the lib */
if (!g_module_symbol (pango_module->library, "script_engine_init",
(gpointer *)&pango_module->init) ||
- !g_module_symbol (pango_module->library, "script_engine_exit",
+ !g_module_symbol (pango_module->library, "script_engine_exit",
(gpointer *)&pango_module->exit) ||
- !g_module_symbol (pango_module->library, "script_engine_list",
+ !g_module_symbol (pango_module->library, "script_engine_list",
(gpointer *)&pango_module->list) ||
- !g_module_symbol (pango_module->library, "script_engine_create",
+ !g_module_symbol (pango_module->library, "script_engine_create",
(gpointer *)&pango_module->create))
{
g_warning ("%s", g_module_error());
g_module_close (pango_module->library);
-
+
return FALSE;
}
}
-
+
/* call the module's init function to let it */
/* setup anything it needs to set up. */
pango_module->init (module);
@@ -211,7 +211,7 @@ pango_module_unload (GTypeModule *module)
{
g_module_close (pango_module->library);
pango_module->library = NULL;
-
+
pango_module->init = NULL;
pango_module->exit = NULL;
pango_module->list = NULL;
@@ -239,7 +239,7 @@ pango_module_class_init (PangoModuleClass *class)
GObjectClass *gobject_class = G_OBJECT_CLASS (class);
parent_class = G_OBJECT_CLASS (g_type_class_peek_parent (class));
-
+
module_class->load = pango_module_load;
module_class->unload = pango_module_unload;
@@ -272,7 +272,7 @@ pango_engine_pair_get_engine (PangoEnginePair *pair)
if (!warned_quark)
warned_quark = g_quark_from_static_string ("pango-module-warned");
-
+
if (!g_object_get_qdata (G_OBJECT (pair->module), warned_quark))
{
g_warning ("Failed to load Pango module '%s' for id '%s'", pair->module->path, pair->info.id);
@@ -309,7 +309,7 @@ handle_included_module (PangoIncludedModule *included_module,
pair->info = engine_info[i];
pair->module = module;
pair->engine = NULL;
-
+
*engine_list = g_slist_prepend (*engine_list, pair);
}
}
@@ -343,7 +343,7 @@ find_or_create_module (const char *raw_path)
{
path = g_strdup (raw_path);
}
-
+
module = g_hash_table_lookup (dlloaded_modules, path);
if (module)
g_free (path);
@@ -364,7 +364,7 @@ script_from_string (const char *str)
GEnumValue *value;
if (!class)
class = g_type_class_ref (PANGO_TYPE_SCRIPT);
-
+
value = g_enum_get_value_by_nick (class, str);
if (!value)
return PANGO_SCRIPT_INVALID_CODE;
@@ -442,30 +442,30 @@ process_module_file (FILE *module_file)
have_error = TRUE;
goto error;
}
-
+
script_info = g_slice_new (PangoEngineScriptInfo);
script_info->script = script;
script_info->langs = g_strdup (q + 1);
-
+
scripts = g_list_prepend (scripts, script_info);
}
if (!pango_skip_space (&p))
break;
-
+
i++;
}
-
+
if (i<3)
{
have_error = TRUE;
goto error;
}
-
+
scripts = g_list_reverse (scripts);
pair->info.n_scripts = g_list_length (scripts);
pair->info.scripts = g_new (PangoEngineScriptInfo, pair->info.n_scripts);
-
+
tmp_list = scripts;
for (i=0; i<pair->info.n_scripts; i++)
{
@@ -474,7 +474,7 @@ process_module_file (FILE *module_file)
}
pair->engine = NULL;
-
+
dlloaded_engines = g_slist_prepend (dlloaded_engines, pair);
error:
@@ -505,7 +505,7 @@ read_modules (void)
int n;
dlloaded_modules = g_hash_table_new (g_str_hash, g_str_equal);
-
+
if (!file_str)
file_str = g_build_filename (pango_get_sysconf_subdirectory (),
"pango.modules",
@@ -543,10 +543,10 @@ init_modules (void)
return;
else
init = TRUE;
-
+
/* Make sure that the type system is initialized */
g_type_init ();
-
+
for (i = 0; _pango_included_lang_modules[i].list; i++)
pango_module_register (&_pango_included_lang_modules[i]);
read_modules ();
@@ -558,7 +558,7 @@ map_add_engine (PangoMapInfo *info,
{
PangoMap *map = info->map;
int i;
-
+
for (i=0; i<pair->info.n_scripts; i++)
{
PangoScript script;
@@ -588,7 +588,7 @@ static void
map_add_engine_list (PangoMapInfo *info,
GSList *engines,
const char *engine_type,
- const char *render_type)
+ const char *render_type)
{
GSList *tmp_list = engines;
@@ -610,7 +610,7 @@ build_map (PangoMapInfo *info)
{
const char *engine_type = g_quark_to_string (info->engine_type_id);
const char *render_type = g_quark_to_string (info->render_type_id);
-
+
init_modules();
if (!dlloaded_engines && !registered_engines)
@@ -628,25 +628,25 @@ build_map (PangoMapInfo *info)
"You should create this file by running pango-querymodules.",
filename);
g_free (filename);
-
+
no_module_warning = TRUE;
}
}
-
+
info->map = g_slice_new (PangoMap);
info->map->entries = g_array_new (FALSE, TRUE, sizeof (PangoMapEntry));
-
- map_add_engine_list (info, dlloaded_engines, engine_type, render_type);
- map_add_engine_list (info, registered_engines, engine_type, render_type);
+
+ map_add_engine_list (info, dlloaded_engines, engine_type, render_type);
+ map_add_engine_list (info, registered_engines, engine_type, render_type);
}
/**
* pango_map_get_engine:
* @map: a #PangoMap
* @script: a #PangoScript
- *
+ *
* Returns the best engine listed in the map for a given script
- *
+ *
* Return value: the best engine, if one is listed for the script,
* or %NULL. The lookup may cause the engine to be loaded;
* once an engine is loaded, it won't be unloaded. If multiple
@@ -659,7 +659,7 @@ pango_map_get_engine (PangoMap *map,
{
PangoMapEntry *entry = NULL;
PangoMapEntry *common_entry = NULL;
-
+
if ((guint)script < map->entries->len)
entry = &g_array_index (map->entries, PangoMapEntry, script);
@@ -700,7 +700,7 @@ append_engines (GSList **engine_list,
* handle this script.
* @fallback_engines: location to store list of engines that approximately
* handle this script.
- *
+ *
* Finds engines in the map that handle the given script. The returned
* 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
@@ -716,7 +716,7 @@ pango_map_get_engines (PangoMap *map,
{
PangoMapEntry *entry = NULL;
PangoMapEntry *common_entry = NULL;
-
+
if ((guint)script < map->entries->len)
entry = &g_array_index (map->entries, PangoMapEntry, script);
@@ -731,7 +731,7 @@ pango_map_get_engines (PangoMap *map,
else if (common_entry && common_entry->exact)
append_engines (exact_engines, common_entry->exact);
}
-
+
if (fallback_engines)
{
*fallback_engines = NULL;
@@ -745,7 +745,7 @@ pango_map_get_engines (PangoMap *map,
/**
* pango_module_register:
* @module: a #PangoIncludedModule
- *
+ *
* Registers a statically linked module with Pango. The
* #PangoIncludedModule structure that is passed in contains the
* functions that would otherwise be loaded from a dynamically loaded
@@ -755,9 +755,9 @@ void
pango_module_register (PangoIncludedModule *module)
{
GSList *tmp_list = NULL;
-
+
handle_included_module (module, &tmp_list);
registered_engines = g_slist_concat (registered_engines,
- g_slist_reverse (tmp_list));
+ g_slist_reverse (tmp_list));
}
diff --git a/pango/pango-attributes.c b/pango/pango-attributes.c
index ea46dd6a..00b5d870 100644
--- a/pango/pango-attributes.c
+++ b/pango/pango-attributes.c
@@ -57,9 +57,9 @@ static PangoAttribute *pango_attr_size_new_internal (int size,
/**
* pango_attr_type_register:
* @name: an identifier for the type (currently unused.)
- *
+ *
* Allocate a new attribute type ID.
- *
+ *
* Return value: the new type ID.
**/
PangoAttrType
@@ -73,9 +73,9 @@ pango_attr_type_register (const gchar *name)
/**
* pango_attribute_copy:
* @attr: a #PangoAttribute
- *
+ *
* Make a copy of an attribute.
- *
+ *
* Return value: the newly allocated #PangoAttribute, which should be
* freed with pango_attribute_destroy().
**/
@@ -96,7 +96,7 @@ pango_attribute_copy (const PangoAttribute *attr)
/**
* pango_attribute_destroy:
* @attr: a #PangoAttribute.
- *
+ *
* Destroy a #PangoAttribute and free all associated memory.
**/
void
@@ -111,11 +111,11 @@ pango_attribute_destroy (PangoAttribute *attr)
* pango_attribute_equal:
* @attr1: a #PangoAttribute
* @attr2: another #PangoAttribute
- *
+ *
* Compare two attributes for equality. This compares only the
* actual value of the two attributes and not the ranges that the
* attributes apply to.
- *
+ *
* Return value: %TRUE if the two attributes have the same value.
**/
gboolean
@@ -168,9 +168,9 @@ pango_attr_string_new (const PangoAttrClass *klass,
/**
* pango_attr_family_new:
* @family: the family or comma separated list of families
- *
+ *
* Create a new font family attribute.
- *
+ *
* Return value: the newly allocated #PangoAttribute, which should be
* freed with pango_attribute_destroy().
**/
@@ -185,7 +185,7 @@ pango_attr_family_new (const char *family)
};
g_return_val_if_fail (family != NULL, NULL);
-
+
return pango_attr_string_new (&klass, family);
}
@@ -213,9 +213,9 @@ pango_attr_language_equal (const PangoAttribute *attr1,
/**
* pango_attr_language_new:
* @language: language tag
- *
- * Create a new language tag attribute.
- *
+ *
+ * Create a new language tag attribute.
+ *
* Return value: the newly allocated #PangoAttribute, which should be
* freed with pango_attribute_destroy().
**/
@@ -223,7 +223,7 @@ PangoAttribute *
pango_attr_language_new (PangoLanguage *language)
{
PangoAttrLanguage *result;
-
+
static const PangoAttrClass klass = {
PANGO_ATTR_LANGUAGE,
pango_attr_language_copy,
@@ -232,7 +232,7 @@ pango_attr_language_new (PangoLanguage *language)
};
g_return_val_if_fail (language != NULL, NULL);
-
+
result = g_slice_new (PangoAttrLanguage);
result->attr.klass = &klass;
@@ -245,7 +245,7 @@ static PangoAttribute *
pango_attr_color_copy (const PangoAttribute *attr)
{
const PangoAttrColor *color_attr = (PangoAttrColor *)attr;
-
+
return pango_attr_color_new (attr->klass,
color_attr->color.red,
color_attr->color.green,
@@ -292,9 +292,9 @@ pango_attr_color_new (const PangoAttrClass *klass,
* @red: the red value (ranging from 0 to 65535)
* @green: the green value
* @blue: the blue value
- *
+ *
* Create a new foreground color attribute.
- *
+ *
* Return value: the newly allocated #PangoAttribute, which should be
* freed with pango_attribute_destroy().
**/
@@ -318,9 +318,9 @@ pango_attr_foreground_new (guint16 red,
* @red: the red value (ranging from 0 to 65535)
* @green: the green value
* @blue: the blue value
- *
+ *
* Create a new background color attribute.
- *
+ *
* Return value: the newly allocated #PangoAttribute, which should be
* freed with pango_attribute_destroy().
**/
@@ -343,7 +343,7 @@ static PangoAttribute *
pango_attr_int_copy (const PangoAttribute *attr)
{
const PangoAttrInt *int_attr = (PangoAttrInt *)attr;
-
+
return pango_attr_int_new (attr->klass, int_attr->value);
}
@@ -361,7 +361,7 @@ pango_attr_int_equal (const PangoAttribute *attr1,
{
const PangoAttrInt *int_attr1 = (const PangoAttrInt *)attr1;
const PangoAttrInt *int_attr2 = (const PangoAttrInt *)attr2;
-
+
return (int_attr1->value == int_attr2->value);
}
@@ -380,7 +380,7 @@ static PangoAttribute *
pango_attr_float_copy (const PangoAttribute *attr)
{
const PangoAttrFloat *float_attr = (PangoAttrFloat *)attr;
-
+
return pango_attr_float_new (attr->klass, float_attr->value);
}
@@ -398,7 +398,7 @@ pango_attr_float_equal (const PangoAttribute *attr1,
{
const PangoAttrFloat *float_attr1 = (const PangoAttrFloat *)attr1;
const PangoAttrFloat *float_attr2 = (const PangoAttrFloat *)attr2;
-
+
return (float_attr1->value == float_attr2->value);
}
@@ -438,7 +438,7 @@ pango_attr_size_equal (const PangoAttribute *attr1,
{
const PangoAttrSize *size_attr1 = (const PangoAttrSize *)attr1;
const PangoAttrSize *size_attr2 = (const PangoAttrSize *)attr2;
-
+
return size_attr1->size == size_attr2->size;
}
@@ -447,7 +447,7 @@ pango_attr_size_new_internal (int size,
gboolean absolute)
{
PangoAttrSize *result;
-
+
static const PangoAttrClass klass = {
PANGO_ATTR_SIZE,
pango_attr_size_copy,
@@ -472,9 +472,9 @@ pango_attr_size_new_internal (int size,
/**
* pango_attr_size_new:
* @size: the font size, in %PANGO_SCALE<!-- -->ths of a point.
- *
+ *
* Create a new font-size attribute in fractional points.
- *
+ *
* Return value: the newly allocated #PangoAttribute, which should be
* freed with pango_attribute_destroy().
**/
@@ -487,9 +487,9 @@ pango_attr_size_new (int size)
/**
* pango_attr_size_new_absolute:
* @size: the font size, in %PANGO_SCALE<!-- -->ths of a device unit.
- *
+ *
* Create a new font-size attribute in device units.
- *
+ *
* Return value: the newly allocated #PangoAttribute, which should be
* freed with pango_attribute_destroy().
*
@@ -504,9 +504,9 @@ pango_attr_size_new_absolute (int size)
/**
* pango_attr_style_new:
* @style: the slant style
- *
+ *
* Create a new font slant style attribute.
- *
+ *
* Return value: the newly allocated #PangoAttribute, which should be
* freed with pango_attribute_destroy().
**/
@@ -526,9 +526,9 @@ pango_attr_style_new (PangoStyle style)
/**
* pango_attr_weight_new:
* @weight: the weight
- *
+ *
* Create a new font weight attribute.
- *
+ *
* Return value: the newly allocated #PangoAttribute, which should be
* freed with pango_attribute_destroy().
**/
@@ -550,7 +550,7 @@ pango_attr_weight_new (PangoWeight weight)
* @variant: the variant
*
* Create a new font variant attribute (normal or small caps)
- *
+ *
* Return value: the newly allocated #PangoAttribute, which should be
* freed with pango_attribute_destroy().
**/
@@ -570,9 +570,9 @@ pango_attr_variant_new (PangoVariant variant)
/**
* pango_attr_stretch_new:
* @stretch: the stretch
- *
+ *
* Create a new font stretch attribute
- *
+ *
* Return value: the newly allocated #PangoAttribute, which should be
* freed with pango_attribute_destroy().
**/
@@ -593,7 +593,7 @@ static PangoAttribute *
pango_attr_font_desc_copy (const PangoAttribute *attr)
{
const PangoAttrFontDesc *desc_attr = (const PangoAttrFontDesc *)attr;
-
+
return pango_attr_font_desc_new (desc_attr->desc);
}
@@ -612,18 +612,18 @@ pango_attr_font_desc_equal (const PangoAttribute *attr1,
{
const PangoAttrFontDesc *desc_attr1 = (const PangoAttrFontDesc *)attr1;
const PangoAttrFontDesc *desc_attr2 = (const PangoAttrFontDesc *)attr2;
-
+
return pango_font_description_equal (desc_attr1->desc, desc_attr2->desc);
}
/**
* pango_attr_font_desc_new:
* @desc: the font description
- *
+ *
* Create a new font description attribute. This attribute
* allows setting family, style, weight, variant, stretch,
* and size simultaneously.
- *
+ *
* Return value: the newly allocated #PangoAttribute, which should be
* freed with pango_attribute_destroy().
**/
@@ -648,9 +648,9 @@ pango_attr_font_desc_new (const PangoFontDescription *desc)
/**
* pango_attr_underline_new:
* @underline: the underline style.
- *
+ *
* Create a new underline-style attribute.
- *
+ *
* Return value: the newly allocated #PangoAttribute, which should be
* freed with pango_attribute_destroy().
**/
@@ -672,11 +672,11 @@ pango_attr_underline_new (PangoUnderline underline)
* @red: the red value (ranging from 0 to 65535)
* @green: the green value
* @blue: the blue value
- *
+ *
* Create a new underline color attribute. This attribute
* modifies the color of underlines. If not set, underlines
* will use the foreground color.
- *
+ *
* Return value: the newly allocated #PangoAttribute, which should be
* freed with pango_attribute_destroy().
*
@@ -700,9 +700,9 @@ pango_attr_underline_color_new (guint16 red,
/**
* pango_attr_strikethrough_new:
* @strikethrough: %TRUE if the text should be struck-through.
- *
+ *
* Create a new strike-through attribute.
- *
+ *
* Return value: the newly allocated #PangoAttribute, which should be
* freed with pango_attribute_destroy().
**/
@@ -724,11 +724,11 @@ pango_attr_strikethrough_new (gboolean strikethrough)
* @red: the red value (ranging from 0 to 65535)
* @green: the green value
* @blue: the blue value
- *
+ *
* Create a new strikethrough color attribute. This attribute
* modifies the color of strikethrough lines. If not set, strikethrough
* lines will use the foreground color.
- *
+ *
* Return value: the newly allocated #PangoAttribute, which should be
* freed with pango_attribute_destroy().
*
@@ -753,9 +753,9 @@ pango_attr_strikethrough_color_new (guint16 red,
* pango_attr_rise_new:
* @rise: the amount that the text should be displaced vertically,
* in Pango units. Positive values displace the text upwards.
- *
+ *
* Create a new baseline displacement attribute.
- *
+ *
* Return value: the newly allocated #PangoAttribute, which should be
* freed with pango_attribute_destroy().
**/
@@ -775,10 +775,10 @@ pango_attr_rise_new (int rise)
/**
* pango_attr_scale_new:
* @scale_factor: factor to scale the font
- *
+ *
* Create a new font size scale attribute. The base font for the
* affected text will have its size multiplied by @scale_factor.
- *
+ *
* Return value: the newly allocated #PangoAttribute, which should be
* freed with pango_attribute_destroy().
**/
@@ -797,16 +797,16 @@ pango_attr_scale_new (double scale_factor)
/**
* pango_attr_fallback_new:
- * @enable_fallback: %TRUE if we should fall back on other fonts
+ * @enable_fallback: %TRUE if we should fall back on other fonts
* for characters the active font is missing.
- *
+ *
* Create a new font fallback attribute.
*
* If fallback is disabled, characters will only be used from the
* closest matching font on the system. No fallback will be done to
* other fonts on the system that might contain the characters in the
* text.
- *
+ *
* Return value: the newly allocated #PangoAttribute, which should be
* freed with pango_attribute_destroy().
*
@@ -829,9 +829,9 @@ pango_attr_fallback_new (gboolean enable_fallback)
* pango_attr_letter_spacing_new:
* @letter_spacing: amount of extra space to add between graphemes
* of the text, in Pango units.
- *
+ *
* Create a new letter-spacing attribute.
- *
+ *
* Return value: the newly allocated #PangoAttribute, which should be
* freed with pango_attribute_destroy().
*
@@ -860,7 +860,7 @@ pango_attr_shape_copy (const PangoAttribute *attr)
data = shape_attr->copy_func (shape_attr->data);
else
data = shape_attr->data;
-
+
return pango_attr_shape_new_with_data (&shape_attr->ink_rect, &shape_attr->logical_rect,
data, shape_attr->copy_func, shape_attr->destroy_func);
}
@@ -869,10 +869,10 @@ static void
pango_attr_shape_destroy (PangoAttribute *attr)
{
PangoAttrShape *shape_attr = (PangoAttrShape *)attr;
-
+
if (shape_attr->destroy_func)
shape_attr->destroy_func (shape_attr->data);
-
+
g_slice_free (PangoAttrShape, shape_attr);
}
@@ -904,11 +904,11 @@ pango_attr_shape_equal (const PangoAttribute *attr1,
* as a pointer.
* @destroy_func: function to free @data when the attribute
* is freed, or %NULL
- *
+ *
* Like pango_attr_shape_new(), but a user data pointer is also
* provided; this pointer can be accessed when later
* rendering the glyph.
- *
+ *
* Return value: the newly allocated #PangoAttribute, which should be
* freed with pango_attribute_destroy().
*
@@ -932,7 +932,7 @@ pango_attr_shape_new_with_data (const PangoRectangle *ink_rect,
g_return_val_if_fail (ink_rect != NULL, NULL);
g_return_val_if_fail (logical_rect != NULL, NULL);
-
+
result = g_slice_new (PangoAttrShape);
result->attr.klass = &klass;
result->ink_rect = *ink_rect;
@@ -948,12 +948,12 @@ pango_attr_shape_new_with_data (const PangoRectangle *ink_rect,
* pango_attr_shape_new:
* @ink_rect: ink rectangle to assign to each character
* @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 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.
- *
+ *
* Return value: the newly allocated #PangoAttribute, which should be
* freed with pango_attribute_destroy().
**/
@@ -971,9 +971,9 @@ pango_attr_shape_new (const PangoRectangle *ink_rect,
/**
* pango_attr_gravity_new:
* @gravity: the gravity value; should not be %PANGO_GRAVITY_AUTO.
- *
+ *
* Create a new gravity attribute.
- *
+ *
* Return value: the newly allocated #PangoAttribute, which should be
* freed with pango_attribute_destroy().
*
@@ -997,9 +997,9 @@ pango_attr_gravity_new (PangoGravity gravity)
/**
* pango_attr_gravity_hint_new:
* @hint: the gravity hint value.
- *
+ *
* Create a new gravity hint attribute.
- *
+ *
* Return value: the newly allocated #PangoAttribute, which should be
* freed with pango_attribute_destroy().
*
@@ -1027,7 +1027,7 @@ GType
pango_attr_list_get_type (void)
{
static GType our_type = 0;
-
+
if (our_type == 0)
our_type = g_boxed_type_register_static (I_("PangoAttrList"),
(GBoxedCopyFunc) pango_attr_list_copy,
@@ -1038,9 +1038,9 @@ pango_attr_list_get_type (void)
/**
* pango_attr_list_new:
- *
+ *
* Create a new empty attribute list with a reference count of one.
- *
+ *
* Return value: the newly allocated #PangoAttrList, which should
* be freed with pango_attr_list_unref().
**/
@@ -1052,14 +1052,14 @@ pango_attr_list_new (void)
list->ref_count = 1;
list->attributes = NULL;
list->attributes_tail = NULL;
-
+
return list;
}
/**
* pango_attr_list_ref:
* @list: a #PangoAttrList
- *
+ *
* Increase the reference count of the given attribute list by one.
*
* Return value: The attribute list passed in
@@ -1079,7 +1079,7 @@ pango_attr_list_ref (PangoAttrList *list)
/**
* pango_attr_list_unref:
* @list: a #PangoAttrList
- *
+ *
* Decrease the reference count of the given attribute list by one.
* If the result is zero, free the attribute list and the attributes
* it contains.
@@ -1088,7 +1088,7 @@ void
pango_attr_list_unref (PangoAttrList *list)
{
GSList *tmp_list;
-
+
g_return_if_fail (list != NULL);
g_return_if_fail (list->ref_count > 0);
@@ -1113,7 +1113,7 @@ pango_attr_list_unref (PangoAttrList *list)
/**
* pango_attr_list_copy:
* @list: a #PangoAttrList
- *
+ *
* Copy @list and return an identical new list.
*
* Return value: the newly allocated #PangoAttrList, with a
@@ -1126,7 +1126,7 @@ pango_attr_list_copy (PangoAttrList *list)
PangoAttrList *new;
GSList *iter;
GSList *new_attrs;
-
+
g_return_val_if_fail (list != NULL, NULL);
new = pango_attr_list_new ();
@@ -1144,7 +1144,7 @@ pango_attr_list_copy (PangoAttrList *list)
/* we're going to reverse the nodes, so head becomes tail */
new->attributes_tail = new_attrs;
new->attributes = g_slist_reverse (new_attrs);
-
+
return new;
}
@@ -1175,7 +1175,7 @@ pango_attr_list_insert_internal (PangoAttrList *list,
while (1)
{
PangoAttribute *tmp_attr = tmp_list->data;
-
+
if (tmp_attr->start_index > start_index ||
(before && tmp_attr->start_index == start_index))
{
@@ -1193,7 +1193,7 @@ pango_attr_list_insert_internal (PangoAttrList *list,
break;
}
-
+
prev = tmp_list;
tmp_list = tmp_list->next;
}
@@ -1205,7 +1205,7 @@ pango_attr_list_insert_internal (PangoAttrList *list,
* @list: a #PangoAttrList
* @attr: the attribute to insert. Ownership of this value is
* assumed by the list.
- *
+ *
* Insert the given attribute into the #PangoAttrList. It will
* be inserted after all other attributes with a matching
* @start_index.
@@ -1225,7 +1225,7 @@ pango_attr_list_insert (PangoAttrList *list,
* @list: a #PangoAttrList
* @attr: the attribute to insert. Ownership of this value is
* assumed by the list.
- *
+ *
* Insert the given attribute into the #PangoAttrList. It will
* be inserted before all other attributes with a matching
* @start_index.
@@ -1245,7 +1245,7 @@ pango_attr_list_insert_before (PangoAttrList *list,
* @list: a #PangoAttrList
* @attr: the attribute to insert. Ownership of this value is
* assumed by the list.
- *
+ *
* Insert the given attribute into the #PangoAttrList. It will
* replace any attributes of the same type on that segment
* and be merged with any adjoining attributes that are identical.
@@ -1253,7 +1253,7 @@ pango_attr_list_insert_before (PangoAttrList *list,
* This function is slower than pango_attr_list_insert() for
* creating a attribute list in order (potentially much slower
* for large lists). However, pango_attr_list_insert() is not
- * suitable for continually changing a set of attributes
+ * suitable for continually changing a set of attributes
* since it never removes or combines existing attributes.
**/
void
@@ -1271,7 +1271,7 @@ pango_attr_list_change (PangoAttrList *list,
pango_attribute_destroy (attr);
return;
}
-
+
tmp_list = list->attributes;
prev = NULL;
while (1)
@@ -1286,15 +1286,15 @@ pango_attr_list_change (PangoAttrList *list,
link = g_slist_alloc ();
link->next = tmp_list;
link->data = attr;
-
+
if (prev)
prev->next = link;
else
list->attributes = link;
-
+
if (!tmp_list)
list->attributes_tail = link;
-
+
prev = link;
tmp_list = prev->next;
break;
@@ -1320,12 +1320,12 @@ pango_attr_list_change (PangoAttrList *list,
}
tmp_attr->end_index = end_index;
pango_attribute_destroy (attr);
-
+
attr = tmp_attr;
-
+
prev = tmp_list;
tmp_list = tmp_list->next;
-
+
break;
}
else
@@ -1364,7 +1364,7 @@ pango_attr_list_change (PangoAttrList *list,
g_assert (prev->data == attr);
g_assert (prev->next == tmp_list);
-
+
/* We now have the range inserted into the list one way or the
* other. Fix up the remainder
*/
@@ -1382,13 +1382,13 @@ pango_attr_list_change (PangoAttrList *list,
/* We can merge the new attribute with this attribute.
*/
attr->end_index = MAX (end_index, tmp_attr->end_index);
-
+
pango_attribute_destroy (tmp_attr);
prev->next = tmp_list->next;
if (!prev->next)
list->attributes_tail = prev;
-
+
g_slist_free_1 (tmp_list);
tmp_list = prev->next;
@@ -1403,7 +1403,7 @@ pango_attr_list_change (PangoAttrList *list,
*/
GSList *tmp_list2;
GSList *prev2;
-
+
tmp_attr->start_index = attr->end_index;
tmp_list2 = tmp_list->next;
@@ -1426,7 +1426,7 @@ pango_attr_list_change (PangoAttrList *list,
if (prev2 != tmp_list)
{
GSList *old_next = tmp_list->next;
-
+
prev->next = old_next;
prev2->next = tmp_list;
tmp_list->next = tmp_list2;
@@ -1440,7 +1440,7 @@ pango_attr_list_change (PangoAttrList *list,
}
}
}
-
+
prev = tmp_list;
tmp_list = tmp_list->next;
}
@@ -1454,7 +1454,7 @@ pango_attr_list_change (PangoAttrList *list,
* @len: the length of the spliced segment. (Note that this
* must be specified since the attributes in @other
* may only be present at some subsection of this range)
- *
+ *
* This function opens up a hole in @list, fills it in with attributes from
* the left, and then merges @other on top of the hole.
*
@@ -1474,9 +1474,9 @@ pango_attr_list_splice (PangoAttrList *list,
{
GSList *tmp_list;
guint upos, ulen;
-
+
g_return_if_fail (list != NULL);
- g_return_if_fail (other != NULL);
+ g_return_if_fail (other != NULL);
g_return_if_fail (pos >= 0);
g_return_if_fail (len >= 0);
@@ -1487,7 +1487,7 @@ pango_attr_list_splice (PangoAttrList *list,
* isn't defined in the C standard for signed integers
*/
#define CLAMP_ADD(a,b) (((a) + (b) < (a)) ? G_MAXUINT : (a) + (b))
-
+
tmp_list = list->attributes;
while (tmp_list)
{
@@ -1523,7 +1523,7 @@ pango_attr_list_splice (PangoAttrList *list,
* pango_attr_list_change() will take care of deleting it.
*/
pango_attr_list_change (list, attr);
-
+
tmp_list = tmp_list->next;
}
#undef CLAMP_ADD
@@ -1532,10 +1532,10 @@ pango_attr_list_splice (PangoAttrList *list,
/**
* pango_attr_list_get_iterator:
* @list: a #PangoAttrList
- *
+ *
* Create a iterator initialized to the beginning of the list.
* @list must not be modified until this iterator is freed.
- *
+ *
* Return value: the newly allocated #PangoAttrIterator, which should
* be freed with pango_attr_iterator_destroy().
**/
@@ -1564,7 +1564,7 @@ pango_attr_list_get_iterator (PangoAttrList *list)
* @iterator: a #PangoAttrIterator
* @start: location to store the start of the range
* @end: location to store the end of the range
- *
+ *
* Get the range of the current segment. Note that the
* stored return values are signed, not unsigned like
* the values in #PangoAttribute. To deal with this API
@@ -1587,9 +1587,9 @@ pango_attr_iterator_range (PangoAttrIterator *iterator,
/**
* pango_attr_iterator_next:
* @iterator: a #PangoAttrIterator
- *
+ *
* Advance the iterator until the next change of style.
- *
+ *
* Return value: %FALSE if the iterator is at the end of the list, otherwise %TRUE
**/
gboolean
@@ -1604,7 +1604,7 @@ pango_attr_iterator_next (PangoAttrIterator *iterator)
iterator->start_index = iterator->end_index;
iterator->end_index = G_MAXUINT;
-
+
tmp_list = iterator->attribute_stack;
while (tmp_list)
{
@@ -1620,7 +1620,7 @@ pango_attr_iterator_next (PangoAttrIterator *iterator)
{
iterator->end_index = MIN (iterator->end_index, attr->end_index);
}
-
+
tmp_list = next;
}
@@ -1644,7 +1644,7 @@ pango_attr_iterator_next (PangoAttrIterator *iterator)
/**
* pango_attr_iterator_copy:
* @iterator: a #PangoAttrIterator.
- *
+ *
* Copy a #PangoAttrIterator
*
* Return value: the newly allocated #PangoAttrIterator, which should
@@ -1669,14 +1669,14 @@ pango_attr_iterator_copy (PangoAttrIterator *iterator)
/**
* pango_attr_iterator_destroy:
* @iterator: a #PangoAttrIterator.
- *
+ *
* Destroy a #PangoAttrIterator and free all associated memory.
**/
void
pango_attr_iterator_destroy (PangoAttrIterator *iterator)
{
g_return_if_fail (iterator != NULL);
-
+
g_list_free (iterator->attribute_stack);
g_slice_free (PangoAttrIterator, iterator);
}
@@ -1685,12 +1685,12 @@ pango_attr_iterator_destroy (PangoAttrIterator *iterator)
* pango_attr_iterator_get:
* @iterator: a #PangoAttrIterator
* @type: the type of attribute to find.
- *
+ *
* Find the current attribute of a particular type at the iterator
* location. When multiple attributes of the same type overlap,
* the attribute whose range starts closest to the current location
* is used.
- *
+ *
* Return value: the current attribute of the given type, or %NULL
* if no attribute of that type applies to the current
* location.
@@ -1752,13 +1752,13 @@ pango_attr_iterator_get_font (PangoAttrIterator *iterator,
g_return_if_fail (iterator != NULL);
g_return_if_fail (desc != NULL);
-
+
if (language)
*language = NULL;
-
+
if (extra_attrs)
*extra_attrs = NULL;
-
+
tmp_list1 = iterator->attribute_stack;
while (tmp_list1)
{
@@ -1773,7 +1773,7 @@ pango_attr_iterator_get_font (PangoAttrIterator *iterator,
mask |= new_mask;
pango_font_description_unset_fields (desc, new_mask);
pango_font_description_merge_static (desc, ((PangoAttrFontDesc *)attr)->desc, FALSE);
-
+
break;
}
case PANGO_ATTR_FAMILY:
@@ -1846,7 +1846,7 @@ pango_attr_iterator_get_font (PangoAttrIterator *iterator,
if (extra_attrs)
{
gboolean found = FALSE;
-
+
tmp_list2 = *extra_attrs;
while (tmp_list2)
{
@@ -1877,11 +1877,11 @@ pango_attr_iterator_get_font (PangoAttrIterator *iterator,
* @func: callback function; returns %TRUE if an attribute
* should be filtered out.
* @data: Data to be passed to @func
- *
+ *
* Given a #PangoAttrList and callback function, removes any elements
* of @list for which @func returns %TRUE and inserts them into
* a new list.
- *
+ *
* Return value: the new #PangoAttrList or %NULL if
* no attributes of the given types were found.
*
@@ -1896,7 +1896,7 @@ pango_attr_list_filter (PangoAttrList *list,
PangoAttrList *new = NULL;
GSList *tmp_list;
GSList *prev;
-
+
g_return_val_if_fail (list != NULL, NULL);
tmp_list = list->attributes;
@@ -1910,14 +1910,14 @@ pango_attr_list_filter (PangoAttrList *list,
{
if (!tmp_list->next)
list->attributes_tail = prev;
-
+
if (prev)
prev->next = tmp_list->next;
else
list->attributes = tmp_list->next;
-
+
tmp_list->next = NULL;
-
+
if (!new)
{
new = pango_attr_list_new ();
@@ -1944,10 +1944,10 @@ pango_attr_list_filter (PangoAttrList *list,
/**
* pango_attr_iterator_get_attrs:
* @iterator: a #PangoAttrIterator
- *
+ *
* Gets a list of all attributes at the current position of the
* iterator.
- *
+ *
* Return value: a list of all attributes for the current range.
* To free this value, call pango_attribute_destroy() on
* each value and g_slist_free() on the list.
diff --git a/pango/pango-attributes.h b/pango/pango-attributes.h
index 3c07275e..85baf724 100644
--- a/pango/pango-attributes.h
+++ b/pango/pango-attributes.h
@@ -52,7 +52,7 @@ gchar *pango_color_to_string(const PangoColor *color);
typedef struct _PangoAttribute PangoAttribute;
typedef struct _PangoAttrClass PangoAttrClass;
-
+
typedef struct _PangoAttrString PangoAttrString;
typedef struct _PangoAttrLanguage PangoAttrLanguage;
typedef struct _PangoAttrInt PangoAttrInt;
@@ -164,7 +164,7 @@ struct _PangoAttrShape
PangoAttribute attr;
PangoRectangle ink_rect;
PangoRectangle logical_rect;
-
+
gpointer data;
PangoAttrDataCopyFunc copy_func;
GDestroyNotify destroy_func;
diff --git a/pango/pango-break.h b/pango/pango-break.h
index 0ef4b5f3..ce9bd850 100644
--- a/pango/pango-break.h
+++ b/pango/pango-break.h
@@ -37,19 +37,19 @@ struct _PangoLogAttr
guint is_mandatory_break : 1; /* Must break line in front of character */
guint is_char_break : 1; /* Can break here when doing char wrap */
-
+
guint is_white : 1; /* Whitespace character */
/* cursor can appear in front of character (i.e. this is a grapheme
* boundary, or the first character in the text)
*/
guint is_cursor_position : 1;
-
+
/* Note that in degenerate cases, you could have both start/end set on
* some text, most likely for sentences (e.g. no space after a period, so
* the next sentence starts right away)
*/
-
+
guint is_word_start : 1; /* first character in a word */
guint is_word_end : 1; /* is first non-word char after a word */
@@ -66,17 +66,17 @@ struct _PangoLogAttr
guint is_sentence_end : 1; /* first non-sentence char after a sentence */
/* if set, backspace deletes one character rather than
- * the entire grapheme cluster
+ * the entire grapheme cluster
*/
- guint backspace_deletes_character : 1;
+ guint backspace_deletes_character : 1;
};
/* Determine information about cluster/word/line breaks in a string
* of Unicode text.
*/
-void pango_break (const gchar *text,
- int length,
- PangoAnalysis *analysis,
+void pango_break (const gchar *text,
+ int length,
+ PangoAnalysis *analysis,
PangoLogAttr *attrs,
int attrs_len);
diff --git a/pango/pango-color-table.h b/pango/pango-color-table.h
index 0c6286c0..ce93d94e 100644
--- a/pango/pango-color-table.h
+++ b/pango/pango-color-table.h
@@ -2,7 +2,7 @@
*
* Date: Fri Mar 4 23:40:25 2005
*
- * Do not edit.
+ * Do not edit.
*/
static const char color_names[] =
"alice blue\0"
diff --git a/pango/pango-color.c b/pango/pango-color.c
index 13e38ff2..a2a88530 100644
--- a/pango/pango-color.c
+++ b/pango/pango-color.c
@@ -31,7 +31,7 @@ GType
pango_color_get_type (void)
{
static GType our_type = 0;
-
+
if (our_type == 0)
our_type = g_boxed_type_register_static (I_("PangoColor"),
(GBoxedCopyFunc) pango_color_copy,
@@ -43,12 +43,12 @@ pango_color_get_type (void)
/**
* pango_color_copy:
* @src: color to copy
- *
+ *
* Creates a copy of @src, which should be freed with
* pango_color_free(). Primarily used by language bindings,
* not that useful otherwise (since colors can just be copied
* by assignment in C).
- *
+ *
* Return value: the newly allocated #PangoColor, which should
* be freed with pango_color_free().
**/
@@ -58,7 +58,7 @@ pango_color_copy (const PangoColor *src)
PangoColor *ret;
g_return_val_if_fail (src != NULL, NULL);
-
+
ret = g_slice_new (PangoColor);
*ret = *src;
@@ -69,7 +69,7 @@ pango_color_copy (const PangoColor *src)
/**
* pango_color_free:
* @color: an allocated #PangoColor
- *
+ *
* Frees a color allocated by pango_color_copy().
**/
void
@@ -178,13 +178,13 @@ find_color(const char *name,
return TRUE;
}
-static gboolean
-hex (const char *spec,
- int len,
+static gboolean
+hex (const char *spec,
+ int len,
unsigned int *c)
{
const char *end;
- *c = 0;
+ *c = 0;
for (end = spec + len; spec != end; spec++)
if (g_ascii_isxdigit (*spec))
*c = (*c << 4) | g_ascii_xdigit_value (*spec);
@@ -197,7 +197,7 @@ hex (const char *spec,
* pango_color_parse:
* @color: a #PangoColor structure in which to store the result
* @spec: a string specifying the new color
- *
+ *
* Fill in the fields of a color from a string specification. The
* string can either one of a large set of standard names. (Taken
* from the X11 <filename>rgb.txt</filename> file), or it can be a hex value in the
@@ -224,10 +224,10 @@ pango_color_parse (PangoColor *color,
len = strlen (spec);
if (len % 3 || len < 3 || len > 12)
return FALSE;
-
+
len /= 3;
- if (!hex (spec, len, &r) ||
+ if (!hex (spec, len, &r) ||
!hex (spec + len, len, &g) ||
!hex (spec + len * 2, len, &b))
return FALSE;
@@ -243,7 +243,7 @@ pango_color_parse (PangoColor *color,
r |= (r >> bits);
g |= (g >> bits);
b |= (b >> bits);
- bits *= 2;
+ bits *= 2;
}
color->red = r;
color->green = g;
diff --git a/pango/pango-context.c b/pango/pango-context.c
index cbde4efd..f11ac213 100644
--- a/pango/pango-context.c
+++ b/pango/pango-context.c
@@ -50,7 +50,7 @@ struct _PangoContext
struct _PangoContextClass
{
GObjectClass parent_class;
-
+
};
static void pango_context_finalize (GObject *object);
@@ -63,7 +63,7 @@ pango_context_init (PangoContext *context)
context->base_dir = PANGO_DIRECTION_WEAK_LTR;
context->resolved_gravity = context->base_gravity = PANGO_GRAVITY_SOUTH;
context->gravity_hint = PANGO_GRAVITY_HINT_NATURAL;
-
+
context->language = NULL;
context->font_map = NULL;
@@ -80,7 +80,7 @@ static void
pango_context_class_init (PangoContextClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
+
object_class->finalize = pango_context_finalize;
}
@@ -97,14 +97,14 @@ pango_context_finalize (GObject *object)
pango_font_description_free (context->font_desc);
if (context->matrix)
pango_matrix_free (context->matrix);
-
+
G_OBJECT_CLASS (pango_context_parent_class)->finalize (object);
}
/**
* pango_context_new:
- *
+ *
* Creates a new #PangoContext initialized to default value.
*
* This function is only useful when implementing a new backend
@@ -116,9 +116,9 @@ pango_context_finalize (GObject *object)
* If you are using Pango as part of a higher-level system,
* that system may have it's own ways of create a #PangoContext.
* For instance, the GTK+ toolkit has, among others,
- * gdk_pango_context_get_for_screen(), and
+ * gdk_pango_context_get_for_screen(), and
* gtk_widget_get_pango_context().
- *
+ *
* Return value: the newly allocated #PangoContext, which should
* be freed with g_object_unref().
**/
@@ -128,7 +128,7 @@ pango_context_new (void)
PangoContext *context;
context = g_object_new (PANGO_TYPE_CONTEXT, NULL);
-
+
return context;
}
@@ -146,7 +146,7 @@ update_resolved_gravity (PangoContext *context)
* @context: a #PangoContext
* @matrix: a #PangoMatrix, or %NULL to unset any existing matrix.
* (No matrix set is the same as setting the identity matrix.)
- *
+ *
* 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
@@ -198,7 +198,7 @@ pango_context_get_matrix (PangoContext *context)
* pango_context_set_font_map:
* @context: a #PangoContext
* @font_map: the #PangoFontMap to set.
- *
+ *
* Sets the font map to be searched when fonts are looked-up in this context.
* This is only for internal use by Pango backends, a #PangoContext obtained
* via one of the recommended methods should already have a suitable font map.
@@ -222,9 +222,9 @@ pango_context_set_font_map (PangoContext *context,
/**
* pango_context_get_font_map:
* @context: a #PangoContext
- *
+ *
* Gets the #PangoFontmap used to look up fonts for this context.
- *
+ *
* Return value: the font map for the #PangoContext. This value
* is owned by Pango and should not be unreferenced.
*
@@ -244,7 +244,7 @@ pango_context_get_font_map (PangoContext *context)
* @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
- *
+ *
* List all families for a context.
**/
void
@@ -257,16 +257,16 @@ pango_context_list_families (PangoContext *context,
if (n_families == NULL)
return;
-
+
if (context->font_map == NULL)
{
*n_families = 0;
if (families)
*families = NULL;
-
+
return;
}
- else
+ else
pango_font_map_list_families (context->font_map, families, n_families);
}
@@ -274,7 +274,7 @@ pango_context_list_families (PangoContext *context,
* pango_context_load_font:
* @context: a #PangoContext
* @desc: a #PangoFontDescription describing the font to load
- *
+ *
* Loads the font in one of the fontmaps in the context
* that is the closest match for @desc.
*
@@ -286,7 +286,7 @@ pango_context_load_font (PangoContext *context,
{
g_return_val_if_fail (context != NULL, NULL);
g_return_val_if_fail (pango_font_description_get_family (desc) != NULL, NULL);
-
+
return pango_font_map_load_font (context->font_map, context, desc);
}
@@ -295,7 +295,7 @@ pango_context_load_font (PangoContext *context,
* @context: a #PangoContext
* @desc: a #PangoFontDescription describing the fonts to load
* @language: a #PangoLanguage the fonts will be used for
- *
+ *
* Load a set of fonts in the context that can be used to render
* a font matching @desc.
*
@@ -317,7 +317,7 @@ pango_context_load_fontset (PangoContext *context,
* pango_context_set_font_description:
* @context: a #PangoContext
* @desc: the new pango font description
- *
+ *
* Set the default font description for the context
**/
void
@@ -334,9 +334,9 @@ pango_context_set_font_description (PangoContext *context,
/**
* pango_context_get_font_description:
* @context: a #PangoContext
- *
+ *
* Retrieve the default font description for the context.
- *
+ *
* Return value: a pointer to the context's default font description.
* This value must not be modified or freed.
**/
@@ -344,7 +344,7 @@ PangoFontDescription *
pango_context_get_font_description (PangoContext *context)
{
g_return_val_if_fail (context != NULL, NULL);
-
+
return context->font_desc;
}
@@ -352,7 +352,7 @@ pango_context_get_font_description (PangoContext *context)
* pango_context_set_language:
* @context: a #PangoContext
* @language: the new language tag.
- *
+ *
* Sets the global language tag for the context. The default language
* for the locale of the running process can be found using
* pango_language_get_default().
@@ -369,9 +369,9 @@ pango_context_set_language (PangoContext *context,
/**
* pango_context_get_language:
* @context: a #PangoContext
- *
+ *
* Retrieves the global language tag for the context.
- *
+ *
* Return value: the global language tag.
**/
PangoLanguage *
@@ -386,7 +386,7 @@ pango_context_get_language (PangoContext *context)
* pango_context_set_base_dir:
* @context: a #PangoContext
* @direction: the new base direction
- *
+ *
* Sets the base direction for the context.
*
* The base direction is used in applying the Unicode bidirectional
@@ -394,7 +394,7 @@ pango_context_get_language (PangoContext *context)
* %PANGO_DIRECTION_RTL, then the value will be used as the paragraph
* direction in the Unicode bidirectional algorithm. A value of
* %PANGO_DIRECTION_WEAK_LTR or %PANGO_DIRECTION_WEAK_RTL is used only
- * for paragraphs that do not contain any strong characters themselves.
+ * for paragraphs that do not contain any strong characters themselves.
**/
void
pango_context_set_base_dir (PangoContext *context,
@@ -408,10 +408,10 @@ pango_context_set_base_dir (PangoContext *context,
/**
* pango_context_get_base_dir:
* @context: a #PangoContext
- *
+ *
* Retrieves the base direction for the context. See
* pango_context_set_base_dir().
- *
+ *
* Return value: the base direction for the context.
**/
PangoDirection
@@ -426,7 +426,7 @@ pango_context_get_base_dir (PangoContext *context)
* pango_context_set_base_gravity:
* @context: a #PangoContext
* @gravity: the new base gravity
- *
+ *
* Sets the base gravity for the context.
*
* The base gravity is used in laying vertical text out.
@@ -447,10 +447,10 @@ pango_context_set_base_gravity (PangoContext *context,
/**
* pango_context_get_base_gravity:
* @context: a #PangoContext
- *
+ *
* Retrieves the base gravity for the context. See
* pango_context_set_base_gravity().
- *
+ *
* Return value: the base gravity for the context.
*
* Since: 1.16
@@ -466,12 +466,12 @@ pango_context_get_base_gravity (PangoContext *context)
/**
* pango_context_get_gravity:
* @context: a #PangoContext
- *
+ *
* Retrieves the gravity for the context. This is similar to
* pango_context_get_base_gravity(), except for when the base gravity
* is %PANGO_GRAVITY_AUTO for which pango_gravity_get_for_matrix() is used
* to return the gravity from the current context matrix.
- *
+ *
* Return value: the resolved gravity for the context.
*
* Since: 1.16
@@ -488,7 +488,7 @@ pango_context_get_gravity (PangoContext *context)
* pango_context_set_gravity_hint:
* @context: a #PangoContext
* @hint: the new gravity hint
- *
+ *
* Sets the gravity hint for the context.
*
* The gravity hint is used in laying vertical text out, and is only relevant
@@ -509,10 +509,10 @@ pango_context_set_gravity_hint (PangoContext *context,
/**
* pango_context_get_gravity_hint:
* @context: a #PangoContext
- *
+ *
* Retrieves the gravity hint for the context. See
* pango_context_set_gravity_hint() for details.
- *
+ *
* Return value: the gravity hint for the context.
*
* Since: 1.16
@@ -532,7 +532,7 @@ advance_attr_iterator_to (PangoAttrIterator *iterator,
int start_index)
{
int start_range, end_range;
-
+
pango_attr_iterator_range (iterator, &start_range, &end_range);
while (start_index >= end_range)
@@ -581,11 +581,11 @@ static ShaperFontCache *
get_shaper_font_cache (PangoFontset *fontset)
{
ShaperFontCache *cache;
-
+
static GQuark cache_quark = 0;
if (!cache_quark)
cache_quark = g_quark_from_static_string ("pango-shaper-font-cache");
-
+
cache = g_object_get_qdata (G_OBJECT (fontset), cache_quark);
if (!cache)
{
@@ -607,7 +607,7 @@ shaper_font_cache_get (ShaperFontCache *cache,
PangoFont **font)
{
ShaperFontElement *element;
-
+
element = g_hash_table_lookup (cache->hash, GUINT_TO_POINTER (wc));
if (element)
{
@@ -629,7 +629,7 @@ shaper_font_cache_insert (ShaperFontCache *cache,
ShaperFontElement *element = g_slice_new (ShaperFontElement);
element->shape_engine = shape_engine;
element->font = font;
-
+
g_hash_table_insert (cache->hash, GUINT_TO_POINTER (wc), element);
}
@@ -650,7 +650,7 @@ struct _ItemizeState
PangoContext *context;
const char *text;
const char *end;
-
+
const char *run_start;
const char *run_end;
@@ -677,19 +677,19 @@ struct _ItemizeState
gboolean copy_extra_attrs;
ChangedFlags changed;
-
+
PangoScriptIter *script_iter;
const char *script_end;
PangoScript script;
PangoLanguage *derived_lang;
PangoEngineLang *lang_engine;
-
+
PangoFontset *current_fonts;
ShaperFontCache *cache;
PangoFont *base_font;
gboolean enable_fallback;
-
+
GSList *exact_engines;
GSList *fallback_engines;
};
@@ -704,7 +704,7 @@ update_embedding_end (ItemizeState *state)
state->embedding_end_offset++;
state->embedding_end = g_utf8_next_char (state->embedding_end);
}
-
+
state->changed |= EMBEDDING_CHANGED;
}
@@ -713,7 +713,7 @@ find_attribute (GSList *attr_list,
PangoAttrType type)
{
GSList *node;
-
+
for (node = attr_list; node; node = node->next)
if (((PangoAttribute *) node->data)->klass->type == type)
return (PangoAttribute *) node->data;
@@ -727,7 +727,7 @@ update_attr_iterator (ItemizeState *state)
PangoLanguage *old_lang;
PangoAttribute *attr;
int end_index;
-
+
pango_attr_iterator_range (state->attr_iter, NULL, &end_index);
if (end_index < state->end - state->text)
state->attr_end = state->text + end_index;
@@ -749,7 +749,7 @@ update_attr_iterator (ItemizeState *state)
if (!state->lang)
state->lang = state->context->language;
-
+
attr = find_attribute (state->extra_attrs, PANGO_ATTR_FALLBACK);
state->enable_fallback = (attr == NULL || ((PangoAttrInt *)attr)->value);
@@ -776,7 +776,7 @@ update_end (ItemizeState *state)
static void
itemize_state_init (ItemizeState *state,
- PangoContext *context,
+ PangoContext *context,
const char *text,
PangoDirection base_dir,
int start_index,
@@ -794,12 +794,12 @@ itemize_state_init (ItemizeState *state,
state->item = NULL;
state->run_start = text + start_index;
-
+
/* First, apply the bidirectional algorithm to break
* the text into directional runs.
*/
state->embedding_levels = pango_log2vis_get_embedding_levels (text + start_index, length, &base_dir);
-
+
state->embedding_end_offset = 0;
state->embedding_end = text + start_index;
update_embedding_end (state);
@@ -836,7 +836,7 @@ itemize_state_init (ItemizeState *state,
state->lang = state->context->language;
state->extra_attrs = NULL;
state->copy_extra_attrs = FALSE;
-
+
state->attr_end = state->end;
state->enable_fallback = TRUE;
}
@@ -865,7 +865,7 @@ itemize_state_init (ItemizeState *state,
state->exact_engines = NULL;
state->fallback_engines = NULL;
state->base_font = NULL;
-
+
state->changed = EMBEDDING_CHANGED | SCRIPT_CHANGED | LANG_CHANGED | FONT_CHANGED;
}
@@ -908,7 +908,7 @@ copy_attr_slist (GSList *attr_slist)
{
GSList *new_list = NULL;
GSList *l;
-
+
for (l = attr_slist; l; l = l->next)
new_list = g_slist_prepend (new_list, pango_attribute_copy (l->data));
@@ -921,7 +921,7 @@ itemize_state_fill_shaper (ItemizeState *state,
PangoFont *font)
{
GList *l;
-
+
for (l = state->result; l; l = l->next)
{
PangoItem *item = l->data;
@@ -976,7 +976,7 @@ itemize_state_add_character (ItemizeState *state,
if (font)
g_object_ref (font);
state->item->analysis.font = font;
-
+
state->item->analysis.level = state->embedding;
state->item->analysis.gravity = state->resolved_gravity;
@@ -1014,7 +1014,7 @@ itemize_state_add_character (ItemizeState *state,
state->item->analysis.flags = state->centered_baseline ? PANGO_ANALYSIS_FLAG_CENTERED_BASELINE : 0;
state->item->analysis.language = state->derived_lang;
-
+
if (state->copy_extra_attrs)
{
state->item->analysis.extra_attrs = copy_attr_slist (state->extra_attrs);
@@ -1124,7 +1124,7 @@ get_shaper_and_font (ItemizeState *state,
info.engines = state->exact_engines;
if (state->enable_fallback)
pango_fontset_foreach (state->current_fonts, get_shaper_and_font_foreach, &info);
- else
+ else
get_shaper_and_font_foreach (NULL, get_base_font (state), &info);
if (info.shape_engine)
@@ -1142,7 +1142,7 @@ get_shaper_and_font (ItemizeState *state,
info.engines = state->fallback_engines;
if (state->enable_fallback)
pango_fontset_foreach (state->current_fonts, get_shaper_and_font_foreach, &info);
- else
+ else
get_shaper_and_font_foreach (NULL, get_base_font (state), &info);
*shape_engine = info.shape_engine;
@@ -1151,7 +1151,7 @@ get_shaper_and_font (ItemizeState *state,
/* skip caching if fallback disabled (see above) */
if (state->enable_fallback)
shaper_font_cache_insert (state->cache, wc, *shape_engine, *font);
-
+
return *shape_engine != NULL;
}
@@ -1169,7 +1169,7 @@ compute_derived_language (PangoLanguage *lang,
PangoScript script)
{
PangoLanguage *derived_lang;
-
+
/* Make sure the language tag is consistent with the derived
* script. There is no point in marking up a section of
* Arabic text with the "en" language tag.
@@ -1198,13 +1198,13 @@ get_lang_map (PangoLanguage *lang)
{
static guint engine_type_id = 0;
static guint render_type_id = 0;
-
+
if (engine_type_id == 0)
{
engine_type_id = g_quark_from_static_string (PANGO_ENGINE_TYPE_LANG);
render_type_id = g_quark_from_static_string (PANGO_RENDER_TYPE_NONE);
}
-
+
return pango_find_map (lang, engine_type_id, render_type_id);
}
@@ -1250,7 +1250,7 @@ itemize_state_update_for_new_run (ItemizeState *state)
if (old_derived_lang != state->derived_lang)
state->changed |= DERIVED_LANG_CHANGED;
}
-
+
if ((state->changed & DERIVED_LANG_CHANGED) || !state->lang_engine)
{
PangoMap *lang_map = get_lang_map (state->derived_lang);
@@ -1259,7 +1259,7 @@ itemize_state_update_for_new_run (ItemizeState *state)
if (state->changed & (SCRIPT_CHANGED | DERIVED_LANG_CHANGED))
itemize_state_reset_shape_engines (state);
-
+
if (state->changed & (FONT_CHANGED | DERIVED_LANG_CHANGED) &&
state->current_fonts)
{
@@ -1339,12 +1339,12 @@ itemize_state_process_run (ItemizeState *state)
{
get_shaper_and_font (state, wc, &shape_engine, &font);
}
-
+
itemize_state_add_character (state,
shape_engine, font,
is_forced_break || last_was_forced_break,
p);
-
+
last_was_forced_break = is_forced_break;
}
@@ -1354,7 +1354,7 @@ itemize_state_process_run (ItemizeState *state)
{
PangoEngineShape *shape_engine;
PangoFont *font;
-
+
if (!get_shaper_and_font (state, ' ', &shape_engine, &font))
{
shape_engine = _pango_get_fallback_shaper ();
@@ -1404,7 +1404,7 @@ itemize_state_finish (ItemizeState *state)
* Since: 1.4
*/
GList *
-pango_itemize_with_base_dir (PangoContext *context,
+pango_itemize_with_base_dir (PangoContext *context,
PangoDirection base_dir,
const char *text,
int start_index,
@@ -1424,18 +1424,18 @@ pango_itemize_with_base_dir (PangoContext *context,
itemize_state_init (&state, context, text, base_dir, start_index, length,
attrs, cached_iter, NULL);
-
- do
+
+ do
itemize_state_process_run (&state);
while (itemize_state_next (&state));
itemize_state_finish (&state);
-
+
return g_list_reverse (state.result);
}
static GList *
-itemize_with_font (PangoContext *context,
+itemize_with_font (PangoContext *context,
const char *text,
int start_index,
int length,
@@ -1449,12 +1449,12 @@ itemize_with_font (PangoContext *context,
itemize_state_init (&state, context, text, context->base_dir, start_index, length,
NULL, NULL, desc);
- do
+ do
itemize_state_process_run (&state);
while (itemize_state_next (&state));
itemize_state_finish (&state);
-
+
return g_list_reverse (state.result);
}
@@ -1484,7 +1484,7 @@ itemize_with_font (PangoContext *context,
* Return value: a #GList of #PangoItem structures.
*/
GList *
-pango_itemize (PangoContext *context,
+pango_itemize (PangoContext *context,
const char *text,
int start_index,
int length,
@@ -1538,7 +1538,7 @@ static void
update_metrics_from_items (PangoFontMetrics *metrics,
PangoLanguage *language,
GList *items)
-
+
{
GHashTable *fonts_seen = g_hash_table_new (NULL, NULL);
int count = 0;
@@ -1557,14 +1557,14 @@ update_metrics_from_items (PangoFontMetrics *metrics,
/* metrics will already be initialized from the first font in the fontset */
metrics->ascent = MAX (metrics->ascent, raw_metrics->ascent);
metrics->descent = MAX (metrics->descent, raw_metrics->descent);
-
+
if (count == 0)
{
metrics->approximate_char_width = raw_metrics->approximate_char_width;
metrics->approximate_digit_width = raw_metrics->approximate_digit_width;
}
else
- {
+ {
metrics->approximate_char_width += raw_metrics->approximate_char_width;
metrics->approximate_digit_width += raw_metrics->approximate_digit_width;
}
@@ -1572,9 +1572,9 @@ update_metrics_from_items (PangoFontMetrics *metrics,
pango_font_metrics_unref (raw_metrics);
}
}
-
+
g_hash_table_destroy (fonts_seen);
-
+
if (count)
{
metrics->approximate_char_width /= count;
@@ -1592,7 +1592,7 @@ update_metrics_from_items (PangoFontMetrics *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.
- *
+ *
* Get overall metric information for a particular font
* description. Since the metrics may be substantially different for
* different scripts, a language tag can be provided to indicate that
@@ -1618,7 +1618,7 @@ pango_context_get_metrics (PangoContext *context,
PangoFontMetrics *metrics;
const char *sample_str;
GList *items;
-
+
g_return_val_if_fail (PANGO_IS_CONTEXT (context), NULL);
g_return_val_if_fail (desc != NULL, NULL);
@@ -1627,15 +1627,15 @@ pango_context_get_metrics (PangoContext *context,
current_fonts = pango_font_map_load_fontset (context->font_map, context, desc, language);
metrics = get_base_metrics (current_fonts);
-
+
sample_str = pango_language_get_sample_string (language);
items = itemize_with_font (context, sample_str, 0, strlen (sample_str), desc);
- update_metrics_from_items (metrics, language, items);
+ update_metrics_from_items (metrics, language, items);
g_list_foreach (items, (GFunc)pango_item_free, NULL);
g_list_free (items);
-
+
g_object_unref (current_fonts);
return metrics;
diff --git a/pango/pango-coverage.c b/pango/pango-coverage.c
index 83900c96..889de9c8 100644
--- a/pango/pango-coverage.c
+++ b/pango/pango-coverage.c
@@ -34,7 +34,7 @@ typedef struct _PangoBlockInfo PangoBlockInfo;
struct _PangoBlockInfo
{
- guchar *data;
+ guchar *data;
PangoCoverageLevel level; /* Used if data == NULL */
};
@@ -43,15 +43,15 @@ struct _PangoCoverage
guint ref_count;
int n_blocks;
int data_size;
-
+
PangoBlockInfo *blocks;
};
/**
* pango_coverage_new:
- *
+ *
* Create a new #PangoCoverage
- *
+ *
* Return value: the newly allocated #PangoCoverage,
* initialized to %PANGO_COVERAGE_NONE
* with a reference count of one, which
@@ -65,17 +65,17 @@ pango_coverage_new (void)
coverage->n_blocks = N_BLOCKS_INCREMENT;
coverage->blocks = g_new0 (PangoBlockInfo, coverage->n_blocks);
coverage->ref_count = 1;
-
+
return coverage;
}
/**
* pango_coverage_copy:
* @coverage: a #PangoCoverage
- *
- * Copy an existing #PangoCoverage. (This function may now be unnecessary
+ *
+ * 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
* should be freed with pango_coverage_unref().
@@ -102,17 +102,17 @@ pango_coverage_copy (PangoCoverage *coverage)
}
else
result->blocks[i].data = NULL;
-
+
result->blocks[i].level = coverage->blocks[i].level;
}
-
+
return result;
}
/**
* pango_coverage_ref:
* @coverage: a #PangoCoverage
- *
+ *
* Increase the reference count on the #PangoCoverage by one
*
* Return value: @coverage
@@ -130,7 +130,7 @@ pango_coverage_ref (PangoCoverage *coverage)
/**
* pango_coverage_unref:
* @coverage: a #PangoCoverage
- *
+ *
* Increase the reference count on the #PangoCoverage by one.
* if the result is zero, free the coverage and all associated memory.
**/
@@ -138,7 +138,7 @@ void
pango_coverage_unref (PangoCoverage *coverage)
{
int i;
-
+
g_return_if_fail (coverage != NULL);
g_return_if_fail (coverage->ref_count > 0);
@@ -148,7 +148,7 @@ pango_coverage_unref (PangoCoverage *coverage)
{
for (i=0; i<coverage->n_blocks; i++)
g_free (coverage->blocks[i].data);
-
+
g_free (coverage->blocks);
g_slice_free (PangoCoverage, coverage);
}
@@ -158,9 +158,9 @@ pango_coverage_unref (PangoCoverage *coverage)
* pango_coverage_get:
* @coverage: a #PangoCoverage
* @index_: the index to check
- *
+ *
* Determine whether a particular index is covered by @coverage
- *
+ *
* Return value: the coverage level of @coverage for character @index_.
**/
PangoCoverageLevel
@@ -168,7 +168,7 @@ pango_coverage_get (PangoCoverage *coverage,
int index)
{
int block_index;
-
+
g_return_val_if_fail (coverage != NULL, PANGO_COVERAGE_NONE);
g_return_val_if_fail (index >= 0, PANGO_COVERAGE_NONE);
@@ -196,7 +196,7 @@ pango_coverage_get (PangoCoverage *coverage,
* @coverage: a #PangoCoverage
* @index_: the index to modify
* @level: the new level for @index_
- *
+ *
* Modify a particular index within @coverage
**/
void
@@ -206,7 +206,7 @@ pango_coverage_set (PangoCoverage *coverage,
{
int block_index, i;
guchar *data;
-
+
g_return_if_fail (coverage != NULL);
g_return_if_fail (index >= 0);
g_return_if_fail (level >= 0 && level <= 3);
@@ -219,7 +219,7 @@ pango_coverage_set (PangoCoverage *coverage,
coverage->n_blocks =
N_BLOCKS_INCREMENT * ((block_index + N_BLOCKS_INCREMENT) / N_BLOCKS_INCREMENT);
-
+
coverage->blocks = g_renew (PangoBlockInfo, coverage->blocks, coverage->n_blocks);
memset (coverage->blocks + old_n_blocks, 0,
sizeof (PangoBlockInfo) * (coverage->n_blocks - old_n_blocks));
@@ -229,10 +229,10 @@ pango_coverage_set (PangoCoverage *coverage,
if (!data)
{
guchar byte;
-
+
if (level == coverage->blocks[block_index].level)
return;
-
+
data = g_new (guchar, 64);
coverage->blocks[block_index].data = data;
@@ -240,7 +240,7 @@ pango_coverage_set (PangoCoverage *coverage,
(coverage->blocks[block_index].level << 2) |
(coverage->blocks[block_index].level << 4) |
(coverage->blocks[block_index].level << 6);
-
+
memset (data, byte, 64);
}
@@ -252,7 +252,7 @@ pango_coverage_set (PangoCoverage *coverage,
* pango_coverage_max:
* @coverage: a #PangoCoverage
* @other: another #PangoCoverage
- *
+ *
* Set the coverage for each index in @coverage to be the max (better)
* value of the current coverage for the index and the coverage for
* the corresponding index in @other.
@@ -263,16 +263,16 @@ pango_coverage_max (PangoCoverage *coverage,
{
int block_index, i;
int old_blocks;
-
+
g_return_if_fail (coverage != NULL);
-
+
old_blocks = MIN (coverage->n_blocks, other->n_blocks);
if (other->n_blocks > coverage->n_blocks)
{
coverage->n_blocks = other->n_blocks;
coverage->blocks = g_renew (PangoBlockInfo, coverage->blocks, coverage->n_blocks);
-
+
for (block_index = old_blocks; block_index < coverage->n_blocks; block_index++)
{
if (other->blocks[block_index].data)
@@ -282,11 +282,11 @@ pango_coverage_max (PangoCoverage *coverage,
}
else
coverage->blocks[block_index].data = NULL;
-
+
coverage->blocks[block_index].level = other->blocks[block_index].level;
}
}
-
+
for (block_index = 0; block_index < old_blocks; block_index++)
{
if (!coverage->blocks[block_index].data && !other->blocks[block_index].data)
@@ -296,7 +296,7 @@ pango_coverage_max (PangoCoverage *coverage,
else if (coverage->blocks[block_index].data && other->blocks[block_index].data)
{
guchar *data = coverage->blocks[block_index].data;
-
+
for (i=0; i<64; i++)
{
int byte1 = data[i];
@@ -327,9 +327,9 @@ pango_coverage_max (PangoCoverage *coverage,
coverage->blocks[block_index].data = dest;
level = coverage->blocks[block_index].level;
}
-
+
byte2 = level | (level << 2) | (level << 4) | (level << 6);
-
+
for (i=0; i<64; i++)
{
int byte1 = src[i];
@@ -352,7 +352,7 @@ pango_coverage_max (PangoCoverage *coverage,
* @coverage: a #PangoCoverage
* @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
**/
void
@@ -364,7 +364,7 @@ pango_coverage_to_bytes (PangoCoverage *coverage,
int size = 8 + 4 * coverage->n_blocks;
guchar *data;
int offset;
-
+
for (i=0; i<coverage->n_blocks; i++)
{
if (coverage->blocks[i].data)
@@ -376,7 +376,7 @@ pango_coverage_to_bytes (PangoCoverage *coverage,
*(guint32 *)&data[0] = g_htonl (PANGO_COVERAGE_MAGIC); /* Magic */
*(guint32 *)&data[4] = g_htonl (coverage->n_blocks);
offset = 8;
-
+
for (i=0; i<coverage->n_blocks; i++)
{
guint32 header_val;
@@ -389,7 +389,7 @@ pango_coverage_to_bytes (PangoCoverage *coverage,
{
guchar *data = coverage->blocks[i].data;
guchar first_val = data[0];
-
+
for (j = 1 ; j < 64; j++)
if (data[j] != first_val)
break;
@@ -436,10 +436,10 @@ pango_coverage_get_uint32 (guchar **ptr)
* pango_coverage_from_bytes:
* @bytes: binary data representing a #PangoCoverage
* @n_bytes: the size of @bytes in bytes
- *
+ *
* Convert data generated from pango_converage_to_bytes() back
* to a #PangoCoverage
- *
+ *
* Return value: a newly allocated #PangoCoverage, or %NULL if
* the data was invalid.
**/
@@ -452,20 +452,20 @@ pango_coverage_from_bytes (guchar *bytes,
int i;
coverage->ref_count = 1;
-
+
if (n_bytes < 8)
goto error;
if (pango_coverage_get_uint32 (&ptr) != PANGO_COVERAGE_MAGIC)
goto error;
-
+
coverage->n_blocks = pango_coverage_get_uint32 (&ptr);
coverage->blocks = g_new0 (PangoBlockInfo, coverage->n_blocks);
for (i = 0; i < coverage->n_blocks; i++)
{
guint val;
-
+
if (ptr + 4 > bytes + n_bytes)
goto error;
@@ -474,7 +474,7 @@ pango_coverage_from_bytes (guchar *bytes,
{
if (ptr + 64 > bytes + n_bytes)
goto error;
-
+
coverage->blocks[i].data = g_new (guchar, 64);
memcpy (coverage->blocks[i].data, ptr, 64);
ptr += 64;
@@ -482,7 +482,7 @@ pango_coverage_from_bytes (guchar *bytes,
else
coverage->blocks[i].level = val;
}
-
+
return coverage;
error:
@@ -490,5 +490,5 @@ pango_coverage_from_bytes (guchar *bytes,
pango_coverage_unref (coverage);
return NULL;
}
-
+
diff --git a/pango/pango-engine.c b/pango/pango-engine.c
index 50699857..20dbacda 100644
--- a/pango/pango-engine.c
+++ b/pango/pango-engine.c
@@ -39,7 +39,7 @@ pango_engine_shape_real_covers (PangoEngineShape *engine,
PangoLanguage *language,
gunichar wc)
{
-
+
PangoCoverage *coverage = pango_font_get_coverage (font, language);
PangoCoverageLevel result = pango_coverage_get (coverage, wc);
@@ -94,7 +94,7 @@ _pango_engine_shape_covers (PangoEngineShape *engine,
typedef PangoEngineShape PangoFallbackEngine;
typedef PangoEngineShapeClass PangoFallbackEngineClass;
-static void
+static void
fallback_engine_shape (PangoEngineShape *engine,
PangoFont *font,
const char *text,
@@ -105,25 +105,25 @@ fallback_engine_shape (PangoEngineShape *engine,
int n_chars;
int i;
const char *p;
-
+
n_chars = text ? g_utf8_strlen (text, length) : 0;
pango_glyph_string_set_size (glyphs, n_chars);
-
+
p = text;
for (i = 0; i < n_chars; i++)
{
PangoRectangle logical_rect;
PangoGlyph glyph = g_utf8_get_char (p) | PANGO_GLYPH_UNKNOWN_FLAG;
-
+
pango_font_get_glyph_extents (analysis->font, glyph, NULL, &logical_rect);
glyphs->glyphs[i].glyph = glyph;
-
+
glyphs->glyphs[i].geometry.x_offset = 0;
glyphs->glyphs[i].geometry.y_offset = 0;
glyphs->glyphs[i].geometry.width = logical_rect.width;
-
+
glyphs->log_clusters[i] = p - text;
p = g_utf8_next_char (p);
diff --git a/pango/pango-engine.h b/pango/pango-engine.h
index 2257a273..057a9652 100644
--- a/pango/pango-engine.h
+++ b/pango/pango-engine.h
@@ -113,7 +113,7 @@ struct _PangoEngineLangClass
{
/*< private >*/
PangoEngineClass parent_class;
-
+
/*< public >*/
void (*script_break) (PangoEngineLang *engine,
const char *text,
@@ -182,7 +182,7 @@ struct _PangoEngineShapeClass
{
/*< private >*/
PangoEngineClass parent_class;
-
+
/*< public >*/
void (*script_shape) (PangoEngineShape *engine,
PangoFont *font,
@@ -201,7 +201,7 @@ GType pango_engine_shape_get_type (void) G_GNUC_CONST;
typedef struct _PangoEngineInfo PangoEngineInfo;
typedef struct _PangoEngineScriptInfo PangoEngineScriptInfo;
-struct _PangoEngineScriptInfo
+struct _PangoEngineScriptInfo
{
PangoScript script;
const gchar *langs;
@@ -220,7 +220,7 @@ struct _PangoEngineInfo
* script_engine_list:
* @engines: location to store a pointer to an array of engines.
* @n_engines: location to store the number of elements in @engines.
- *
+ *
* Function to be provided by a module to list the engines that the
* module supplies. The function stores a pointer to an array
* of #PangoEngineInfo structures and the length of that array in
@@ -236,7 +236,7 @@ void script_engine_list (PangoEngineInfo **engines,
* script_engine_init:
* @module: a #GTypeModule structure used to associate any
* GObject types created in this module with the module.
- *
+ *
* Function to be provided by a module to register any
* GObject types in the module.
**/
@@ -245,7 +245,7 @@ void script_engine_init (GTypeModule *module);
/**
* script_engine_exit:
- *
+ *
* Function to be provided by the module that is called
* when the module is unloading. Frequently does nothing.
**/
@@ -254,10 +254,10 @@ void script_engine_exit (void);
/**
* script_engine_create:
* @id: the ID of an engine as reported by script_engine_list.
- *
+ *
* Function to be provided by the module to create an instance
* of one of the engines implemented by the module.
- *
+ *
* Return value: a newly created #PangoEngine of the specified
* type, or %NULL if an error occurred. (In normal operation,
* a module should not return %NULL. A %NULL return is only
diff --git a/pango/pango-font.h b/pango/pango-font.h
index c03f553b..e9b571b7 100644
--- a/pango/pango-font.h
+++ b/pango/pango-font.h
@@ -179,7 +179,7 @@ PangoFontMetrics *pango_font_metrics_new (void);
struct _PangoFontMetrics
{
guint ref_count;
-
+
int ascent;
int descent;
int approximate_char_width;
@@ -229,7 +229,7 @@ struct _PangoFontFamilyClass
GObjectClass parent_class;
/*< public >*/
-
+
void (*list_faces) (PangoFontFamily *family,
PangoFontFace ***faces,
int *n_faces);
@@ -258,8 +258,8 @@ GType pango_font_face_get_type (void) G_GNUC_CONST;
PangoFontDescription *pango_font_face_describe (PangoFontFace *face);
G_CONST_RETURN char *pango_font_face_get_face_name (PangoFontFace *face);
-void pango_font_face_list_sizes (PangoFontFace *face,
- int **sizes,
+void pango_font_face_list_sizes (PangoFontFace *face,
+ int **sizes,
int *n_sizes);
#ifdef PANGO_ENABLE_BACKEND
@@ -280,11 +280,11 @@ struct _PangoFontFaceClass
GObjectClass parent_class;
/*< public >*/
-
+
const char * (*get_face_name) (PangoFontFace *face);
PangoFontDescription * (*describe) (PangoFontFace *face);
- void (*list_sizes) (PangoFontFace *face,
- int **sizes,
+ void (*list_sizes) (PangoFontFace *face,
+ int **sizes,
int *n_sizes);
/*< private >*/
@@ -340,7 +340,7 @@ struct _PangoFontClass
GObjectClass parent_class;
/*< public >*/
-
+
PangoFontDescription *(*describe) (PangoFont *font);
PangoCoverage * (*get_coverage) (PangoFont *font,
PangoLanguage *lang);
diff --git a/pango/pango-fontmap.c b/pango/pango-fontmap.c
index b0498d30..c181eb63 100644
--- a/pango/pango-fontmap.c
+++ b/pango/pango-fontmap.c
@@ -48,7 +48,7 @@ pango_font_map_init (PangoFontMap *fontmap)
* @fontmap: a #PangoFontMap
* @context: the #PangoContext the font will be used with
* @desc: a #PangoFontDescription describing the font to load
- *
+ *
* Load the font in the fontmap that is the closest match for @desc.
*
* Returns the font loaded, or %NULL if no font matched.
@@ -70,8 +70,8 @@ pango_font_map_load_font (PangoFontMap *fontmap,
* @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 @families
- *
- * List all families for a fontmap.
+ *
+ * List all families for a fontmap.
**/
void
pango_font_map_list_families (PangoFontMap *fontmap,
@@ -89,7 +89,7 @@ pango_font_map_list_families (PangoFontMap *fontmap,
* @context: the #PangoContext the font will be used with
* @desc: a #PangoFontDescription describing the font to load
* @language: a #PangoLanguage the fonts will be used for
- *
+ *
* Load a set of fonts in the fontmap that can be used to render
* a font matching @desc.
*
@@ -103,7 +103,7 @@ pango_font_map_load_fontset (PangoFontMap *fontmap,
{
g_return_val_if_fail (fontmap != NULL, NULL);
g_return_val_if_fail (pango_font_description_get_family (desc) != NULL, NULL);
-
+
return PANGO_FONT_MAP_GET_CLASS (fontmap)->load_fontset (fontmap, context, desc, language);
}
@@ -122,7 +122,7 @@ pango_font_map_fontset_add_fonts (PangoFontMap *fontmap,
pango_lookup_aliases (family,
&aliases,
&n_aliases);
-
+
if (n_aliases)
{
for (j = 0; j < n_aliases; j++)
@@ -157,14 +157,14 @@ pango_font_map_real_load_fontset (PangoFontMap *fontmap,
families = g_strsplit (pango_font_description_get_family (desc), ",", -1);
fonts = pango_fontset_simple_new (language);
-
+
for (i = 0; families[i]; i++)
pango_font_map_fontset_add_fonts (fontmap,
context,
fonts,
tmp_desc,
families[i]);
-
+
g_strfreev (families);
/* The font description was completely unloadable, try with
@@ -173,10 +173,10 @@ pango_font_map_real_load_fontset (PangoFontMap *fontmap,
if (pango_fontset_simple_size (fonts) == 0)
{
char *ctmp1, *ctmp2;
-
+
pango_font_description_set_family_static (tmp_desc,
pango_font_description_get_family (desc));
-
+
ctmp1 = pango_font_description_to_string (desc);
pango_font_description_set_family_static (tmp_desc, "Sans");
@@ -193,20 +193,20 @@ pango_font_map_real_load_fontset (PangoFontMap *fontmap,
g_free (ctmp2);
}
g_free (ctmp1);
-
+
pango_font_map_fontset_add_fonts (fontmap,
context,
fonts,
tmp_desc,
"Sans");
}
-
+
/* We couldn't try with Sans and the specified style. Try Sans Normal
*/
if (pango_fontset_simple_size (fonts) == 0)
{
char *ctmp1, *ctmp2;
-
+
pango_font_description_set_family_static (tmp_desc, "Sans");
ctmp1 = pango_font_description_to_string (tmp_desc);
pango_font_description_set_style (tmp_desc, PANGO_STYLE_NORMAL);
@@ -219,14 +219,14 @@ pango_font_map_real_load_fontset (PangoFontMap *fontmap,
g_hash_table_insert (warned_fonts, g_strdup (ctmp1), GINT_TO_POINTER (1));
ctmp2 = pango_font_description_to_string (tmp_desc);
-
+
g_warning ("couldn't load font \"%s\", falling back to \"%s\", "
"expect ugly output.", ctmp1, ctmp2);
g_free (ctmp2);
}
g_free (ctmp1);
-
+
pango_font_map_fontset_add_fonts (fontmap,
context,
fonts,
@@ -248,11 +248,11 @@ pango_font_map_real_load_fontset (PangoFontMap *fontmap,
/**
* pango_font_map_get_shape_engine_type:
* @fontmap: a #PangoFontMap
- *
+ *
* Returns the render ID for shape engines for this fontmap.
* See the <structfield>render_type</structfield> field of
* #PangoEngineInfo.
- *
+ *
* Return value: the ID string for shape engines for
* this fontmap. Owned by Pango, should not be modified
* or freed.
@@ -263,7 +263,7 @@ G_CONST_RETURN char *
pango_font_map_get_shape_engine_type (PangoFontMap *fontmap)
{
g_return_val_if_fail (PANGO_IS_FONT_MAP (fontmap), NULL);
-
+
return PANGO_FONT_MAP_GET_CLASS (fontmap)->shape_engine_type;
}
diff --git a/pango/pango-fontmap.h b/pango/pango-fontmap.h
index 3823f94c..204178fc 100644
--- a/pango/pango-fontmap.h
+++ b/pango/pango-fontmap.h
@@ -63,7 +63,7 @@ struct _PangoFontMapClass
GObjectClass parent_class;
/*< public >*/
-
+
PangoFont * (*load_font) (PangoFontMap *fontmap,
PangoContext *context,
const PangoFontDescription *desc);
@@ -74,7 +74,7 @@ struct _PangoFontMapClass
PangoContext *context,
const PangoFontDescription *desc,
PangoLanguage *language);
-
+
const char *shape_engine_type;
/*< private >*/
diff --git a/pango/pango-fontset.c b/pango/pango-fontset.c
index 29dedb31..109d5985 100644
--- a/pango/pango-fontset.c
+++ b/pango/pango-fontset.c
@@ -56,7 +56,7 @@ PangoFont *
pango_fontset_get_font (PangoFontset *fontset,
guint wc)
{
-
+
g_return_val_if_fail (PANGO_IS_FONTSET (fontset), NULL);
return PANGO_FONTSET_GET_CLASS (fontset)->get_font (fontset, wc);
@@ -65,7 +65,7 @@ pango_fontset_get_font (PangoFontset *fontset,
/**
* pango_fontset_get_metrics:
* @fontset: a #PangoFontset
- *
+ *
* Get overall metric information for the fonts in the fontset.
*
* Return value: a #PangoFontMetrics object. The caller must call pango_font_metrics_unref()
@@ -84,7 +84,7 @@ pango_fontset_get_metrics (PangoFontset *fontset)
* @fontset: a #PangoFontset
* @func: Callback function
* @data: data to pass to the callback function
- *
+ *
* Iterates through all the fonts in a fontset, calling @func for
* each one. If @func returns %TRUE, that stops the iteration.
*
@@ -156,7 +156,7 @@ pango_fontset_real_get_metrics (PangoFontset *fontset)
{
raw_metrics = pango_font_get_metrics (font, language);
g_hash_table_insert (fonts_seen, font, font);
-
+
if (count == 0)
{
metrics->ascent = raw_metrics->ascent;
@@ -165,7 +165,7 @@ pango_fontset_real_get_metrics (PangoFontset *fontset)
metrics->approximate_digit_width = raw_metrics->approximate_digit_width;
}
else
- {
+ {
metrics->ascent = MAX (metrics->ascent, raw_metrics->ascent);
metrics->descent = MAX (metrics->descent, raw_metrics->descent);
metrics->approximate_char_width += raw_metrics->approximate_char_width;
@@ -177,12 +177,12 @@ pango_fontset_real_get_metrics (PangoFontset *fontset)
else
g_object_unref (font);
}
-
+
p = g_utf8_next_char (p);
}
g_hash_table_destroy (fonts_seen);
-
+
if (count)
{
metrics->approximate_char_width /= count;
@@ -230,7 +230,7 @@ static PangoFontsetClass *simple_parent_class; /* Parent class structure for Pan
/**
* pango_fontset_simple_new:
* @language: a #PangoLanguage tag
- *
+ *
* Creates a new #PangoFontsetSimple for the given language.
*
* Return value: the newly allocated #PangoFontsetSimple, which should
@@ -240,10 +240,10 @@ PangoFontsetSimple *
pango_fontset_simple_new (PangoLanguage *language)
{
PangoFontsetSimple *fontset;
-
+
fontset = g_object_new (PANGO_TYPE_FONTSET_SIMPLE, NULL);
fontset->language = language;
-
+
return fontset;
}
@@ -254,7 +254,7 @@ pango_fontset_simple_class_init (PangoFontsetSimpleClass *class)
PangoFontsetClass *fontset_class = PANGO_FONTSET_CLASS (class);
simple_parent_class = g_type_class_peek_parent (class);
-
+
object_class->finalize = pango_fontset_simple_finalize;
fontset_class->get_font = pango_fontset_simple_get_font;
fontset_class->get_metrics = pango_fontset_simple_get_metrics;
@@ -262,7 +262,7 @@ pango_fontset_simple_class_init (PangoFontsetSimpleClass *class)
fontset_class->foreach = pango_fontset_simple_foreach;
}
-static void
+static void
pango_fontset_simple_init (PangoFontsetSimple *fontset)
{
fontset->fonts = g_ptr_array_new ();
@@ -292,7 +292,7 @@ pango_fontset_simple_finalize (GObject *object)
if (coverage)
pango_coverage_unref (coverage);
}
-
+
g_ptr_array_free (fontset->coverages, TRUE);
G_OBJECT_CLASS (simple_parent_class)->finalize (object);
@@ -317,7 +317,7 @@ pango_fontset_simple_append (PangoFontsetSimple *fontset,
* pango_fontset_simple_size:
* @fontset: a #PangoFontsetSimple.
*
- * Returns the number of fonts in the fontset.
+ * Returns the number of fonts in the fontset.
*
* Return value: the size of @fontset.
**/
@@ -339,11 +339,11 @@ static PangoFontMetrics *
pango_fontset_simple_get_metrics (PangoFontset *fontset)
{
PangoFontsetSimple *simple = PANGO_FONTSET_SIMPLE (fontset);
-
+
if (simple->fonts->len == 1)
return pango_font_get_metrics (PANGO_FONT (g_ptr_array_index(simple->fonts, 0)),
simple->language);
-
+
return PANGO_FONTSET_CLASS (simple_parent_class)->get_metrics (fontset);
}
@@ -358,21 +358,21 @@ pango_fontset_simple_get_font (PangoFontset *fontset,
PangoCoverage *coverage;
int result = -1;
unsigned int i;
-
+
for (i = 0; i < simple->fonts->len; i++)
{
coverage = g_ptr_array_index (simple->coverages, i);
-
+
if (coverage == NULL)
{
font = g_ptr_array_index (simple->fonts, i);
-
+
coverage = pango_font_get_coverage (font, simple->language);
g_ptr_array_index (simple->coverages, i) = coverage;
}
-
+
level = pango_coverage_get (coverage, wc);
-
+
if (result == -1 || level > best_level)
{
result = i;
@@ -393,7 +393,7 @@ pango_fontset_simple_foreach (PangoFontset *fontset,
{
PangoFontsetSimple *simple = PANGO_FONTSET_SIMPLE (fontset);
unsigned int i;
-
+
for (i = 0; i < simple->fonts->len; i++)
{
if ((*func) (fontset,
diff --git a/pango/pango-fontset.h b/pango/pango-fontset.h
index 67b98fca..5c6c7488 100644
--- a/pango/pango-fontset.h
+++ b/pango/pango-fontset.h
@@ -46,7 +46,7 @@ typedef struct _PangoFontset PangoFontset;
* @fontset: a #PangoFontset
* @font: a font from @fontset
* @data: callback data
- *
+ *
* A callback function used by pango_fontset_foreach() when enumerating
* the fonts in a fontset.
*
@@ -83,7 +83,7 @@ struct _PangoFontsetClass
GObjectClass parent_class;
/*< public >*/
-
+
PangoFont * (*get_font) (PangoFontset *fontset,
guint wc);
diff --git a/pango/pango-glyph-item-private.h b/pango/pango-glyph-item-private.h
index aa19c3c9..f936d755 100644
--- a/pango/pango-glyph-item-private.h
+++ b/pango/pango-glyph-item-private.h
@@ -39,7 +39,7 @@ struct _PangoGlyphItemIter
{
PangoGlyphItem *glyph_item;
const gchar *text;
-
+
int start_glyph;
int start_index;
int start_char;
diff --git a/pango/pango-glyph-item.c b/pango/pango-glyph-item.c
index b42e0411..94f07881 100644
--- a/pango/pango-glyph-item.c
+++ b/pango/pango-glyph-item.c
@@ -32,7 +32,7 @@
* @orig: a #PangoItem
* @text: text to which positions in @orig apply
* @split_index: byte index of position to split item, relative to the start of the item
- *
+ *
* Modifies @orig to cover only the text after @split_index, and
* returns a new item that covers the text before @split_index that
* used to be in @orig. You can think of @split_index as the length of
@@ -43,7 +43,7 @@
*
* This function is similar in function to pango_item_split() (and uses
* it internally.)
- *
+ *
* Return value: the newly allocated item representing text before
* @split_index, which should be freed
* with pango_glyph_item_free().
@@ -109,7 +109,7 @@ pango_glyph_item_split (PangoGlyphItem *orig,
{
memcpy (new->glyphs->glyphs, orig->glyphs->glyphs, num_glyphs * sizeof (PangoGlyphInfo));
memcpy (new->glyphs->log_clusters, orig->glyphs->log_clusters, num_glyphs * sizeof (int));
-
+
memmove (orig->glyphs->glyphs, orig->glyphs->glyphs + num_glyphs,
num_remaining * sizeof (PangoGlyphInfo));
for (i = num_glyphs; i < orig->glyphs->num_glyphs; i++)
@@ -132,7 +132,7 @@ pango_glyph_item_split (PangoGlyphItem *orig,
/**
* pango_glyph_item_free:
* @glyph_item: a #PangoGlyphItem
- *
+ *
* Frees a #PangoGlyphItem and memory to which it points.
*
* Since: 1.6
@@ -151,9 +151,9 @@ pango_glyph_item_free (PangoGlyphItem *glyph_item)
/**
* _pango_glyph_item_iter_next_cluster:
* @iter: a #PangoGlyphItemIter
- *
+ *
* Advances the iterator to the next cluster in the glyph item.
- *
+ *
* Return value: %TRUE if the iterator was advanced, %FALSE if we were already on the
* last cluster.
**/
@@ -175,31 +175,31 @@ _pango_glyph_item_iter_next_cluster (PangoGlyphItemIter *iter)
if (glyph_index < 0)
return FALSE;
}
-
+
iter->start_glyph = iter->end_glyph;
iter->start_index = iter->end_index;
iter->start_char = iter->end_char;
-
+
if (LTR (iter->glyph_item))
{
cluster = glyphs->log_clusters[glyph_index + 1];
while (TRUE)
{
glyph_index++;
-
+
if (glyph_index == glyphs->num_glyphs)
{
iter->end_index = item->offset + item->length;
iter->end_char = item->num_chars;
break;
}
-
+
if (glyphs->log_clusters[glyph_index] != cluster)
{
iter->end_index = item->offset + glyphs->log_clusters[glyph_index];
iter->end_char += g_utf8_strlen (iter->text + iter->start_index,
iter->end_index - iter->start_index);
- break;
+ break;
}
}
}
@@ -209,20 +209,20 @@ _pango_glyph_item_iter_next_cluster (PangoGlyphItemIter *iter)
while (TRUE)
{
glyph_index--;
-
+
if (glyph_index < 0)
{
iter->end_index = item->offset + item->length;
iter->end_char = item->num_chars;
break;
}
-
+
if (glyphs->log_clusters[glyph_index] != cluster)
{
iter->end_index = item->offset + glyphs->log_clusters[glyph_index];
iter->end_char += g_utf8_strlen (iter->text + iter->start_index,
iter->end_index - iter->start_index);
- break;
+ break;
}
}
}
@@ -234,9 +234,9 @@ _pango_glyph_item_iter_next_cluster (PangoGlyphItemIter *iter)
/**
* _pango_glyph_item_iter_prev_cluster:
* @iter: a #PangoGlyphItemIter
- *
+ *
* Moves the iterator to the preceding cluster in the glyph item.
- *
+ *
* Return value: %TRUE if the iterator was moved, %FALSE if we were already on the
* first cluster.
**/
@@ -247,7 +247,7 @@ _pango_glyph_item_iter_prev_cluster (PangoGlyphItemIter *iter)
PangoGlyphString *glyphs = iter->glyph_item->glyphs;
int cluster;
PangoItem *item = iter->glyph_item->item;
-
+
if (LTR (iter->glyph_item))
{
if (glyph_index == 0)
@@ -257,33 +257,33 @@ _pango_glyph_item_iter_prev_cluster (PangoGlyphItemIter *iter)
{
if (glyph_index == glyphs->num_glyphs - 1)
return FALSE;
-
+
}
-
+
iter->end_glyph = iter->start_glyph;
iter->end_index = iter->start_index;
iter->end_char = iter->start_char;
-
+
if (LTR (iter->glyph_item))
{
cluster = glyphs->log_clusters[glyph_index - 1];
while (TRUE)
{
glyph_index--;
-
+
if (glyph_index == 0)
{
iter->start_index = item->offset;
iter->start_char = 0;
break;
}
-
+
if (glyphs->log_clusters[glyph_index] != cluster)
{
iter->start_index = item->offset + glyphs->log_clusters[glyph_index];
iter->start_char -= g_utf8_strlen (iter->text + iter->start_index,
iter->end_index - iter->start_index);
- break;
+ break;
}
}
}
@@ -293,20 +293,20 @@ _pango_glyph_item_iter_prev_cluster (PangoGlyphItemIter *iter)
while (TRUE)
{
glyph_index++;
-
+
if (glyph_index == glyphs->num_glyphs - 1)
{
iter->start_index = item->offset;
iter->start_char = 0;
break;
}
-
+
if (glyphs->log_clusters[glyph_index] != cluster)
{
iter->start_index = item->offset + glyphs->log_clusters[glyph_index];
iter->start_char -= g_utf8_strlen (iter->text + iter->start_index,
iter->end_index - iter->start_index);
- break;
+ break;
}
}
}
@@ -320,10 +320,10 @@ _pango_glyph_item_iter_prev_cluster (PangoGlyphItemIter *iter)
* @iter: pointer to a #PangoGlyphItemIter structure
* @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 @iter is undefined.
**/
@@ -334,7 +334,7 @@ _pango_glyph_item_iter_init_start (PangoGlyphItemIter *iter,
{
iter->glyph_item = glyph_item;
iter->text = text;
-
+
if (LTR (glyph_item))
iter->end_glyph = 0;
else
@@ -352,10 +352,10 @@ _pango_glyph_item_iter_init_start (PangoGlyphItemIter *iter,
* @iter: pointer to a #PangoGlyphItemIter structure
* @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 @iter is undefined.
**/
@@ -366,7 +366,7 @@ _pango_glyph_item_iter_init_end (PangoGlyphItemIter *iter,
{
iter->glyph_item = glyph_item;
iter->text = text;
-
+
if (LTR (glyph_item))
iter->start_glyph = glyph_item->glyphs->num_glyphs;
else
@@ -379,10 +379,10 @@ _pango_glyph_item_iter_init_end (PangoGlyphItemIter *iter,
return _pango_glyph_item_iter_prev_cluster (iter);
}
-typedef struct
+typedef struct
{
PangoGlyphItemIter iter;
-
+
GSList *segment_attrs;
} ApplyAttrsState;
@@ -403,9 +403,9 @@ attr_slist_copy (GSList *attrs)
{
GSList *tmp_list;
GSList *new_attrs;
-
+
new_attrs = g_slist_copy (attrs);
-
+
for (tmp_list = new_attrs; tmp_list; tmp_list = tmp_list->next)
tmp_list->data = pango_attribute_copy (tmp_list->data);
@@ -430,19 +430,19 @@ split_before_cluster_start (ApplyAttrsState *state)
state->iter.start_glyph -= split_item->glyphs->num_glyphs;
state->iter.end_glyph -= split_item->glyphs->num_glyphs;
}
-
+
state->iter.start_char -= split_item->item->num_chars;
state->iter.end_char -= split_item->item->num_chars;
-
+
return split_item;
}
/**
* pango_glyph_item_apply_attrs:
- * @glyph_item: a shaped item
+ * @glyph_item: a shaped item
* @text: text that @list applies to
* @list: a #PangoAttrList
- *
+ *
* Splits a shaped item (PangoGlyphItem) into multiple items based
* on an attribute list. The idea is that if you have attributes
* that don't affect shaping, such as color or underline, to avoid
@@ -459,7 +459,7 @@ split_before_cluster_start (ApplyAttrsState *state)
*
* This function takes ownership of @glyph_item; it will be reused
* as one of the elements in the list.
- *
+ *
* Return value: a list of glyph items resulting from splitting
* @glyph_item. Free the elements using pango_glyph_item_free(),
* the list using g_slist_free().
@@ -502,7 +502,7 @@ pango_glyph_item_apply_attrs (PangoGlyphItem *glyph_item,
while (pango_attr_iterator_next (iter));
state.segment_attrs = pango_attr_iterator_get_attrs (iter);
-
+
/* Short circuit the case when we don't actually need to
* split the item
*/
@@ -515,7 +515,7 @@ pango_glyph_item_apply_attrs (PangoGlyphItem *glyph_item,
have_cluster = _pango_glyph_item_iter_next_cluster (&state.iter))
{
gboolean have_next;
-
+
/* [range_start,range_end] is the first range that intersects
* the current cluster.
*/
@@ -529,7 +529,7 @@ pango_glyph_item_apply_attrs (PangoGlyphItem *glyph_item,
split_before_cluster_start (&state));
state.segment_attrs = pango_attr_iterator_get_attrs (iter);
}
-
+
start_new_segment = FALSE;
/* Loop over all ranges that intersect this cluster; exiting
@@ -565,11 +565,11 @@ pango_glyph_item_apply_attrs (PangoGlyphItem *glyph_item,
state.iter.start_index != glyph_item->item->offset)
{
GSList *new_attrs = attr_slist_copy (state.segment_attrs);
- result = g_slist_prepend (result,
+ result = g_slist_prepend (result,
split_before_cluster_start (&state));
state.segment_attrs = new_attrs;
}
-
+
state.segment_attrs = g_slist_concat (state.segment_attrs,
pango_attr_iterator_get_attrs (iter));
}
@@ -586,7 +586,7 @@ pango_glyph_item_apply_attrs (PangoGlyphItem *glyph_item,
result = g_slist_reverse (result);
pango_attr_iterator_destroy (iter);
-
+
return result;
}
@@ -602,7 +602,7 @@ pango_glyph_item_apply_attrs (PangoGlyphItem *glyph_item,
* @letter_spacing: amount of letter spacing to add
* in Pango units. May be negative, though too large
* negative values will give ugly results.
- *
+ *
* Adds spacing between the graphemes of @glyph_item to
* give the effect of typographic letter spacing.
*
diff --git a/pango/pango-glyph.h b/pango/pango-glyph.h
index 8d85d3d7..16d9e35e 100644
--- a/pango/pango-glyph.h
+++ b/pango/pango-glyph.h
@@ -40,7 +40,7 @@ typedef gint32 PangoGlyphUnit;
struct _PangoGlyphGeometry
{
PangoGlyphUnit width;
- PangoGlyphUnit x_offset;
+ PangoGlyphUnit x_offset;
PangoGlyphUnit y_offset;
};
@@ -51,7 +51,7 @@ struct _PangoGlyphVisAttr
guint is_cluster_start : 1;
};
-/* A single glyph
+/* A single glyph
*/
struct _PangoGlyphInfo
{
diff --git a/pango/pango-gravity.c b/pango/pango-gravity.c
index 73103134..159ce8a9 100644
--- a/pango/pango-gravity.c
+++ b/pango/pango-gravity.c
@@ -249,11 +249,11 @@ pango_gravity_get_for_script (PangoScript script,
{
PangoScriptProperties props = get_script_properties (script);
gboolean vertical;
-
+
if (G_UNLIKELY (base_gravity == PANGO_GRAVITY_AUTO))
base_gravity = props.preferred_gravity;
-
+
vertical = PANGO_GRAVITY_IS_VERTICAL (base_gravity);
/* Everything is designed such that a system with no vertical support
diff --git a/pango/pango-gravity.h b/pango/pango-gravity.h
index b79436c5..cee1ab03 100644
--- a/pango/pango-gravity.h
+++ b/pango/pango-gravity.h
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
* @PANGO_GRAVITY_NORTH: Glyphs are upside-down
* @PANGO_GRAVITY_WEST: Glyphs are rotated 90 degrees counter-clockwise
* @PANGO_GRAVITY_AUTO: Gravity is resolved from the context matrix
- *
+ *
* The #PangoGravity type represents the orientation of glyphs in a segment
* of text. This is useful when rendering vertical text layouts. In
* those situations, the layout is rotated using a non-identity PangoMatrix,
@@ -44,9 +44,9 @@ G_BEGIN_DECLS
* pango_context_get_base_gravity().
*
* See also: #PangoGravityHint
- *
+ *
* Since: 1.16
- **/
+ **/
typedef enum {
PANGO_GRAVITY_SOUTH,
PANGO_GRAVITY_EAST,
@@ -65,7 +65,7 @@ typedef enum {
* Latin in East gravity), choose per-script gravity such that every script
* respects the line progression. This means, Latin and Arabic will take
* opposite gravities and both flow top-to-bottom for example.
- *
+ *
* The #PangoGravityHint defines how horizontal scripts should behave in a
* vertical context. That is, English excerpt in a vertical paragraph for
* example.
diff --git a/pango/pango-impl-utils.h b/pango/pango-impl-utils.h
index 59494ed8..759fdffe 100644
--- a/pango/pango-impl-utils.h
+++ b/pango/pango-impl-utils.h
@@ -80,12 +80,12 @@ prefix ## _get_type (void) \
typedef struct _PangoWarningHistory PangoWarningHistory;
struct _PangoWarningHistory {
- guint shape_font : 1;
+ guint shape_font : 1;
guint shape_shape_engine : 1;
guint get_glyph_extents : 1;
guint get_metrics : 1;
guint get_font_map : 1;
-};
+};
extern PangoWarningHistory _pango_warning_history;
diff --git a/pango/pango-item.c b/pango/pango-item.c
index 54d0f52e..4abe6337 100644
--- a/pango/pango-item.c
+++ b/pango/pango-item.c
@@ -26,9 +26,9 @@
/**
* pango_item_new:
- *
+ *
* Creates a new #PangoItem structure initialized to default values.
- *
+ *
* Return value: the newly allocated #PangoItem, which should
* be freed with pango_item_free().
**/
@@ -43,9 +43,9 @@ pango_item_new (void)
/**
* pango_item_copy:
* @item: a #PangoItem
- *
+ *
* Copy an existing #PangoItem structure.
- *
+ *
* Return value: the newly allocated #PangoItem, which should
* be freed with pango_item_free().
**/
@@ -62,7 +62,7 @@ pango_item_copy (PangoItem *item)
result->analysis = item->analysis;
if (result->analysis.font)
g_object_ref (result->analysis.font);
-
+
extra_attrs = NULL;
tmp_list = item->analysis.extra_attrs;
while (tmp_list)
@@ -79,7 +79,7 @@ pango_item_copy (PangoItem *item)
/**
* pango_item_free:
* @item: a #PangoItem
- *
+ *
* Free a #PangoItem and all associated memory.
**/
void
@@ -101,7 +101,7 @@ GType
pango_item_get_type (void)
{
static GType our_type = 0;
-
+
if (our_type == 0)
our_type = g_boxed_type_register_static (I_("PangoItem"),
(GBoxedCopyFunc) pango_item_copy,
@@ -114,7 +114,7 @@ pango_item_get_type (void)
* @orig: a #PangoItem
* @split_index: byte index of position to split item, relative to the start of the item
* @split_offset: number of chars between start of @orig and @split_index
- *
+ *
* Modifies @orig to cover only the text after @split_index, and
* returns a new item that covers the text before @split_index that
* used to be in @orig. You can think of @split_index as the length of
@@ -125,7 +125,7 @@ pango_item_get_type (void)
* chars, and must be provided because the text used to generate the
* item isn't available, so pango_item_split() can't count the char
* length of the split items itself.
- *
+ *
* Return value: new item representing text before @split_index, which
* should be freed with pango_item_free().
**/
@@ -142,14 +142,14 @@ pango_item_split (PangoItem *orig,
g_return_val_if_fail (split_index < orig->length, NULL);
g_return_val_if_fail (split_offset > 0, NULL);
g_return_val_if_fail (split_offset < orig->num_chars, NULL);
-
+
new_item = pango_item_copy (orig);
new_item->length = split_index;
new_item->num_chars = split_offset;
-
+
orig->offset += split_index;
orig->length -= split_index;
orig->num_chars -= split_offset;
-
+
return new_item;
}
diff --git a/pango/pango-layout-private.h b/pango/pango-layout-private.h
index 6751ae60..4f01276c 100644
--- a/pango/pango-layout-private.h
+++ b/pango/pango-layout-private.h
@@ -33,11 +33,11 @@ struct _PangoLayout
/* If you add fields to PangoLayout, be sure to update both
* the _copy function
*/
-
+
PangoContext *context;
PangoAttrList *attrs;
PangoFontDescription *font_desc;
-
+
gchar *text;
int length; /* length of text in bytes */
int width; /* wrap width, in device units */
@@ -51,7 +51,7 @@ struct _PangoLayout
guint single_paragraph : 1;
guint auto_dir : 1;
-
+
guint wrap : 2; /* PangoWrapMode */
guint is_wrapped : 1; /* Whether the layout has any wrapped lines */
guint ellipsize : 2; /* PangoEllipsizeMode */
@@ -70,7 +70,7 @@ struct _PangoLayout
int tab_width; /* Cached width of a tab. -1 == not yet calculated */
PangoTabArray *tabs;
-
+
GSList *lines;
};
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index e6e4d8cf..afc2fe86 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -38,7 +38,7 @@ struct _Extents
{
/* Vertical position of the line's baseline in layout coords */
int baseline;
-
+
/* Line extents in layout coords */
PangoRectangle ink_rect;
PangoRectangle logical_rect;
@@ -71,7 +71,7 @@ struct _PangoLayoutIter
/* list of Extents for each line in layout coordinates */
GSList *line_extents;
GSList *line_extents_link;
-
+
/* X position of the current run */
int run_x;
@@ -209,7 +209,7 @@ static void
pango_layout_class_init (PangoLayoutClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
+
object_class->finalize = pango_layout_finalize;
}
@@ -221,10 +221,10 @@ pango_layout_finalize (GObject *object)
layout = PANGO_LAYOUT (object);
pango_layout_clear_lines (layout);
-
+
if (layout->context)
g_object_unref (layout->context);
-
+
if (layout->attrs)
pango_attr_list_unref (layout->attrs);
@@ -235,7 +235,7 @@ pango_layout_finalize (GObject *object)
if (layout->tabs)
pango_tab_array_free (layout->tabs);
-
+
G_OBJECT_CLASS (pango_layout_parent_class)->finalize (object);
}
@@ -243,10 +243,10 @@ pango_layout_finalize (GObject *object)
/**
* pango_layout_new:
* @context: a #PangoContext
- *
+ *
* Create a new #PangoLayout object with attributes initialized to
* default values for a particular #PangoContext.
- *
+ *
* Return value: the newly allocated #PangoLayout, with a reference
* count of one, which should be freed with
* g_object_unref().
@@ -269,11 +269,11 @@ pango_layout_new (PangoContext *context)
/**
* pango_layout_copy:
* @src: a #PangoLayout
- *
+ *
* Does a deep copy-by-value of the @src layout. The attribute list,
* tab array, and text from the original layout are all copied by
* value.
- *
+ *
* Return value: the newly allocated #PangoLayout, with a reference
* count of one, which should be freed with
* g_object_unref().
@@ -282,7 +282,7 @@ PangoLayout*
pango_layout_copy (PangoLayout *src)
{
PangoLayout *layout;
-
+
g_return_val_if_fail (PANGO_IS_LAYOUT (src), NULL);
layout = pango_layout_new (src->context);
@@ -306,11 +306,11 @@ pango_layout_copy (PangoLayout *src)
if (src->tabs)
layout->tabs = pango_tab_array_copy (src->tabs);
- layout->wrap = src->wrap;
+ layout->wrap = src->wrap;
layout->ellipsize = src->ellipsize;
layout->unknown_glyphs_count = -1;
-
+
/* unknown_glyphs_count, is_wrapped, is_ellipsized, log_attrs, lines
* fields are updated by check_lines */
@@ -320,9 +320,9 @@ pango_layout_copy (PangoLayout *src)
/**
* pango_layout_get_context:
* @layout: a #PangoLayout
- *
+ *
* Retrieves the #PangoContext used for this layout.
- *
+ *
* Return value: the #PangoContext for the layout. This does not
* have an additional refcount added, so if you want to keep
* a copy of this around, you must reference it yourself.
@@ -340,7 +340,7 @@ pango_layout_get_context (PangoLayout *layout)
* @layout: a #PangoLayout.
* @width: the desired width in Pango units, or -1 to indicate that no
* wrapping should be performed.
- *
+ *
* Sets the width to which the lines of the #PangoLayout should wrap.
**/
void
@@ -359,9 +359,9 @@ pango_layout_set_width (PangoLayout *layout,
/**
* pango_layout_get_width:
* @layout: a #PangoLayout
- *
+ *
* Gets the width to which the lines of the #PangoLayout should wrap.
- *
+ *
* Return value: the width, or -1 if no width set.
**/
int
@@ -375,7 +375,7 @@ pango_layout_get_width (PangoLayout *layout)
* pango_layout_set_wrap:
* @layout: a #PangoLayout
* @wrap: the wrap mode
- *
+ *
* Sets the wrap mode; the wrap mode only has effect if a width
* is set on the layout with pango_layout_set_width(). To turn off wrapping,
* set the width to -1.
@@ -396,26 +396,26 @@ pango_layout_set_wrap (PangoLayout *layout,
/**
* pango_layout_get_wrap:
* @layout: a #PangoLayout
- *
+ *
* Gets the wrap mode for the layout.
*
* Use pango_layout_is_wrapped() to query whether any paragraphs
* were actually wrapped.
- *
+ *
* Return value: active wrap mode.
**/
PangoWrapMode
pango_layout_get_wrap (PangoLayout *layout)
{
g_return_val_if_fail (PANGO_IS_LAYOUT (layout), 0);
-
+
return layout->wrap;
}
/**
* pango_layout_is_wrapped:
* @layout: a #PangoLayout
- *
+ *
* Queries whether the layout had to wrap any paragraphs.
*
* This returns %TRUE if a positive width is set on @layout,
@@ -442,7 +442,7 @@ pango_layout_is_wrapped (PangoLayout *layout)
* pango_layout_set_indent
* @layout: a #PangoLayout.
* @indent: the amount by which to indent.
- *
+ *
* 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 lines will be indented by the
@@ -464,10 +464,10 @@ pango_layout_set_indent (PangoLayout *layout,
/**
* pango_layout_get_indent:
* @layout: a #PangoLayout
- *
+ *
* Gets the paragraph indent width in Pango units. A negative value
* indicates a hanging indentation.
- *
+ *
* Return value: the indent.
**/
int
@@ -481,7 +481,7 @@ pango_layout_get_indent (PangoLayout *layout)
* pango_layout_set_spacing:
* @layout: a #PangoLayout.
* @spacing: the amount of spacing
- *
+ *
* Sets the amount of spacing in #PangoGlyphUnit between the lines of the
* layout.
*
@@ -502,10 +502,10 @@ pango_layout_set_spacing (PangoLayout *layout,
/**
* pango_layout_get_spacing:
* @layout: a #PangoLayout
- *
+ *
* Gets the amount of spacing in #PangoGlyphUnit between the lines of the
* layout.
- *
+ *
* Return value: the spacing.
**/
int
@@ -519,7 +519,7 @@ pango_layout_get_spacing (PangoLayout *layout)
* pango_layout_set_attributes:
* @layout: a #PangoLayout
* @attrs: a #PangoAttrList
- *
+ *
* Sets the text attributes for a layout object.
**/
void
@@ -544,9 +544,9 @@ pango_layout_set_attributes (PangoLayout *layout,
/**
* pango_layout_get_attributes:
* @layout: a #PangoLayout
- *
+ *
* Gets the attribute list for the layout, if any.
- *
+ *
* Return value: a #PangoAttrList.
**/
PangoAttrList*
@@ -562,8 +562,8 @@ pango_layout_get_attributes (PangoLayout *layout)
* @layout: a #PangoLayout
* @desc: the new #PangoFontDescription, or %NULL to unset the
* current font description
- *
- * Sets the default font description for the layout. If no font
+ *
+ * Sets the default font description for the layout. If no font
* description is set on the layout, the font description from
* the layout's context is used.
**/
@@ -577,12 +577,12 @@ pango_layout_set_font_description (PangoLayout *layout,
{
if (layout->font_desc)
pango_font_description_free (layout->font_desc);
-
+
if (desc)
layout->font_desc = pango_font_description_copy (desc);
else
layout->font_desc = NULL;
-
+
pango_layout_clear_lines (layout);
layout->tab_width = -1;
}
@@ -591,9 +591,9 @@ pango_layout_set_font_description (PangoLayout *layout,
/**
* pango_layout_get_font_description:
* @layout: a #PangoLayout
- *
+ *
* Gets the font description for the layout, if any.
- *
+ *
* Return value: a pointer to the layout's font description,
* or %NULL if the font description from the layout's
* context is inherited. This value is owned by the layout
@@ -613,7 +613,7 @@ pango_layout_get_font_description (PangoLayout *layout)
* pango_layout_set_justify:
* @layout: a #PangoLayout
* @justify: whether the lines in the layout should be justified.
- *
+ *
* Sets whether each complete line should be stretched to
* fill the entire width of the layout. This stretching is typically
* done by adding whitespace, but for some scripts (such as Arabic),
@@ -634,10 +634,10 @@ pango_layout_set_justify (PangoLayout *layout,
/**
* pango_layout_get_justify:
* @layout: a #PangoLayout
- *
+ *
* Gets whether each complete line should be stretched to fill the entire
* width of the layout.
- *
+ *
* Return value: the justify.
**/
gboolean
@@ -652,7 +652,7 @@ pango_layout_get_justify (PangoLayout *layout)
* @layout: a #PangoLayout
* @auto_dir: if %TRUE, compute the bidirectional base direction
* from the layout's contents.
- *
+ *
* Sets whether to calculate the bidirectional base direction
* for the layout according to the contents of the layout;
* when this flag is on (the default), then paragraphs in
@@ -668,7 +668,7 @@ pango_layout_get_justify (PangoLayout *layout)
*
* When the auto-computed direction of a paragraph differs from the
* base direction of the context, the interpretation of
- * %PANGO_ALIGN_LEFT and %PANGO_ALIGN_RIGHT are swapped.
+ * %PANGO_ALIGN_LEFT and %PANGO_ALIGN_RIGHT are swapped.
*
* Since: 1.4
**/
@@ -690,11 +690,11 @@ pango_layout_set_auto_dir (PangoLayout *layout,
/**
* pango_layout_get_auto_dir:
* @layout: a #PangoLayout
- *
+ *
* Gets whether to calculate the bidirectional base direction
* for the layout according to the contents of the layout.
* See pango_layout_set_auto_dir().
- *
+ *
* Return value: %TRUE if the bidirectional base direction
* is computed from the layout's contents, %FALSE otherwise.
*
@@ -704,7 +704,7 @@ gboolean
pango_layout_get_auto_dir (PangoLayout *layout)
{
g_return_val_if_fail (PANGO_IS_LAYOUT (layout), FALSE);
-
+
return layout->auto_dir;
}
@@ -712,7 +712,7 @@ pango_layout_get_auto_dir (PangoLayout *layout)
* pango_layout_set_alignment:
* @layout: a #PangoLayout
* @alignment: the alignment
- *
+ *
* Sets the alignment for the layout: how partial lines are
* positioned within the horizontal space available.
**/
@@ -728,10 +728,10 @@ pango_layout_set_alignment (PangoLayout *layout,
/**
* pango_layout_get_alignment:
* @layout: a #PangoLayout
- *
+ *
* Gets the alignment for the layout: how partial lines are
* positioned within the horizontal space available.
- *
+ *
* Return value: the alignment.
**/
PangoAlignment
@@ -744,9 +744,9 @@ pango_layout_get_alignment (PangoLayout *layout)
/**
* pango_layout_set_tabs:
- * @layout: a #PangoLayout
+ * @layout: a #PangoLayout
* @tabs: a #PangoTabArray
- *
+ *
* Sets the tabs to use for @layout, overriding the default tabs
* (by default, tabs are every 8 spaces). If @tabs is %NULL, the default
* tabs are reinstated. @tabs is copied into the layout; you must
@@ -757,7 +757,7 @@ pango_layout_set_tabs (PangoLayout *layout,
PangoTabArray *tabs)
{
g_return_if_fail (PANGO_IS_LAYOUT (layout));
-
+
if (layout->tabs)
pango_tab_array_free (layout->tabs);
@@ -767,12 +767,12 @@ pango_layout_set_tabs (PangoLayout *layout,
/**
* pango_layout_get_tabs:
* @layout: a #PangoLayout
- *
+ *
* Gets the current #PangoTabArray used by this layout. If no
* #PangoTabArray has been set, then the default tabs are in use
* and %NULL is returned. Default tabs are every 8 spaces.
* The return value should be freed with pango_tab_array_free().
- *
+ *
* Return value: a copy of the tabs for this layout, or %NULL.
**/
PangoTabArray*
@@ -790,12 +790,12 @@ pango_layout_get_tabs (PangoLayout *layout)
* pango_layout_set_single_paragraph_mode:
* @layout: a #PangoLayout
* @setting: new setting
- *
+ *
* If @setting is %TRUE, do not treat newlines and similar characters
* as paragraph separators; instead, keep all text in a single paragraph,
* and display a glyph for paragraph separator characters. Used when
* you want to allow editing of newlines on a single text line.
- *
+ *
**/
void
pango_layout_set_single_paragraph_mode (PangoLayout *layout,
@@ -816,10 +816,10 @@ pango_layout_set_single_paragraph_mode (PangoLayout *layout,
/**
* pango_layout_get_single_paragraph_mode:
* @layout: a #PangoLayout
- *
+ *
* Obtains the value set by pango_layout_set_single_paragraph_mode().
- *
- * Return value: %TRUE if the layout does not break paragraphs at
+ *
+ * Return value: %TRUE if the layout does not break paragraphs at
* paragraph separator characters, %FALSE otherwise.
**/
gboolean
@@ -834,7 +834,7 @@ pango_layout_get_single_paragraph_mode (PangoLayout *layout)
* pango_layout_set_ellipsize:
* @layout: a #PangoLayout
* @ellipsize: the new ellipsization mode for @layout
- *
+ *
* Sets the type of ellipsization being performed for @layout.
* Depending on the ellipsization mode @ellipsize text is
* removed from the start, middle, or end of lines so they
@@ -855,7 +855,7 @@ pango_layout_set_ellipsize (PangoLayout *layout,
if (ellipsize != layout->ellipsize)
{
layout->ellipsize = ellipsize;
-
+
pango_layout_clear_lines (layout);
}
}
@@ -863,15 +863,15 @@ pango_layout_set_ellipsize (PangoLayout *layout,
/**
* pango_layout_get_ellipsize:
* @layout: a #PangoLayout
- *
+ *
* Gets the type of ellipsization being performed for @layout.
* See pango_layout_set_ellipsize()
- *
+ *
* Return value: the current ellipsization mode for @layout.
*
* Use pango_layout_is_ellipsized() to query whether any paragraphs
* were actually ellipsized.
- *
+ *
* Since: 1.6
**/
PangoEllipsizeMode
@@ -885,7 +885,7 @@ pango_layout_get_ellipsize (PangoLayout *layout)
/**
* pango_layout_is_ellipsized:
* @layout: a #PangoLayout
- *
+ *
* Queries whether the layout had to ellipsize any paragraphs.
*
* This returns %TRUE if the ellipsization mode for @layout
@@ -917,7 +917,7 @@ pango_layout_is_ellipsized (PangoLayout *layout)
* calculated. The text will also be truncated on
* encountering a nul-termination even when @length is
* positive.
- *
+ *
* Sets the text of the layout.
**/
void
@@ -926,12 +926,12 @@ pango_layout_set_text (PangoLayout *layout,
int length)
{
char *old_text, *start, *end;
-
+
g_return_if_fail (layout != NULL);
g_return_if_fail (length == 0 || text != NULL);
old_text = layout->text;
-
+
if (length < 0)
layout->text = g_strdup (text);
else if (length > 0)
@@ -948,7 +948,7 @@ pango_layout_set_text (PangoLayout *layout,
start = layout->text;
for (;;) {
gboolean valid;
-
+
valid = g_utf8_validate (start, -1, (const char **)&end);
if (!*end)
@@ -967,17 +967,17 @@ pango_layout_set_text (PangoLayout *layout,
layout->n_chars = g_utf8_strlen (layout->text, -1);
pango_layout_clear_lines (layout);
-
+
g_free (old_text);
}
/**
* pango_layout_get_text:
* @layout: a #PangoLayout
- *
+ *
* Gets the text in the layout. The returned text should not
* be freed or modified.
- *
+ *
* Return value: the text in the @layout.
**/
G_CONST_RETURN char*
@@ -997,7 +997,7 @@ pango_layout_get_text (PangoLayout *layout)
*
* Same as pango_layout_set_markup_with_accel(), but
* the markup text isn't scanned for accelerators.
- *
+ *
**/
void
pango_layout_set_markup (PangoLayout *layout,
@@ -1010,13 +1010,13 @@ pango_layout_set_markup (PangoLayout *layout,
/**
* pango_layout_set_markup_with_accel:
* @layout: a #PangoLayout
- * @markup: marked-up text
+ * @markup: marked-up text
* (see <link linkend="PangoMarkupFormat">markup format</link>)
* @length: length of marked-up text in bytes, or -1 if @markup is
* nul-terminated
* @accel_marker: marker for accelerators in the text
* @accel_char: return location for first located accelerator, or %NULL
- *
+ *
* Sets the layout text and attribute list from marked-up text (see
* <link linkend="PangoMarkupFormat">markup format</link>). Replaces
* the current text and attribute list.
@@ -1039,10 +1039,10 @@ pango_layout_set_markup_with_accel (PangoLayout *layout,
PangoAttrList *list = NULL;
char *text = NULL;
GError *error;
-
+
g_return_if_fail (PANGO_IS_LAYOUT (layout));
g_return_if_fail (markup != NULL);
-
+
error = NULL;
if (!pango_parse_markup (markup, length,
accel_marker,
@@ -1054,7 +1054,7 @@ pango_layout_set_markup_with_accel (PangoLayout *layout,
g_error_free (error);
return;
}
-
+
pango_layout_set_text (layout, text, -1);
pango_layout_set_attributes (layout, list);
pango_attr_list_unref (list);
@@ -1064,7 +1064,7 @@ pango_layout_set_markup_with_accel (PangoLayout *layout,
/**
* pango_layout_get_unknown_glyphs_count:
* @layout: a #PangoLayout
- *
+ *
* Counts the number unknown glyphs in @layout. That is, zero if
* glyphs for all characters in the layout text were found, or more
* than zero otherwise.
@@ -1117,7 +1117,7 @@ pango_layout_get_unknown_glyphs_count (PangoLayout *layout)
/**
* pango_layout_context_changed:
* @layout: a #PangoLayout
- *
+ *
* Forces recomputation of any state in the #PangoLayout that
* might depend on the layout's context. This function should
* be called if you make changes to the context subsequent
@@ -1140,9 +1140,9 @@ pango_layout_context_changed (PangoLayout *layout)
* of characters in the layout, since there need to be attributes
* corresponding to both the position before the first character
* and the position after the last character.)
- *
+ *
* Retrieves an array of logical attributes for each character in
- * the @layout.
+ * the @layout.
**/
void
pango_layout_get_log_attrs (PangoLayout *layout,
@@ -1158,7 +1158,7 @@ pango_layout_get_log_attrs (PangoLayout *layout,
*attrs = g_new (PangoLogAttr, layout->n_chars + 1);
memcpy (*attrs, layout->log_attrs, sizeof(PangoLogAttr) * (layout->n_chars + 1));
}
-
+
if (n_attrs)
*n_attrs = layout->n_chars + 1;
}
@@ -1167,9 +1167,9 @@ pango_layout_get_log_attrs (PangoLayout *layout,
/**
* pango_layout_get_line_count:
* @layout: #PangoLayout
- *
+ *
* Retrieves the count of lines for the @layout.
- *
+ *
* Return value: the line count.
**/
int
@@ -1184,12 +1184,12 @@ pango_layout_get_line_count (PangoLayout *layout)
/**
* pango_layout_get_lines:
* @layout: a #PangoLayout
- *
+ *
* Returns the lines of the @layout as a list.
*
* Use the faster pango_layout_get_lines_readonly() if you do not plan
* to modify the contents of the lines (glyphs, glyph widths, etc.).
- *
+ *
* Return value: a #GSList containing the lines in the layout. This
* points to internal data of the #PangoLayout and must be used with
* care. It will become invalid on any change to the layout's
@@ -1207,7 +1207,7 @@ pango_layout_get_lines (PangoLayout *layout)
{
PangoLayoutLine *line = tmp_list->data;
tmp_list = tmp_list->next;
-
+
pango_layout_line_leaked (line);
}
}
@@ -1218,9 +1218,9 @@ pango_layout_get_lines (PangoLayout *layout)
/**
* pango_layout_get_lines_readonly:
* @layout: a #PangoLayout
- *
+ *
* Returns the lines of the @layout as a list.
- *
+ *
* This is a faster alternative to pango_layout_get_lines(),
* but the user is not expected
* to modify the contents of the lines (glyphs, glyph widths, etc.).
@@ -1245,9 +1245,9 @@ pango_layout_get_lines_readonly (PangoLayout *layout)
* @layout: a #PangoLayout
* @line: the index of a line, which must be between 0 and
* <literal>pango_layout_get_line_count(layout) - 1</literal>, inclusive.
- *
+ *
* Retrieves a particular line from a #PangoLayout.
- *
+ *
* Use the faster pango_layout_get_line_readonly() if you do not plan
* to modify the contents of the line (glyphs, glyph widths, etc.).
*
@@ -1287,9 +1287,9 @@ pango_layout_get_line (PangoLayout *layout,
* @layout: a #PangoLayout
* @line: the index of a line, which must be between 0 and
* <literal>pango_layout_get_line_count(layout) - 1</literal>, inclusive.
- *
+ *
* Retrieves a particular line from a #PangoLayout.
- *
+ *
* This is a faster alternative to pango_layout_get_line(),
* but the user is not expected
* to modify the contents of the line (glyphs, glyph widths, etc.).
@@ -1330,11 +1330,11 @@ pango_layout_get_line_readonly (PangoLayout *layout,
* pango_layout_line_index_to_x:
* @line: a #PangoLayoutLine
* @index_: byte offset of a grapheme within the layout
- * @trailing: an integer indicating the edge of the grapheme to retrieve
- * the position of. If 0, the trailing edge of the grapheme,
+ * @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: location to store the x_offset (in #PangoGlyphUnit)
- *
+ *
* Converts an index within a line to a X position.
*
**/
@@ -1352,7 +1352,7 @@ pango_layout_line_index_to_x (PangoLayoutLine *line,
{
PangoLayoutRun *run = run_list->data;
ItemProperties properties;
-
+
pango_layout_get_item_properties (run->item, &properties);
if (run->item->offset <= index && run->item->offset + run->item->length > index)
@@ -1383,9 +1383,9 @@ pango_layout_line_index_to_x (PangoLayoutLine *line,
offset--;
index = g_utf8_prev_char (layout->text + index) - layout->text;
}
-
+
}
-
+
pango_glyph_string_index_to_x (run->glyphs,
layout->text + run->item->offset,
run->item->length,
@@ -1394,10 +1394,10 @@ pango_layout_line_index_to_x (PangoLayoutLine *line,
if (x_pos)
*x_pos += width;
}
-
+
return;
}
-
+
if (!properties.shape_set)
width += pango_glyph_string_get_width (run->glyphs);
else
@@ -1422,7 +1422,7 @@ pango_layout_index_to_line (PangoLayout *layout,
PangoLayoutLine *line = NULL;
PangoLayoutLine *prev_line = NULL;
int i = 0;
-
+
line_list = tmp_list = layout->lines;
while (tmp_list)
{
@@ -1438,16 +1438,16 @@ pango_layout_index_to_line (PangoLayout *layout,
if (line->start_index + line->length > index)
break;
-
+
tmp_list = tmp_list->next;
}
if (line_nr)
*line_nr = i;
-
+
if (line_before)
*line_before = prev_line;
-
+
if (line_after)
*line_after = (line_list && line_list->next) ? line_list->next->data : NULL;
@@ -1461,7 +1461,7 @@ pango_layout_index_to_line_and_extents (PangoLayout *layout,
{
PangoLayoutIter *iter;
PangoLayoutLine *line = NULL;
-
+
iter = pango_layout_get_iter (layout);
if (!ITER_IS_INVALID (iter))
@@ -1473,9 +1473,9 @@ pango_layout_index_to_line_and_extents (PangoLayout *layout,
break; /* index was in paragraph delimiters */
line = tmp_line;
-
+
pango_layout_iter_get_line_extents (iter, NULL, line_rect);
-
+
if (line->start_index + line->length > index)
break;
@@ -1492,8 +1492,8 @@ pango_layout_index_to_line_and_extents (PangoLayout *layout,
* pango_layout_index_to_line_x:
* @layout: a #PangoLayout
* @index_: the byte index of a grapheme within the layout.
- * @trailing: an integer indicating the edge of the grapheme to retrieve the
- * position of. If 0, the trailing edge of the grapheme, if > 0,
+ * @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.
* @line: location to store resulting line index. (which will
* between 0 and pango_layout_get_line_count(layout) - 1)
@@ -1512,7 +1512,7 @@ pango_layout_index_to_line_x (PangoLayout *layout,
{
int line_num;
PangoLayoutLine *layout_line = NULL;
-
+
g_return_if_fail (layout != NULL);
g_return_if_fail (index >= 0);
g_return_if_fail (index <= layout->length);
@@ -1527,10 +1527,10 @@ pango_layout_index_to_line_x (PangoLayout *layout,
/* use end of line if index was in the paragraph delimiters */
if (index > layout_line->start_index + layout_line->length)
index = layout_line->start_index + layout_line->length;
-
+
if (line)
*line = line_num;
-
+
pango_layout_line_index_to_x (layout_line, index, trailing, x_pos);
}
else
@@ -1549,12 +1549,12 @@ pango_layout_index_to_line_x (PangoLayout *layout,
* weak cursor. The strong cursor is the cursor corresponding
* to text insertion in the base direction for the layout.
* @old_index: the byte index of the grapheme for the old index
- * @old_trailing: if 0, the cursor was at the trailing edge of the
+ * @old_trailing: if 0, the cursor was at the trailing edge of the
* grapheme indicated by @old_index, if > 0, the cursor
* was at the leading edge.
* @direction: direction to move cursor. A negative
* value indicates motion to the left.
- * @new_index: location to store the new cursor byte index. A value of -1
+ * @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
* the cursor has been moved off the end of the layout.
@@ -1563,14 +1563,14 @@ pango_layout_index_to_line_x (PangoLayout *layout,
* be displayed. This allows distinguishing the position at
* the beginning of one line from the position at the end
* of the preceding line. @new_index is always on the line
- * where the cursor should be displayed.
- *
+ * where the cursor should be displayed.
+ *
* Computes a new cursor position from an old position and
* a count of positions to move visually. If @direction is positive,
* then the new strong cursor position will be one position
* to the right of the old cursor position. If @direction is negative,
* then the new strong cursor position will be one position
- * to the left of the old cursor position.
+ * to the left of the old cursor position.
*
* In the presence of bidirectional text, the correspondence
* between logical and visual order will depend on the direction
@@ -1628,7 +1628,7 @@ pango_layout_move_cursor_visually (PangoLayout *layout,
/* Clamp old_index to fit on the line */
if (old_index > (line->start_index + line->length))
old_index = line->start_index + line->length;
-
+
vis_pos = log2vis_map[old_index - line->start_index];
g_free (log2vis_map);
@@ -1710,12 +1710,12 @@ pango_layout_move_cursor_visually (PangoLayout *layout,
}
while (vis_pos > 0 && vis_pos < n_vis &&
!layout->log_attrs[start_offset + log_pos].is_cursor_position);
-
+
*new_index = line->start_index + vis2log_map[vis_pos];
g_free (vis2log_map);
*new_trailing = 0;
-
+
if (*new_index == line->start_index + line->length && line->length > 0)
{
do
@@ -1741,7 +1741,7 @@ pango_layout_move_cursor_visually (PangoLayout *layout,
* be zero, or the number of characters in the
* grapheme. 0 represents the trailing edge of the grapheme.
*
- * Converts from X and Y position within a layout to the byte
+ * Converts from X and Y position within a layout to the byte
* index to the character at that logical position. If the
* Y position is not inside the layout, the closest position is chosen
* (the position will be clamped inside the layout). If the
@@ -1767,16 +1767,16 @@ pango_layout_xy_to_index (PangoLayout *layout,
int prev_line_x = 0;
gboolean retval = FALSE;
gboolean outside = FALSE;
-
+
g_return_val_if_fail (PANGO_IS_LAYOUT (layout), FALSE);
-
+
iter = pango_layout_get_iter (layout);
-
+
do
{
PangoRectangle line_logical;
int first_y, last_y;
-
+
pango_layout_iter_get_line_extents (iter, NULL, &line_logical);
pango_layout_iter_get_line_yrange (iter, &first_y, &last_y);
@@ -1791,7 +1791,7 @@ pango_layout_xy_to_index (PangoLayout *layout,
{
if (prev_line == NULL)
outside = TRUE; /* off the top */
-
+
found = _pango_layout_iter_get_line (iter);
found_line_x = x - line_logical.x;
}
@@ -1811,18 +1811,18 @@ pango_layout_xy_to_index (PangoLayout *layout,
break;
}
while (pango_layout_iter_next_line (iter));
-
+
pango_layout_iter_free (iter);
if (found == NULL)
{
/* Off the bottom of the layout */
outside = TRUE;
-
+
found = prev_line;
found_line_x = prev_line_x;
}
-
+
retval = pango_layout_line_x_to_index (found,
found_line_x,
index, trailing);
@@ -1838,11 +1838,11 @@ pango_layout_xy_to_index (PangoLayout *layout,
* @layout: a #PangoLayout
* @index_: byte index within @layout
* @pos: rectangle in which to store the position of the grapheme
- *
+ *
* Converts from an index within a #PangoLayout to the onscreen position
* corresponding to the grapheme at that index, which is represented
- * as rectangle. Note that <literal>pos->x</literal> is always the leading
- * edge of the grapheme and <literal>pos->x + pos->width</literal> the trailing
+ * as rectangle. Note that <literal>pos->x</literal> is always the leading
+ * edge of the grapheme and <literal>pos->x + pos->width</literal> the trailing
* edge of the grapheme. If the directionality of the grapheme is right-to-left,
* then <literal>pos->width</literal> will be negative.
**/
@@ -1855,11 +1855,11 @@ pango_layout_index_to_pos (PangoLayout *layout,
PangoLayoutIter *iter;
PangoLayoutLine *layout_line = NULL;
int x_pos;
-
+
g_return_if_fail (layout != NULL);
g_return_if_fail (index >= 0);
g_return_if_fail (pos != NULL);
-
+
iter = pango_layout_get_iter (layout);
if (!ITER_IS_INVALID (iter))
@@ -1878,9 +1878,9 @@ pango_layout_index_to_pos (PangoLayout *layout,
}
layout_line = tmp_line;
-
+
pango_layout_iter_get_line_extents (iter, NULL, &logical_rect);
-
+
if (layout_line->start_index + layout_line->length > index)
break;
@@ -1905,7 +1905,7 @@ pango_layout_index_to_pos (PangoLayout *layout,
else
pos->width = 0;
}
-
+
pango_layout_iter_free (iter);
}
@@ -1915,7 +1915,7 @@ pango_layout_line_get_range (PangoLayoutLine *line,
char **end)
{
char *p;
-
+
p = line->layout->text + line->start_index;
if (start)
@@ -1939,7 +1939,7 @@ pango_layout_line_get_vis2log_map (PangoLayoutLine *line,
pango_layout_line_get_range (line, &start, &end);
n_chars = g_utf8_strlen (start, end - start);
-
+
result = g_new (int, n_chars + 1);
if (strong)
@@ -1971,15 +1971,15 @@ pango_layout_line_get_vis2log_map (PangoLayoutLine *line,
if ((cursor_dir == PANGO_DIRECTION_LTR) ||
(prev_dir == run_dir))
result[pos] = p - start;
-
+
p = g_utf8_next_char (p);
-
+
for (i = 1; i < run_n_chars; i++)
{
result[pos + i] = p - start;
p = g_utf8_next_char (p);
}
-
+
if (cursor_dir == PANGO_DIRECTION_LTR)
result[pos + run_n_chars] = p - start;
}
@@ -2010,7 +2010,7 @@ pango_layout_line_get_vis2log_map (PangoLayoutLine *line,
*/
if ((cursor_dir == line->resolved_dir) || (prev_dir == line->resolved_dir))
result[pos] = line->resolved_dir == PANGO_DIRECTION_LTR ? end - start : 0;
-
+
return result;
}
@@ -2048,7 +2048,7 @@ pango_layout_line_get_char_direction (PangoLayoutLine *layout_line,
while (run_list)
{
PangoLayoutRun *run = run_list->data;
-
+
if (run->item->offset <= index && run->item->offset + run->item->length > index)
return run->item->analysis.level % 2 ? PANGO_DIRECTION_RTL : PANGO_DIRECTION_LTR;
@@ -2066,7 +2066,7 @@ pango_layout_line_get_char_direction (PangoLayoutLine *layout_line,
* @index_: the byte index of the cursor
* @strong_pos: location to store the strong cursor position (may be %NULL)
* @weak_pos: location to store the weak cursor position (may be %NULL)
- *
+ *
* Given an index within a layout, determines the positions that of the
* strong and weak cursors if the insertion point is at that
* index. The position of each cursor is stored as a zero-width
@@ -2087,15 +2087,15 @@ pango_layout_get_cursor_pos (PangoLayout *layout,
PangoLayoutLine *layout_line = NULL; /* Quiet GCC */
int x1_trailing;
int x2;
-
+
g_return_if_fail (layout != NULL);
g_return_if_fail (index >= 0 && index <= layout->length);
-
+
layout_line = pango_layout_index_to_line_and_extents (layout, index,
&line_rect);
g_assert (index >= layout_line->start_index);
-
+
/* Examine the trailing edge of the character before the cursor */
if (index == layout_line->start_index)
{
@@ -2111,7 +2111,7 @@ pango_layout_get_cursor_pos (PangoLayout *layout,
dir1 = pango_layout_line_get_char_direction (layout_line, prev_index);
pango_layout_line_index_to_x (layout_line, prev_index, TRUE, &x1_trailing);
}
-
+
/* Examine the leading edge of the character after the cursor */
if (index >= layout_line->start_index + layout_line->length)
{
@@ -2124,11 +2124,11 @@ pango_layout_get_cursor_pos (PangoLayout *layout,
{
pango_layout_line_index_to_x (layout_line, index, FALSE, &x2);
}
-
+
if (strong_pos)
{
strong_pos->x = line_rect.x;
-
+
if (dir1 == layout_line->resolved_dir)
strong_pos->x += x1_trailing;
else
@@ -2142,7 +2142,7 @@ pango_layout_get_cursor_pos (PangoLayout *layout,
if (weak_pos)
{
weak_pos->x = line_rect.x;
-
+
if (dir1 == layout_line->resolved_dir)
weak_pos->x += x2;
else
@@ -2219,10 +2219,10 @@ get_x_offset (PangoLayout *layout,
* indented left/right, though we can't sensibly do that without
* knowing whether left/right is the "normal" thing for this text
*/
-
+
if (alignment == PANGO_ALIGN_CENTER)
return;
-
+
if (line->is_paragraph_start)
{
if (layout->indent > 0)
@@ -2258,12 +2258,12 @@ get_line_extents_layout_coords (PangoLayout *layout,
/* Line extents in line coords (origin at line baseline) */
PangoRectangle line_ink;
PangoRectangle line_logical;
-
+
pango_layout_line_get_extents (line, line_ink_layout ? &line_ink : NULL,
&line_logical);
-
+
get_x_offset (layout, line, layout_width, line_logical.width, &x_offset);
-
+
/* Convert the line's extents into layout coordinates */
if (line_ink_layout)
{
@@ -2314,8 +2314,8 @@ pango_layout_get_extents_internal (PangoLayout *layout,
pango_layout_check_lines (layout);
- /* When we are not wrapping, we need the overall width of the layout to
- * figure out the x_offsets of each line. However, we only need the
+ /* When we are not wrapping, we need the overall width of the layout to
+ * figure out the x_offsets of each line. However, we only need the
* x_offsets if we are computing the ink_rect or individual line extents.
*/
width = layout->width;
@@ -2339,15 +2339,15 @@ pango_layout_get_extents_internal (PangoLayout *layout,
}
else if (layout->alignment != PANGO_ALIGN_LEFT)
need_width = TRUE;
-
+
if (width == -1 && need_width && (ink_rect || line_extents))
{
PangoRectangle overall_logical;
-
+
pango_layout_get_extents_internal (layout, NULL, &overall_logical, NULL);
width = overall_logical.width;
}
-
+
if (logical_rect)
{
logical_rect->x = 0;
@@ -2355,7 +2355,7 @@ pango_layout_get_extents_internal (PangoLayout *layout,
logical_rect->width = 0;
logical_rect->height = 0;
}
-
+
line_list = layout->lines;
while (line_list)
{
@@ -2363,19 +2363,19 @@ pango_layout_get_extents_internal (PangoLayout *layout,
/* Line extents in layout coords (origin at 0,0 of the layout) */
PangoRectangle line_ink_layout;
PangoRectangle line_logical_layout;
-
+
int new_pos;
/* This block gets the line extents in layout coords */
{
int baseline;
-
+
get_line_extents_layout_coords (layout, line,
width, y_offset,
&baseline,
ink_rect ? &line_ink_layout : NULL,
&line_logical_layout);
-
+
if (line_extents)
{
Extents *ext = g_slice_new (Extents);
@@ -2385,13 +2385,13 @@ pango_layout_get_extents_internal (PangoLayout *layout,
*line_extents = g_slist_prepend (*line_extents, ext);
}
}
-
+
if (ink_rect)
{
/* Compute the union of the current ink_rect with
* line_ink_layout
*/
-
+
if (line_list == layout->lines)
{
*ink_rect = line_ink_layout;
@@ -2438,17 +2438,17 @@ pango_layout_get_extents_internal (PangoLayout *layout,
MAX (logical_rect->x + logical_rect->width,
line_logical_layout.x + line_logical_layout.width) - new_pos;
logical_rect->x = new_pos;
-
+
}
}
-
+
logical_rect->height += line_logical_layout.height;
/* No space after the last line, of course. */
if (line_list->next != NULL)
logical_rect->height += layout->spacing;
}
-
+
y_offset += line_logical_layout.height + layout->spacing;
line_list = line_list->next;
}
@@ -2472,9 +2472,9 @@ pango_layout_get_extents_internal (PangoLayout *layout,
* @layout: a #PangoLayout
* @ink_rect: rectangle used to store the extents of the layout as drawn
* or %NULL to indicate that the result is not needed.
- * @logical_rect: rectangle used to store the logical extents of the layout
+ * @logical_rect: rectangle used to store the logical extents of the layout
or %NULL to indicate that the result is not needed.
- *
+ *
* Computes the logical and ink extents of @layout. Logical extents
* are usually what you want for positioning things. Note that both extents
* may have non-zero x and y. You may want to use those to offset where you
@@ -2483,13 +2483,13 @@ pango_layout_get_extents_internal (PangoLayout *layout,
* a set width.
*
* The extents are given in layout coordinates and in Pango units; layout
- * coordinates begin at the top left corner of the layout.
+ * coordinates begin at the top left corner of the layout.
*/
void
pango_layout_get_extents (PangoLayout *layout,
PangoRectangle *ink_rect,
PangoRectangle *logical_rect)
-{
+{
g_return_if_fail (layout != NULL);
pango_layout_get_extents_internal (layout, ink_rect, logical_rect, NULL);
@@ -2500,9 +2500,9 @@ pango_layout_get_extents (PangoLayout *layout,
* @layout: a #PangoLayout
* @ink_rect: rectangle used to store the extents of the layout as drawn
* or %NULL to indicate that the result is not needed.
- * @logical_rect: rectangle used to store the logical extents of the
+ * @logical_rect: rectangle used to store the logical extents of the
* layout or %NULL to indicate that the result is not needed.
- *
+ *
* Computes the logical and ink extents of @layout in device units.
* This function just calls pango_layout_get_extents() followed by
* pango_extents_to_pixels().
@@ -2523,7 +2523,7 @@ pango_layout_get_pixel_extents (PangoLayout *layout,
* @layout: a #PangoLayout
* @width: location to store the logical width, or %NULL
* @height: location to store the logical height, or %NULL
- *
+ *
* Determines the logical width and height of a #PangoLayout
* in Pango units (device units scaled by %PANGO_SCALE). This
* is simply a convenience function around pango_layout_get_extents().
@@ -2548,7 +2548,7 @@ pango_layout_get_size (PangoLayout *layout,
* @layout: a #PangoLayout
* @width: location to store the logical width, or %NULL
* @height: location to store the logical height, or %NULL
- *
+ *
* Determines the logical width and height of a #PangoLayout
* in device units. (pango_layout_get_size() returns the width
* and height scaled by %PANGO_SCALE.) This
@@ -2580,11 +2580,11 @@ pango_layout_clear_lines (PangoLayout *layout)
{
PangoLayoutLine *line = tmp_list->data;
tmp_list = tmp_list->next;
-
+
line->layout = NULL;
pango_layout_line_unref (line);
}
-
+
g_slist_free (layout->lines);
layout->lines = NULL;
@@ -2630,7 +2630,7 @@ imposed_shape (const char *text,
{
int i;
const char *p;
-
+
pango_glyph_string_set_size (glyphs, n_chars);
for (i=0, p = text; i < n_chars; i++, p = g_utf8_next_char (p))
@@ -2640,7 +2640,7 @@ imposed_shape (const char *text,
glyphs->glyphs[i].geometry.y_offset = 0;
glyphs->glyphs[i].geometry.width = shape_logical->width;
glyphs->glyphs[i].attr.is_cluster_start = 1;
-
+
glyphs->log_clusters[i] = p - text;
}
}
@@ -2678,7 +2678,7 @@ imposed_extents (gint n_chars,
ink_rect->width = 0;
ink_rect->height = 0;
}
-
+
if (logical_rect)
{
logical_rect->x = 0;
@@ -2719,15 +2719,15 @@ uninsert_run (PangoLayoutLine *line)
{
PangoLayoutRun *run;
PangoItem *item;
-
+
GSList *tmp_node = line->runs;
run = tmp_node->data;
item = run->item;
-
+
line->runs = tmp_node->next;
line->length -= item->length;
-
+
g_slist_free_1 (tmp_node);
free_run (run, (gpointer)FALSE);
@@ -2756,16 +2756,16 @@ ensure_tab_width (PangoLayout *layout)
layout_attrs = pango_layout_get_effective_attributes (layout);
iter = pango_attr_list_get_iterator (layout_attrs);
pango_attr_iterator_get_font (iter, font_desc, &language, NULL);
-
+
tmp_attrs = pango_attr_list_new ();
attr = pango_attr_font_desc_new (font_desc);
pango_font_description_free (font_desc);
-
+
attr->start_index = 0;
attr->end_index = 1;
pango_attr_list_insert_before (tmp_attrs, attr);
-
+
if (language)
{
attr = pango_attr_language_new (language);
@@ -2773,24 +2773,24 @@ ensure_tab_width (PangoLayout *layout)
attr->end_index = 1;
pango_attr_list_insert_before (tmp_attrs, attr);
}
-
+
items = pango_itemize (layout->context, " ", 0, 1, tmp_attrs, NULL);
pango_attr_iterator_destroy (iter);
if (layout_attrs != layout->attrs)
pango_attr_list_unref (layout_attrs);
pango_attr_list_unref (tmp_attrs);
-
+
item = items->data;
pango_shape (" ", 8, &item->analysis, glyphs);
-
+
pango_item_free (item);
g_list_free (items);
-
+
layout->tab_width = 0;
for (i=0; i < glyphs->num_glyphs; i++)
layout->tab_width += glyphs->glyphs[i].geometry.width;
-
+
pango_glyph_string_free (glyphs);
/* We need to make sure the tab_width is > 0 so finding tab positions
@@ -2821,7 +2821,7 @@ get_tab_pos (PangoLayout *layout, int index)
n_tabs = 0;
in_pixels = FALSE;
}
-
+
if (index < n_tabs)
{
gint pos = 0;
@@ -2842,7 +2842,7 @@ get_tab_pos (PangoLayout *layout, int index)
int last_pos = 0;
int next_to_last_pos = 0;
int tab_width;
-
+
pango_tab_array_get_tab (layout->tabs, n_tabs - 1, NULL, &last_pos);
if (n_tabs > 1)
@@ -2855,7 +2855,7 @@ get_tab_pos (PangoLayout *layout, int index)
next_to_last_pos *= PANGO_SCALE;
last_pos *= PANGO_SCALE;
}
-
+
if (last_pos > next_to_last_pos)
{
tab_width = last_pos - next_to_last_pos;
@@ -2881,14 +2881,14 @@ line_width (PangoLayoutLine *line)
GSList *l;
int i;
int width = 0;
-
+
/* Compute the width of the line currently - inefficient, but easier
* than keeping the current width of the line up to date everywhere
*/
for (l = line->runs; l; l = l->next)
{
PangoLayoutRun *run = l->data;
-
+
for (i=0; i < run->glyphs->num_glyphs; i++)
width += run->glyphs->glyphs[i].geometry.width;
}
@@ -2905,12 +2905,12 @@ shape_tab (PangoLayoutLine *line,
int current_width = line_width (line);
pango_glyph_string_set_size (glyphs, 1);
-
+
glyphs->glyphs[0].glyph = PANGO_GLYPH_EMPTY;
glyphs->glyphs[0].geometry.x_offset = 0;
glyphs->glyphs[0].geometry.y_offset = 0;
glyphs->glyphs[0].attr.is_cluster_start = 1;
-
+
glyphs->log_clusters[0] = 0;
ensure_tab_width (line->layout);
@@ -2938,10 +2938,10 @@ can_break_at (PangoLayout *layout,
* editing.
*/
wrap = layout->wrap;
-
+
if (wrap == PANGO_WRAP_WORD_CHAR)
wrap = always_wrap_char ? PANGO_WRAP_CHAR : PANGO_WRAP_WORD;
-
+
if (offset == layout->n_chars)
return TRUE;
else if (wrap == PANGO_WRAP_WORD)
@@ -2970,7 +2970,7 @@ can_break_in (PangoLayout *layout,
return FALSE;
}
-typedef enum
+typedef enum
{
BREAK_NONE_FIT,
BREAK_SOME_FIT,
@@ -3004,7 +3004,7 @@ shape_run (PangoLayoutLine *line,
{
PangoLayout *layout = line->layout;
PangoGlyphString *glyphs = pango_glyph_string_new ();
-
+
if (layout->text[item->offset] == '\t')
shape_tab (line, glyphs);
else
@@ -3013,16 +3013,16 @@ shape_run (PangoLayoutLine *line,
imposed_shape (layout->text + item->offset, item->num_chars,
state->properties.shape_ink_rect, state->properties.shape_logical_rect,
glyphs);
- else
+ else
pango_shape (layout->text + item->offset, item->length, &item->analysis, glyphs);
if (state->properties.letter_spacing)
{
PangoGlyphItem glyph_item;
-
+
glyph_item.item = item;
glyph_item.glyphs = glyphs;
-
+
pango_glyph_item_letter_space (&glyph_item,
layout->text,
layout->log_attrs + state->start_offset,
@@ -3061,7 +3061,7 @@ insert_run (PangoLayoutLine *line,
state->glyphs = NULL;
g_free (state->log_widths);
}
-
+
line->runs = g_slist_prepend (line->runs, run);
line->length += run_item->length;
}
@@ -3107,7 +3107,7 @@ process_item (PangoLayout *layout,
{
pango_layout_get_item_properties (item, &state->properties);
state->glyphs = shape_run (line, state, item);
-
+
state->log_widths = NULL;
state->log_widths_offset = 0;
@@ -3121,7 +3121,7 @@ process_item (PangoLayout *layout,
state->log_widths_offset += item->num_chars;
return BREAK_LINE_SEPARATOR;
}
-
+
if (state->remaining_width < 0 && !no_break_at_end) /* Wrapping off */
{
insert_run (line, state, item, TRUE);
@@ -3174,7 +3174,7 @@ process_item (PangoLayout *layout,
}
retry_break:
-
+
/* Shorten the item by one line break
*/
while (--num_chars >= 0)
@@ -3187,7 +3187,7 @@ process_item (PangoLayout *layout,
{
break_num_chars = num_chars;
break_width = width;
-
+
if (width <= state->remaining_width || (num_chars == 1 && !line->runs))
break;
}
@@ -3210,7 +3210,7 @@ process_item (PangoLayout *layout,
state->remaining_width -= break_width;
state->remaining_width = MAX (state->remaining_width, 0);
}
-
+
if (break_num_chars == item->num_chars)
{
insert_run (line, state, item, TRUE);
@@ -3228,7 +3228,7 @@ process_item (PangoLayout *layout,
length = g_utf8_offset_to_pointer (layout->text + item->offset, break_num_chars) - (layout->text + item->offset);
new_item = pango_item_split (item, length, break_num_chars);
-
+
insert_run (line, state, new_item, FALSE);
state->log_widths_offset += break_num_chars;
@@ -3265,7 +3265,7 @@ line_set_resolved_dir (PangoLayoutLine *line,
case PANGO_DIRECTION_WEAK_LTR:
case PANGO_DIRECTION_NEUTRAL:
line->resolved_dir = PANGO_DIRECTION_LTR;
- break;
+ break;
case PANGO_DIRECTION_RTL:
case PANGO_DIRECTION_WEAK_RTL:
case PANGO_DIRECTION_TTB_LTR:
@@ -3313,7 +3313,7 @@ process_line (PangoLayout *layout,
ParaBreakState *state)
{
PangoLayoutLine *line;
-
+
gboolean have_break = FALSE; /* If we've seen a possible break yet */
int break_remaining_width = 0; /* Remaining width before adding run with break */
int break_start_offset = 0; /* Start width before adding run with break */
@@ -3355,7 +3355,7 @@ process_line (PangoLayout *layout,
break_start_offset = state->start_offset;
break_link = line->runs->next;
}
-
+
state->items = g_list_delete_link (state->items, state->items);
state->start_offset += old_num_chars;
@@ -3363,12 +3363,12 @@ process_line (PangoLayout *layout,
case BREAK_EMPTY_FIT:
goto done;
-
+
case BREAK_SOME_FIT:
state->start_offset += old_num_chars - item->num_chars;
layout->is_wrapped = TRUE;
goto done;
-
+
case BREAK_NONE_FIT:
/* Back up over unused runs to run where there is a break */
while (line->runs && line->runs != break_link)
@@ -3379,13 +3379,13 @@ process_line (PangoLayout *layout,
/* Reshape run to break */
item = state->items->data;
-
+
old_num_chars = item->num_chars;
result = process_item (layout, line, state, TRUE, TRUE);
g_assert (result == BREAK_SOME_FIT || result == BREAK_EMPTY_FIT);
-
+
state->start_offset += old_num_chars - item->num_chars;
-
+
layout->is_wrapped = TRUE;
goto done;
@@ -3396,7 +3396,7 @@ process_line (PangoLayout *layout,
}
}
- done:
+ done:
pango_layout_line_postprocess (line, state);
layout->lines = g_slist_prepend (layout->lines, line);
state->first_line = FALSE;
@@ -3411,7 +3411,7 @@ get_items_log_attrs (const char *text,
{
int offset = 0;
int index = 0;
-
+
while (items)
{
PangoItem tmp_item = *(PangoItem *)items->data;
@@ -3447,7 +3447,7 @@ get_items_log_attrs (const char *text,
offset += tmp_item.num_chars;
index += tmp_item.length;
-
+
items = items->next;
}
}
@@ -3456,7 +3456,7 @@ static PangoAttrList *
pango_layout_get_effective_attributes (PangoLayout *layout)
{
PangoAttrList *attrs;
-
+
if (layout->attrs)
attrs = pango_attr_list_copy (layout->attrs);
else
@@ -3467,7 +3467,7 @@ pango_layout_get_effective_attributes (PangoLayout *layout)
PangoAttribute *attr = pango_attr_font_desc_new (layout->font_desc);
attr->start_index = 0;
attr->end_index = layout->length;
-
+
pango_attr_list_insert_before (attrs, attr);
}
@@ -3514,20 +3514,20 @@ apply_no_shape_attributes (PangoLayout *layout,
PangoLayoutLine *line = line_list->data;
GSList *old_runs = g_slist_reverse (line->runs);
GSList *run_list;
-
+
line->runs = NULL;
for (run_list = old_runs; run_list; run_list = run_list->next)
{
PangoGlyphItem *glyph_item = run_list->data;
GSList *new_runs;
-
+
new_runs = pango_glyph_item_apply_attrs (glyph_item,
layout->text,
no_shape_attrs);
line->runs = g_slist_concat (new_runs, line->runs);
}
-
+
g_slist_free (old_runs);
}
}
@@ -3542,7 +3542,7 @@ pango_layout_check_lines (PangoLayout *layout)
PangoAttrList *no_shape_attrs;
PangoAttrIterator *iter;
PangoDirection prev_base_dir = PANGO_DIRECTION_NEUTRAL, base_dir = PANGO_DIRECTION_NEUTRAL;
-
+
if (layout->lines)
return;
@@ -3557,12 +3557,12 @@ pango_layout_check_lines (PangoLayout *layout)
attrs = pango_layout_get_effective_attributes (layout);
no_shape_attrs = filter_no_shape_attributes (attrs);
iter = pango_attr_list_get_iterator (attrs);
-
+
layout->log_attrs = g_new (PangoLogAttr, layout->n_chars + 1);
-
+
start_offset = 0;
start = layout->text;
-
+
/* Find the first strong direction of the text */
if (layout->auto_dir)
{
@@ -3598,7 +3598,7 @@ pango_layout_check_lines (PangoLayout *layout)
if (layout->auto_dir)
{
base_dir = pango_find_base_dir (start, delimiter_index);
-
+
/* Propagate the base direction for neutral paragraphs */
if (base_dir == PANGO_DIRECTION_NEUTRAL)
base_dir = prev_base_dir;
@@ -3607,9 +3607,9 @@ pango_layout_check_lines (PangoLayout *layout)
}
end = start + delimiter_index;
-
+
delim_len = next_para_index - delimiter_index;
-
+
if (end == (layout->text + layout->length))
done = TRUE;
@@ -3640,7 +3640,7 @@ pango_layout_check_lines (PangoLayout *layout)
state.glyphs = NULL;
state.log_widths = NULL;
-
+
while (state.items)
process_line (layout, &state);
}
@@ -3679,7 +3679,7 @@ pango_layout_check_lines (PangoLayout *layout)
/**
* pango_layout_line_ref:
* @line: a #PangoLayoutLine
- *
+ *
* Increase the reference count of a #PangoLayoutLine by one.
*
* Return value: the line passed in.
@@ -3690,7 +3690,7 @@ PangoLayoutLine *
pango_layout_line_ref (PangoLayoutLine *line)
{
PangoLayoutLinePrivate *private = (PangoLayoutLinePrivate *)line;
-
+
g_return_val_if_fail (line != NULL, NULL);
private->ref_count++;
@@ -3701,7 +3701,7 @@ pango_layout_line_ref (PangoLayoutLine *line)
/**
* pango_layout_line_unref:
* @line: a #PangoLayoutLine
- *
+ *
* Decrease the reference count of a #PangoLayoutLine by one.
* If the result is zero, the line and all associated memory
* will be freed.
@@ -3710,7 +3710,7 @@ void
pango_layout_line_unref (PangoLayoutLine *line)
{
PangoLayoutLinePrivate *private = (PangoLayoutLinePrivate *)line;
-
+
g_return_if_fail (line != NULL);
g_return_if_fail (private->ref_count > 0);
@@ -3727,7 +3727,7 @@ GType
pango_layout_line_get_type(void)
{
static GType our_type = 0;
-
+
if (our_type == 0)
our_type = g_boxed_type_register_static (I_("PangoLayoutLine"),
(GBoxedCopyFunc) pango_layout_line_ref,
@@ -3796,17 +3796,17 @@ pango_layout_line_x_to_index (PangoLayoutLine *line,
*index = first_index;
if (trailing)
*trailing = 0;
-
+
return FALSE;
}
g_assert (line->length > 0);
-
+
first_offset = g_utf8_pointer_to_offset (layout->text, layout->text + line->start_index);
end_index = first_index + line->length;
end_offset = first_offset + g_utf8_pointer_to_offset (layout->text + first_index, layout->text + end_index);
-
+
last_index = end_index;
last_offset = end_offset;
last_trailing = 0;
@@ -3826,14 +3826,14 @@ pango_layout_line_x_to_index (PangoLayoutLine *line,
*
* That is, if the text is "now is the time", and is broken between
* 'now' and 'is'
- *
+ *
* Then when the cursor is actually at:
*
- * n|o|w| |i|s|
+ * n|o|w| |i|s|
* ^
* we lie and say it is at:
*
- * n|o|w| |i|s|
+ * n|o|w| |i|s|
* ^
*
* So the cursor won't appear on the next line before 'the'.
@@ -3851,7 +3851,7 @@ pango_layout_line_x_to_index (PangoLayoutLine *line,
suppress_last_trailing = TRUE;
else
suppress_last_trailing = FALSE;
-
+
if (x_pos < 0)
{
/* pick the leftmost char */
@@ -3860,7 +3860,7 @@ pango_layout_line_x_to_index (PangoLayoutLine *line,
/* and its leftmost edge */
if (trailing)
*trailing = (line->resolved_dir == PANGO_DIRECTION_LTR || suppress_last_trailing) ? 0 : last_trailing;
-
+
return FALSE;
}
@@ -3917,7 +3917,7 @@ pango_layout_line_x_to_index (PangoLayoutLine *line,
grapheme_start_index = g_utf8_prev_char (layout->text + grapheme_start_index) - layout->text;
grapheme_start_offset--;
}
-
+
grapheme_end_offset = offset;
do
{
@@ -3928,7 +3928,7 @@ pango_layout_line_x_to_index (PangoLayoutLine *line,
if (index)
*index = grapheme_start_index;
-
+
if (trailing)
{
if ((grapheme_end_offset == end_offset && suppress_last_trailing) ||
@@ -3970,13 +3970,13 @@ pango_layout_line_x_to_index (PangoLayoutLine *line,
* edge of the layout. Otherwise, it will end at the
* trailing edge of the last character.
* @ranges: location to store a pointer to an array of ranges.
- * The array will be of length <literal>2*n_ranges</literal>,
+ * The array will be of length <literal>2*n_ranges</literal>,
* with each range starting at <literal>(*ranges)[2*n]</literal>
- * and of width <literal>(*ranges)[2*n + 1] - (*ranges)[2*n]</literal>.
- * This array must be freed with g_free(). The coordinates are relative
+ * and of width <literal>(*ranges)[2*n + 1] - (*ranges)[2*n]</literal>.
+ * This array must be freed with g_free(). The coordinates are relative
* to the layout and are in #PangoGlyphUnit.
* @n_ranges: The number of ranges stored in @ranges.
- *
+ *
* Gets a list of visual ranges corresponding to a given logical range.
* This list is not necessarily minimal - there may be consecutive
* ranges which are adjacent. The ranges will be sorted from left to
@@ -4026,7 +4026,7 @@ pango_layout_line_get_x_ranges (PangoLayoutLine *line,
/* Allocate the maximum possible size */
if (ranges)
*ranges = g_new (int, 2 * (2 + g_slist_length (line->runs)));
-
+
if (x_offset > 0 &&
((line->resolved_dir == PANGO_DIRECTION_LTR && start_index < line_start_index) ||
(line->resolved_dir == PANGO_DIRECTION_RTL && end_index > line_start_index + line->length)))
@@ -4036,7 +4036,7 @@ pango_layout_line_get_x_ranges (PangoLayoutLine *line,
(*ranges)[2*range_count] = 0;
(*ranges)[2*range_count + 1] = x_offset;
}
-
+
range_count ++;
}
@@ -4055,7 +4055,7 @@ pango_layout_line_get_x_ranges (PangoLayoutLine *line,
int run_start_x, run_end_x;
g_assert (run_end_index > 0);
-
+
/* Back the end_index off one since we want to find the trailing edge of the preceding character */
run_end_index = g_utf8_prev_char (line->layout->text + run_end_index) - line->layout->text;
@@ -4095,7 +4095,7 @@ pango_layout_line_get_x_ranges (PangoLayoutLine *line,
(*ranges)[2*range_count] = x_offset + logical_rect.width;
(*ranges)[2*range_count + 1] = line->layout->width;
}
-
+
range_count ++;
}
@@ -4125,11 +4125,11 @@ pango_layout_line_get_empty_extents (PangoLayoutLine *line,
{
PangoAttrIterator *iter = pango_attr_list_get_iterator (layout->attrs);
int start, end;
-
+
do
{
pango_attr_iterator_range (iter, &start, &end);
-
+
if (start <= index && index < end)
{
PangoFontDescription *base_font_desc;
@@ -4141,7 +4141,7 @@ pango_layout_line_get_empty_extents (PangoLayoutLine *line,
font_desc = pango_font_description_copy_static (base_font_desc);
free_font_desc = TRUE;
-
+
pango_attr_iterator_get_font (iter,
font_desc,
NULL,
@@ -4152,7 +4152,7 @@ pango_layout_line_get_empty_extents (PangoLayoutLine *line,
}
while (pango_attr_iterator_next (iter));
-
+
pango_attr_iterator_destroy (iter);
}
else
@@ -4193,7 +4193,7 @@ pango_layout_line_get_empty_extents (PangoLayoutLine *line,
if (free_font_desc)
pango_font_description_free (font_desc);
-
+
logical_rect->x = 0;
logical_rect->width = 0;
}
@@ -4250,7 +4250,7 @@ pango_layout_run_get_extents (PangoLayoutRun *run,
if (run_ink && (properties.uline != PANGO_UNDERLINE_NONE || properties.strikethrough))
{
PangoFontMetrics *metrics = pango_font_get_metrics (run->item->analysis.font,
- run->item->analysis.language);
+ run->item->analysis.language);
int underline_thickness = pango_font_metrics_get_underline_thickness (metrics);
int underline_position = pango_font_metrics_get_underline_position (metrics);
int strikethrough_thickness = pango_font_metrics_get_strikethrough_thickness (metrics);
@@ -4325,7 +4325,7 @@ pango_layout_run_get_extents (PangoLayoutRun *run,
* as drawn, or %NULL
* @logical_rect: rectangle used to store the logical extents of the glyph
* string, or %NULL
- *
+ *
* Computes the logical and ink extents of a layout line. See
* pango_font_get_glyph_extents() for details about the interpretation
* of the rectangles.
@@ -4339,7 +4339,7 @@ pango_layout_line_get_extents (PangoLayoutLine *line,
GSList *tmp_list;
int x_pos = 0;
gboolean caching = FALSE;
-
+
g_return_if_fail (LINE_IS_VALID (line));
if (!LINE_IS_VALID (line))
@@ -4380,7 +4380,7 @@ pango_layout_line_get_extents (PangoLayoutLine *line,
ink_rect->width = 0;
ink_rect->height = 0;
}
-
+
if (logical_rect)
{
logical_rect->x = 0;
@@ -4388,7 +4388,7 @@ pango_layout_line_get_extents (PangoLayoutLine *line,
logical_rect->width = 0;
logical_rect->height = 0;
}
-
+
tmp_list = line->runs;
while (tmp_list)
{
@@ -4400,7 +4400,7 @@ pango_layout_line_get_extents (PangoLayoutLine *line,
pango_layout_run_get_extents (run,
ink_rect ? &run_ink : NULL,
&run_logical);
-
+
if (ink_rect)
{
if (ink_rect->width == 0 || ink_rect->height == 0)
@@ -4414,32 +4414,32 @@ pango_layout_line_get_extents (PangoLayoutLine *line,
ink_rect->width = MAX (ink_rect->x + ink_rect->width,
x_pos + run_ink.x + run_ink.width) - new_pos;
ink_rect->x = new_pos;
-
+
new_pos = MIN (ink_rect->y, run_ink.y);
ink_rect->height = MAX (ink_rect->y + ink_rect->height,
run_ink.y + run_ink.height) - new_pos;
ink_rect->y = new_pos;
}
}
-
+
if (logical_rect)
{
new_pos = MIN (logical_rect->x, x_pos + run_logical.x);
logical_rect->width = MAX (logical_rect->x + logical_rect->width,
x_pos + run_logical.x + run_logical.width) - new_pos;
logical_rect->x = new_pos;
-
+
new_pos = MIN (logical_rect->y, run_logical.y);
logical_rect->height = MAX (logical_rect->y + logical_rect->height,
run_logical.y + run_logical.height) - new_pos;
logical_rect->y = new_pos;
}
-
+
x_pos += run_logical.width;
tmp_list = tmp_list->next;
}
-
- if (logical_rect && !line->runs)
+
+ if (logical_rect && !line->runs)
pango_layout_line_get_empty_extents (line, logical_rect);
if (caching)
@@ -4476,7 +4476,7 @@ pango_layout_line_new (PangoLayout *layout)
* as drawn, or %NULL
* @logical_rect: rectangle used to store the logical extents of the glyph
* string, or %NULL
- *
+ *
* Computes the logical and ink extents of @layout_line in device units.
* This function just calls pango_layout_line_get_extents() followed by
* pango_extents_to_pixels().
@@ -4546,7 +4546,7 @@ reorder_runs_recurse (GSList *items, int n_items)
tmp_list = tmp_list->next;
}
-
+
if (min_level % 2)
{
if (i > level_start_i)
@@ -4613,7 +4613,7 @@ adjust_line_letter_spacing (PangoLayoutLine *line)
PangoLayoutRun *last_run;
int tab_adjustment;
GSList *l;
-
+
/* If we have tab stops and the resolved direction of the
* line is RTL, then we need to walk through the line
* in reverse direction to figure out the corrections for
@@ -4640,7 +4640,7 @@ adjust_line_letter_spacing (PangoLayoutLine *line)
* which we add onto the next tab stop space to keep the
* things properly aligned.
*/
-
+
last_run = NULL;
tab_adjustment = 0;
for (l = line->runs; l; l = l->next)
@@ -4659,12 +4659,12 @@ adjust_line_letter_spacing (PangoLayoutLine *line)
PangoLayoutRun *visual_last_run = reversed ? next_run : last_run;
int run_spacing = get_item_letter_spacing (run->item);
int adjustment = run_spacing / 2;
-
+
if (visual_last_run && !is_tab_run (layout, visual_last_run))
adjust_final_space (visual_last_run->glyphs, adjustment);
else
tab_adjustment += adjustment;
-
+
if (visual_next_run && !is_tab_run (layout, visual_next_run))
adjust_final_space (run->glyphs, - adjustment);
else
@@ -4687,7 +4687,7 @@ pango_layout_line_postprocess (PangoLayoutLine *line,
{
/* NB: the runs are in reverse order at this point, since we prepended them to the list
*/
-
+
/* Reverse the runs
*/
line->runs = g_slist_reverse (line->runs);
@@ -4696,11 +4696,11 @@ pango_layout_line_postprocess (PangoLayoutLine *line,
*/
if (_pango_layout_line_ellipsize (line, state->attrs))
line->layout->is_ellipsized = TRUE;
-
+
/* Now convert logical to visual order
*/
pango_layout_line_reorder (line);
-
+
/* Fixup letter spacing between runs
*/
adjust_line_letter_spacing (line);
@@ -4733,11 +4733,11 @@ pango_layout_get_item_properties (PangoItem *item,
case PANGO_ATTR_STRIKETHROUGH:
properties->strikethrough = ((PangoAttrInt *)attr)->value;
break;
-
+
case PANGO_ATTR_RISE:
properties->rise = ((PangoAttrInt *)attr)->value;
break;
-
+
case PANGO_ATTR_LETTER_SPACING:
properties->letter_spacing = ((PangoAttrInt *)attr)->value;
break;
@@ -4766,7 +4766,7 @@ next_cluster_start (PangoGlyphString *gs,
{
if (gs->glyphs[i].attr.is_cluster_start)
return i;
-
+
i++;
}
@@ -4786,7 +4786,7 @@ cluster_width (PangoGlyphString *gs,
{
if (gs->glyphs[i].attr.is_cluster_start)
break;
-
+
width += gs->glyphs[i].geometry.width;
i++;
}
@@ -4808,7 +4808,7 @@ offset_y (PangoLayoutIter *iter,
/* Sets up the iter for the start of a new cluster. cluster_start_index
* is the byte index of the cluster start relative to the run.
*/
-static void
+static void
update_cluster (PangoLayoutIter *iter,
int cluster_start_index)
{
@@ -4863,7 +4863,7 @@ update_run (PangoLayoutIter *iter,
Extents *line_ext;
line_ext = (Extents*)iter->line_extents_link->data;
-
+
/* Note that in iter_new() the iter->run_width
* is garbage but we don't use it since we're on the first run of
* a line.
@@ -4872,7 +4872,7 @@ update_run (PangoLayoutIter *iter,
iter->run_x = line_ext->logical_rect.x;
else
iter->run_x += iter->run_width;
-
+
if (iter->run)
{
iter->run_width = pango_layout_run_get_width (iter->run);
@@ -4911,7 +4911,7 @@ pango_layout_iter_copy (PangoLayoutIter *iter)
GSList *l;
new = g_slice_new (PangoLayoutIter);
-
+
new->layout = g_object_ref (iter->layout);
new->line_list_link = iter->line_list_link;
new->line = iter->line;
@@ -4932,11 +4932,11 @@ pango_layout_iter_copy (PangoLayoutIter *iter)
new->line_extents_link = new->line_extents;
}
new->line_extents = g_slist_reverse (new->line_extents);
-
+
new->run_x = iter->run_x;
new->run_width = iter->run_width;
new->ltr = iter->ltr;
-
+
new->cluster_x = iter->cluster_x;
new->cluster_width = iter->cluster_width;
@@ -4955,7 +4955,7 @@ GType
pango_layout_iter_get_type (void)
{
static GType our_type = 0;
-
+
if (our_type == 0)
our_type = g_boxed_type_register_static (I_("PangoLayoutIter"),
(GBoxedCopyFunc)pango_layout_iter_copy,
@@ -4967,9 +4967,9 @@ pango_layout_iter_get_type (void)
/**
* pango_layout_get_iter:
* @layout: a #PangoLayout
- *
+ *
* Returns an iterator to iterate over the visual extents of the layout.
- *
+ *
* Return value: the new #PangoLayoutIter that should be freed using
* pango_layout_iter_free().
**/
@@ -4979,16 +4979,16 @@ pango_layout_get_iter (PangoLayout *layout)
int run_start_index;
PangoLayoutIter *iter;
PangoRectangle logical_rect;
-
+
g_return_val_if_fail (PANGO_IS_LAYOUT (layout), NULL);
-
+
iter = g_slice_new (PangoLayoutIter);
iter->layout = layout;
g_object_ref (iter->layout);
pango_layout_check_lines (layout);
-
+
iter->line_list_link = layout->lines;
iter->line = iter->line_list_link->data;
pango_layout_line_ref (iter->line);
@@ -5021,7 +5021,7 @@ pango_layout_get_iter (PangoLayout *layout)
/**
* pango_layout_iter_free:
* @iter: a #PangoLayoutIter
- *
+ *
* Frees an iterator that's no longer in use.
**/
void
@@ -5039,12 +5039,12 @@ pango_layout_iter_free (PangoLayoutIter *iter)
/**
* pango_layout_iter_get_index:
* @iter: a #PangoLayoutIter
- *
+ *
* Gets the current byte index. Note that iterating forward by char
* moves in visual order, not logical order, so indexes may not be
* sequential. Also, the index may be equal to the length of the text
* in the layout, if on the %NULL run (see pango_layout_iter_get_run()).
- *
+ *
* Return value: current byte index.
**/
int
@@ -5052,14 +5052,14 @@ pango_layout_iter_get_index (PangoLayoutIter *iter)
{
if (ITER_IS_INVALID (iter))
return 0;
-
+
return iter->index;
}
/**
* pango_layout_iter_get_run:
* @iter: a #PangoLayoutIter
- *
+ *
* Gets the current run. When iterating by run, at the end of each
* line, there's a position with a %NULL run, so this function can return
* %NULL. The %NULL run at the end of each line ensures that all lines have
@@ -5067,7 +5067,7 @@ pango_layout_iter_get_index (PangoLayoutIter *iter)
*
* Use the faster pango_layout_iter_get_run_readonly() if you do not plan
* to modify the contents of the run (glyphs, glyph widths, etc.).
- *
+ *
* Return value: the current run.
**/
PangoLayoutRun*
@@ -5084,16 +5084,16 @@ pango_layout_iter_get_run (PangoLayoutIter *iter)
/**
* pango_layout_iter_get_run_readonly:
* @iter: a #PangoLayoutIter
- *
+ *
* Gets the current run. When iterating by run, at the end of each
* line, there's a position with a %NULL run, so this function can return
* %NULL. The %NULL run at the end of each line ensures that all lines have
* at least one run, even lines consisting of only a newline.
- *
+ *
* This is a faster alternative to pango_layout_iter_get_run(),
* but the user is not expected
* to modify the contents of the run (glyphs, glyph widths, etc.).
- *
+ *
* Return value: the current run, that should not be modified.
*
* Since: 1.16
@@ -5119,12 +5119,12 @@ _pango_layout_iter_get_line (PangoLayoutIter *iter)
/**
* pango_layout_iter_get_line:
* @iter: a #PangoLayoutIter
- *
+ *
* Gets the current line.
*
* Use the faster pango_layout_iter_get_line_readonly() if you do not plan
* to modify the contents of the line (glyphs, glyph widths, etc.).
- *
+ *
* Return value: the current line.
**/
PangoLayoutLine*
@@ -5141,13 +5141,13 @@ pango_layout_iter_get_line (PangoLayoutIter *iter)
/**
* pango_layout_iter_get_line_readonly:
* @iter: a #PangoLayoutIter
- *
+ *
* Gets the current line for read-only access.
*
* This is a faster alternative to pango_layout_iter_get_line(),
* but the user is not expected
* to modify the contents of the line (glyphs, glyph widths, etc.).
- *
+ *
* Return value: the current line, that should not be modified.
*
* Since: 1.16
@@ -5164,9 +5164,9 @@ pango_layout_iter_get_line_readonly (PangoLayoutIter *iter)
/**
* pango_layout_iter_at_last_line:
* @iter: a #PangoLayoutIter
- *
+ *
* Determines whether @iter is on the last line of the layout.
- *
+ *
* Return value: %TRUE if @iter is on the last line.
**/
gboolean
@@ -5209,14 +5209,14 @@ next_nonempty_line (PangoLayoutIter *iter,
result = pango_layout_iter_next_line (iter);
if (!result)
break;
-
+
if (iter->line->runs)
break;
-
+
if (include_terminators && line_is_terminated (iter))
break;
}
-
+
return result;
}
@@ -5229,20 +5229,20 @@ next_nonempty_run (PangoLayoutIter *iter,
gboolean include_terminators)
{
gboolean result;
-
+
while (TRUE)
{
result = pango_layout_iter_next_run (iter);
if (!result)
break;
-
+
if (iter->run)
break;
-
+
if (include_terminators && line_is_terminated (iter))
break;
}
-
+
return result;
}
@@ -5256,15 +5256,15 @@ next_cluster_internal (PangoLayoutIter *iter,
{
PangoGlyphString *gs;
int next_start;
-
+
if (ITER_IS_INVALID (iter))
return FALSE;
if (iter->run == NULL)
return next_nonempty_line (iter, include_terminators);
-
+
gs = iter->run->glyphs;
-
+
next_start = iter->next_cluster_glyph;
if (next_start == gs->num_glyphs)
{
@@ -5283,10 +5283,10 @@ next_cluster_internal (PangoLayoutIter *iter,
/**
* pango_layout_iter_next_char:
* @iter: a #PangoLayoutIter
- *
+ *
* Moves @iter forward to the next character in visual order. If @iter was already at
* the end of the layout, returns %FALSE.
- *
+ *
* Return value: whether motion was possible.
**/
gboolean
@@ -5314,23 +5314,23 @@ pango_layout_iter_next_char (PangoLayoutIter *iter)
iter->character_position++;
if (iter->character_position >= iter->cluster_num_chars)
return next_cluster_internal (iter, TRUE);
-
+
text = iter->layout->text;
if (iter->ltr)
iter->index = g_utf8_next_char (text + iter->index) - text;
else
iter->index = g_utf8_prev_char (text + iter->index) - text;
-
+
return TRUE;
}
/**
* pango_layout_iter_next_cluster:
* @iter: a #PangoLayoutIter
- *
+ *
* Moves @iter forward to the next cluster in visual order. If @iter
* was already at the end of the layout, returns %FALSE.
- *
+ *
* Return value: whether motion was possible.
**/
gboolean
@@ -5342,10 +5342,10 @@ pango_layout_iter_next_cluster (PangoLayoutIter *iter)
/**
* pango_layout_iter_next_run:
* @iter: a #PangoLayoutIter
- *
+ *
* Moves @iter forward to the next run in visual order. If @iter was
* already at the end of the layout, returns %FALSE.
- *
+ *
* Return value: whether motion was possible.
**/
gboolean
@@ -5353,7 +5353,7 @@ pango_layout_iter_next_run (PangoLayoutIter *iter)
{
int next_run_start; /* byte index */
GSList *next_link;
-
+
if (ITER_IS_INVALID (iter))
return FALSE;
@@ -5367,7 +5367,7 @@ pango_layout_iter_next_run (PangoLayoutIter *iter)
/* Moving on to the zero-width "virtual run" at the end of each
* line
*/
- next_run_start = iter->run->item->offset + iter->run->item->length;
+ next_run_start = iter->run->item->offset + iter->run->item->length;
iter->run = NULL;
iter->run_list_link = NULL;
}
@@ -5377,19 +5377,19 @@ pango_layout_iter_next_run (PangoLayoutIter *iter)
iter->run = iter->run_list_link->data;
next_run_start = iter->run->item->offset;
}
-
+
update_run (iter, next_run_start);
-
+
return TRUE;
}
/**
* pango_layout_iter_next_line:
* @iter: a #PangoLayoutIter
- *
+ *
* Moves @iter forward to the start of the next line. If @iter is
* already on the last line, returns %FALSE.
- *
+ *
* Return value: whether motion was possible.
**/
gboolean
@@ -5408,7 +5408,7 @@ pango_layout_iter_next_line (PangoLayoutIter *iter)
iter->line_list_link = next_link;
pango_layout_line_unref (iter->line);
-
+
iter->line = iter->line_list_link->data;
pango_layout_line_ref (iter->line);
@@ -5421,10 +5421,10 @@ pango_layout_iter_next_line (PangoLayoutIter *iter)
iter->run = NULL;
iter->line_extents_link = iter->line_extents_link->next;
- g_assert (iter->line_extents_link != NULL);
+ g_assert (iter->line_extents_link != NULL);
update_run (iter, iter->line->start_index);
-
+
return TRUE;
}
@@ -5432,12 +5432,12 @@ pango_layout_iter_next_line (PangoLayoutIter *iter)
* pango_layout_iter_get_char_extents:
* @iter: a #PangoLayoutIter
* @logical_rect: rectangle to fill with logical extents
- *
+ *
* Gets the extents of the current character, in layout coordinates
* (origin is the top left of the entire layout). Only logical extents
* can sensibly be obtained for characters; ink extents make sense only
* down to the level of clusters.
- *
+ *
**/
void
pango_layout_iter_get_char_extents (PangoLayoutIter *iter,
@@ -5462,7 +5462,7 @@ pango_layout_iter_get_char_extents (PangoLayoutIter *iter,
*logical_rect = cluster_rect;
return;
}
-
+
x0 = (iter->character_position * cluster_rect.width) / iter->cluster_num_chars;
x1 = ((iter->character_position + 1) * cluster_rect.width) / iter->cluster_num_chars;
@@ -5480,7 +5480,7 @@ pango_layout_iter_get_char_extents (PangoLayoutIter *iter,
*
* Gets the extents of the current cluster, in layout coordinates
* (origin is the top left of the entire layout).
- *
+ *
**/
void
pango_layout_iter_get_cluster_extents (PangoLayoutIter *iter,
@@ -5498,7 +5498,7 @@ pango_layout_iter_get_cluster_extents (PangoLayoutIter *iter,
pango_layout_iter_get_run_extents (iter, ink_rect, logical_rect);
return;
}
-
+
pango_glyph_string_extents_range (iter->run->glyphs,
iter->cluster_start,
iter->next_cluster_glyph,
@@ -5525,10 +5525,10 @@ pango_layout_iter_get_cluster_extents (PangoLayoutIter *iter,
* @iter: a #PangoLayoutIter
* @ink_rect: rectangle to fill with ink extents, or %NULL
* @logical_rect: rectangle to fill with logical extents, or %NULL
- *
+ *
* Gets the extents of the current run in layout coordinates
* (origin is the top left of the entire layout).
- *
+ *
**/
void
pango_layout_iter_get_run_extents (PangoLayoutIter *iter,
@@ -5560,12 +5560,12 @@ pango_layout_iter_get_run_extents (PangoLayoutIter *iter,
else
{
/* The empty run at the end of a line */
-
+
pango_layout_iter_get_line_extents (iter, ink_rect, logical_rect);
if (ink_rect)
{
- ink_rect->x = iter->run_x;
+ ink_rect->x = iter->run_x;
ink_rect->width = 0;
}
@@ -5589,7 +5589,7 @@ pango_layout_iter_get_run_extents (PangoLayoutIter *iter,
* #PangoLayout). Thus the extents returned by this function will be
* the same width/height but not at the same x/y as the extents
* returned from pango_layout_line_get_extents().
- *
+ *
**/
void
pango_layout_iter_get_line_extents (PangoLayoutIter *iter,
@@ -5597,7 +5597,7 @@ pango_layout_iter_get_line_extents (PangoLayoutIter *iter,
PangoRectangle *logical_rect)
{
Extents *ext;
-
+
if (ITER_IS_INVALID (iter))
return;
@@ -5612,7 +5612,7 @@ pango_layout_iter_get_line_extents (PangoLayoutIter *iter,
ink_rect,
NULL);
}
-
+
if (logical_rect)
*logical_rect = ext->logical_rect;
}
@@ -5620,7 +5620,7 @@ pango_layout_iter_get_line_extents (PangoLayoutIter *iter,
/**
* pango_layout_iter_get_line_yrange:
* @iter: a #PangoLayoutIter
- * @y0_: start of line
+ * @y0_: start of line
* @y1_: end of line
*
* Divides the vertical space in the #PangoLayout being iterated over
@@ -5630,7 +5630,7 @@ pango_layout_iter_get_line_extents (PangoLayoutIter *iter,
* pango_layout_set_spacing() has been called to set layout spacing.
* The Y positions are in layout coordinates (origin at top left of the
* entire layout).
- *
+ *
**/
void
pango_layout_iter_get_line_yrange (PangoLayoutIter *iter,
@@ -5639,7 +5639,7 @@ pango_layout_iter_get_line_yrange (PangoLayoutIter *iter,
{
Extents *ext;
int half_spacing;
-
+
if (ITER_IS_INVALID (iter))
return;
@@ -5650,11 +5650,11 @@ pango_layout_iter_get_line_yrange (PangoLayoutIter *iter,
/* Note that if layout->spacing is odd, the remainder spacing goes
* above the line (this is pretty arbitrary of course)
*/
-
+
if (y0)
{
/* No spacing above the first line */
-
+
if (iter->line_extents_link == iter->line_extents)
*y0 = ext->logical_rect.y;
else
@@ -5674,17 +5674,17 @@ pango_layout_iter_get_line_yrange (PangoLayoutIter *iter,
/**
* pango_layout_iter_get_baseline:
* @iter: a #PangoLayoutIter
- *
+ *
* Gets the Y position of the current line's baseline, in layout
* coordinates (origin at top left of the entire layout).
- *
+ *
* Return value: baseline of current line.
**/
int
pango_layout_iter_get_baseline (PangoLayoutIter *iter)
{
Extents *ext;
-
+
if (ITER_IS_INVALID (iter))
return 0;
@@ -5702,7 +5702,7 @@ pango_layout_iter_get_baseline (PangoLayoutIter *iter)
* Obtains the extents of the #PangoLayout being iterated
* over. @ink_rect or @logical_rect can be %NULL if you
* aren't interested in them.
- *
+ *
**/
void
pango_layout_iter_get_layout_extents (PangoLayoutIter *iter,
diff --git a/pango/pango-layout.h b/pango/pango-layout.h
index 47b4394f..752d624b 100644
--- a/pango/pango-layout.h
+++ b/pango/pango-layout.h
@@ -54,7 +54,7 @@ typedef enum {
* @PANGO_ELLIPSIZE_START: Omit characters at the start of the text
* @PANGO_ELLIPSIZE_MIDDLE: Omit characters in the middle of the text
* @PANGO_ELLIPSIZE_END: Omit characters at the end of the text
- *
+ *
* The #PangoEllipsizeMode type describes what sort of (if any)
* ellipsization should be applied to a line of text. In
* the ellipsization process characters are removed from the
@@ -74,7 +74,7 @@ struct _PangoLayoutLine
gint start_index; /* start of line as byte index into layout->text */
gint length; /* length of line in bytes */
GSList *runs;
- guint is_paragraph_start : 1; /* TRUE if this is the first line of the paragraph */
+ guint is_paragraph_start : 1; /* TRUE if this is the first line of the paragraph */
guint resolved_dir : 3; /* Resolved PangoDirection of line */
};
diff --git a/pango/pango-markup.c b/pango/pango-markup.c
index e53bb592..077bb3b1 100644
--- a/pango/pango-markup.c
+++ b/pango/pango-markup.c
@@ -162,7 +162,7 @@ scale_factor (int scale_level, double base)
int i;
/* 1.2 is the CSS scale factor between sizes */
-
+
if (scale_level > 0)
{
i = 0;
@@ -179,7 +179,7 @@ scale_factor (int scale_level, double base)
while (i < 0)
{
factor /= 1.2;
-
+
++i;
}
}
@@ -214,24 +214,24 @@ open_tag_set_absolute_font_scale (OpenTag *ot,
ot->scale_level = 0;
ot->scale_level_delta = 0;
}
-
+
static OpenTag*
markup_data_open_tag (MarkupData *md)
{
OpenTag *ot;
OpenTag *parent = NULL;
-
+
if (md->attr_list == NULL)
return NULL;
if (md->tag_stack)
parent = md->tag_stack->data;
-
+
ot = g_slice_new (OpenTag);
ot->attrs = NULL;
ot->start_index = md->index;
ot->scale_level_delta = 0;
-
+
if (parent == NULL)
{
ot->base_scale_factor = 1.0;
@@ -246,7 +246,7 @@ markup_data_open_tag (MarkupData *md)
ot->has_base_font_size = parent->has_base_font_size;
ot->scale_level = parent->scale_level;
}
-
+
md->tag_stack = g_slist_prepend (md->tag_stack, ot);
return ot;
@@ -278,7 +278,7 @@ markup_data_close_tag (MarkupData *md)
a->start_index = ot->start_index;
a->end_index = md->index;
-
+
md->to_apply = g_slist_prepend (md->to_apply, a);
tmp_list = g_slist_next (tmp_list);
@@ -311,12 +311,12 @@ markup_data_close_tag (MarkupData *md)
a->start_index = ot->start_index;
a->end_index = md->index;
-
+
md->to_apply = g_slist_prepend (md->to_apply, a);
}
-
+
g_slist_free (ot->attrs);
- g_slice_free (OpenTag, ot);
+ g_slice_free (OpenTag, ot);
}
static void
@@ -425,9 +425,9 @@ text_handler (GMarkupParseContext *context,
if (md->accel_marker == 0)
{
/* Just append all the text */
-
+
md->index += text_len;
-
+
g_string_append_len (md->text, text, text_len);
}
else
@@ -439,16 +439,16 @@ text_handler (GMarkupParseContext *context,
const gchar *range_end;
gssize uline_index = -1;
gsize uline_len = 0; /* Quiet GCC */
-
+
range_end = NULL;
range_start = text;
p = text;
end = text + text_len;
-
+
while (p != end)
{
gunichar c;
-
+
c = g_utf8_get_char (p);
if (range_end)
@@ -487,19 +487,19 @@ text_handler (GMarkupParseContext *context,
*/
uline_index = md->index;
uline_len = g_utf8_next_char (p) - p;
-
+
/* set next range_start to include this char */
range_start = p;
}
/* reset range_end */
range_end = NULL;
- }
+ }
else if (c == md->accel_marker)
{
range_end = p;
}
-
+
p = g_utf8_next_char (p);
}
@@ -517,17 +517,17 @@ text_handler (GMarkupParseContext *context,
end - range_start);
md->index += end - range_start;
}
-
+
if (md->attr_list != NULL && uline_index >= 0)
{
- /* Add the underline indicating the accelerator */
+ /* Add the underline indicating the accelerator */
PangoAttribute *attr;
attr = pango_attr_underline_new (PANGO_UNDERLINE_LOW);
attr->start_index = uline_index;
attr->end_index = uline_index + uline_len;
-
+
pango_attr_list_change (md->attr_list, attr);
}
}
@@ -556,7 +556,7 @@ static const GMarkupParser pango_markup_parser = {
* @text: address of return location for text with tags stripped, or %NULL
* @accel_char: address of return location for accelerator char, or %NULL
* @error: address of return location for errors, or %NULL
- *
+ *
*
* Parses marked-up text (see
* <link linkend="PangoMarkupFormat">markup format</link>) to create
@@ -569,7 +569,7 @@ static const GMarkupParser pango_markup_parser = {
* and the first character so marked will be returned in @accel_char.
* Two @accel_marker characters following each other produce a single
* literal @accel_marker character.
- *
+ *
* Return value: %FALSE if @error is set, otherwise %TRUE
**/
gboolean
@@ -587,9 +587,9 @@ pango_parse_markup (const char *markup_text,
GSList *tmp_list;
const char *p;
const char *end;
-
+
g_return_val_if_fail (markup_text != NULL, FALSE);
-
+
md = g_slice_new (MarkupData);
/* Don't bother creating these if they weren't requested;
@@ -602,22 +602,22 @@ pango_parse_markup (const char *markup_text,
md->attr_list = NULL;
md->text = g_string_new (NULL);
-
+
if (accel_char)
*accel_char = 0;
md->accel_marker = accel_marker;
md->accel_char = 0;
-
+
md->index = 0;
md->tag_stack = NULL;
md->to_apply = NULL;
-
+
context = g_markup_parse_context_new (&pango_markup_parser,
0, md, NULL);
if (length < 0)
- length = strlen (markup_text);
+ length = strlen (markup_text);
p = markup_text;
end = markup_text + length;
@@ -662,7 +662,7 @@ pango_parse_markup (const char *markup_text,
while (tmp_list != NULL)
{
PangoAttribute *attr = tmp_list->data;
-
+
/* Innermost tags before outermost */
pango_attr_list_change (md->attr_list, attr);
@@ -671,7 +671,7 @@ pango_parse_markup (const char *markup_text,
g_slist_free (md->to_apply);
md->to_apply = NULL;
}
-
+
if (attr_list)
*attr_list = md->attr_list;
@@ -679,12 +679,12 @@ pango_parse_markup (const char *markup_text,
*text = g_string_free (md->text, FALSE);
else
g_string_free (md->text, TRUE);
-
+
if (accel_char)
*accel_char = md->accel_char;
-
+
g_assert (md->tag_stack == NULL);
-
+
g_slice_free (MarkupData, md);
return TRUE;
@@ -695,7 +695,7 @@ pango_parse_markup (const char *markup_text,
g_slist_foreach (md->to_apply, (GFunc) pango_attribute_destroy, NULL);
g_slist_free (md->to_apply);
g_string_free (md->text, TRUE);
-
+
if (md->attr_list)
pango_attr_list_unref (md->attr_list);
@@ -782,7 +782,7 @@ parse_absolute_size (OpenTag *tag,
{
SizeLevel level = Medium;
double factor;
-
+
if (strcmp (size, "xx-small") == 0)
level = XXSmall;
else if (strcmp (size, "x-small") == 0)
@@ -807,7 +807,7 @@ parse_absolute_size (OpenTag *tag,
add_attribute (tag, pango_attr_scale_new (factor));
if (tag)
open_tag_set_absolute_font_scale (tag, factor);
-
+
return TRUE;
}
@@ -979,7 +979,7 @@ span_parse_func (MarkupData *md,
const char *fallback = NULL;
const char *gravity = NULL;
const char *gravity_hint = NULL;
-
+
g_markup_parse_context_get_position (context,
&line_number, &char_number);
@@ -1134,7 +1134,7 @@ span_parse_func (MarkupData *md,
if (G_UNLIKELY (style))
{
PangoStyle pango_style;
-
+
if (pango_parse_style (style, &pango_style, FALSE))
add_attribute (tag, pango_attr_style_new (pango_style));
else
@@ -1153,7 +1153,7 @@ span_parse_func (MarkupData *md,
if (G_UNLIKELY (weight))
{
PangoWeight pango_weight;
-
+
if (pango_parse_weight (weight, &pango_weight, FALSE))
add_attribute (tag,
pango_attr_weight_new (pango_weight));
@@ -1173,7 +1173,7 @@ span_parse_func (MarkupData *md,
if (G_UNLIKELY (variant))
{
PangoVariant pango_variant;
-
+
if (pango_parse_variant (variant, &pango_variant, FALSE))
add_attribute (tag, pango_attr_variant_new (pango_variant));
else
@@ -1192,7 +1192,7 @@ span_parse_func (MarkupData *md,
if (G_UNLIKELY (stretch))
{
PangoStretch pango_stretch;
-
+
if (pango_parse_stretch (stretch, &pango_stretch, FALSE))
add_attribute (tag, pango_attr_stretch_new (pango_stretch));
else
@@ -1222,7 +1222,7 @@ span_parse_func (MarkupData *md,
if (G_UNLIKELY (background))
{
PangoColor color;
-
+
if (!span_parse_color ("background", background, &color, line_number, error))
goto error;
@@ -1312,7 +1312,7 @@ span_parse_func (MarkupData *md,
if (G_UNLIKELY (letter_spacing))
{
gint n = 0;
-
+
if (!span_parse_int ("letter_spacing", letter_spacing, &n, line_number, error))
goto error;
@@ -1324,7 +1324,7 @@ span_parse_func (MarkupData *md,
add_attribute (tag,
pango_attr_language_new (pango_language_from_string (lang)));
}
-
+
return TRUE;
error:
@@ -1355,7 +1355,7 @@ markup_parse_func (MarkupData *md,
GError **error)
{
/* We don't do anything with this tag at the moment. */
-
+
return TRUE;
}
diff --git a/pango/pango-matrix.c b/pango/pango-matrix.c
index 907cc7ea..971e6a61 100644
--- a/pango/pango-matrix.c
+++ b/pango/pango-matrix.c
@@ -30,7 +30,7 @@ GType
pango_matrix_get_type (void)
{
static GType our_type = 0;
-
+
if (our_type == 0)
our_type = g_boxed_type_register_static (I_("PangoMatrix"),
(GBoxedCopyFunc) pango_matrix_copy,
@@ -42,9 +42,9 @@ pango_matrix_get_type (void)
/**
* pango_matrix_copy:
* @matrix: a #PangoMatrix, can be %NULL
- *
+ *
* Copies a #PangoMatrix.
- *
+ *
* Return value: the newly allocated #PangoMatrix, which should
* be freed with pango_matrix_free(), or %NULL if
* @matrix was %NULL.
@@ -70,7 +70,7 @@ pango_matrix_copy (const PangoMatrix *matrix)
/**
* pango_matrix_free:
* @matrix: a #PangoMatrix, or %NULL
- *
+ *
* Free a #PangoMatrix created with pango_matrix_copy().
* Does nothing if @matrix is %NULL.
*
@@ -88,7 +88,7 @@ pango_matrix_free (PangoMatrix *matrix)
* @matrix: a #PangoMatrix
* @tx: amount to translate in the X direction
* @ty: amount to translate in the Y direction
- *
+ *
* Changes the transformation represented by @matrix to be the
* transformation given by first translating by (@tx, @ty)
* then applying the original transformation.
@@ -111,7 +111,7 @@ pango_matrix_translate (PangoMatrix *matrix,
* @matrix: a #PangoMatrix
* @scale_x: amount to scale by in X direction
* @scale_y: amount to scale by in Y direction
- *
+ *
* Changes the transformation represented by @matrix to be the
* transformation given by first scaling by @sx in the X direction
* and @sy in the Y direction then applying the original
@@ -136,7 +136,7 @@ pango_matrix_scale (PangoMatrix *matrix,
* pango_matrix_rotate:
* @matrix: a #PangoMatrix
* @degrees: degrees to rotate counter-clockwise
- *
+ *
* Changes the transformation represented by @matrix to be the
* transformation given by first rotating by @degrees degrees
* counter-clockwise then applying the original transformation.
@@ -170,7 +170,7 @@ pango_matrix_rotate (PangoMatrix *matrix,
* pango_matrix_concat:
* @matrix: a #PangoMatrix
* @new_matrix: a #PangoMatrix
- *
+ *
* Changes the transformation represented by @matrix to be the
* transformation given by first applying transformation
* given by @new_matrix then applying the original transformation.
@@ -182,7 +182,7 @@ pango_matrix_concat (PangoMatrix *matrix,
const PangoMatrix *new_matrix)
{
PangoMatrix tmp;
-
+
g_return_if_fail (matrix != NULL);
tmp = *matrix;
@@ -198,7 +198,7 @@ pango_matrix_concat (PangoMatrix *matrix,
/**
* pango_matrix_get_font_scale_factor:
* @matrix: a #PangoMatrix, may be %NULL
- *
+ *
* Returns the scale factor of a matrix on the height of the font.
* That is, the scale factor in the direction perpendicular to the
* vector that the X coordinate is mapped to.
@@ -217,10 +217,10 @@ pango_matrix_get_font_scale_factor (const PangoMatrix *matrix)
* Copyright 2005, Keith Packard
*/
double det;
-
+
if (!matrix)
return 1.0;
-
+
det = matrix->xx * matrix->yy - matrix->yx * matrix->xy;
if (det == 0)
@@ -234,16 +234,16 @@ pango_matrix_get_font_scale_factor (const PangoMatrix *matrix)
double major, minor;
major = sqrt (x*x + y*y);
-
+
/*
* ignore mirroring
*/
if (det < 0)
det = - det;
-
+
if (major)
minor = det / major;
- else
+ else
minor = 0.0;
return minor;
@@ -295,7 +295,7 @@ pango_matrix_transform_distance (const PangoMatrix *matrix,
* @matrix: a #PangoMatrix, or %NULL
* @x: in/out X position
* @y: in/out Y position
- *
+ *
* Transforms the point (@x, @y) by @matrix.
*
* Since: 1.16
@@ -318,7 +318,7 @@ pango_matrix_transform_point (const PangoMatrix *matrix,
* pango_matrix_transform_rectangle:
* @matrix: a #PangoMatrix, or %NULL
* @rect: in/out bounding box in Pango units, or %NULL
- *
+ *
* First transforms @rect using @matrix, then calculates the bounding box
* of the transformed rectangle. The rectangle should be in Pango units.
*
@@ -397,7 +397,7 @@ pango_matrix_transform_rectangle (const PangoMatrix *matrix,
* pango_matrix_transform_pixel_rectangle:
* @matrix: a #PangoMatrix, or %NULL
* @rect: in/out bounding box in device units, or %NULL
- *
+ *
* First transforms the @rect using @matrix, then calculates the bounding box
* of the transformed rectangle. The rectangle should be in device units
* (pixels).
diff --git a/pango/pango-ot-buffer.c b/pango/pango-ot-buffer.c
index eef1f0e8..539d5fd9 100644
--- a/pango/pango-ot-buffer.c
+++ b/pango/pango-ot-buffer.c
@@ -36,7 +36,7 @@
* be freed with pango_ot_buffer_destroy().
*
* Since: 1.4
- **/
+ **/
PangoOTBuffer *
pango_ot_buffer_new (PangoFcFont *font)
{
@@ -69,7 +69,7 @@ pango_ot_buffer_new (PangoFcFont *font)
* Destroys a #PangoOTBuffer and free all associated memory.
*
* Since: 1.4
- **/
+ **/
void
pango_ot_buffer_destroy (PangoOTBuffer *buffer)
{
@@ -85,7 +85,7 @@ pango_ot_buffer_destroy (PangoOTBuffer *buffer)
* Empties a #PangoOTBuffer, make it ready to add glyphs to.
*
* Since: 1.4
- **/
+ **/
void
pango_ot_buffer_clear (PangoOTBuffer *buffer)
{
@@ -104,7 +104,7 @@ pango_ot_buffer_clear (PangoOTBuffer *buffer)
* features should be applied on this glyph. See pango_ruleset_add_feature().
*
* Since: 1.4
- **/
+ **/
void
pango_ot_buffer_add_glyph (PangoOTBuffer *buffer,
guint glyph,
@@ -124,7 +124,7 @@ pango_ot_buffer_add_glyph (PangoOTBuffer *buffer,
* is needed for proper horizontal positioning of right-to-left scripts.
*
* Since: 1.4
- **/
+ **/
void
pango_ot_buffer_set_rtl (PangoOTBuffer *buffer,
gboolean rtl)
@@ -137,7 +137,7 @@ pango_ot_buffer_set_rtl (PangoOTBuffer *buffer,
* @buffer: a #PangoOTBuffer
* @zero_width_marks: %TRUE if characters with a mark class should
* be forced to zero width.
- *
+ *
* 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
@@ -163,7 +163,7 @@ pango_ot_buffer_set_zero_width_marks (PangoOTBuffer *buffer,
* as buffer is not modified.
*
* Since: 1.4
- **/
+ **/
void
pango_ot_buffer_get_glyphs (PangoOTBuffer *buffer,
PangoOTGlyph **glyphs,
@@ -180,16 +180,16 @@ static void
swap_range (PangoGlyphString *glyphs, int start, int end)
{
int i, j;
-
+
for (i = start, j = end - 1; i < j; i++, j--)
{
PangoGlyphInfo glyph_info;
gint log_cluster;
-
+
glyph_info = glyphs->glyphs[i];
glyphs->glyphs[i] = glyphs->glyphs[j];
glyphs->glyphs[j] = glyph_info;
-
+
log_cluster = glyphs->log_clusters[i];
glyphs->log_clusters[i] = glyphs->log_clusters[j];
glyphs->log_clusters[j] = log_cluster;
@@ -201,27 +201,27 @@ apply_gpos_ltr (PangoGlyphString *glyphs,
HB_Position positions)
{
int i;
-
+
for (i = 0; i < glyphs->num_glyphs; i++)
{
FT_Pos x_pos = positions[i].x_pos;
FT_Pos y_pos = positions[i].y_pos;
int back = i;
int j;
-
+
while (positions[back].back != 0)
{
back -= positions[back].back;
x_pos += positions[back].x_pos;
y_pos += positions[back].y_pos;
}
-
+
for (j = back; j < i; j++)
glyphs->glyphs[i].geometry.x_offset -= glyphs->glyphs[j].geometry.width;
-
+
glyphs->glyphs[i].geometry.x_offset += PANGO_UNITS_26_6(x_pos);
glyphs->glyphs[i].geometry.y_offset -= PANGO_UNITS_26_6(y_pos);
-
+
if (positions[i].new_advance)
glyphs->glyphs[i].geometry.width = PANGO_UNITS_26_6(positions[i].x_advance);
else
@@ -234,7 +234,7 @@ apply_gpos_rtl (PangoGlyphString *glyphs,
HB_Position positions)
{
int i;
-
+
for (i = 0; i < glyphs->num_glyphs; i++)
{
int i_rev = glyphs->num_glyphs - i - 1;
@@ -252,13 +252,13 @@ apply_gpos_rtl (PangoGlyphString *glyphs,
}
back = glyphs->num_glyphs - back_rev - 1;
-
+
for (j = i; j < back; j++)
glyphs->glyphs[i].geometry.x_offset += glyphs->glyphs[j].geometry.width;
-
+
glyphs->glyphs[i].geometry.x_offset += PANGO_UNITS_26_6(x_pos);
glyphs->glyphs[i].geometry.y_offset -= PANGO_UNITS_26_6(y_pos);
-
+
if (positions[i_rev].new_advance)
glyphs->glyphs[i].geometry.width = PANGO_UNITS_26_6(positions[i_rev].x_advance);
else
@@ -276,7 +276,7 @@ apply_gpos_rtl (PangoGlyphString *glyphs,
* resulting glyphs into a generic Pango glyph string.
*
* Since: 1.4
- **/
+ **/
void
pango_ot_buffer_output (PangoOTBuffer *buffer,
PangoGlyphString *glyphs)
@@ -289,7 +289,7 @@ pango_ot_buffer_output (PangoOTBuffer *buffer,
face = pango_fc_font_lock_face (buffer->font);
g_assert (face);
-
+
/* Copy glyphs into output glyph string */
pango_glyph_string_set_size (glyphs, buffer->buffer->in_length);
@@ -297,7 +297,7 @@ pango_ot_buffer_output (PangoOTBuffer *buffer,
for (i = 0; i < buffer->buffer->in_length; i++)
{
HB_GlyphItem item = &buffer->buffer->in_string[i];
-
+
glyphs->glyphs[i].glyph = item->gindex;
glyphs->log_clusters[i] = item->cluster;
@@ -311,14 +311,14 @@ pango_ot_buffer_output (PangoOTBuffer *buffer,
info = pango_ot_info_get (face);
gdef = pango_ot_info_get_gdef (info);
-
+
/* Apply default positioning */
for (i = 0; i < (unsigned int)glyphs->num_glyphs; i++)
{
if (glyphs->glyphs[i].glyph)
{
PangoRectangle logical_rect;
-
+
FT_UShort property;
if (buffer->zero_width_marks &&
@@ -336,7 +336,7 @@ pango_ot_buffer_output (PangoOTBuffer *buffer,
}
else
glyphs->glyphs[i].geometry.width = 0;
-
+
glyphs->glyphs[i].geometry.x_offset = 0;
glyphs->glyphs[i].geometry.y_offset = 0;
}
diff --git a/pango/pango-ot-info.c b/pango/pango-ot-info.c
index 6c362db5..b2f4dac6 100644
--- a/pango/pango-ot-info.c
+++ b/pango/pango-ot-info.c
@@ -57,28 +57,28 @@ pango_ot_info_get_type (void)
NULL, /* init */
NULL, /* value_table */
};
-
+
object_type = g_type_register_static (G_TYPE_OBJECT,
I_("PangoOTInfo"),
&object_info, 0);
}
-
+
return object_type;
}
-static void
+static void
pango_ot_info_class_init (GObjectClass *object_class)
{
parent_class = g_type_class_peek_parent (object_class);
-
+
object_class->finalize = pango_ot_info_finalize;
}
-static void
+static void
pango_ot_info_finalize (GObject *object)
{
PangoOTInfo *info = PANGO_OT_INFO (object);
-
+
if (info->gdef)
{
HB_Done_GDEF_Table (info->gdef);
@@ -101,9 +101,9 @@ pango_ot_info_finalize (GObject *object)
static void
pango_ot_info_finalizer (void *object)
{
- FT_Face face = object;
+ FT_Face face = object;
PangoOTInfo *info = face->generic.data;
-
+
info->face = NULL;
g_object_unref (info);
}
@@ -111,7 +111,7 @@ pango_ot_info_finalizer (void *object)
/**
* pango_ot_info_get:
* @face: a <type>FT_Face</type>.
- *
+ *
* Returns the #PangoOTInfo structure for the given FreeType font.
*
* Return value: the #PangoOTInfo for @face. This object will have
@@ -130,7 +130,7 @@ pango_ot_info_get (FT_Face face)
{
info = face->generic.data = g_object_new (PANGO_TYPE_OT_INFO, NULL);
face->generic.finalizer = pango_ot_info_finalizer;
-
+
info->face = face;
}
@@ -163,7 +163,7 @@ compare_glyph_info (gconstpointer a,
(info_a->glyph == info_b->glyph) ? 0 : 1;
}
-/* Make a guess at the appropriate class for a glyph given
+/* Make a guess at the appropriate class for a glyph given
* a character code that maps to the glyph
*/
static gboolean
@@ -176,7 +176,7 @@ get_glyph_class (gunichar charcode,
if ((charcode >= 0xFB50 && charcode <= 0xFDFF) || /* Arabic Presentation Forms-A */
(charcode >= 0xFE70 && charcode <= 0XFEFF)) /* Arabic Presentation Forms-B */
return FALSE;
-
+
switch (g_unichar_type (charcode))
{
case G_UNICODE_COMBINING_MARK:
@@ -223,7 +223,7 @@ synthesize_class_def (PangoOTInfo *info)
FT_UInt glyph;
unsigned int i, j;
FT_CharMap old_charmap;
-
+
old_charmap = info->face->charmap;
if (!old_charmap || !old_charmap->encoding != ft_encoding_unicode)
@@ -246,7 +246,7 @@ synthesize_class_def (PangoOTInfo *info)
if (get_glyph_class (charcode, &glyph_info.class))
g_array_append_val (glyph_infos, glyph_info);
}
-
+
charcode = FT_Get_Next_Char (info->face, charcode, &glyph);
}
@@ -265,7 +265,7 @@ synthesize_class_def (PangoOTInfo *info)
{
glyph_indices[j] = info->glyph;
classes[j] = info->class;
-
+
j++;
}
}
@@ -282,7 +282,7 @@ synthesize_class_def (PangoOTInfo *info)
FT_Set_Charmap (info->face, old_charmap);
}
-HB_GDEF
+HB_GDEF
pango_ot_info_get_gdef (PangoOTInfo *info)
{
g_return_val_if_fail (PANGO_IS_OT_INFO (info), NULL);
@@ -290,13 +290,13 @@ pango_ot_info_get_gdef (PangoOTInfo *info)
if (!(info->loaded & INFO_LOADED_GDEF))
{
FT_Error error;
-
+
info->loaded |= INFO_LOADED_GDEF;
if (is_truetype (info->face))
{
error = HB_Load_GDEF_Table (info->face, &info->gdef);
-
+
if (error && error != FT_Err_Table_Missing)
g_warning ("Error loading GDEF table %d", error);
@@ -315,12 +315,12 @@ HB_GSUB
pango_ot_info_get_gsub (PangoOTInfo *info)
{
g_return_val_if_fail (PANGO_IS_OT_INFO (info), NULL);
-
+
if (!(info->loaded & INFO_LOADED_GSUB))
{
FT_Error error;
HB_GDEF gdef = pango_ot_info_get_gdef (info);
-
+
info->loaded |= INFO_LOADED_GSUB;
if (is_truetype (info->face))
@@ -331,7 +331,7 @@ pango_ot_info_get_gsub (PangoOTInfo *info)
g_warning ("Error loading GSUB table %d", error);
}
}
-
+
return info->gsub;
}
@@ -339,7 +339,7 @@ HB_GPOS
pango_ot_info_get_gpos (PangoOTInfo *info)
{
g_return_val_if_fail (PANGO_IS_OT_INFO (info), NULL);
-
+
if (!(info->loaded & INFO_LOADED_GPOS))
{
FT_Error error;
@@ -403,12 +403,12 @@ get_tables (PangoOTInfo *info,
* @table_type: the table type to obtain information about.
* @script_tag: the tag of the script to find.
* @script_index: location to store the index of the script, or %NULL.
- *
+ *
* Finds the index of a script.
*
* Return value: %TRUE if the script was found.
**/
-gboolean
+gboolean
pango_ot_info_find_script (PangoOTInfo *info,
PangoOTTableType table_type,
PangoOTTag script_tag,
@@ -443,10 +443,10 @@ pango_ot_info_find_script (PangoOTInfo *info,
* @script_index: the index of the script whose languages are searched.
* @language_tag: the tag of the language to find.
* @language_index: location to store the index of the language, or %NULL.
- * @required_feature_index: location to store the required feature index of
+ * @required_feature_index: location to store the required feature index of
* the language, or %NULL.
- *
- * Finds the index of a language and its required feature index.
+ *
+ * Finds the index of a language and its required feature index.
*
* Return value: %TRUE if the language was found.
**/
@@ -494,8 +494,8 @@ pango_ot_info_find_language (PangoOTInfo *info,
* @script_index: the index of the script.
* @language_index: the index of the language whose features are searched,
* or %PANGO_OT_DEFAULT_LANGUAGE to use the default language of the script.
- * @feature_index: location to store the index of the feature, or %NULL.
- *
+ * @feature_index: location to store the index of the feature, or %NULL.
+ *
* Finds the index of a feature.
*
* Return value: %TRUE if the feature was found.
@@ -553,7 +553,7 @@ pango_ot_info_find_feature (PangoOTInfo *info,
* @info: a #PangoOTInfo.
* @table_type: the table type to obtain information about.
*
- * Obtains the list of available scripts.
+ * Obtains the list of available scripts.
*
* Return value: a newly-allocated array containing the tags of the
* available scripts.
@@ -572,7 +572,7 @@ pango_ot_info_list_scripts (PangoOTInfo *info,
return NULL;
result = g_new (PangoOTTag, script_list->ScriptCount + 1);
-
+
for (i=0; i < script_list->ScriptCount; i++)
result[i] = script_list->ScriptRecord[i].ScriptTag;
@@ -587,12 +587,12 @@ pango_ot_info_list_scripts (PangoOTInfo *info,
* @table_type: the table type to obtain information about.
* @script_index: the index of the script to list languages for.
* @language_tag: unused parameter.
- *
+ *
* Obtains the list of available languages for a given script.
*
* Return value: a newly-allocated array containing the tags of the
* available languages.
- **/
+ **/
PangoOTTag *
pango_ot_info_list_languages (PangoOTInfo *info,
PangoOTTableType table_type,
@@ -612,9 +612,9 @@ pango_ot_info_list_languages (PangoOTInfo *info,
g_return_val_if_fail (script_index < script_list->ScriptCount, NULL);
script = &script_list->ScriptRecord[script_index].Script;
-
+
result = g_new (PangoOTTag, script->LangSysCount + 1);
-
+
for (i = 0; i < script->LangSysCount; i++)
result[i] = script->LangSysRecord[i].LangSysTag;
@@ -623,12 +623,12 @@ pango_ot_info_list_languages (PangoOTInfo *info,
return result;
}
-/**
+/**
* pango_ot_info_list_features:
* @info: a #PangoOTInfo.
* @table_type: the table type to obtain information about.
* @tag: unused parameter.
- * @script_index: the index of the script to obtain information about.
+ * @script_index: the index of the script to obtain information about.
* @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.
@@ -636,7 +636,7 @@ pango_ot_info_list_languages (PangoOTInfo *info,
* Obtains the list of features for the given language of the given script.
*
* Return value: a newly-allocated array containing the tags of the
- * available features.
+ * available features.
**/
PangoOTTag *
pango_ot_info_list_features (PangoOTInfo *info,
@@ -672,7 +672,7 @@ pango_ot_info_list_features (PangoOTInfo *info,
}
result = g_new (PangoOTTag, lang_sys->FeatureCount + 1);
-
+
for (i = 0; i < lang_sys->FeatureCount; i++)
{
FT_UShort index = lang_sys->FeatureIndex[i];
diff --git a/pango/pango-ot-private.h b/pango/pango-ot-private.h
index e51294f6..c301a56f 100644
--- a/pango/pango-ot-private.h
+++ b/pango/pango-ot-private.h
@@ -38,7 +38,7 @@ G_BEGIN_DECLS
typedef struct _PangoOTInfoClass PangoOTInfoClass;
-struct _PangoOTInfo
+struct _PangoOTInfo
{
GObject parent_instance;
diff --git a/pango/pango-ot-ruleset.c b/pango/pango-ot-ruleset.c
index 591cd571..666dfcf5 100644
--- a/pango/pango-ot-ruleset.c
+++ b/pango/pango-ot-ruleset.c
@@ -26,7 +26,7 @@
typedef struct _PangoOTRule PangoOTRule;
-struct _PangoOTRule
+struct _PangoOTRule
{
gulong property_bit;
FT_UShort feature_index;
@@ -59,30 +59,30 @@ pango_ot_ruleset_get_type (void)
(GInstanceInitFunc)pango_ot_ruleset_init,
NULL /* value_table */
};
-
+
object_type = g_type_register_static (G_TYPE_OBJECT,
I_("PangoOTRuleset"),
&object_info, 0);
}
-
+
return object_type;
}
-static void
+static void
pango_ot_ruleset_class_init (GObjectClass *object_class)
{
parent_class = g_type_class_peek_parent (object_class);
-
+
object_class->finalize = pango_ot_ruleset_finalize;
}
-static void
+static void
pango_ot_ruleset_init (PangoOTRuleset *ruleset)
{
ruleset->rules = g_array_new (FALSE, FALSE, sizeof (PangoOTRule));
}
-static void
+static void
pango_ot_ruleset_finalize (GObject *object)
{
PangoOTRuleset *ruleset = PANGO_OT_RULESET (object);
@@ -162,9 +162,9 @@ pango_ot_ruleset_substitute (PangoOTRuleset *ruleset,
PangoOTBuffer *buffer)
{
unsigned int i;
-
+
HB_GSUB gsub = NULL;
-
+
g_return_if_fail (PANGO_IS_OT_RULESET (ruleset));
g_return_if_fail (PANGO_IS_OT_INFO (ruleset->info));
@@ -206,9 +206,9 @@ pango_ot_ruleset_position (PangoOTRuleset *ruleset,
PangoOTBuffer *buffer)
{
unsigned int i;
-
+
HB_GPOS gpos = NULL;
-
+
g_return_if_fail (PANGO_IS_OT_RULESET (ruleset));
g_return_if_fail (PANGO_IS_OT_INFO (ruleset->info));
diff --git a/pango/pango-ot.h b/pango/pango-ot.h
index 0d223f72..3d6c4f1f 100644
--- a/pango/pango-ot.h
+++ b/pango/pango-ot.h
@@ -37,7 +37,7 @@ typedef struct _PangoOTBuffer PangoOTBuffer;
typedef struct _PangoOTGlyph PangoOTGlyph;
typedef struct _PangoOTRuleset PangoOTRuleset;
-typedef enum
+typedef enum
{
PANGO_OT_TABLE_GSUB,
PANGO_OT_TABLE_GPOS
diff --git a/pango/pango-renderer.c b/pango/pango-renderer.c
index bb415cc0..702af77c 100644
--- a/pango/pango-renderer.c
+++ b/pango/pango-renderer.c
@@ -2,7 +2,7 @@
* pango-renderer.h: Base class for rendering
*
* Copyright (C) 2004 Red Hat, Inc.
- *
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
@@ -41,7 +41,7 @@ struct _LineState
{
PangoUnderline underline;
PangoRectangle underline_rect;
-
+
gboolean strikethrough;
PangoRectangle strikethrough_rect;
@@ -103,7 +103,7 @@ static void
pango_renderer_class_init (PangoRendererClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
+
klass->draw_glyphs = pango_renderer_default_draw_glyphs;
klass->draw_rectangle = pango_renderer_default_draw_rectangle;
klass->draw_error_underline = pango_renderer_default_draw_error_underline;
@@ -127,7 +127,7 @@ static void
pango_renderer_finalize (GObject *gobject)
{
PangoRenderer *renderer = PANGO_RENDERER (gobject);
-
+
if (renderer->matrix)
pango_matrix_free (renderer->matrix);
}
@@ -152,7 +152,7 @@ pango_renderer_draw_layout (PangoRenderer *renderer,
int y)
{
PangoLayoutIter *iter;
-
+
g_return_if_fail (PANGO_IS_RENDERER (renderer));
g_return_if_fail (PANGO_IS_LAYOUT (layout));
@@ -165,7 +165,7 @@ pango_renderer_draw_layout (PangoRenderer *renderer,
pango_renderer_set_matrix (renderer,
pango_context_get_matrix (context));
}
-
+
pango_renderer_activate (renderer);
iter = pango_layout_get_iter (layout);
@@ -175,9 +175,9 @@ pango_renderer_draw_layout (PangoRenderer *renderer,
PangoRectangle logical_rect;
PangoLayoutLine *line;
int baseline;
-
+
line = pango_layout_iter_get_line_readonly (iter);
-
+
pango_layout_iter_get_line_extents (iter, NULL, &logical_rect);
baseline = pango_layout_iter_get_baseline (iter);
@@ -189,7 +189,7 @@ pango_renderer_draw_layout (PangoRenderer *renderer,
while (pango_layout_iter_next_line (iter));
pango_layout_iter_free (iter);
-
+
pango_renderer_deactivate (renderer);
}
@@ -199,9 +199,9 @@ draw_underline (PangoRenderer *renderer,
{
PangoRectangle *rect = &state->underline_rect;
PangoUnderline underline = state->underline;
-
+
state->underline = PANGO_UNDERLINE_NONE;
-
+
switch (underline)
{
case PANGO_UNDERLINE_NONE:
@@ -241,7 +241,7 @@ draw_strikethrough (PangoRenderer *renderer,
gboolean strikethrough = state->strikethrough;
state->strikethrough = FALSE;
-
+
if (strikethrough)
pango_renderer_draw_rectangle (renderer,
PANGO_RENDER_PART_STRIKETHROUGH,
@@ -258,12 +258,12 @@ handle_line_state_change (PangoRenderer *renderer,
LineState *state = renderer->priv->line_state;
if (!state)
return;
-
+
if (part == PANGO_RENDER_PART_UNDERLINE &&
state->underline != PANGO_UNDERLINE_NONE)
{
PangoRectangle *rect = &state->underline_rect;
-
+
rect->width = state->logical_rect_end - rect->x;
draw_underline (renderer, state);
state->underline = renderer->underline;
@@ -295,7 +295,7 @@ add_underline (PangoRenderer *renderer,
{
PangoRectangle *current_rect = &state->underline_rect;
PangoRectangle new_rect;
-
+
int underline_thickness = pango_font_metrics_get_underline_thickness (metrics);
int underline_position = pango_font_metrics_get_underline_position (metrics);
@@ -303,7 +303,7 @@ add_underline (PangoRenderer *renderer,
new_rect.width = logical_rect->width;
new_rect.height = underline_thickness;
new_rect.y = base_y;
-
+
switch (renderer->underline)
{
case PANGO_UNDERLINE_NONE:
@@ -318,7 +318,7 @@ add_underline (PangoRenderer *renderer,
new_rect.y += ink_rect->y + ink_rect->height + underline_thickness;
break;
}
-
+
if (renderer->underline == state->underline &&
new_rect.y == current_rect->y &&
new_rect.height == current_rect->height)
@@ -328,7 +328,7 @@ add_underline (PangoRenderer *renderer,
else
{
draw_underline (renderer, state);
-
+
*current_rect = new_rect;
state->underline = renderer->underline;
}
@@ -345,15 +345,15 @@ add_strikethrough (PangoRenderer *renderer,
{
PangoRectangle *current_rect = &state->strikethrough_rect;
PangoRectangle new_rect;
-
+
int strikethrough_thickness = pango_font_metrics_get_strikethrough_thickness (metrics);
int strikethrough_position = pango_font_metrics_get_strikethrough_position (metrics);
-
+
new_rect.x = base_x + logical_rect->x;
new_rect.width = logical_rect->width;
new_rect.y = base_y - strikethrough_position;
new_rect.height = strikethrough_thickness;
-
+
if (state->strikethrough &&
new_rect.y == current_rect->y &&
new_rect.height == current_rect->height)
@@ -363,7 +363,7 @@ add_strikethrough (PangoRenderer *renderer,
else
{
draw_strikethrough (renderer, state);
-
+
*current_rect = new_rect;
state->strikethrough = TRUE;
}
@@ -452,7 +452,7 @@ pango_renderer_draw_layout_line (PangoRenderer *renderer,
GSList *l;
gboolean got_overall = FALSE;
PangoRectangle overall_rect;
-
+
g_return_if_fail (PANGO_IS_RENDERER_FAST (renderer));
/* We only change the matrix if the renderer isn't already
@@ -485,7 +485,7 @@ pango_renderer_draw_layout_line (PangoRenderer *renderer,
logical = &logical_rect;
pango_renderer_prepare_run (renderer, run);
-
+
get_item_properties (run->item, &rise, &shape_attr);
if (shape_attr)
@@ -526,7 +526,7 @@ pango_renderer_draw_layout_line (PangoRenderer *renderer,
pango_layout_line_get_extents (line, NULL, &overall_rect);
got_overall = TRUE;
}
-
+
pango_renderer_draw_rectangle (renderer,
PANGO_RENDER_PART_BACKGROUND,
x + x_off,
@@ -551,17 +551,17 @@ pango_renderer_draw_layout_line (PangoRenderer *renderer,
{
metrics = pango_font_get_metrics (run->item->analysis.font,
run->item->analysis.language);
-
+
if (renderer->underline != PANGO_UNDERLINE_NONE)
add_underline (renderer, &state,metrics,
x + x_off, y - rise,
ink, logical);
-
+
if (renderer->strikethrough)
add_strikethrough (renderer, &state, metrics,
x + x_off, y - rise,
ink, logical);
-
+
pango_font_metrics_unref (metrics);
}
@@ -581,7 +581,7 @@ pango_renderer_draw_layout_line (PangoRenderer *renderer,
draw_strikethrough (renderer, &state);
renderer->priv->line_state = NULL;
-
+
pango_renderer_deactivate (renderer);
}
@@ -607,11 +607,11 @@ pango_renderer_draw_glyphs (PangoRenderer *renderer,
int y)
{
g_return_if_fail (PANGO_IS_RENDERER_FAST (renderer));
-
+
pango_renderer_activate (renderer);
PANGO_RENDERER_GET_CLASS (renderer)->draw_glyphs (renderer, font, glyphs, x, y);
-
+
pango_renderer_deactivate (renderer);
}
@@ -629,7 +629,7 @@ pango_renderer_default_draw_glyphs (PangoRenderer *renderer,
{
PangoGlyphInfo *gi = &glyphs->glyphs[i];
Point p;
-
+
to_device (renderer->matrix,
x + x_position + gi->geometry.x_offset,
y + gi->geometry.y_offset,
@@ -669,7 +669,7 @@ pango_renderer_draw_rectangle (PangoRenderer *renderer,
g_return_if_fail (PANGO_IS_RENDERER_FAST (renderer));
g_return_if_fail (IS_VALID_PART (part));
g_return_if_fail (renderer->active_count > 0);
-
+
PANGO_RENDERER_GET_CLASS (renderer)->draw_rectangle (renderer, part, x, y, width, height);
}
@@ -748,7 +748,7 @@ draw_rectangle (PangoRenderer *renderer,
points[1].y, points[1].x, points[1].x + base_width,
points[2].y, points[2].x - base_width, points[2].x);
pango_renderer_draw_trapezoid (renderer, part, /* C */
- points[2].y, points[2].x - base_width, points[2].x,
+ points[2].y, points[2].x - base_width, points[2].x,
points[3].y, points[3].x, points[3].x);
}
else
@@ -764,7 +764,7 @@ draw_rectangle (PangoRenderer *renderer,
points[1].y, points[1].x - base_width, points[1].x,
points[2].y, points[2].x, points[2].x + base_width);
pango_renderer_draw_trapezoid (renderer, part, /* C */
- points[2].y, points[2].x, points[2].x + base_width,
+ points[2].y, points[2].x, points[2].x + base_width,
points[3].y, points[3].x, points[3].x);
}
}
@@ -808,7 +808,7 @@ pango_renderer_draw_error_underline (PangoRenderer *renderer,
{
g_return_if_fail (PANGO_IS_RENDERER_FAST (renderer));
g_return_if_fail (renderer->active_count > 0);
-
+
PANGO_RENDERER_GET_CLASS (renderer)->draw_error_underline (renderer, x, y, width, height);
}
@@ -818,7 +818,7 @@ pango_renderer_draw_error_underline (PangoRenderer *renderer,
* / \ / \ / \ / \ / \ |
* \ \ /\ \ / / \ \ /\ \ |
* \ \/B \ \/ C / \ \/B \ \ | height = HEIGHT_SQUARES * square
- * \ A \ /\ A \ / \ A \ /\ A \ |
+ * \ A \ /\ A \ / \ A \ /\ A \ |
* \ \/ \ \/ \ \/ \ \ |
* \ / \ / \ / \ / |
* \/ \/ \/ \/ -
@@ -829,15 +829,15 @@ pango_renderer_draw_error_underline (PangoRenderer *renderer,
* are axis aligned rectangles. (If fonts were square, the diagrams
* would be clearer)
*
- * (0,0)
- * /\ /\
- * / \ / \
- * /\ /\ /\ /
- * / \/ \/ \/
- * / \ /\ /
- * Y axis \/ \/
- * \ /\
- * \/ \
+ * (0,0)
+ * /\ /\
+ * / \ / \
+ * /\ /\ /\ /
+ * / \/ \/ \/
+ * / \ /\ /
+ * Y axis \/ \/
+ * \ /\
+ * \/ \
* \ X axis
*
* Note that the long side in this coordinate system is HEIGHT_SQUARES + 1
@@ -848,7 +848,7 @@ pango_renderer_draw_error_underline (PangoRenderer *renderer,
* either HEIGHT_SQUARES=3 (a little long and skinny) or
* HEIGHT_SQUARES=2 (a bit short and stubby)
*/
-
+
#define HEIGHT_SQUARES 2.5
static void
@@ -938,7 +938,7 @@ pango_renderer_default_draw_error_underline (PangoRenderer *renderer,
* @y2: Y coordinate of bottom of trapezoid
* @x12: X coordinate of left end of bottom of trapezoid
* @x22: X coordinate of right end of bottom of trapezoid
- *
+ *
* Draws a trapezoid with the parallel sides aligned with the X axis
* using the given #PangoRenderer; coordinates are in device space.
*
@@ -956,7 +956,7 @@ pango_renderer_draw_trapezoid (PangoRenderer *renderer,
{
g_return_if_fail (PANGO_IS_RENDERER_FAST (renderer));
g_return_if_fail (renderer->active_count > 0);
-
+
if (PANGO_RENDERER_GET_CLASS (renderer)->draw_trapezoid)
PANGO_RENDERER_GET_CLASS (renderer)->draw_trapezoid (renderer, part,
y1_, x11, x21,
@@ -970,7 +970,7 @@ pango_renderer_draw_trapezoid (PangoRenderer *renderer,
* @glyph: the glyph index of a single glyph
* @x: X coordinate of left edge of baseline of glyph
* @y: Y coordinate of left edge of baseline of glyph
- *
+ *
* Draws a single glyph with coordinates in device space.
*
* Since: 1.8
@@ -984,10 +984,10 @@ pango_renderer_draw_glyph (PangoRenderer *renderer,
{
g_return_if_fail (PANGO_IS_RENDERER_FAST (renderer));
g_return_if_fail (renderer->active_count > 0);
-
+
if (glyph == PANGO_GLYPH_EMPTY) /* glyph PANGO_GLYPH_EMPTY never renders */
return;
-
+
if (PANGO_RENDERER_GET_CLASS (renderer)->draw_glyph)
PANGO_RENDERER_GET_CLASS (renderer)->draw_glyph (renderer, font, glyph, x, y);
}
@@ -995,7 +995,7 @@ pango_renderer_draw_glyph (PangoRenderer *renderer,
/**
* pango_renderer_activate:
* @renderer: a #PangoRenderer
- *
+ *
* Does initial setup before rendering operations on @renderer.
* pango_renderer_deactivate() should be called when done drawing.
* Calls such as pango_renderer_draw_layout() automatically
@@ -1022,7 +1022,7 @@ pango_renderer_activate (PangoRenderer *renderer)
/**
* pango_renderer_deactivate:
* @renderer: a #PangoRenderer
- *
+ *
* Cleans up after rendering operations on @renderer. See
* docs for pango_renderer_activate().
*
@@ -1033,7 +1033,7 @@ pango_renderer_deactivate (PangoRenderer *renderer)
{
g_return_if_fail (PANGO_IS_RENDERER_FAST (renderer));
g_return_if_fail (renderer->active_count > 0);
-
+
if (renderer->active_count == 1)
{
if (PANGO_RENDERER_GET_CLASS (renderer)->end)
@@ -1047,7 +1047,7 @@ pango_renderer_deactivate (PangoRenderer *renderer)
* @renderer: a #PangoRenderer
* @part: the part to change the color of
* @color: the new color or %NULL to unset the current color
- *
+ *
* Sets the color for part of the rendering.
*
* Since: 1.8
@@ -1068,7 +1068,7 @@ pango_renderer_set_color (PangoRenderer *renderer,
return;
pango_renderer_part_changed (renderer, part);
-
+
if (color)
{
renderer->priv->color_set[part] = TRUE;
@@ -1084,9 +1084,9 @@ pango_renderer_set_color (PangoRenderer *renderer,
* pango_renderer_get_color:
* @renderer: a #PangoRenderer
* @part: the part to get the color for
- *
+ *
* Gets the current rendering color for the specified part.
- *
+ *
* Return value: the color for the specified part, or %NULL
* if it hasn't been set and should be inherited from the
* environment.
@@ -1099,7 +1099,7 @@ pango_renderer_get_color (PangoRenderer *renderer,
{
g_return_val_if_fail (PANGO_IS_RENDERER_FAST (renderer), NULL);
g_return_val_if_fail (IS_VALID_PART (part), NULL);
-
+
if (renderer->priv->color_set[part])
return &renderer->priv->color[part];
else
@@ -1110,7 +1110,7 @@ pango_renderer_get_color (PangoRenderer *renderer,
* pango_renderer_part_changed:
* @renderer: a #PangoRenderer
* @part: the part for which rendering has changed.
- *
+ *
* 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
@@ -1134,7 +1134,7 @@ pango_renderer_part_changed (PangoRenderer *renderer,
g_return_if_fail (PANGO_IS_RENDERER_FAST (renderer));
g_return_if_fail (IS_VALID_PART (part));
g_return_if_fail (renderer->active_count > 0);
-
+
handle_line_state_change (renderer, part);
if (PANGO_RENDERER_GET_CLASS (renderer)->part_changed)
@@ -1145,7 +1145,7 @@ pango_renderer_part_changed (PangoRenderer *renderer,
* pango_renderer_prepare_run:
* @renderer: a #PangoRenderer
* @run: a #PangoLayoutRun
- *
+ *
* Set up the state of the #PangoRenderer for rendering @run.
*
* Since: 1.8
@@ -1155,7 +1155,7 @@ pango_renderer_prepare_run (PangoRenderer *renderer,
PangoLayoutRun *run)
{
g_return_if_fail (PANGO_IS_RENDERER_FAST (renderer));
-
+
PANGO_RENDERER_GET_CLASS (renderer)->prepare_run (renderer, run);
}
@@ -1175,33 +1175,33 @@ pango_renderer_default_prepare_run (PangoRenderer *renderer,
for (l = run->item->analysis.extra_attrs; l; l = l->next)
{
PangoAttribute *attr = l->data;
-
+
switch (attr->klass->type)
{
case PANGO_ATTR_UNDERLINE:
renderer->underline = ((PangoAttrInt *)attr)->value;
break;
-
+
case PANGO_ATTR_STRIKETHROUGH:
renderer->strikethrough = ((PangoAttrInt *)attr)->value;
break;
-
+
case PANGO_ATTR_FOREGROUND:
fg_color = &((PangoAttrColor *)attr)->color;
break;
-
+
case PANGO_ATTR_BACKGROUND:
bg_color = &((PangoAttrColor *)attr)->color;
break;
-
+
case PANGO_ATTR_UNDERLINE_COLOR:
underline_color = &((PangoAttrColor *)attr)->color;
break;
-
+
case PANGO_ATTR_STRIKETHROUGH_COLOR:
strikethrough_color = &((PangoAttrColor *)attr)->color;
break;
-
+
default:
break;
}
@@ -1224,7 +1224,7 @@ pango_renderer_default_prepare_run (PangoRenderer *renderer,
* @renderer: a #PangoRenderer
* @matrix: a #PangoMatrix, or %NULL to unset any existing matrix.
* (No matrix set is the same as setting the identity matrix.)
- *
+ *
* Sets the transformation matrix that will be applied when rendering.
*
* Since: 1.8
diff --git a/pango/pango-renderer.h b/pango/pango-renderer.h
index 4a993969..211ae283 100644
--- a/pango/pango-renderer.h
+++ b/pango/pango-renderer.h
@@ -2,7 +2,7 @@
* pango-renderer.h: Base class for rendering
*
* Copyright (C) 2004, Red Hat, Inc.
- *
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
@@ -76,10 +76,10 @@ struct _PangoRenderer
PangoUnderline underline;
gboolean strikethrough;
int active_count;
-
+
/*< public >*/
PangoMatrix *matrix; /* May be NULL */
-
+
/*< private >*/
PangoRendererPrivate *priv;
};
@@ -90,7 +90,7 @@ struct _PangoRenderer
* @draw_rectangle: draws a rectangle
* @draw_error_underline: draws a squiggly line that approximately
* covers the given rectangle in the style of an underline used to
- * indicate a spelling error.
+ * indicate a spelling error.
* @draw_shape: draw content for a glyph shaped with #PangoAttrShape.
* @x, @y are the coordinates of the left edge of the baseline,
* in user coordinates.
@@ -173,7 +173,7 @@ struct _PangoRendererClass
PangoLayoutRun *run);
/*< private >*/
-
+
/* Padding for future expansion */
void (*_pango_reserved1) (void);
void (*_pango_reserved2) (void);
diff --git a/pango/pango-script-table.h b/pango/pango-script-table.h
index abe7e866..cfc796e1 100644
--- a/pango/pango-script-table.h
+++ b/pango/pango-script-table.h
@@ -2745,7 +2745,7 @@ static const struct {
gunichar start;
guint16 chars;
guint16 script;
-} pango_script_table[] = {
+} pango_script_table[] = {
{ 0x2000, 12, PANGO_SCRIPT_COMMON },
{ 0x200c, 2, PANGO_SCRIPT_INHERITED },
{ 0x200e, 86, PANGO_SCRIPT_COMMON },
diff --git a/pango/pango-script.c b/pango/pango-script.c
index 130309ff..88b2ef64 100644
--- a/pango/pango-script.c
+++ b/pango/pango-script.c
@@ -36,7 +36,7 @@
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
@@ -46,7 +46,7 @@
* FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
* NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
+ *
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale, use
* or other dealings in this Software without prior written authorization
@@ -94,7 +94,7 @@ pango_script_for_unichar_bsearch (gunichar ch)
int mid = saved_mid;
- do
+ do
{
if (ch < pango_script_table[mid].start)
upper = mid - 1;
@@ -113,12 +113,12 @@ pango_script_for_unichar_bsearch (gunichar ch)
/**
* pango_script_for_unichar:
* @ch: a Unicode character
- *
+ *
* Looks up the #PangoScript for a particular character (as defined by
* Unicode Standard Annex #24). No check is made for @ch being a
* valid Unicode character; if you pass in invalid character, the
* result is undefined.
- *
+ *
* Return value: the #PangoScript for the character.
*
* Since: 1.4
@@ -128,8 +128,8 @@ pango_script_for_unichar (gunichar ch)
{
if (ch < G_N_ELEMENTS (pango_script_easy_table))
return pango_script_easy_table[ch];
- else
- return pango_script_for_unichar_bsearch (ch);
+ else
+ return pango_script_for_unichar_bsearch (ch);
}
/**********************************************************************/
@@ -138,12 +138,12 @@ pango_script_for_unichar (gunichar ch)
* pango_script_iter_new:
* @text: a UTF-8 string
* @length: length of @text, or -1 if @text is nul-terminated.
- *
+ *
* Create a new #PangoScriptIter, used to break a string of
* Unicode into runs by text. No copy is made of @text, so
* the caller needs to make sure it remains valid until
* the iterator is freed with pango_script_iter_free ().x
- *
+ *
* Return value: the new script iterator, initialized
* to point at the first range in the text, which should be
* freed with pango_script_iter_free(). If the string is
@@ -166,7 +166,7 @@ pango_script_iter_new (const char *text,
iter->script_start = text;
iter->script_end = text;
iter->script_code = PANGO_SCRIPT_COMMON;
-
+
iter->paren_sp = -1;
pango_script_iter_next (iter);
@@ -177,7 +177,7 @@ pango_script_iter_new (const char *text,
/**
* pango_script_iter_free:
* @iter: a #PangoScriptIter
- *
+ *
* Frees a #PangoScriptIter created with pango_script_iter_new().
*
* Since: 1.4
@@ -194,7 +194,7 @@ pango_script_iter_free (PangoScriptIter *iter)
* @start: location to store start position of the range, or %NULL
* @end: location to store end position of the range, or %NULL
* @script: location to store script for range, or %NULL
- *
+ *
* Gets information about the range to which @iter currently points.
* The range is the set of locations p where *start <= p < *end.
* (That is, it doesn't include the character stored at *end)
@@ -244,7 +244,7 @@ get_pair_index (gunichar ch)
while (lower <= upper)
{
int mid = (lower + upper) / 2;
-
+
if (ch < paired_chars[mid])
upper = mid - 1;
else if (ch > paired_chars[mid])
@@ -267,11 +267,11 @@ get_pair_index (gunichar ch)
/**
* pango_script_iter_next:
* @iter: a #PangoScriptIter
- *
+ *
* 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 @iter was successfully advanced.
*
* Since: 1.4
@@ -280,7 +280,7 @@ gboolean
pango_script_iter_next (PangoScriptIter *iter)
{
int start_sp;
-
+
if (iter->script_end == iter->text_end)
return FALSE;
@@ -293,7 +293,7 @@ pango_script_iter_next (PangoScriptIter *iter)
gunichar ch = g_utf8_get_char (iter->script_end);
PangoScript sc;
int pair_index;
-
+
sc = pango_script_for_unichar (ch);
if (sc != PANGO_SCRIPT_COMMON)
pair_index = -1;
@@ -361,7 +361,7 @@ pango_script_iter_next (PangoScriptIter *iter)
if (pair_index >= 0 && !IS_OPEN (pair_index) && iter->paren_sp >= 0)
{
iter->paren_sp--;
-
+
if (iter->paren_sp < start_sp)
start_sp = iter->paren_sp;
}
@@ -420,7 +420,7 @@ script_for_lang_compare (gconstpointer key,
* pango_language_includes_script:
* @language: a #PangoLanguage
* @script: a #PangoScript
- *
+ *
* Determines if @script is one of the scripts used to
* write @language. The returned value is conservative;
* if nothing is known about the language tag @language,
@@ -431,7 +431,7 @@ script_for_lang_compare (gconstpointer key,
* determining if a supplied language tag is relevant to
* a particular section of text. It probably is not useful for
* applications in most circumstances.
- *
+ *
* Return value: %TRUE if @script is one of the scripts used
* to write @language, or if nothing is known about @language.
*
@@ -471,7 +471,7 @@ pango_language_includes_script (PangoLanguage *language,
/**
* pango_script_get_sample_language:
* @script: a #PangoScript
- *
+ *
* Given a script, finds a language tag that is reasonably
* representative of that script. This will usually be the
* most widely spoken or used language written in that script:
@@ -487,7 +487,7 @@ pango_language_includes_script (PangoLanguage *language,
* significantly different sets of Han characters and forms
* of shared characters. No sample language can be provided
* for many historical scripts as well.
- *
+ *
* Return value: a #PangoLanguage that is representative
* of the script, or %NULL if no such language exists.
*
@@ -566,7 +566,7 @@ pango_script_get_sample_language (PangoScript script)
"", /* PANGO_SCRIPT_LINEAR_B */
"", /* PANGO_SCRIPT_TAI_LE */
"uga", /* PANGO_SCRIPT_UGARITIC */
-
+
"", /* PANGO_SCRIPT_NEW_TAI_LUE */
"bug", /* PANGO_SCRIPT_BUGINESE */
/* The original script for Old Church Slavonic (chu), later
@@ -587,10 +587,10 @@ pango_script_get_sample_language (PangoScript script)
"nqo" /* PANGO_SCRIPT_NKO */
};
const char *sample_language;
-
+
g_return_val_if_fail (script >= 0, NULL);
g_return_val_if_fail ((guint)script < G_N_ELEMENTS (sample_languages), NULL);
-
+
sample_language = sample_languages[script];
if (!sample_language[0])
diff --git a/pango/pango-script.h b/pango/pango-script.h
index e152a695..394354b5 100644
--- a/pango/pango-script.h
+++ b/pango/pango-script.h
@@ -92,7 +92,7 @@ typedef enum { /* ISO 15924 code */
PANGO_SCRIPT_LINEAR_B, /* Linb */
PANGO_SCRIPT_TAI_LE, /* Tale */
PANGO_SCRIPT_UGARITIC, /* Ugar */
-
+
/* Unicode-4.1 additions */
PANGO_SCRIPT_NEW_TAI_LUE, /* Talu */
PANGO_SCRIPT_BUGINESE, /* Bugi */
diff --git a/pango/pango-tabs.c b/pango/pango-tabs.c
index 2f3a49b6..f582b232 100644
--- a/pango/pango-tabs.c
+++ b/pango/pango-tabs.c
@@ -59,11 +59,11 @@ init_tabs (PangoTabArray *array, gint start, gint end)
* pango_tab_array_new:
* @initial_size: Initial number of tab stops to allocate, can be 0
* @positions_in_pixels: whether positions are in pixel units
- *
+ *
* Creates an array of @initial_size tab stops. Tab stops are specified in
* pixel units if @positions_in_pixels is %TRUE, otherwise in Pango
* units. All stops are initially at position 0.
- *
+ *
* Return value: the newly allocated #PangoTabArray, which should
* be freed with pango_tab_array_free().
**/
@@ -93,7 +93,7 @@ pango_tab_array_new (gint initial_size,
array->tabs = NULL;
array->positions_in_pixels = positions_in_pixels;
-
+
return array;
}
@@ -104,12 +104,12 @@ pango_tab_array_new (gint initial_size,
* @first_alignment: alignment of first tab stop
* @first_position: position of first tab stop
* @varargs: additional alignment/position pairs
- *
+ *
* This is a convenience function that creates a #PangoTabArray
* and allows you to specify the alignment and position of each
* tab stop. You <emphasis>must</emphasis> provide an alignment
* and position for @size tab stops.
- *
+ *
* Return value: the newly allocated #PangoTabArray, which should
* be freed with pango_tab_array_free().
**/
@@ -125,7 +125,7 @@ pango_tab_array_new_with_positions (gint size,
int i;
g_return_val_if_fail (size >= 0, NULL);
-
+
array = pango_tab_array_new (size, positions_in_pixels);
if (size == 0)
@@ -136,7 +136,7 @@ pango_tab_array_new_with_positions (gint size,
if (size == 1)
return array;
-
+
va_start (args, first_position);
i = 1;
@@ -160,7 +160,7 @@ GType
pango_tab_array_get_type (void)
{
static GType our_type = 0;
-
+
if (our_type == 0)
our_type = g_boxed_type_register_static (I_("PangoTabArray"),
(GBoxedCopyFunc)pango_tab_array_copy,
@@ -171,9 +171,9 @@ pango_tab_array_get_type (void)
/**
* pango_tab_array_copy:
* @src: #PangoTabArray to copy
- *
+ *
* Copies a #PangoTabArray
- *
+ *
* Return value: the newly allocated #PangoTabArray, which should
* be freed with pango_tab_array_free().
**/
@@ -183,7 +183,7 @@ pango_tab_array_copy (PangoTabArray *src)
PangoTabArray *copy;
g_return_val_if_fail (src != NULL, NULL);
-
+
copy = pango_tab_array_new (src->size, src->positions_in_pixels);
memcpy (copy->tabs, src->tabs, sizeof(PangoTab)*src->size);
@@ -196,7 +196,7 @@ pango_tab_array_copy (PangoTabArray *src)
* @tab_array: a #PangoTabArray
*
* Frees a tab array and associated resources.
- *
+ *
**/
void
pango_tab_array_free (PangoTabArray *tab_array)
@@ -204,23 +204,23 @@ pango_tab_array_free (PangoTabArray *tab_array)
g_return_if_fail (tab_array != NULL);
g_free (tab_array->tabs);
-
+
g_slice_free (PangoTabArray, tab_array);
}
/**
* pango_tab_array_get_size:
* @tab_array: a #PangoTabArray
- *
+ *
* Gets the number of tab stops in @tab_array.
- *
+ *
* Return value: the number of tab stops in the array.
**/
gint
pango_tab_array_get_size (PangoTabArray *tab_array)
{
g_return_val_if_fail (tab_array != NULL, 0);
-
+
return tab_array->size;
}
@@ -228,7 +228,7 @@ pango_tab_array_get_size (PangoTabArray *tab_array)
* pango_tab_array_resize:
* @tab_array: a #PangoTabArray
* @new_size: new size of the array
- *
+ *
* Resizes a tab array. You must subsequently initialize any tabs that
* were added as a result of growing the array.
*
@@ -240,20 +240,20 @@ pango_tab_array_resize (PangoTabArray *tab_array,
if (new_size > tab_array->allocated)
{
gint current_end = tab_array->allocated;
-
+
/* Ratchet allocated size up above the index. */
if (tab_array->allocated == 0)
tab_array->allocated = 2;
-
+
while (new_size > tab_array->allocated)
tab_array->allocated = tab_array->allocated * 2;
-
+
tab_array->tabs = g_renew (PangoTab, tab_array->tabs,
tab_array->allocated);
-
+
init_tabs (tab_array, current_end, tab_array->allocated);
}
-
+
tab_array->size = new_size;
}
@@ -267,7 +267,7 @@ pango_tab_array_resize (PangoTabArray *tab_array,
* Sets the alignment and location of a tab stop.
* @alignment must always be #PANGO_TAB_LEFT in the current
* implementation.
- *
+ *
**/
void
pango_tab_array_set_tab (PangoTabArray *tab_array,
@@ -282,7 +282,7 @@ pango_tab_array_set_tab (PangoTabArray *tab_array,
if (tab_index >= tab_array->size)
pango_tab_array_resize (tab_array, tab_index + 1);
-
+
tab_array->tabs[tab_index].alignment = alignment;
tab_array->tabs[tab_index].location = location;
}
@@ -295,7 +295,7 @@ pango_tab_array_set_tab (PangoTabArray *tab_array,
* @location: location to store tab position, or %NULL
*
* Gets the alignment and position of a tab stop.
- *
+ *
**/
void
pango_tab_array_get_tab (PangoTabArray *tab_array,
@@ -323,7 +323,7 @@ pango_tab_array_get_tab (PangoTabArray *tab_array,
* If non-%NULL, @alignments and @locations are filled with allocated
* arrays of length pango_tab_array_get_size(). You must free the
* returned array.
- *
+ *
**/
void
pango_tab_array_get_tabs (PangoTabArray *tab_array,
@@ -331,7 +331,7 @@ pango_tab_array_get_tabs (PangoTabArray *tab_array,
gint **locations)
{
gint i;
-
+
g_return_if_fail (tab_array != NULL);
if (alignments)
@@ -339,7 +339,7 @@ pango_tab_array_get_tabs (PangoTabArray *tab_array,
if (locations)
*locations = g_new (gint, tab_array->size);
-
+
i = 0;
while (i < tab_array->size)
{
@@ -355,16 +355,16 @@ pango_tab_array_get_tabs (PangoTabArray *tab_array,
/**
* pango_tab_array_get_positions_in_pixels:
* @tab_array: a #PangoTabArray
- *
+ *
* Returns %TRUE if the tab positions are in pixels, %FALSE if they are
* in Pango units.
- *
+ *
* Return value: whether positions are in pixels.
**/
gboolean
pango_tab_array_get_positions_in_pixels (PangoTabArray *tab_array)
{
g_return_val_if_fail (tab_array != NULL, FALSE);
-
+
return tab_array->positions_in_pixels;
}
diff --git a/pango/pango-types.h b/pango/pango-types.h
index 45f76e40..6a9ef191 100644
--- a/pango/pango-types.h
+++ b/pango/pango-types.h
@@ -109,7 +109,7 @@ void pango_extents_to_pixels (PangoRectangle *ink_rect,
* @PANGO_DIRECTION_WEAK_LTR: A weak left-to-right direction
* @PANGO_DIRECTION_WEAK_RTL: A weak right-to-left direction
* @PANGO_DIRECTION_NEUTRAL: No direction specified
- *
+ *
* The #PangoDirection type represents a direction in the
* Unicode bidirectional algorithm; not every value in this
* enumeration makes sense for every usage of #PangoDirection;
@@ -125,7 +125,7 @@ void pango_extents_to_pixels (PangoRectangle *ink_rect,
* enumeration as the writing direction of a block of
* text and are no longer used; See #PangoGravity for how
* vertical text is handled in Pango.
- **/
+ **/
typedef enum {
PANGO_DIRECTION_LTR,
PANGO_DIRECTION_RTL,
diff --git a/pango/pango-utils.c b/pango/pango-utils.c
index 01e20403..02444755 100644
--- a/pango/pango-utils.c
+++ b/pango/pango-utils.c
@@ -151,9 +151,9 @@ pango_version_check (int required_major,
/**
* pango_trim_string:
* @str: a string
- *
+ *
* Trims leading and trailing whitespace from a string.
- *
+ *
* Return value: A newly-allocated string that must be freed with g_free()
**/
char *
@@ -162,7 +162,7 @@ pango_trim_string (const char *str)
int len;
g_return_val_if_fail (str != NULL, NULL);
-
+
while (*str && g_ascii_isspace (*str))
str++;
@@ -176,10 +176,10 @@ pango_trim_string (const char *str)
/**
* pango_split_file_list:
* @str: a %G_SEARCHPATH_SEPARATOR separated list of filenames
- *
+ *
* 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()
**/
char **
@@ -200,10 +200,10 @@ pango_split_file_list (const char *str)
{
g_free(file);
g_free (files[i]);
-
+
for (j = i + 1; files[j]; j++)
files[j - 1] = files[j];
-
+
files[j - 1] = NULL;
continue;
@@ -229,7 +229,7 @@ pango_split_file_list (const char *str)
#endif
g_free (files[i]);
files[i] = file;
-
+
i++;
}
@@ -240,7 +240,7 @@ pango_split_file_list (const char *str)
* pango_read_line:
* @stream: a stdio stream
* @str: #GString buffer into which to write the result
- *
+ *
* Reads an entire line from a file into a buffer. Lines may
* be delimited with '\n', '\r', '\n\r', or '\r\n'. The delimiter
* is not written into the buffer. Text after a '#' character is treated as
@@ -248,10 +248,10 @@ pango_split_file_list (const char *str)
* '\' proceeding a line delimiter combines adjacent lines. A '\' proceeding
* any other character is ignored and written into the output buffer
* unmodified.
- *
+ *
* Return value: 0 if the stream was already at an %EOF character, otherwise
* the number of lines read (this is useful for maintaining
- * a line number counter which doesn't combine lines with '\')
+ * a line number counter which doesn't combine lines with '\')
**/
gint
pango_read_line (FILE *stream, GString *str)
@@ -260,22 +260,22 @@ pango_read_line (FILE *stream, GString *str)
gboolean comment = FALSE;
int n_read = 0;
int lines = 1;
-
+
flockfile (stream);
g_string_truncate (str, 0);
-
+
while (1)
{
int c;
-
+
c = getc_unlocked (stream);
if (c == EOF)
{
if (quoted)
g_string_append_c (str, '\\');
-
+
goto done;
}
else
@@ -284,7 +284,7 @@ pango_read_line (FILE *stream, GString *str)
if (quoted)
{
quoted = FALSE;
-
+
switch (c)
{
case '#':
@@ -301,11 +301,11 @@ pango_read_line (FILE *stream, GString *str)
ungetc (next_c, stream);
lines++;
-
+
break;
}
default:
- g_string_append_c (str, '\\');
+ g_string_append_c (str, '\\');
g_string_append_c (str, c);
}
}
@@ -348,9 +348,9 @@ pango_read_line (FILE *stream, GString *str)
/**
* pango_skip_space:
* @pos: in/out string position
- *
+ *
* Skips 0 or more characters of white space.
- *
+ *
* Return value: %FALSE if skipping the white space leaves
* the position at a '\0' character.
**/
@@ -358,7 +358,7 @@ gboolean
pango_skip_space (const char **pos)
{
const char *p = *pos;
-
+
while (g_ascii_isspace (*p))
p++;
@@ -371,12 +371,12 @@ pango_skip_space (const char **pos)
* pango_scan_word:
* @pos: in/out string position
* @out: a #GString into which to write the result
- *
+ *
* Scans a word into a #GString buffer. A word consists
* 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 occurred.
+ *
+ * Return value: %FALSE if a parse error occurred.
**/
gboolean
pango_scan_word (const char **pos, GString *out)
@@ -385,7 +385,7 @@ pango_scan_word (const char **pos, GString *out)
while (g_ascii_isspace (*p))
p++;
-
+
if (!((*p >= 'A' && *p <= 'Z') ||
(*p >= 'a' && *p <= 'z') ||
*p == '_'))
@@ -413,19 +413,19 @@ pango_scan_word (const char **pos, GString *out)
* pango_scan_string:
* @pos: in/out string position
* @out: a #GString into which to write the result
- *
+ *
* Scans a string into a #GString buffer. The string may either
* be a sequence of non-white-space characters, or a quoted
* 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 occurred.
**/
gboolean
pango_scan_string (const char **pos, GString *out)
{
const char *p = *pos;
-
+
while (g_ascii_isspace (*p))
p++;
@@ -443,7 +443,7 @@ pango_scan_string (const char **pos, GString *out)
if (quoted)
{
int c = *p;
-
+
switch (c)
{
case '\0':
@@ -457,7 +457,7 @@ pango_scan_string (const char **pos, GString *out)
default:
break;
}
-
+
quoted = FALSE;
g_string_append_c (out, c);
}
@@ -503,10 +503,10 @@ pango_scan_string (const char **pos, GString *out)
* pango_scan_int:
* @pos: in/out string position
* @out: an int into which to write the result
- *
- * Scans an integer.
+ *
+ * Scans an integer.
* Leading white space is skipped.
- *
+ *
* Return value: %FALSE if a parse error occurred.
**/
gboolean
@@ -523,7 +523,7 @@ pango_scan_int (const char **pos, int *out)
errno = 0;
return FALSE;
}
-
+
*out = (int)temp;
if ((long)(*out) != temp)
{
@@ -545,7 +545,7 @@ read_config_file (const char *filename, gboolean enoent_error)
gchar **groups;
gsize groups_count = 0;
guint group_index;
-
+
if (!g_key_file_load_from_file(key_file,filename, 0, &key_file_error))
{
if (key_file_error)
@@ -560,7 +560,7 @@ read_config_file (const char *filename, gboolean enoent_error)
g_key_file_free(key_file);
return;
}
-
+
groups = g_key_file_get_groups (key_file, &groups_count);
for (group_index = 0; group_index < groups_count; group_index++)
{
@@ -568,9 +568,9 @@ read_config_file (const char *filename, gboolean enoent_error)
const gchar *group = groups[group_index];
GError *keys_error = NULL;
gchar **keys;
-
+
keys = g_key_file_get_keys(key_file, group, &keys_count, &keys_error);
-
+
if (keys)
{
guint key_index;
@@ -615,7 +615,7 @@ read_config (void)
char *filename;
const char *home;
const char *envvar;
-
+
config_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
(GDestroyNotify)g_free,
(GDestroyNotify)g_free);
@@ -642,11 +642,11 @@ read_config (void)
/**
* pango_config_key_get:
* @key: Key to look up, in the form "SECTION/KEY".
- *
+ *
* Looks up a key in the Pango config database
* (pseudo-win.ini style, read from $sysconfdir/pango/pangorc,
* ~/.pangorc, and getenv (PANGO_RC_FILE).)
- *
+ *
* Return value: the value, if found, otherwise %NULL. The value is a
* newly-allocated string and must be freed with g_free().
**/
@@ -654,7 +654,7 @@ char *
pango_config_key_get (const char *key)
{
g_return_val_if_fail (key != NULL, NULL);
-
+
read_config ();
return g_strdup (g_hash_table_lookup (config_hash, key));
@@ -676,7 +676,7 @@ G_WIN32_DLLMAIN_FOR_DLL_NAME(static, dll_name)
* the DLL's location, or stored in the Registry).
*
* Return value: the Pango sysconf directory. The returned string should
- * not be freed.
+ * not be freed.
*/
G_CONST_RETURN char *
pango_get_sysconf_subdirectory (void)
@@ -704,7 +704,7 @@ pango_get_sysconf_subdirectory (void)
* not be freed.
*
* Return value: the Pango lib directory. The returned string should
- * not be freed.
+ * not be freed.
*/
G_CONST_RETURN char *
pango_get_lib_subdirectory (void)
@@ -730,7 +730,7 @@ pango_get_lib_subdirectory (void)
* @value: integer to store the result in, or %NULL.
* @warn: if %TRUE, issue a g_warning() on bad input.
* @possible_values: place to store list of possible values on failure, or %NULL.
- *
+ *
* Parses an enum type and stored the result in @value.
*
* If @str does not match the nick name of any of the possible values for the
@@ -739,11 +739,11 @@ pango_get_lib_subdirectory (void)
* @possible_values. The list is slash-separated, eg.
* "none/start/middle/end". If failed and @possible_values is not %NULL,
* returned string should be freed using g_free().
- *
+ *
* Return value: %TRUE if @str was successfully parsed.
*
* Since: 1.16
- **/
+ **/
gboolean
pango_parse_enum (GType type,
const char *str,
@@ -788,7 +788,7 @@ pango_parse_enum (GType type,
if (possible_values)
*possible_values = s->str;
-
+
g_string_free (s, possible_values ? FALSE : TRUE);
}
}
@@ -803,13 +803,13 @@ pango_parse_enum (GType type,
* @str: a string to parse.
* @style: a #PangoStyle to store the result in.
* @warn: if %TRUE, issue a g_warning() on bad input.
- *
+ *
* Parses a font style. The allowed values are "normal",
* "italic" and "oblique", case variations being
* ignored.
- *
+ *
* Return value: %TRUE if @str was successfully parsed.
- **/
+ **/
gboolean
pango_parse_style (const char *str,
PangoStyle *style,
@@ -847,7 +847,7 @@ pango_parse_style (const char *str,
}
if (warn)
g_warning ("style must be normal, italic, or oblique");
-
+
return FALSE;
}
@@ -856,13 +856,13 @@ pango_parse_style (const char *str,
* @str: a string to parse.
* @variant: a #PangoVariant to store the result in.
* @warn: if %TRUE, issue a g_warning() on bad input.
- *
+ *
* Parses a font variant. The allowed values are "normal"
* and "smallcaps" or "small_caps", case variations being
* ignored.
- *
+ *
* Return value: %TRUE if @str was successfully parsed.
- **/
+ **/
gboolean
pango_parse_variant (const char *str,
PangoVariant *variant,
@@ -891,7 +891,7 @@ pango_parse_variant (const char *str,
}
break;
}
-
+
if (warn)
g_warning ("variant must be normal or small_caps");
return FALSE;
@@ -902,13 +902,13 @@ pango_parse_variant (const char *str,
* @str: a string to parse.
* @weight: a #PangoWeight to store the result in.
* @warn: if %TRUE, issue a g_warning() on bad input.
- *
+ *
* Parses a font weight. The allowed values are "heavy",
- * "ultrabold", "bold", "normal", "light", "ultraleight"
+ * "ultrabold", "bold", "normal", "light", "ultraleight"
* and integers. Case variations are ignored.
- *
+ *
* Return value: %TRUE if @str was successfully parsed.
- **/
+ **/
gboolean
pango_parse_weight (const char *str,
PangoWeight *weight,
@@ -987,7 +987,7 @@ pango_parse_weight (const char *str,
return TRUE;
}
}
-
+
if (warn)
g_warning ("weight must be ultralight, light, normal, bold, ultrabold, heavy, or an integer");
return FALSE;
@@ -998,15 +998,15 @@ pango_parse_weight (const char *str,
* @str: a string to parse.
* @stretch: a #PangoStretch to store the result in.
* @warn: if %TRUE, issue a g_warning() on bad input.
- *
- * Parses a font stretch. The allowed values are
- * "ultra_condensed", "extra_condensed", "condensed",
- * "semi_condensed", "normal", "semi_expanded", "expanded",
- * "extra_expanded" and "ultra_expanded". Case variations are
+ *
+ * Parses a font stretch. The allowed values are
+ * "ultra_condensed", "extra_condensed", "condensed",
+ * "semi_condensed", "normal", "semi_expanded", "expanded",
+ * "extra_expanded" and "ultra_expanded". Case variations are
* ignored and the '_' characters may be omitted.
- *
+ *
* Return value: %TRUE if @str was successfully parsed.
- **/
+ **/
gboolean
pango_parse_stretch (const char *str,
PangoStretch *stretch,
@@ -1016,7 +1016,7 @@ pango_parse_stretch (const char *str,
return FALSE;
switch (str[0])
- {
+ {
case 'c':
case 'C':
if (g_ascii_strcasecmp (str, "condensed") == 0)
@@ -1091,16 +1091,16 @@ pango_parse_stretch (const char *str,
}
static const char canon_map[256] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '-', 0, 0,
- '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '-', 0, 0,
+ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 0, 0, 0, 0, 0, 0,
0, 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 0, 0, 0, 0, '-',
0, 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 0, 0, 0, 0, 0
};
-
+
static gboolean
lang_equal (gconstpointer v1,
gconstpointer v2)
@@ -1146,7 +1146,7 @@ GType
pango_language_get_type (void)
{
static GType our_type = 0;
-
+
if (our_type == 0)
our_type = g_boxed_type_register_static (I_("PangoLanguage"),
(GBoxedCopyFunc)pango_language_copy,
@@ -1166,13 +1166,13 @@ pango_language_get_type (void)
* COUNTRY is an ISO-3166 country code. For instance, sv_FI for
* Swedish as written in Finland or pt_BR for Portuguese as written in
* Brazil.
- *
+ *
* On Windows, the C library doesn't use any such environment
* variables, and setting them won't affect the behavior of functions
- * like ctime(). The user sets the locale through the Regional Options
- * in the Control Panel. The C library (in the setlocale() function)
- * does not use country and language codes, but country and language
- * names spelled out in English.
+ * like ctime(). The user sets the locale through the Regional Options
+ * in the Control Panel. The C library (in the setlocale() function)
+ * does not use country and language codes, but country and language
+ * names spelled out in English.
* However, this function does check the above environment
* variables, and does return a Unix-style locale string based on
* either said environment variables or the thread's current locale.
@@ -1228,13 +1228,13 @@ _pango_get_lc_ctype (void)
* COUNTRY is an ISO-3166 country code. For instance, sv_FI for
* Swedish as written in Finland or pt_BR for Portuguese as written in
* Brazil.
- *
+ *
* On Windows, the C library does not use any such environment
* variables, and setting them won't affect the behavior of functions
- * like ctime(). The user sets the locale through the Regional Options
- * in the Control Panel. The C library (in the setlocale() function)
- * does not use country and language codes, but country and language
- * names spelled out in English.
+ * like ctime(). The user sets the locale through the Regional Options
+ * in the Control Panel. The C library (in the setlocale() function)
+ * does not use country and language codes, but country and language
+ * names spelled out in English.
* However, this function does check the above environment
* variables, and does return a Unix-style locale string based on
* either said environment variables or the thread's current locale.
@@ -1243,7 +1243,7 @@ _pango_get_lc_ctype (void)
* for the user settings to take effect. Gtk+ does this in its initialization
* functions automatically (by calling gtk_set_locale()).
* See <literal>man setlocale</literal> for more details.
- *
+ *
* Return value: the default language as a #PangoLanguage, must not be
* freed.
*
@@ -1253,20 +1253,20 @@ PangoLanguage *
pango_language_get_default (void)
{
gchar *lang;
- PangoLanguage *result;
-
+ PangoLanguage *result;
+
lang = _pango_get_lc_ctype ();
-
+
result = pango_language_from_string (lang);
g_free (lang);
-
+
return result;
}
/**
* pango_language_from_string:
* @language: a string representing a language tag
- *
+ *
* Take a RFC-3066 format language tag as a string and convert it to a
* #PangoLanguage pointer that can be efficiently copied (copy the
* pointer) and compared with other language tags (compare the
@@ -1278,7 +1278,7 @@ pango_language_get_default (void)
*
* Use pango_language_get_default() if you want to get the #PangoLanguage for
* the current locale of the process.
- *
+ *
* Return value: an opaque pointer to a #PangoLanguage structure.
* this will be valid forever after.
**/
@@ -1319,7 +1319,7 @@ pango_language_from_string (const char *language)
* ',', or space characters.
* Each element must either be '*', or a RFC 3066 language range
* canonicalized as by pango_language_from_string()
- *
+ *
* Checks if a language tag matches one of the elements in a list of
* language ranges. A language tag is considered to match a range
* in the list if the range is '*', the range is exactly the tag,
@@ -1405,11 +1405,11 @@ static const LangInfo lang_texts[] = {
/**
* pango_language_get_sample_string:
* @language: a #PangoLanguage
- *
+ *
* Get a string that is representative of the characters needed to
* render a particular language. This function is a bad hack for
* internal use by renderers and Pango.
- *
+ *
* Return value: the sample string. This value is owned by Pango
* and must not be freed.
**/
@@ -1417,11 +1417,11 @@ G_CONST_RETURN char *
pango_language_get_sample_string (PangoLanguage *language)
{
const char *result;
-
+
if (language)
{
const char *lang_str = pango_language_to_string (language);
-
+
LangInfo *lang_info = bsearch (lang_str, lang_texts,
G_N_ELEMENTS (lang_texts), sizeof (LangInfo),
lang_info_compare);
@@ -1551,15 +1551,15 @@ pango_unichar_direction (gunichar ch)
*
* Use g_unichar_get_mirror_char() instead; the docs for that function
* provide full details.
- *
+ *
* Return value: %TRUE if @ch has a mirrored character and @mirrored_ch is
* filled in, %FALSE otherwise
**/
-gboolean
+gboolean
pango_get_mirror_char (gunichar ch,
gunichar *mirrored_ch)
{
- return g_unichar_get_mirror_char (ch, mirrored_ch);
+ return g_unichar_get_mirror_char (ch, mirrored_ch);
}
@@ -1588,7 +1588,7 @@ alias_free (struct PangoAlias *alias)
g_free (alias->families[i]);
g_free (alias->families);
-
+
g_slice_free (struct PangoAlias, alias);
}
@@ -1596,7 +1596,7 @@ static void
read_alias_file (const char *filename)
{
FILE *file;
-
+
GString *line_buffer;
GString *tmp_buffer1;
GString *tmp_buffer2;
@@ -1625,14 +1625,14 @@ read_alias_file (const char *filename)
pos = line_buffer->str;
if (!pango_skip_space (&pos))
continue;
-
+
if (!pango_scan_word (&pos, tmp_buffer1) ||
!pango_skip_space (&pos))
{
errstring = g_strdup ("Line is not of the form KEY=VALUE or KEY+=VALUE");
goto error;
}
-
+
if (*pos == '+')
{
append = TRUE;
@@ -1644,7 +1644,7 @@ read_alias_file (const char *filename)
errstring = g_strdup ("Line is not of the form KEY=VALUE or KEY+=VALUE");
goto error;
}
-
+
if (!pango_scan_string (&pos, tmp_buffer2))
{
errstring = g_strdup ("Error parsing value string");
@@ -1657,27 +1657,27 @@ read_alias_file (const char *filename)
}
alias_key.alias = g_ascii_strdown (tmp_buffer1->str, -1);
-
+
/* Remove any existing values */
alias = g_hash_table_lookup (pango_aliases_ht, &alias_key);
-
+
if (!alias)
{
alias = g_slice_new0 (struct PangoAlias);
alias->alias = alias_key.alias;
-
+
g_hash_table_insert (pango_aliases_ht,
alias, alias);
}
else
g_free (alias_key.alias);
-
+
new_families = g_strsplit (tmp_buffer2->str, ",", -1);
-
+
n_new = 0;
while (new_families[n_new])
n_new++;
-
+
if (alias->families && append)
{
alias->families = g_realloc (alias->families,
@@ -1692,7 +1692,7 @@ read_alias_file (const char *filename)
for (i = 0; i < alias->n_families; i++)
g_free (alias->families[i]);
g_free (alias->families);
-
+
alias->families = new_families;
alias->n_families = n_new;
}
@@ -1700,7 +1700,7 @@ read_alias_file (const char *filename)
if (ferror (file))
errstring = g_strdup (g_strerror(errno));
-
+
error:
if (errstring)
@@ -1708,7 +1708,7 @@ read_alias_file (const char *filename)
g_warning ("error reading alias file: %s:%d: %s\n", filename, line, errstring);
g_free (errstring);
}
-
+
g_string_free (line_buffer, TRUE);
g_string_free (tmp_buffer1, TRUE);
g_string_free (tmp_buffer2, TRUE);
@@ -1733,7 +1733,7 @@ pango_load_aliases (void)
NULL);
read_alias_file (filename);
g_free (filename);
-
+
home = g_get_home_dir ();
if (home && *home)
{
@@ -1764,7 +1764,7 @@ pango_lookup_aliases (const char *fontname,
{
struct PangoAlias alias_key;
struct PangoAlias *alias;
-
+
if (pango_aliases_ht == NULL)
pango_load_aliases ();
@@ -1789,7 +1789,7 @@ pango_lookup_aliases (const char *fontname,
* @text: the text to process
* @length: length of @text in bytes (may be -1 if @text is nul-terminated)
*
- * Searches a string the first character that has a strong
+ * Searches a string the first character that has a strong
* direction, according to the Unicode bidirectional algorithm.
*
* Return value: The direction corresponding to the first strong character.
@@ -1894,7 +1894,7 @@ pango_quantize_line_geometry (int *thickness,
int thickness_pixels = (*thickness + PANGO_SCALE / 2) / PANGO_SCALE;
if (thickness_pixels == 0)
thickness_pixels = 1;
-
+
if (thickness_pixels & 1)
{
int new_center = ((*position - *thickness / 2) & ~(PANGO_SCALE - 1)) + PANGO_SCALE / 2;
@@ -1947,7 +1947,7 @@ pango_units_to_double (int i)
* pango_extents_to_pixels:
* @ink_rect: ink rectangle to convert, or %NULL.
* @logical_rect: logical rectangle to convert, or %NULL.
- *
+ *
* Converts extents from Pango units to device units, dividing by the
* %PANGO_SCALE factor and performing rounding.
*
diff --git a/pango/pangoatsui-fontmap.c b/pango/pangoatsui-fontmap.c
index 28e689f3..c9bbfe6a 100644
--- a/pango/pangoatsui-fontmap.c
+++ b/pango/pangoatsui-fontmap.c
@@ -100,7 +100,7 @@ pango_atsui_family_list_faces (PangoFontFamily *family,
PangoATSUIFamily *atsuifamily = PANGO_ATSUI_FAMILY (family);
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- if (atsuifamily->n_faces < 0)
+ if (atsuifamily->n_faces < 0)
{
const char *real_family = get_real_family (atsuifamily->family_name);
NSArray *members = [[NSFontManager sharedFontManager] availableMembersOfFontFamily:[NSString stringWithUTF8String:real_family]];
@@ -156,13 +156,13 @@ pango_atsui_family_finalize (GObject *object)
g_free (family->family_name);
- if (family->n_faces != -1)
+ if (family->n_faces != -1)
{
- for (i = 0; i < family->n_faces; i++)
+ for (i = 0; i < family->n_faces; i++)
{
g_object_unref (family->faces[i]);
}
-
+
g_free (family->faces);
}
@@ -174,7 +174,7 @@ pango_atsui_family_class_init (PangoFontFamilyClass *class)
{
GObjectClass *object_class = (GObjectClass *)class;
int i;
-
+
pango_atsui_family_parent_class = g_type_class_peek_parent (class);
object_class->finalize = pango_atsui_family_finalize;
@@ -212,12 +212,12 @@ pango_atsui_family_get_type (void)
0, /* n_preallocs */
(GInstanceInitFunc) pango_atsui_family_init,
};
-
+
object_type = g_type_register_static (PANGO_TYPE_FONT_FAMILY,
I_("PangoATSUIFamily"),
&object_info, 0);
}
-
+
return object_type;
}
@@ -230,7 +230,7 @@ pango_atsui_face_describe (PangoFontFace *face)
PangoStyle pango_style;
PangoVariant pango_variant;
int weight;
-
+
description = pango_font_description_new ();
pango_font_description_set_family (description, atsuiface->family->family_name);
@@ -251,7 +251,7 @@ pango_atsui_face_describe (PangoFontFace *face)
pango_weight = PANGO_WEIGHT_ULTRABOLD;
else if (weight == 13 || weight == 14)
pango_weight = PANGO_WEIGHT_HEAVY;
- else
+ else
g_assert_not_reached ();
if (atsuiface->traits & NSItalicFontMask)
@@ -267,7 +267,7 @@ pango_atsui_face_describe (PangoFontFace *face)
pango_font_description_set_weight (description, pango_weight);
pango_font_description_set_style (description, pango_style);
- return description;
+ return description;
}
static const char *
@@ -331,12 +331,12 @@ pango_atsui_face_get_type (void)
0, /* n_preallocs */
(GInstanceInitFunc) NULL,
};
-
+
object_type = g_type_register_static (PANGO_TYPE_FONT_FACE,
I_("PangoATSUIFace"),
&object_info, 0);
}
-
+
return object_type;
}
@@ -354,7 +354,7 @@ static void
pango_atsui_font_map_finalize (GObject *object)
{
PangoATSUIFontMap *fontmap = PANGO_ATSUI_FONT_MAP (object);
-
+
g_hash_table_destroy (fontmap->font_hash);
g_hash_table_destroy (fontmap->families);
@@ -370,7 +370,7 @@ struct _FontHashKey {
};
/* Fowler / Noll / Vo (FNV) Hash (http://www.isthe.com/chongo/tech/comp/fnv/)
- *
+ *
* Not necessarily better than a lot of other hashes, but should be OK, and
* well tested with binary data.
*/
@@ -388,7 +388,7 @@ hash_bytes_fnv (unsigned char *buffer,
hval *= FNV_32_PRIME;
hval ^= *buffer++;
}
-
+
return hval;
}
@@ -439,7 +439,7 @@ font_hash_key_free (FontHashKey *key)
if (key->context_key)
PANGO_ATSUI_FONT_MAP_GET_CLASS (key->fontmap)->context_key_free (key->fontmap,
key->context_key);
-
+
g_slice_free (FontHashKey, key);
}
@@ -447,7 +447,7 @@ static FontHashKey *
font_hash_key_copy (FontHashKey *old)
{
FontHashKey *key = g_slice_new (FontHashKey);
-
+
key->fontmap = old->fontmap;
key->matrix = old->matrix;
key->desc = pango_font_description_copy (old->desc);
@@ -457,7 +457,7 @@ font_hash_key_copy (FontHashKey *old)
old->context_key);
else
key->context_key = NULL;
-
+
return key;
}
@@ -487,7 +487,7 @@ font_hash_key_for_context (PangoATSUIFontMap *fcfontmap,
{
key->fontmap = fcfontmap;
get_context_matrix (context, &key->matrix);
-
+
if (PANGO_ATSUI_FONT_MAP_GET_CLASS (fcfontmap)->context_key_get)
key->context_key = (gpointer)PANGO_ATSUI_FONT_MAP_GET_CLASS (fcfontmap)->context_key_get (fcfontmap, context);
else
@@ -523,7 +523,7 @@ pango_atsui_font_map_lookup (PangoATSUIFontMap *atsuifontmap,
const char *postscript_name)
{
FontHashKey key;
-
+
font_hash_key_for_context (atsuifontmap, context, &key);
key.postscript_name = (char *)postscript_name;
key.desc = desc;
@@ -558,33 +558,33 @@ pango_atsui_font_map_load_font (PangoFontMap *fontmap,
PangoATSUIFace *best_face = NULL;
PangoATSUIFont *best_font;
int i;
-
+
/* Force a listing of the available faces */
pango_font_family_list_faces ((PangoFontFamily *)font_family, NULL, NULL);
for (i = 0; i < font_family->n_faces; i++)
{
new_desc = pango_font_face_describe (font_family->faces[i]);
-
+
if (pango_font_description_better_match (description, best_desc, new_desc))
{
pango_font_description_free (best_desc);
best_desc = new_desc;
best_face = (PangoATSUIFace *)font_family->faces[i];
}
- else
+ else
{
pango_font_description_free (new_desc);
}
}
-
+
if (best_desc == NULL || best_face == NULL)
return NULL;
pango_font_description_set_size (best_desc, size);
best_font = pango_atsui_font_map_lookup (atsuifontmap, context, best_desc, best_face->postscript_name);
-
+
if (best_font)
g_object_ref (best_font);
else
@@ -632,7 +632,7 @@ pango_atsui_font_map_list_families (PangoFontMap *fontmap,
if (families)
{
int i = 0;
-
+
*families = g_new (PangoFontFamily *, *n_families);
tmp_list = family_list;
@@ -643,11 +643,11 @@ pango_atsui_font_map_list_families (PangoFontMap *fontmap,
tmp_list = tmp_list->next;
}
}
-
+
g_slist_free (family_list);
}
-static void
+static void
pango_atsui_font_map_init (PangoATSUIFontMap *atsuifontmap)
{
NSArray *family_array;
@@ -659,7 +659,7 @@ pango_atsui_font_map_init (PangoATSUIFontMap *atsuifontmap)
atsuifontmap->families = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free, g_object_unref);
-
+
atsuifontmap->font_hash = g_hash_table_new_full ((GHashFunc)font_hash_key_hash,
(GEqualFunc)font_hash_key_equal,
(GDestroyNotify)font_hash_key_free,
diff --git a/pango/pangoatsui.c b/pango/pangoatsui.c
index 50da844d..fda231ee 100644
--- a/pango/pangoatsui.c
+++ b/pango/pangoatsui.c
@@ -92,7 +92,7 @@ pango_atsui_font_class_init (PangoATSUIFontClass *class)
GObjectClass *object_class = G_OBJECT_CLASS (class);
PangoFontClass *font_class = PANGO_FONT_CLASS (class);
- object_class->finalize = pango_atsui_font_finalize;
+ object_class->finalize = pango_atsui_font_finalize;
font_class->describe = pango_atsui_font_describe;
font_class->get_coverage = pango_atsui_font_get_coverage;
diff --git a/pango/pangocairo-atsuifont.c b/pango/pangocairo-atsuifont.c
index 7a4379ae..ccce9be5 100644
--- a/pango/pangocairo-atsuifont.c
+++ b/pango/pangocairo-atsuifont.c
@@ -122,7 +122,7 @@ pango_cairo_atsui_font_get_scaled_font (PangoCairoFont *font)
if (!cafont->scaled_font)
g_error ("Unable to create ATSUI cairo scaled font.\nThis means out of memory or a cairo/fontconfig/FreeType bug");
}
-
+
return cafont->scaled_font;
}
@@ -153,7 +153,7 @@ pango_cairo_atsui_font_get_glyph_extents (PangoFont *font,
if (logical_rect)
cairo_scaled_font_extents (scaled_font, &font_extents);
-
+
cairo_glyph.index = glyph;
cairo_glyph.x = 0;
cairo_glyph.y = 0;
@@ -189,7 +189,7 @@ pango_cairo_atsui_font_get_glyph_extents (PangoFont *font,
ink_rect->width = extents.width * PANGO_SCALE;
ink_rect->height = extents.height * PANGO_SCALE;
}
-
+
if (logical_rect)
{
logical_rect->x = 0;
@@ -221,10 +221,10 @@ pango_cairo_atsui_font_get_metrics (PangoFont *font,
metrics->approximate_char_width = ats_metrics.avgAdvanceWidth * cafont->size * PANGO_SCALE;
metrics->approximate_digit_width = ats_metrics.avgAdvanceWidth * cafont->size * PANGO_SCALE;
-
+
metrics->underline_position = ats_metrics.underlinePosition * cafont->size * PANGO_SCALE;
metrics->underline_thickness = ats_metrics.underlineThickness * cafont->size * PANGO_SCALE;
-
+
metrics->strikethrough_position = metrics->ascent / 3;
metrics->strikethrough_thickness = ats_metrics.underlineThickness * cafont->size * PANGO_SCALE;
@@ -273,12 +273,12 @@ _pango_cairo_atsui_font_new (PangoCairoATSUIFontMap *cafontmap,
const PangoMatrix *pango_ctm;
ATSUFontID font_id;
- cfstr = CFStringCreateWithCString (NULL, postscript_name,
+ cfstr = CFStringCreateWithCString (NULL, postscript_name,
kCFStringEncodingUTF8);
font_ref = ATSFontFindFromPostScriptName (cfstr, kATSOptionFlagsDefault);
font_id = FMGetFontFromATSFontRef (font_ref);
-
+
CFRelease (cfstr);
if (!font_id)
@@ -296,7 +296,7 @@ _pango_cairo_atsui_font_new (PangoCairoATSUIFontMap *cafontmap,
if (!pango_font_description_get_size_is_absolute (desc))
{
/* FIXME: Need to handle dpi here. See other font implementations for more info. */
- }
+ }
cairo_matrix_init_scale (&cafont->font_matrix, cafont->size, cafont->size);
pango_ctm = pango_context_get_matrix (context);
diff --git a/pango/pangocairo-atsuifontmap.c b/pango/pangocairo-atsuifontmap.c
index 617f3720..14adca47 100644
--- a/pango/pangocairo-atsuifontmap.c
+++ b/pango/pangocairo-atsuifontmap.c
@@ -37,7 +37,7 @@ static PangoRenderer *
pango_cairo_atsui_font_map_get_renderer (PangoCairoFontMap *cfontmap)
{
PangoCairoATSUIFontMap *cwfontmap = PANGO_CAIRO_ATSUI_FONT_MAP (cfontmap);
-
+
if (!cwfontmap->renderer)
cwfontmap->renderer = g_object_new (PANGO_TYPE_CAIRO_RENDERER, NULL);
@@ -49,7 +49,7 @@ pango_cairo_atsui_font_map_set_resolution (PangoCairoFontMap *cfontmap,
double dpi)
{
PangoCairoATSUIFontMap *cafontmap = PANGO_CAIRO_ATSUI_FONT_MAP (cfontmap);
-
+
cafontmap->dpi = dpi;
}
@@ -88,7 +88,7 @@ static void
pango_cairo_atsui_font_map_finalize (GObject *object)
{
PangoCairoATSUIFontMap *cafontmap = PANGO_CAIRO_ATSUI_FONT_MAP (object);
-
+
if (cafontmap->renderer)
g_object_unref (cafontmap->renderer);
diff --git a/pango/pangocairo-fcfont.c b/pango/pangocairo-fcfont.c
index 1d90ab48..6fb61fc7 100644
--- a/pango/pangocairo-fcfont.c
+++ b/pango/pangocairo-fcfont.c
@@ -70,7 +70,7 @@ struct _PangoCairoFcFont
PangoGravity gravity;
PangoRectangle font_extents;
- GlyphExtentsCacheEntry *glyph_extents_cache;
+ GlyphExtentsCacheEntry *glyph_extents_cache;
};
struct _PangoCairoFcFontClass
@@ -95,14 +95,14 @@ pango_cairo_fc_font_get_font_face (PangoCairoFont *font)
if (!cffont->font_face)
{
cffont->font_face = cairo_ft_font_face_create_for_pattern (fcfont->font_pattern);
-
+
/* Unable to create FT2 cairo scaled font.
* This means out of memory or a cairo/fontconfig/FreeType bug,
*/
if (!cffont->font_face)
return NULL;
}
-
+
return cffont->font_face;
}
@@ -181,7 +181,7 @@ pango_cairo_fc_font_finalize (GObject *object)
if (cffont->glyph_extents_cache)
{
g_free (cffont->glyph_extents_cache);
- }
+ }
G_OBJECT_CLASS (pango_cairo_fc_font_parent_class)->finalize (object);
}
@@ -196,15 +196,15 @@ pango_cairo_fc_font_get_metrics (PangoFont *font,
PangoFcFont *fcfont = (PangoFcFont *) (font);
PangoCairoFcFont *cffont = (PangoCairoFcFont *) (font);
PangoFcMetricsInfo *info = NULL; /* Quiet gcc */
- GSList *tmp_list;
+ GSList *tmp_list;
const char *sample_str = pango_language_get_sample_string (language);
-
+
tmp_list = fcfont->metrics_by_lang;
while (tmp_list)
{
info = tmp_list->data;
-
+
if (info->sample_str == sample_str) /* We _don't_ need strcmp */
break;
@@ -220,9 +220,9 @@ pango_cairo_fc_font_get_metrics (PangoFont *font,
return pango_font_metrics_new ();
info = g_slice_new0 (PangoFcMetricsInfo);
-
+
fcfont->metrics_by_lang = g_slist_prepend (fcfont->metrics_by_lang, info);
-
+
info->sample_str = sample_str;
context = pango_fc_font_map_create_context (PANGO_FC_FONT_MAP (fcfont->fontmap));
@@ -268,7 +268,7 @@ pango_cairo_fc_font_lock_face (PangoFcFont *font)
cairo_scaled_font_t *scaled_font = pango_cairo_fc_font_get_scaled_font (cfont);
if (G_UNLIKELY (!scaled_font))
return NULL;
-
+
return cairo_ft_scaled_font_lock_face (scaled_font);
}
@@ -279,7 +279,7 @@ pango_cairo_fc_font_unlock_face (PangoFcFont *font)
cairo_scaled_font_t *scaled_font = pango_cairo_fc_font_get_scaled_font (cfont);
if (G_UNLIKELY (!scaled_font))
return;
-
+
cairo_ft_scaled_font_unlock_face (scaled_font);
}
@@ -328,10 +328,10 @@ compute_glyph_extents (PangoCairoFcFont *cffont,
cairo_glyph.index = glyph;
cairo_glyph.x = 0;
cairo_glyph.y = 0;
-
+
cairo_scaled_font_glyph_extents (cffont->scaled_font,
&cairo_glyph, 1, &extents);
-
+
entry->glyph = glyph;
entry->width = pango_units_from_double (extents.x_advance);
entry->ink_rect.x = pango_units_from_double (extents.x_bearing);
@@ -339,7 +339,7 @@ compute_glyph_extents (PangoCairoFcFont *cffont,
entry->ink_rect.width = pango_units_from_double (extents.width);
entry->ink_rect.height = pango_units_from_double (extents.height);
}
-
+
static GlyphExtentsCacheEntry *
pango_cairo_fc_font_get_glyph_extents_cache_entry (PangoCairoFcFont *cffont,
PangoGlyph glyph)
@@ -387,7 +387,7 @@ pango_cairo_fc_font_get_glyph_extents (PangoFont *font,
*logical_rect = cffont->font_extents;
return;
}
- else if (glyph & PANGO_GLYPH_UNKNOWN_FLAG)
+ else if (glyph & PANGO_GLYPH_UNKNOWN_FLAG)
{
_pango_cairo_get_glyph_extents_missing((PangoCairoFont *)font, glyph, ink_rect, logical_rect);
return;
@@ -428,7 +428,7 @@ pango_cairo_fc_font_class_init (PangoCairoFcFontClass *class)
PangoFcFontClass *fc_font_class = PANGO_FC_FONT_CLASS (class);
object_class->finalize = pango_cairo_fc_font_finalize;
-
+
font_class->get_glyph_extents = pango_cairo_fc_font_get_glyph_extents;
font_class->get_metrics = pango_cairo_fc_font_get_metrics;
@@ -456,13 +456,13 @@ get_font_size (PangoCairoFcFontMap *cffontmap,
double size;
/* The reason why we read FC_PIXEL_SIZE here rather than just
- * using the specified size is to support operations like clamping
- * a font to a minimal readable size in fonts.conf. This is pretty weird,
- * since it could mean that changing the Cairo CTM doesn't change the
+ * using the specified size is to support operations like clamping
+ * a font to a minimal readable size in fonts.conf. This is pretty weird,
+ * since it could mean that changing the Cairo CTM doesn't change the
* font size, but it's just a more radical version of the non-linear
* font scaling we already have due to hinting and due to bitmap
* fonts being only available at a few sizes.
- *
+ *
* If honoring FC_PIXEL_SIZE gets in the way of more useful features
* it should be removed since it only matters in the unusual case
* of people doing exotic stuff in fonts.conf.
@@ -482,7 +482,7 @@ get_font_size (PangoCairoFcFontMap *cffontmap,
if (dpi <= 0)
dpi = cffontmap->dpi;
-
+
return dpi * pango_font_description_get_size (desc) / 72.;
}
}
@@ -497,7 +497,7 @@ _pango_cairo_fc_font_new (PangoCairoFcFontMap *cffontmap,
const PangoMatrix *pango_ctm;
FcMatrix *fc_matrix;
double size;
-
+
g_return_val_if_fail (PANGO_IS_CAIRO_FC_FONT_MAP (cffontmap), NULL);
g_return_val_if_fail (pattern != NULL, NULL);
@@ -542,10 +542,10 @@ _pango_cairo_fc_font_new (PangoCairoFcFontMap *cffontmap,
cffont->options = cairo_font_options_copy (_pango_cairo_context_get_merged_font_options (context));
-
+
/* fcfont's is_hinted controls metric hinting
*/
- ((PangoFcFont *)(cffont))->is_hinted =
+ ((PangoFcFont *)(cffont))->is_hinted =
(cairo_font_options_get_hint_metrics(cffont->options) != CAIRO_HINT_METRICS_OFF);
return (PangoFcFont *) (cffont);
diff --git a/pango/pangocairo-fcfontmap.c b/pango/pangocairo-fcfontmap.c
index cc1360ba..5b5c9fb5 100644
--- a/pango/pangocairo-fcfontmap.c
+++ b/pango/pangocairo-fcfontmap.c
@@ -38,7 +38,7 @@ pango_cairo_fc_font_map_set_resolution (PangoCairoFontMap *cfontmap,
double dpi)
{
PangoCairoFcFontMap *cffontmap = (PangoCairoFcFontMap *) (cfontmap);
-
+
cffontmap->dpi = dpi;
pango_fc_font_map_cache_clear ((PangoFcFontMap *) (cfontmap));
@@ -56,7 +56,7 @@ static PangoRenderer *
pango_cairo_fc_font_map_get_renderer (PangoCairoFontMap *cfontmap)
{
PangoCairoFcFontMap *cffontmap = (PangoCairoFcFontMap *) (cfontmap);
-
+
if (!cffontmap->renderer)
cffontmap->renderer = g_object_new (PANGO_TYPE_CAIRO_RENDERER, NULL);
@@ -78,7 +78,7 @@ static void
pango_cairo_fc_font_map_finalize (GObject *object)
{
PangoCairoFcFontMap *cffontmap = (PangoCairoFcFontMap *) (object);
-
+
if (cffontmap->renderer)
g_object_unref (cffontmap->renderer);
@@ -97,7 +97,7 @@ pango_cairo_fc_font_map_context_substitute (PangoFcFontMap *fcfontmap,
if (context)
cairo_ft_font_options_substitute (_pango_cairo_context_get_merged_font_options (context),
pattern);
-
+
FcDefaultSubstitute (pattern);
}
@@ -107,11 +107,11 @@ pango_cairo_fc_font_map_get_resolution_fc (PangoFcFontMap *fcfontmap,
{
PangoCairoFcFontMap *cffontmap = (PangoCairoFcFontMap *) (fcfontmap);
double dpi;
-
+
if (context)
{
dpi = pango_cairo_context_get_resolution (context);
-
+
if (dpi <= 0)
dpi = cffontmap->dpi;
}
@@ -157,7 +157,7 @@ pango_cairo_fc_font_map_context_key_equal (PangoFcFontMap *fcfontmap,
{
return cairo_font_options_equal (key_a, key_b);
}
-
+
static PangoFcFont *
pango_cairo_fc_font_map_create_font (PangoFcFontMap *fcfontmap,
PangoContext *context,
@@ -175,16 +175,16 @@ pango_cairo_fc_font_map_class_init (PangoCairoFcFontMapClass *class)
PangoFcFontMapClass *fcfontmap_class = PANGO_FC_FONT_MAP_CLASS (class);
gobject_class->finalize = pango_cairo_fc_font_map_finalize;
-
+
fcfontmap_class->context_substitute = pango_cairo_fc_font_map_context_substitute;
fcfontmap_class->get_resolution = pango_cairo_fc_font_map_get_resolution_fc;
-
+
fcfontmap_class->context_key_get = pango_cairo_fc_font_map_context_key_get;
fcfontmap_class->context_key_copy = pango_cairo_fc_font_map_context_key_copy;
fcfontmap_class->context_key_free = pango_cairo_fc_font_map_context_key_free;
fcfontmap_class->context_key_hash = pango_cairo_fc_font_map_context_key_hash;
fcfontmap_class->context_key_equal = pango_cairo_fc_font_map_context_key_equal;
-
+
fcfontmap_class->create_font = pango_cairo_fc_font_map_create_font;
}
diff --git a/pango/pangocairo-font.c b/pango/pangocairo-font.c
index b72b6e2d..87dccd35 100644
--- a/pango/pangocairo-font.c
+++ b/pango/pangocairo-font.c
@@ -82,7 +82,7 @@ _pango_cairo_font_install (PangoCairoFont *font,
}
return FALSE;
}
-
+
return (* PANGO_CAIRO_FONT_GET_IFACE (font)->install) (font, cr);
}
@@ -91,7 +91,7 @@ _pango_cairo_font_get_font_face (PangoCairoFont *font)
{
g_return_val_if_fail (PANGO_IS_CAIRO_FONT (font), NULL);
/* this function will be removed. don't bother with warning history here */
-
+
return (* PANGO_CAIRO_FONT_GET_IFACE (font)->get_font_face) (font);
}
@@ -107,7 +107,7 @@ _pango_cairo_font_get_scaled_font (PangoCairoFont *font)
}
return NULL;
}
-
+
return (* PANGO_CAIRO_FONT_GET_IFACE (font)->get_scaled_font) (font);
}
@@ -119,8 +119,8 @@ _pango_cairo_hex_box_info_destroy (PangoCairoHexBoxInfo *hbi)
g_object_unref (hbi->font);
g_slice_free (PangoCairoHexBoxInfo, hbi);
}
-}
-
+}
+
PangoCairoHexBoxInfo *
_pango_cairo_font_get_hex_box_info (PangoCairoFont *cfont)
{
@@ -154,10 +154,10 @@ _pango_cairo_font_get_hex_box_info (PangoCairoFont *cfont)
if (hbi)
return hbi;
- scaled_font = _pango_cairo_font_get_scaled_font (cfont);
+ scaled_font = _pango_cairo_font_get_scaled_font (cfont);
if (!scaled_font)
{
- g_object_set_data_full (G_OBJECT (cfont), "hex_box_info", NULL, NULL);
+ g_object_set_data_full (G_OBJECT (cfont), "hex_box_info", NULL, NULL);
return NULL;
}
@@ -193,7 +193,7 @@ _pango_cairo_font_get_hex_box_info (PangoCairoFont *cfont)
#define HINT(value, scale, scale_inv) (ceil ((value-1e-5) * scale) * scale_inv)
#define HINT_X(value) HINT ((value), scale_x, scale_x_inv)
#define HINT_Y(value) HINT ((value), scale_y, scale_y_inv)
-
+
/* create mini_font description */
{
PangoContext *context;
@@ -242,7 +242,7 @@ _pango_cairo_font_get_hex_box_info (PangoCairoFont *cfont)
mini_cfont = (PangoCairoFont *) mini_font;
- scaled_mini_font = _pango_cairo_font_get_scaled_font (mini_cfont);
+ scaled_mini_font = _pango_cairo_font_get_scaled_font (mini_cfont);
for (i = 0 ; i < 16 ; i++)
{
@@ -294,7 +294,7 @@ _pango_cairo_font_get_hex_box_info (PangoCairoFont *cfont)
hbi->box_descent = HINT_Y (hbi->box_descent);
}
- g_object_set_data_full (G_OBJECT (cfont), "hex_box_info", hbi, (GDestroyNotify)_pango_cairo_hex_box_info_destroy);
+ g_object_set_data_full (G_OBJECT (cfont), "hex_box_info", hbi, (GDestroyNotify)_pango_cairo_hex_box_info_destroy);
return hbi;
}
@@ -305,7 +305,7 @@ _pango_cairo_get_glyph_extents_missing (PangoCairoFont *cfont,
PangoRectangle *ink_rect,
PangoRectangle *logical_rect)
{
- PangoCairoHexBoxInfo *hbi;
+ PangoCairoHexBoxInfo *hbi;
gint rows, cols;
hbi = _pango_cairo_font_get_hex_box_info (cfont);
@@ -317,7 +317,7 @@ _pango_cairo_get_glyph_extents_missing (PangoCairoFont *cfont,
rows = hbi->rows;
cols = ((glyph & ~PANGO_GLYPH_UNKNOWN_FLAG) > 0xffff ? 6 : 4) / rows;
-
+
if (ink_rect)
{
ink_rect->x = PANGO_SCALE * hbi->pad_x;
@@ -325,13 +325,13 @@ _pango_cairo_get_glyph_extents_missing (PangoCairoFont *cfont,
ink_rect->width = PANGO_SCALE * (3 * hbi->pad_x + cols * (hbi->digit_width + hbi->pad_x));
ink_rect->height = PANGO_SCALE * hbi->box_height;
}
-
+
if (logical_rect)
{
logical_rect->x = 0;
logical_rect->y = PANGO_SCALE * (hbi->box_descent - (hbi->box_height + hbi->pad_y));
logical_rect->width = PANGO_SCALE * (5 * hbi->pad_x + cols * (hbi->digit_width + hbi->pad_x));
logical_rect->height = PANGO_SCALE * (hbi->box_height + 2 * hbi->pad_y);
- }
+ }
}
diff --git a/pango/pangocairo-fontmap.c b/pango/pangocairo-fontmap.c
index f1a4c67f..56384953 100644
--- a/pango/pangocairo-fontmap.c
+++ b/pango/pangocairo-fontmap.c
@@ -66,7 +66,7 @@ pango_cairo_font_map_get_type (void)
/**
* pango_cairo_font_map_new:
- *
+ *
* Creates a new #PangoCairoFontMap object; a fontmap is used
* to cache information about available fonts, and holds
* certain global parameters such as the resolution.
@@ -77,7 +77,7 @@ pango_cairo_font_map_get_type (void)
* on the particular font backend Cairo was compiled to use;
* You generally should only use the #PangoFontMap and
* #PangoCairoFontMap interfaces on the returned object.
- *
+ *
* Return value: the newly allocated #PangoFontMap, which should
* be freed with g_object_unref().
*
@@ -100,9 +100,9 @@ pango_cairo_font_map_new (void)
/**
* pango_cairo_font_map_get_default:
- *
- * Gets a default font map to use with Cairo.
- *
+ *
+ * Gets a default font map to use with Cairo.
+ *
* Return value: the default Cairo fontmap for #Pango. This
* object is owned by Pango and must not be freed.
*
@@ -121,10 +121,10 @@ pango_cairo_font_map_get_default (void)
/**
* pango_cairo_font_map_set_resolution:
- * @fontmap: a #PangoCairoFontMap
+ * @fontmap: a #PangoCairoFontMap
* @dpi: the resolution in "dots per inch". (Physical inches aren't actually
* involved; the terminology is conventional.)
- *
+ *
* Sets the resolution for the fontmap. This is a scale factor between
* points specified in a #PangoFontDescription and Cairo units. The
* default value is 96, meaning that a 10 point font will be 13
@@ -137,14 +137,14 @@ pango_cairo_font_map_set_resolution (PangoCairoFontMap *fontmap,
double dpi)
{
g_return_if_fail (PANGO_IS_CAIRO_FONT_MAP (fontmap));
-
+
(* PANGO_CAIRO_FONT_MAP_GET_IFACE (fontmap)->set_resolution) (fontmap, dpi);
}
/**
* pango_cairo_font_map_get_resolution:
- * @fontmap: a #PangoCairoFontMap
- *
+ * @fontmap: a #PangoCairoFontMap
+ *
* Gets the resolution for the fontmap. See pango_cairo_font_map_set_resolution()
*
* Return value: the resolution in "dots per inch"
@@ -155,16 +155,16 @@ double
pango_cairo_font_map_get_resolution (PangoCairoFontMap *fontmap)
{
g_return_val_if_fail (PANGO_IS_CAIRO_FONT_MAP (fontmap), 96.);
-
+
return (* PANGO_CAIRO_FONT_MAP_GET_IFACE (fontmap)->get_resolution) (fontmap);
}
/**
* pango_cairo_font_map_create_context:
* @fontmap: a #PangoCairoFontMap
- *
+ *
* Create a #PangoContext for the given fontmap.
- *
+ *
* Return value: the newly created context; free with g_object_unref().
*
* Since: 1.10
@@ -173,9 +173,9 @@ PangoContext *
pango_cairo_font_map_create_context (PangoCairoFontMap *fontmap)
{
PangoContext *context;
-
+
g_return_val_if_fail (PANGO_IS_CAIRO_FONT_MAP (fontmap), NULL);
-
+
context = pango_context_new ();
pango_context_set_font_map (context, PANGO_FONT_MAP (fontmap));
@@ -185,16 +185,16 @@ pango_cairo_font_map_create_context (PangoCairoFontMap *fontmap)
/**
* _pango_cairo_font_map_get_renderer:
* @fontmap: a #PangoCairoFontmap
- *
+ *
* Gets the singleton #PangoCairoRenderer for this fontmap.
- *
+ *
* Return value: the singleton renderer
**/
PangoRenderer *
_pango_cairo_font_map_get_renderer (PangoCairoFontMap *fontmap)
{
g_return_val_if_fail (PANGO_IS_CAIRO_FONT_MAP (fontmap), NULL);
-
+
return (* PANGO_CAIRO_FONT_MAP_GET_IFACE (fontmap)->get_renderer) (fontmap);
}
@@ -203,7 +203,7 @@ typedef struct _PangoCairoContextInfo PangoCairoContextInfo;
struct _PangoCairoContextInfo
{
double dpi;
-
+
cairo_font_options_t *set_options;
cairo_font_options_t *surface_options;
cairo_font_options_t *merged_options;
@@ -218,7 +218,7 @@ free_context_info (PangoCairoContextInfo *info)
cairo_font_options_destroy (info->surface_options);
if (info->merged_options)
cairo_font_options_destroy (info->merged_options);
-
+
g_slice_free (PangoCairoContextInfo, info);
}
@@ -242,7 +242,7 @@ get_context_info (PangoContext *context,
info->surface_options = NULL;
info->merged_options = NULL;
- g_object_set_qdata_full (G_OBJECT (context), context_info_quark,
+ g_object_set_qdata_full (G_OBJECT (context), context_info_quark,
info, (GDestroyNotify)free_context_info);
}
@@ -253,7 +253,7 @@ get_context_info (PangoContext *context,
* pango_cairo_update_context:
* @cr: a Cairo context
* @context: a #PangoContext, from pango_cairo_font_map_create_context()
- *
+ *
* Updates a #PangoContext previously created for use with Cairo to
* match the current transformation and target surface of a Cairo
* context. If any layouts have been created for the context,
@@ -270,7 +270,7 @@ pango_cairo_update_context (cairo_t *cr,
cairo_matrix_t cairo_matrix;
cairo_surface_t *target;
PangoMatrix pango_matrix;
-
+
g_return_if_fail (cr != NULL);
g_return_if_fail (PANGO_IS_CONTEXT (context));
@@ -291,7 +291,7 @@ pango_cairo_update_context (cairo_t *cr,
target = cairo_get_target (cr);
cairo_surface_get_font_options (target, info->surface_options);
-
+
if (info->merged_options)
{
cairo_font_options_destroy (info->merged_options);
@@ -305,7 +305,7 @@ pango_cairo_update_context (cairo_t *cr,
* @dpi: the resolution in "dots per inch". (Physical inches aren't actually
* involved; the terminology is conventional.) A 0 or negative value
* means to use the resolution from the font map.
- *
+ *
* Sets the resolution for the context. This is a scale factor between
* points specified in a #PangoFontDescription and Cairo units. The
* default value is 96, meaning that a 10 point font will be 13
@@ -324,7 +324,7 @@ pango_cairo_context_set_resolution (PangoContext *context,
/**
* pango_cairo_context_get_resolution:
* @context: a #PangoContext, from pango_cairo_font_map_create_context()
- *
+ *
* Gets the resolution for the context. See pango_cairo_context_set_resolution()
*
* Return value: the resolution in "dots per inch". A negative value will
@@ -348,19 +348,19 @@ pango_cairo_context_get_resolution (PangoContext *context)
* @context: a #PangoContext, from pango_cairo_font_map_create_context()
* @options: a #cairo_font_options_t, or %NULL to unset any previously set
* options. A copy is made.
- *
+ *
* Sets the font options used when rendering text with this context.
* These options override any options that pango_cairo_update_context()
* derives from the target surface.
*/
-void
+void
pango_cairo_context_set_font_options (PangoContext *context,
const cairo_font_options_t *options)
{
PangoCairoContextInfo *info;
g_return_if_fail (PANGO_IS_CONTEXT (context));
-
+
info = get_context_info (context, TRUE);
if (info->set_options)
@@ -370,22 +370,22 @@ pango_cairo_context_set_font_options (PangoContext *context,
info->set_options = cairo_font_options_copy (options);
else
info->set_options = NULL;
-
+
if (info->merged_options)
{
cairo_font_options_destroy (info->merged_options);
info->merged_options = NULL;
}
}
-
+
/**
* pango_cairo_context_get_font_options:
* @context: a #PangoContext, from pango_cairo_font_map_create_context()
- *
+ *
* Retrieves any font rendering options previously set with
* pango_cairo_font_map_set_font_options(). This functions not report options
* that are derived from the target surface by pango_cairo_update_context()
- *
+ *
* Return value: the font options previously set on the context, or %NULL
* if no options have been set. This value is owned by the context
* and must not be modified or freed.
@@ -394,7 +394,7 @@ G_CONST_RETURN cairo_font_options_t *
pango_cairo_context_get_font_options (PangoContext *context)
{
PangoCairoContextInfo *info;
-
+
g_return_val_if_fail (PANGO_IS_CONTEXT (context), NULL);
info = get_context_info (context, FALSE);
@@ -409,7 +409,7 @@ pango_cairo_context_get_font_options (PangoContext *context)
* _pango_cairo_context_merge_font_options:
* @context: a #PangoContext
* @options: a #cairo_font_options_t
- *
+ *
* Merge together options from the target surface and explicitly set
* on the context.
*
@@ -437,7 +437,7 @@ _pango_cairo_context_get_merged_font_options (PangoContext *context)
/**
* pango_cairo_create_layout:
* @cr: a Cairo context
- *
+ *
* Creates a layout object set up to match the current transformation
* and target surface of the Cairo context. This layout can then be
* used for text measurement with functions like
@@ -449,7 +449,7 @@ _pango_cairo_context_get_merged_font_options (PangoContext *context)
* however it is slightly inefficient since it creates a separate
* #PangoContext object for each layout. This might matter in an
* application that was laying out large amounts of text.
- *
+ *
* Return value: the newly created #PangoLayout. Free with
* g_object_unref().
*
@@ -478,7 +478,7 @@ pango_cairo_create_layout (cairo_t *cr)
* pango_cairo_update_layout:
* @cr: a Cairo context
* @layout: a #PangoLayout, from pango_cairo_create_layout()
- *
+ *
* Updates the private #PangoContext of a #PangoLayout created with
* pango_cairo_create_layout() to match the current transformation
* and target surface of a Cairo context.
diff --git a/pango/pangocairo-private.h b/pango/pangocairo-private.h
index 7ccd1857..74ab88cf 100644
--- a/pango/pangocairo-private.h
+++ b/pango/pangocairo-private.h
@@ -109,7 +109,7 @@ typedef struct _PangoCairoWarningHistory PangoCairoWarningHistory;
struct _PangoCairoWarningHistory {
guint font_install : 1;
guint font_get_scaled_font : 1;
-};
+};
extern PangoCairoWarningHistory _pango_cairo_warning_history;
diff --git a/pango/pangocairo-render.c b/pango/pangocairo-render.c
index 48aedf95..595ff0ce 100644
--- a/pango/pangocairo-render.c
+++ b/pango/pangocairo-render.c
@@ -50,7 +50,7 @@ set_color (PangoCairoRenderer *crenderer,
PangoRenderPart part)
{
PangoColor *color = pango_renderer_get_color ((PangoRenderer *) (crenderer), part);
-
+
if (color)
cairo_set_source_rgb (crenderer->cr,
color->red / 65535.,
@@ -133,7 +133,7 @@ _pango_cairo_renderer_draw_unknown_glyph (PangoCairoRenderer *crenderer,
cairo_save (crenderer->cr);
cairo_get_current_point (crenderer->cr, &temp_x, &temp_y);
- hbi = _pango_cairo_font_get_hex_box_info ((PangoCairoFont *)font);
+ hbi = _pango_cairo_font_get_hex_box_info ((PangoCairoFont *)font);
if (!hbi || !_pango_cairo_font_install ((PangoCairoFont *) (hbi->font), crenderer->cr))
{
@@ -179,7 +179,7 @@ done:
cairo_move_to (crenderer->cr, temp_x, temp_y);
cairo_restore (crenderer->cr);
}
-
+
static void
pango_cairo_renderer_draw_glyphs (PangoRenderer *renderer,
PangoFont *font,
@@ -191,7 +191,7 @@ pango_cairo_renderer_draw_glyphs (PangoRenderer *renderer,
/* cairo_glyph_t is 24 bytes */
#define MAX_STACK 40
-
+
int i, count;
int x_position = 0;
cairo_glyph_t *cairo_glyphs;
@@ -217,7 +217,7 @@ pango_cairo_renderer_draw_glyphs (PangoRenderer *renderer,
base_y + (double)(gi->geometry.y_offset) / PANGO_SCALE;
_pango_cairo_renderer_draw_unknown_glyph (crenderer, font, gi, cx, cy);
- }
+ }
x_position += gi->geometry.width;
}
@@ -250,7 +250,7 @@ pango_cairo_renderer_draw_glyphs (PangoRenderer *renderer,
cairo_glyphs[count].y = cy;
count++;
}
- }
+ }
x_position += gi->geometry.width;
}
@@ -258,13 +258,13 @@ pango_cairo_renderer_draw_glyphs (PangoRenderer *renderer,
cairo_glyph_path (crenderer->cr, cairo_glyphs, count);
else
cairo_show_glyphs (crenderer->cr, cairo_glyphs, count);
-
+
if (glyphs->num_glyphs > MAX_STACK)
g_free (cairo_glyphs);
done:
cairo_restore (crenderer->cr);
-
+
#undef MAX_STACK
}
@@ -287,13 +287,13 @@ pango_cairo_renderer_draw_rectangle (PangoRenderer *renderer,
cairo_rectangle (crenderer->cr,
crenderer->x_offset + (double)x / PANGO_SCALE,
- crenderer->y_offset + (double)y / PANGO_SCALE,
+ crenderer->y_offset + (double)y / PANGO_SCALE,
(double)width / PANGO_SCALE, (double)height / PANGO_SCALE);
if (!crenderer->do_path)
{
cairo_fill (crenderer->cr);
-
+
cairo_restore (crenderer->cr);
}
}
@@ -304,11 +304,11 @@ pango_cairo_renderer_draw_rectangle (PangoRenderer *renderer,
* A/ \ / \ / \ A/ \ / \ |
* \ \ / \ / /D \ \ / \ |
* \ \/ C \/ / \ \/ C \ | height = HEIGHT_SQUARES * square
- * \ /\ F / \ F /\ \ |
+ * \ /\ F / \ F /\ \ |
* \ / \ / \ / \ \G |
* \ / \ / \ / \ / |
* \/ \/ \/ \/ -
- * B B
+ * B B
* |---|
* unit_width = (HEIGHT_SQUARES - 1) * square
*
@@ -336,16 +336,16 @@ draw_error_underline (cairo_t *cr,
y_top = y;
y_bottom = y + height;
-
+
/* Bottom of squiggle */
cairo_move_to (cr, x - square / 2, y_top + square / 2); /* A */
for (i = 0; i < width_units; i += 2)
{
double x_middle = x + (i + 1) * unit_width;
double x_right = x + (i + 2) * unit_width;
-
+
cairo_line_to (cr, x_middle, y_bottom); /* B */
-
+
if (i + 1 == width_units)
/* Nothing */;
else if (i + 2 == width_units)
@@ -353,14 +353,14 @@ draw_error_underline (cairo_t *cr,
else
cairo_line_to (cr, x_right, y_top + square); /* C */
}
-
+
/* Top of squiggle */
for (i -= 2; i >= 0; i -= 2)
{
double x_left = x + i * unit_width;
double x_middle = x + (i + 1) * unit_width;
double x_right = x + (i + 2) * unit_width;
-
+
if (i + 1 == width_units)
cairo_line_to (cr, x_middle + square / 2, y_bottom - square / 2); /* G */
else {
@@ -368,7 +368,7 @@ draw_error_underline (cairo_t *cr,
cairo_line_to (cr, x_right, y_top); /* E */
cairo_line_to (cr, x_middle, y_bottom - square); /* F */
}
-
+
cairo_line_to (cr, x_left, y_top); /* H */
}
}
@@ -388,7 +388,7 @@ pango_cairo_renderer_draw_error_underline (PangoRenderer *renderer,
cairo_save (cr);
set_color (crenderer, PANGO_RENDER_PART_UNDERLINE);
-
+
cairo_new_path (cr);
}
@@ -396,7 +396,7 @@ pango_cairo_renderer_draw_error_underline (PangoRenderer *renderer,
crenderer->x_offset + (double)x / PANGO_SCALE,
crenderer->y_offset + (double)y / PANGO_SCALE,
(double)width / PANGO_SCALE, (double)height / PANGO_SCALE);
-
+
if (!crenderer->do_path)
{
cairo_fill (cr);
@@ -487,21 +487,21 @@ _pango_cairo_do_glyph_string (cairo_t *cr,
* prepare_run() isn't called.
*/
- pango_renderer_activate (renderer);
-
- pango_renderer_set_color (renderer, PANGO_RENDER_PART_FOREGROUND, NULL);
- pango_renderer_set_color (renderer, PANGO_RENDER_PART_BACKGROUND, NULL);
- pango_renderer_set_color (renderer, PANGO_RENDER_PART_UNDERLINE, NULL);
- pango_renderer_set_color (renderer, PANGO_RENDER_PART_STRIKETHROUGH, NULL);
+ pango_renderer_activate (renderer);
+
+ pango_renderer_set_color (renderer, PANGO_RENDER_PART_FOREGROUND, NULL);
+ pango_renderer_set_color (renderer, PANGO_RENDER_PART_BACKGROUND, NULL);
+ pango_renderer_set_color (renderer, PANGO_RENDER_PART_UNDERLINE, NULL);
+ pango_renderer_set_color (renderer, PANGO_RENDER_PART_STRIKETHROUGH, NULL);
}
-
+
pango_renderer_draw_glyphs (renderer, font, glyphs, 0, 0);
if (!do_path)
{
pango_renderer_deactivate (renderer);
}
-
+
release_renderer (crenderer, free_renderer);
}
@@ -519,7 +519,7 @@ _pango_cairo_do_layout_line (cairo_t *cr,
cairo_get_current_point (cr, &crenderer->x_offset, &crenderer->y_offset);
pango_renderer_draw_layout_line (renderer, line, 0, 0);
-
+
release_renderer (crenderer, free_renderer);
}
@@ -531,24 +531,24 @@ _pango_cairo_do_layout (cairo_t *cr,
gboolean free_renderer;
PangoCairoRenderer *crenderer = acquire_renderer (&free_renderer);
PangoRenderer *renderer = (PangoRenderer *) crenderer;
-
+
crenderer->cr = cr;
crenderer->do_path = do_path;
cairo_get_current_point (cr, &crenderer->x_offset, &crenderer->y_offset);
pango_renderer_draw_layout (renderer, layout, 0, 0);
-
+
release_renderer (crenderer, free_renderer);
}
-static void
-_pango_cairo_do_error_underline (cairo_t *cr,
+static void
+_pango_cairo_do_error_underline (cairo_t *cr,
double x,
double y,
double width,
double height,
gboolean do_path)
-{
+{
/* We don't use a renderer here, for a simple reason:
* the only renderer we can get is the default renderer, that
* is all implemented here, so we shortcircuit and make our
@@ -562,7 +562,7 @@ _pango_cairo_do_error_underline (cairo_t *cr,
if (!do_path)
cairo_fill (cr);
-}
+}
/* public wrapper of above to show or append path */
@@ -573,7 +573,7 @@ _pango_cairo_do_error_underline (cairo_t *cr,
* @cr: a Cairo context
* @font: a #PangoFont
* @glyphs: a #PangoGlyphString
- *
+ *
* Draws the glyphs in @glyphs in the specified cairo context.
* The origin of the glyphs (the left edge of the baseline) will
* be drawn at the current point of the cairo context.
@@ -595,7 +595,7 @@ pango_cairo_show_glyph_string (cairo_t *cr,
* pango_cairo_show_layout_line:
* @cr: a Cairo context
* @line: a #PangoLayoutLine
- *
+ *
* Draws a #PangoLayoutLine in the specified cairo context.
* The origin of the glyphs (the left edge of the line) will
* be drawn at the current point of the cairo context.
@@ -616,7 +616,7 @@ pango_cairo_show_layout_line (cairo_t *cr,
* pango_cairo_show_layout:
* @cr: a Cairo context
* @layout: a Pango layout
- *
+ *
* Draws a #PangoLayoutLine in the specified cairo context.
* The top-left corner of the #PangoLayout will be drawn
* at the current point of the cairo context.
@@ -640,7 +640,7 @@ pango_cairo_show_layout (cairo_t *cr,
* @y: The Y coordinate of one corner of the rectangle
* @width: Non-negative width of the rectangle
* @height: Non-negative height of the rectangle
- *
+ *
* Draw a squiggly line in the specified cairo context that approximately
* covers the given rectangle in the style of an underline used to indicate a
* spelling error. (The width of the underline is rounded to an integer
@@ -649,25 +649,25 @@ pango_cairo_show_layout (cairo_t *cr,
*
* Since: 1.14
**/
-void
-pango_cairo_show_error_underline (cairo_t *cr,
+void
+pango_cairo_show_error_underline (cairo_t *cr,
double x,
double y,
double width,
double height)
-{
+{
g_return_if_fail (cr != NULL);
- g_return_if_fail ((width >= 0) && (height >= 0));
-
- _pango_cairo_do_error_underline (cr, x, y, width, height, FALSE);
-}
+ g_return_if_fail ((width >= 0) && (height >= 0));
+
+ _pango_cairo_do_error_underline (cr, x, y, width, height, FALSE);
+}
/**
* pango_cairo_glyph_string_path
* @cr: a Cairo context
* @font: a #PangoFont
* @glyphs: a #PangoGlyphString
- *
+ *
* Adds the glyphs in @glyphs to the current path in the specified
* cairo context. The origin of the glyphs (the left edge of the baseline)
* will be at the current point of the cairo context.
@@ -689,7 +689,7 @@ pango_cairo_glyph_string_path (cairo_t *cr,
* pango_cairo_layout_line_path:
* @cr: a Cairo context
* @line: a #PangoLayoutLine
- *
+ *
* Adds the text in #PangoLayoutLine to the current path in the
* specified cairo context. The origin of the glyphs (the left edge
* of the line) will be at the current point of the cairo context.
@@ -710,7 +710,7 @@ pango_cairo_layout_line_path (cairo_t *cr,
* pango_cairo_layout_path:
* @cr: a Cairo context
* @layout: a Pango layout
- *
+ *
* Adds the text in a #PangoLayout to the current path in the
* specified cairo context. The top-left corner of the #PangoLayout
* will be at the current point of the cairo context.
@@ -734,7 +734,7 @@ pango_cairo_layout_path (cairo_t *cr,
* @y: The Y coordinate of one corner of the rectangle
* @width: Non-negative width of the rectangle
* @height: Non-negative height of the rectangle
- *
+ *
* Add a squiggly line to the current path in the specified cairo context that
* approximately covers the given rectangle in the style of an underline used
* to indicate a spelling error. (The width of the underline is rounded to an
@@ -743,8 +743,8 @@ pango_cairo_layout_path (cairo_t *cr,
*
* Since: 1.14
**/
-void
-pango_cairo_error_underline_path (cairo_t *cr,
+void
+pango_cairo_error_underline_path (cairo_t *cr,
double x,
double y,
double width,
@@ -752,6 +752,6 @@ pango_cairo_error_underline_path (cairo_t *cr,
{
g_return_if_fail (cr != NULL);
g_return_if_fail ((width >= 0) && (height >= 0));
-
- _pango_cairo_do_error_underline (cr, x, y, width, height, TRUE);
+
+ _pango_cairo_do_error_underline (cr, x, y, width, height, TRUE);
}
diff --git a/pango/pangocairo-win32font.c b/pango/pangocairo-win32font.c
index 6aa114d9..297012db 100644
--- a/pango/pangocairo-win32font.c
+++ b/pango/pangocairo-win32font.c
@@ -50,11 +50,11 @@ struct _PangoCairoWin32Font
cairo_font_face_t *font_face;
cairo_scaled_font_t *scaled_font;
-
+
cairo_matrix_t font_matrix;
cairo_matrix_t ctm;
cairo_font_options_t *options;
-
+
GSList *metrics_by_lang;
GHashTable *glyph_info;
};
@@ -91,12 +91,12 @@ pango_cairo_win32_font_get_font_face (PangoCairoFont *font)
* last field
*/
memcpy (&logfontw, &win32font->logfont, sizeof (LOGFONTA));
-
+
if (!MultiByteToWideChar (CP_ACP, MB_ERR_INVALID_CHARS,
win32font->logfont.lfFaceName, -1,
logfontw.lfFaceName, G_N_ELEMENTS (logfontw.lfFaceName)))
logfontw.lfFaceName[0] = 0; /* Hopefully this will select some font */
-
+
cwfont->font_face = cairo_win32_font_face_create_for_logfontw (&logfontw);
/* Failure of the above should only occur for out of memory,
@@ -105,7 +105,7 @@ pango_cairo_win32_font_get_font_face (PangoCairoFont *font)
if (!cwfont->font_face)
g_error ("Unable to create Win32 cairo font face.\nThis means out of memory or a cairo/fontconfig/FreeType bug");
}
-
+
return cwfont->font_face;
}
@@ -130,7 +130,7 @@ pango_cairo_win32_font_get_scaled_font (PangoCairoFont *font)
if (!cwfont->scaled_font)
g_error ("Unable to create Win32 cairo scaled font.\nThis means out of memory or a cairo/fontconfig/FreeType bug");
}
-
+
return cwfont->scaled_font;
}
@@ -178,7 +178,7 @@ pango_cairo_win32_font_finalize (GObject *object)
g_hash_table_destroy (cwfont->glyph_info);
g_slist_foreach (cwfont->metrics_by_lang, (GFunc)free_metrics_info, NULL);
- g_slist_free (cwfont->metrics_by_lang);
+ g_slist_free (cwfont->metrics_by_lang);
if (cwfont->scaled_font)
cairo_scaled_font_destroy (cwfont->scaled_font);
@@ -204,9 +204,9 @@ compute_glyph_extents (PangoFont *font,
cairo_font_extents_t font_extents;
cairo_text_extents_t extents;
cairo_glyph_t cairo_glyph;
-
+
cairo_scaled_font_extents (scaled_font, &font_extents);
-
+
logical_rect->x = 0;
logical_rect->y = - font_extents.ascent * PANGO_SCALE;
logical_rect->width = 0;
@@ -226,15 +226,15 @@ compute_glyph_extents (PangoFont *font,
cairo_glyph.index = glyph;
cairo_glyph.x = 0;
cairo_glyph.y = 0;
-
+
cairo_scaled_font_glyph_extents (scaled_font,
&cairo_glyph, 1, &extents);
-
+
ink_rect->x = extents.x_bearing * PANGO_SCALE;
ink_rect->y = extents.y_bearing * PANGO_SCALE;
ink_rect->width = extents.width * PANGO_SCALE;
ink_rect->height = extents.height * PANGO_SCALE;
-
+
logical_rect->width = extents.x_advance * PANGO_SCALE;
}
}
@@ -250,17 +250,17 @@ pango_cairo_win32_font_get_glyph_info (PangoFont *font,
if (!info)
{
info = g_new0 (PangoCairoWin32GlyphInfo, 1);
-
+
compute_glyph_extents (font, glyph,
&info->ink_rect,
&info->logical_rect);
-
+
g_hash_table_insert (cwfont->glyph_info, GUINT_TO_POINTER (glyph), info);
}
return info;
}
-
+
static void
pango_cairo_win32_font_get_glyph_extents (PangoFont *font,
PangoGlyph glyph,
@@ -270,7 +270,7 @@ pango_cairo_win32_font_get_glyph_extents (PangoFont *font,
PangoCairoWin32GlyphInfo *info;
info = pango_cairo_win32_font_get_glyph_info (font, glyph);
-
+
if (ink_rect)
*ink_rect = info->ink_rect;
if (logical_rect)
@@ -315,14 +315,14 @@ create_metrics_for_context (PangoFont *font,
cairo_scaled_font_t *scaled_font;
cairo_font_extents_t font_extents;
double height;
-
+
metrics = pango_font_metrics_new ();
-
+
scaled_font = pango_cairo_win32_font_get_scaled_font (PANGO_CAIRO_FONT (cwfont));
cairo_scaled_font_extents (scaled_font, &font_extents);
cairo_win32_scaled_font_done_font (scaled_font);
-
+
metrics->ascent = font_extents.ascent * PANGO_SCALE;
metrics->descent = font_extents.descent * PANGO_SCALE;
@@ -343,9 +343,9 @@ create_metrics_for_context (PangoFont *font,
layout = pango_layout_new (context);
font_desc = pango_font_describe_with_absolute_size (font);
pango_layout_set_font_description (layout, font_desc);
- pango_layout_set_text (layout, sample_str, -1);
+ pango_layout_set_text (layout, sample_str, -1);
pango_layout_get_extents (layout, NULL, &extents);
-
+
metrics->approximate_char_width = extents.width / g_utf8_strlen (sample_str, -1);
pango_layout_set_text (layout, "0123456789", -1);
@@ -364,14 +364,14 @@ pango_cairo_win32_font_get_metrics (PangoFont *font,
PangoWin32Font *win32font = PANGO_WIN32_FONT (font);
PangoCairoWin32Font *cwfont = PANGO_CAIRO_WIN32_FONT (font);
PangoWin32MetricsInfo *info = NULL; /* Quiet gcc */
- GSList *tmp_list;
+ GSList *tmp_list;
const char *sample_str = pango_language_get_sample_string (language);
-
+
tmp_list = cwfont->metrics_by_lang;
while (tmp_list)
{
info = tmp_list->data;
-
+
if (info->sample_str == sample_str) /* We _don't_ need strcmp */
break;
@@ -386,10 +386,10 @@ pango_cairo_win32_font_get_metrics (PangoFont *font,
return pango_font_metrics_new ();
info = g_slice_new0 (PangoWin32MetricsInfo);
-
- cwfont->metrics_by_lang = g_slist_prepend (cwfont->metrics_by_lang,
+
+ cwfont->metrics_by_lang = g_slist_prepend (cwfont->metrics_by_lang,
info);
-
+
info->sample_str = sample_str;
context = pango_context_new ();
@@ -410,7 +410,7 @@ pango_cairo_win32_font_select_font (PangoFont *font,
HDC hdc)
{
cairo_scaled_font_t *scaled_font = pango_cairo_win32_font_get_scaled_font (PANGO_CAIRO_FONT (font));
-
+
return cairo_win32_scaled_font_select_font (scaled_font, hdc) == CAIRO_STATUS_SUCCESS;
}
@@ -418,7 +418,7 @@ static void
pango_cairo_win32_font_done_font (PangoFont *font)
{
cairo_scaled_font_t *scaled_font = pango_cairo_win32_font_get_scaled_font (PANGO_CAIRO_FONT (font));
-
+
cairo_win32_scaled_font_done_font (scaled_font);
}
@@ -439,7 +439,7 @@ pango_cairo_win32_font_class_init (PangoCairoWin32FontClass *class)
PangoWin32FontClass *win32_font_class = PANGO_WIN32_FONT_CLASS (class);
object_class->finalize = pango_cairo_win32_font_finalize;
-
+
font_class->get_glyph_extents = pango_cairo_win32_font_get_glyph_extents;
font_class->get_metrics = pango_cairo_win32_font_get_metrics;
@@ -485,19 +485,19 @@ _pango_cairo_win32_font_new (PangoCairoWin32FontMap *cwfontmap,
if (context)
{
dpi = pango_cairo_context_get_resolution (context);
-
+
if (dpi <= 0)
dpi = cwfontmap->dpi;
}
else
dpi = cwfontmap->dpi;
-
+
if (!pango_font_description_get_size_is_absolute (desc))
size *= dpi / 72.;
#ifdef USE_FACE_CACHED_FONTS
win32fontmap = PANGO_WIN32_FONT_MAP (cwfontmap);
-
+
tmp_list = face->cached_fonts;
while (tmp_list)
{
@@ -507,7 +507,7 @@ _pango_cairo_win32_font_new (PangoCairoWin32FontMap *cwfontmap,
g_object_ref (win32font);
if (win32font->in_cache)
pango_win32_fontmap_cache_remove (PANGO_FONT_MAP (win32fontmap), win32font);
-
+
return PANGO_FONT (win32font);
}
tmp_list = tmp_list->next;
@@ -515,7 +515,7 @@ _pango_cairo_win32_font_new (PangoCairoWin32FontMap *cwfontmap,
#endif
cwfont = g_object_new (PANGO_TYPE_CAIRO_WIN32_FONT, NULL);
win32font = PANGO_WIN32_FONT (cwfont);
-
+
win32font->fontmap = PANGO_FONT_MAP (cwfontmap);
g_object_ref (cwfontmap);
@@ -550,6 +550,6 @@ _pango_cairo_win32_font_new (PangoCairoWin32FontMap *cwfontmap,
&win32font->logfont);
cwfont->options = cairo_font_options_copy (_pango_cairo_context_get_merged_font_options (context));
-
+
return PANGO_FONT (cwfont);
}
diff --git a/pango/pangocairo-win32fontmap.c b/pango/pangocairo-win32fontmap.c
index 5dfa9482..d3d829b7 100644
--- a/pango/pangocairo-win32fontmap.c
+++ b/pango/pangocairo-win32fontmap.c
@@ -38,7 +38,7 @@ pango_cairo_win32_font_map_set_resolution (PangoCairoFontMap *cfontmap,
double dpi)
{
PangoCairoWin32FontMap *cwfontmap = PANGO_CAIRO_WIN32_FONT_MAP (cfontmap);
-
+
cwfontmap->dpi = dpi;
}
@@ -54,7 +54,7 @@ static PangoRenderer *
pango_cairo_win32_font_map_get_renderer (PangoCairoFontMap *cfontmap)
{
PangoCairoWin32FontMap *cwfontmap = PANGO_CAIRO_WIN32_FONT_MAP (cfontmap);
-
+
if (!cwfontmap->renderer)
cwfontmap->renderer = g_object_new (PANGO_TYPE_CAIRO_RENDERER, NULL);
@@ -76,7 +76,7 @@ static void
pango_cairo_win32_font_map_finalize (GObject *object)
{
PangoCairoWin32FontMap *cwfontmap = PANGO_CAIRO_WIN32_FONT_MAP (object);
-
+
if (cwfontmap->renderer)
g_object_unref (cwfontmap->renderer);
diff --git a/pango/pangocairo.h b/pango/pangocairo.h
index 51bb3c78..fe97db3b 100644
--- a/pango/pangocairo.h
+++ b/pango/pangocairo.h
@@ -31,7 +31,7 @@ G_BEGIN_DECLS
/**
* PangoCairoFontMap:
- *
+ *
* #PangoCairoFontMap is an interface exported by font maps for
* use with Cairo. The actual type of the font map will depend
* on the particular font technology Cairo was compiled to use.
@@ -87,7 +87,7 @@ void pango_cairo_show_layout_line (cairo_t *cr,
void pango_cairo_show_layout (cairo_t *cr,
PangoLayout *layout);
-void pango_cairo_show_error_underline (cairo_t *cr,
+void pango_cairo_show_error_underline (cairo_t *cr,
double x,
double y,
double width,
@@ -103,8 +103,8 @@ void pango_cairo_layout_line_path (cairo_t *cr,
PangoLayoutLine *line);
void pango_cairo_layout_path (cairo_t *cr,
PangoLayout *layout);
-
-void pango_cairo_error_underline_path (cairo_t *cr,
+
+void pango_cairo_error_underline_path (cairo_t *cr,
double x,
double y,
double width,
diff --git a/pango/pangofc-decoder.h b/pango/pangofc-decoder.h
index f812c1e2..eccdc6ea 100644
--- a/pango/pangofc-decoder.h
+++ b/pango/pangofc-decoder.h
@@ -2,7 +2,7 @@
* pangofc-decoder.h: Custom encoders/decoders on a per-font basis.
*
* Copyright (C) 2004 Red Hat Software
- *
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
@@ -87,7 +87,7 @@ struct _PangoFcDecoderClass
guint32 wc);
/*< private >*/
-
+
/* Padding for future expansion */
void (*_pango_reserved1) (void);
void (*_pango_reserved2) (void);
diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c
index 6c6dcb08..d552c485 100644
--- a/pango/pangofc-font.c
+++ b/pango/pangofc-font.c
@@ -58,7 +58,7 @@ struct _PangoFcFontPrivate
{
PangoFcDecoder *decoder;
gpointer context_key;
- GUnicharToGlyphCacheEntry *char_to_glyph_cache;
+ GUnicharToGlyphCacheEntry *char_to_glyph_cache;
};
#define GLYPH_CACHE_NUM_ENTRIES 256 /* should be power of two */
@@ -100,7 +100,7 @@ pango_fc_font_class_init (PangoFcFontClass *class)
class->has_char = pango_fc_font_real_has_char;
class->get_glyph = pango_fc_font_real_get_glyph;
class->get_unknown_glyph = NULL;
-
+
object_class->finalize = pango_fc_font_finalize;
object_class->set_property = pango_fc_font_set_property;
font_class->describe = pango_fc_font_describe;
@@ -109,7 +109,7 @@ pango_fc_font_class_init (PangoFcFontClass *class)
font_class->get_coverage = pango_fc_font_get_coverage;
font_class->get_metrics = pango_fc_font_get_metrics;
font_class->get_font_map = pango_fc_font_get_font_map;
-
+
g_object_class_install_property (object_class, PROP_PATTERN,
g_param_spec_pointer ("pattern",
"Pattern",
@@ -141,7 +141,7 @@ pango_fc_font_finalize (GObject *object)
PangoFcFontPrivate *priv = fcfont->priv;
g_slist_foreach (fcfont->metrics_by_lang, (GFunc)free_metrics_info, NULL);
- g_slist_free (fcfont->metrics_by_lang);
+ g_slist_free (fcfont->metrics_by_lang);
if (fcfont->fontmap)
_pango_fc_font_map_remove (PANGO_FC_FONT_MAP (fcfont->fontmap), fcfont);
@@ -165,7 +165,7 @@ pattern_is_hinted (FcPattern *pattern)
if (FcPatternGetBool (pattern,
FC_HINTING, 0, &hinting) != FcResultMatch)
hinting = FcTrue;
-
+
return hinting;
}
@@ -177,7 +177,7 @@ pattern_is_transformed (FcPattern *pattern)
if (FcPatternGetMatrix (pattern, FC_MATRIX, 0, &fc_matrix) == FcResultMatch)
{
FT_Matrix ft_matrix;
-
+
ft_matrix.xx = 0x10000L * fc_matrix->xx;
ft_matrix.yy = 0x10000L * fc_matrix->yy;
ft_matrix.xy = 0x10000L * fc_matrix->xy;
@@ -203,7 +203,7 @@ pango_fc_font_set_property (GObject *object,
{
PangoFcFont *fcfont = PANGO_FC_FONT (object);
FcPattern *pattern = g_value_get_pointer (value);
-
+
g_return_if_fail (pattern != NULL);
g_return_if_fail (fcfont->font_pattern == NULL);
@@ -216,7 +216,7 @@ pango_fc_font_set_property (GObject *object,
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
+ break;
}
}
@@ -246,13 +246,13 @@ pango_fc_get_shaper_map (PangoLanguage *language)
{
static guint engine_type_id = 0;
static guint render_type_id = 0;
-
+
if (engine_type_id == 0)
{
engine_type_id = g_quark_from_static_string (PANGO_ENGINE_TYPE_SHAPE);
render_type_id = g_quark_from_static_string (PANGO_RENDER_TYPE_FC);
}
-
+
return pango_find_map (language, engine_type_id, render_type_id);
}
@@ -322,7 +322,7 @@ get_face_metrics (PangoFcFont *fcfont,
ft_matrix.yy = 0x10000L * fc_matrix->yy;
ft_matrix.xy = 0x10000L * fc_matrix->xy;
ft_matrix.yx = 0x10000L * fc_matrix->yx;
-
+
have_transform = (ft_matrix.xx != 0x10000 || ft_matrix.xy != 0 ||
ft_matrix.yx != 0 || ft_matrix.yy != 0x10000);
}
@@ -330,12 +330,12 @@ get_face_metrics (PangoFcFont *fcfont,
if (have_transform)
{
FT_Vector vector;
-
+
vector.x = 0;
vector.y = face->size->metrics.descender;
FT_Vector_Transform (&vector, &ft_matrix);
metrics->descent = - PANGO_UNITS_26_6 (vector.y);
-
+
vector.x = 0;
vector.y = face->size->metrics.ascender;
FT_Vector_Transform (&vector, &ft_matrix);
@@ -369,7 +369,7 @@ get_face_metrics (PangoFcFont *fcfont,
else
{
FT_Fixed ft_thickness, ft_position;
-
+
ft_thickness = FT_MulFix (face->underline_thickness, face->size->metrics.y_scale);
metrics->underline_thickness = PANGO_UNITS_26_6 (ft_thickness);
@@ -381,7 +381,7 @@ get_face_metrics (PangoFcFont *fcfont,
if (os2 && os2->version != 0xFFFF && os2->yStrikeoutSize != 0)
{
FT_Fixed ft_thickness, ft_position;
-
+
ft_thickness = FT_MulFix (os2->yStrikeoutSize, face->size->metrics.y_scale);
metrics->strikethrough_thickness = PANGO_UNITS_26_6 (ft_thickness);
@@ -404,7 +404,7 @@ get_face_metrics (PangoFcFont *fcfont,
pango_quantize_line_geometry (&metrics->strikethrough_thickness,
&metrics->strikethrough_position);
}
-
+
PANGO_FC_FONT_UNLOCK_FACE (fcfont);
}
@@ -442,19 +442,19 @@ pango_fc_font_create_metrics_for_context (PangoFcFont *fcfont,
PangoLanguage *language = pango_context_get_language (context);
const char *sample_str = pango_language_get_sample_string (language);
PangoFontDescription *desc = pango_font_describe_with_absolute_size (fcfont);
-
+
metrics = pango_font_metrics_new ();
-
+
get_face_metrics (fcfont, metrics);
-
+
layout = pango_layout_new (context);
pango_layout_set_font_description (layout, desc);
pango_font_description_free (desc);
-
- pango_layout_set_text (layout, sample_str, -1);
+
+ pango_layout_set_text (layout, sample_str, -1);
pango_layout_get_extents (layout, NULL, &extents);
-
- metrics->approximate_char_width =
+
+ metrics->approximate_char_width =
extents.width / g_utf8_strlen (sample_str, -1);
pango_layout_set_text (layout, "0123456789", -1);
@@ -474,15 +474,15 @@ pango_fc_font_get_metrics (PangoFont *font,
{
PangoFcFont *fcfont = PANGO_FC_FONT (font);
PangoFcMetricsInfo *info = NULL; /* Quiet gcc */
- GSList *tmp_list;
+ GSList *tmp_list;
const char *sample_str = pango_language_get_sample_string (language);
-
+
tmp_list = fcfont->metrics_by_lang;
while (tmp_list)
{
info = tmp_list->data;
-
+
if (info->sample_str == sample_str) /* We _don't_ need strcmp */
break;
@@ -498,9 +498,9 @@ pango_fc_font_get_metrics (PangoFont *font,
info = g_slice_new0 (PangoFcMetricsInfo);
- fcfont->metrics_by_lang = g_slist_prepend (fcfont->metrics_by_lang,
+ fcfont->metrics_by_lang = g_slist_prepend (fcfont->metrics_by_lang,
info);
-
+
info->sample_str = sample_str;
context = pango_fc_font_map_create_context (PANGO_FC_FONT_MAP (fcfont->fontmap));
@@ -566,7 +566,7 @@ pango_fc_font_real_get_glyph (PangoFcFont *font,
entry->ch = wc;
entry->glyph = index;
-
+
PANGO_FC_FONT_UNLOCK_FACE (font);
}
@@ -606,7 +606,7 @@ void
pango_fc_font_unlock_face (PangoFcFont *font)
{
g_return_if_fail (PANGO_IS_FC_FONT (font));
-
+
PANGO_FC_FONT_UNLOCK_FACE (font);
}
@@ -614,9 +614,9 @@ pango_fc_font_unlock_face (PangoFcFont *font)
* pango_fc_font_has_char:
* @font: a #PangoFcFont
* @wc: Unicode codepoint to look up
- *
+ *
* Determines whether @font has a glyph for the codepoint @wc.
- *
+ *
* Return value: %TRUE if @font has the requested codepoint.
*
* Since: 1.4
@@ -643,11 +643,11 @@ pango_fc_font_has_char (PangoFcFont *font,
* pango_fc_font_get_glyph:
* @font: a #PangoFcFont
* @wc: Unicode character to look up
- *
+ *
* Gets the glyph index for a given Unicode character
* for @font. If you only want to determine
* whether the font has the glyph, use pango_fc_font_has_char().
- *
+ *
* Return value: the glyph index, or 0, if the Unicode
* character doesn't exist in the font.
*
@@ -709,10 +709,10 @@ _pango_fc_font_shutdown (PangoFcFont *font)
* pango_fc_font_kern_glyphs
* @font: a #PangoFcFont
* @glyphs: a #PangoGlyphString
- *
+ *
* Adjust each adjacent pair of glyphs in @glyphs according to
* kerning information in @font.
- *
+ *
* Since: 1.4
**/
void
@@ -736,7 +736,7 @@ pango_fc_font_kern_glyphs (PangoFcFont *font,
PANGO_FC_FONT_UNLOCK_FACE (font);
return;
}
-
+
for (i = 1; i < glyphs->num_glyphs; ++i)
{
error = FT_Get_Kerning (face,
@@ -748,7 +748,7 @@ pango_fc_font_kern_glyphs (PangoFcFont *font,
if (error == FT_Err_Ok)
glyphs->glyphs[i-1].geometry.width += PANGO_UNITS_26_6 (kerning.x);
}
-
+
PANGO_FC_FONT_UNLOCK_FACE (font);
}
@@ -821,7 +821,7 @@ get_per_char (FT_Face face,
{
FT_Error error;
FT_Glyph_Metrics *result;
-
+
error = FT_Load_Glyph (face, glyph, load_flags);
if (error == FT_Err_Ok)
result = &face->glyph->metrics;
@@ -838,7 +838,7 @@ get_per_char (FT_Face face,
* @glyph: the glyph index to load
* @ink_rect: location to store ink extents of the glyph, or %NULL
* @logical_rect: location to store logical extents of the glyph or %NULL
- *
+ *
* Gets the extents of a single glyph from a font. The extents are in
* user space; that is, they are not transformed by any matrix in effect
* for the font.
@@ -869,7 +869,7 @@ pango_fc_font_get_raw_extents (PangoFcFont *fcfont,
gm = NULL;
else
gm = get_per_char (face, load_flags, glyph);
-
+
if (gm)
{
if (ink_rect)
@@ -893,10 +893,10 @@ pango_fc_font_get_raw_extents (PangoFcFont *fcfont,
else
{
FT_Fixed ascender, descender;
-
+
ascender = FT_MulFix (face->ascender, face->size->metrics.y_scale);
descender = FT_MulFix (face->descender, face->size->metrics.y_scale);
-
+
logical_rect->y = - PANGO_UNITS_26_6 (ascender);
logical_rect->height = PANGO_UNITS_26_6 (ascender - descender);
}
@@ -920,7 +920,7 @@ pango_fc_font_get_raw_extents (PangoFcFont *fcfont,
logical_rect->height = 0;
}
}
-
+
PANGO_FC_FONT_UNLOCK_FACE (fcfont);
}
diff --git a/pango/pangofc-font.h b/pango/pangofc-font.h
index 9b198ed8..3a6eb40d 100644
--- a/pango/pangofc-font.h
+++ b/pango/pangofc-font.h
@@ -42,7 +42,7 @@ typedef struct _PangoFcFontClass PangoFcFontClass;
/**
* PANGO_RENDER_TYPE_FC:
- *
+ *
* A string constant used to identify shape engines that work
* with the fontconfig based backends. See the @engine_type field
* of #PangoEngineInfo.
@@ -57,7 +57,7 @@ typedef struct _PangoFcFontClass PangoFcFontClass;
/**
* PangoFcFont:
- *
+ *
* #PangoFcFont is a base class for font implementations
* using the Fontconfig and FreeType libraries and is used in
* conjunction with #PangoFcFontMap. When deriving from this
@@ -74,7 +74,7 @@ struct _PangoFcFont
gpointer priv; /* used internally */
PangoMatrix matrix; /* used internally */
PangoFontDescription *description;
-
+
GSList *metrics_by_lang;
guint is_hinted : 1;
diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c
index e901f07a..f1f3a56a 100644
--- a/pango/pangofc-fontmap.c
+++ b/pango/pangofc-fontmap.c
@@ -51,11 +51,11 @@ typedef struct _FontHashKey FontHashKey;
struct _PangoFcFontMapPrivate
{
GHashTable *fontset_hash; /* Maps PangoFontDescription -> PangoFcPatternSet */
-
+
/* pattern_hash is used to make sure we only store one copy of
* each identical pattern. (Speeds up lookup).
*/
- GHashTable *pattern_hash;
+ GHashTable *pattern_hash;
GHashTable *coverage_hash; /* Maps font file name/id -> PangoCoverage */
GHashTable *font_hash; /* Maps FcPattern -> PangoFcFont */
@@ -76,7 +76,7 @@ struct _PangoFcFontMapPrivate
struct _PangoFcCoverageKey
{
- char *filename;
+ char *filename;
int id; /* needed to handle TTC files with multiple faces */
};
@@ -109,7 +109,7 @@ struct _PangoFcPatternSet
FcPattern **patterns;
PangoFontset *fontset;
GList *cache_link;
-
+
FontsetHashKey *key;
};
@@ -160,7 +160,7 @@ static void fontset_hash_key_free (FontsetHashKey *key);
G_DEFINE_TYPE (PangoFcFontMap, pango_fc_font_map, PANGO_TYPE_FONT_MAP)
-static void
+static void
pango_fc_font_map_init (PangoFcFontMap *fcfontmap)
{
static gboolean registered_modules = FALSE;
@@ -173,9 +173,9 @@ pango_fc_font_map_init (PangoFcFontMap *fcfontmap)
if (!registered_modules)
{
int i;
-
+
registered_modules = TRUE;
-
+
for (i = 0; _pango_included_fc_modules[i].list; i++)
pango_module_register (&_pango_included_fc_modules[i]);
}
@@ -204,7 +204,7 @@ pango_fc_font_map_class_init (PangoFcFontMapClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
PangoFontMapClass *fontmap_class = PANGO_FONT_MAP_CLASS (class);
-
+
object_class->finalize = pango_fc_font_map_finalize;
fontmap_class->load_font = pango_fc_font_map_load_font;
fontmap_class->load_fontset = pango_fc_font_map_load_fontset;
@@ -249,7 +249,7 @@ pango_fc_pattern_hash (FcPattern *pattern)
hash ^= (guint) (d*1000.0);
return hash;
-#endif
+#endif
}
static gboolean
@@ -292,7 +292,7 @@ struct _FontHashKey {
};
/* Fowler / Noll / Vo (FNV) Hash (http://www.isthe.com/chongo/tech/comp/fnv/)
- *
+ *
* Not necessarily better than a lot of other hashes, but should be OK, and
* well tested with binary data.
*/
@@ -310,7 +310,7 @@ hash_bytes_fnv (unsigned char *buffer,
hval *= FNV_32_PRIME;
hval ^= *buffer++;
}
-
+
return hval;
}
@@ -366,7 +366,7 @@ fontset_hash_key_free (FontsetHashKey *key)
if (key->context_key)
PANGO_FC_FONT_MAP_GET_CLASS (key->fontmap)->context_key_free (key->fontmap,
key->context_key);
-
+
g_slice_free (FontsetHashKey, key);
}
@@ -374,7 +374,7 @@ static FontsetHashKey *
fontset_hash_key_copy (FontsetHashKey *old)
{
FontsetHashKey *key = g_slice_new (FontsetHashKey);
-
+
key->fontmap = old->fontmap;
key->matrix = old->matrix;
key->language = old->language;
@@ -385,7 +385,7 @@ fontset_hash_key_copy (FontsetHashKey *old)
old->context_key);
else
key->context_key = NULL;
-
+
return key;
}
@@ -433,7 +433,7 @@ font_hash_key_free (FontHashKey *key)
if (key->context_key)
PANGO_FC_FONT_MAP_GET_CLASS (key->fontmap)->context_key_free (key->fontmap,
key->context_key);
-
+
g_slice_free (FontHashKey, key);
}
@@ -441,7 +441,7 @@ static FontHashKey *
font_hash_key_copy (FontHashKey *old)
{
FontHashKey *key = g_slice_new (FontHashKey);
-
+
key->fontmap = old->fontmap;
key->matrix = old->matrix;
key->pattern = old->pattern;
@@ -450,7 +450,7 @@ font_hash_key_copy (FontHashKey *old)
old->context_key);
else
key->context_key = NULL;
-
+
return key;
}
@@ -547,7 +547,7 @@ font_hash_key_for_context (PangoFcFontMap *fcfontmap,
{
key->fontmap = fcfontmap;
get_context_matrix (context, &key->matrix);
-
+
if (PANGO_FC_FONT_MAP_GET_CLASS (fcfontmap)->context_key_get)
key->context_key = (gpointer)PANGO_FC_FONT_MAP_GET_CLASS (fcfontmap)->context_key_get (fcfontmap, context);
else
@@ -570,11 +570,11 @@ pango_fc_font_map_add (PangoFcFontMap *fcfontmap,
font_hash_key_for_context (fcfontmap, context, &key);
key.pattern = fcfont->font_pattern;
-
+
key_copy = font_hash_key_copy (&key);
_pango_fc_font_set_context_key (fcfont, key_copy->context_key);
fcfont->matrix = key.matrix;
-
+
g_hash_table_insert (priv->font_hash, key_copy, fcfont);
}
@@ -604,7 +604,7 @@ _pango_fc_font_map_remove (PangoFcFontMap *fcfontmap,
key.matrix = fcfont->matrix;
key.pattern = fcfont->font_pattern;
key.context_key = _pango_fc_font_get_context_key (fcfont);
-
+
g_hash_table_remove (priv->font_hash, &key);
fcfont->fontmap = NULL;
_pango_fc_font_set_context_key (fcfont, NULL);
@@ -671,10 +671,10 @@ pango_fc_font_map_list_families (PangoFontMap *fontmap,
GHashTable *temp_family_hash;
fontset = FcFontList (NULL, pat, os);
-
+
FcPatternDestroy (pat);
FcObjectSetDestroy (os);
-
+
priv->families = g_new (PangoFcFamily *, fontset->nfont + 3); /* 3 standard aliases */
temp_family_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
@@ -684,7 +684,7 @@ pango_fc_font_map_list_families (PangoFontMap *fontmap,
FcChar8 *s;
FcResult res;
int spacing;
-
+
res = FcPatternGetString (fontset->fonts[i], FC_FAMILY, 0, (FcChar8 **) &s);
g_assert (res == FcResultMatch);
@@ -692,7 +692,7 @@ pango_fc_font_map_list_families (PangoFontMap *fontmap,
g_assert (res == FcResultMatch || res == FcResultNoMatch);
if (res == FcResultNoMatch)
spacing = FC_PROPORTIONAL;
-
+
if (!is_alias_family (s) && !g_hash_table_lookup (temp_family_hash, s))
{
PangoFcFamily *temp_family = create_family (fcfontmap, (gchar *)s, spacing);
@@ -707,13 +707,13 @@ pango_fc_font_map_list_families (PangoFontMap *fontmap,
priv->families[count++] = create_family (fcfontmap, "Sans", FC_PROPORTIONAL);
priv->families[count++] = create_family (fcfontmap, "Serif", FC_PROPORTIONAL);
priv->families[count++] = create_family (fcfontmap, "Monospace", FC_MONO);
-
+
priv->n_families = count;
}
if (n_families)
*n_families = priv->n_families;
-
+
if (families)
*families = g_memdup (priv->families, priv->n_families * sizeof (PangoFontFamily *));
}
@@ -721,7 +721,7 @@ pango_fc_font_map_list_families (PangoFontMap *fontmap,
static int
pango_fc_convert_weight_to_fc (PangoWeight pango_weight)
{
-#ifdef FC_WEIGHT_ULTRABOLD
+#ifdef FC_WEIGHT_ULTRABOLD
/* fontconfig 2.1 only had light/medium/demibold/bold/black */
if (pango_weight < (PANGO_WEIGHT_ULTRALIGHT + PANGO_WEIGHT_LIGHT) / 2)
return FC_WEIGHT_ULTRALIGHT;
@@ -750,7 +750,7 @@ pango_fc_convert_weight_to_fc (PangoWeight pango_weight)
return FC_WEIGHT_BOLD;
else
return FC_WEIGHT_BLACK;
-#endif
+#endif
}
static int
@@ -847,7 +847,7 @@ pango_fc_make_pattern (const PangoFontDescription *description,
NULL);
families = g_strsplit (pango_font_description_get_family (description), ",", -1);
-
+
for (i = 0; families[i]; i++)
FcPatternAddString (pattern, FC_FAMILY, families[i]);
@@ -861,7 +861,7 @@ pango_fc_make_pattern (const PangoFontDescription *description,
GEnumValue *value = g_enum_get_value (get_gravity_class (), gravity);
FcPatternAddString (pattern, PANGO_FC_GRAVITY, value->value_nick);
}
-
+
return pattern;
}
@@ -880,11 +880,11 @@ pango_fc_font_map_new_font (PangoFontMap *fontmap,
if (priv->closed)
return NULL;
-
+
fcfont = pango_fc_font_map_lookup (fcfontmap, context, match);
if (fcfont)
return g_object_ref (fcfont);
-
+
class = PANGO_FC_FONT_MAP_GET_CLASS (fontmap);
if (class->create_font)
@@ -906,20 +906,20 @@ pango_fc_font_map_new_font (PangoFontMap *fontmap,
if (pango_matrix)
{
FcMatrix fc_matrix;
-
+
/* Fontconfig has the Y axis pointing up, Pango, down.
*/
fc_matrix.xx = pango_matrix->xx;
fc_matrix.xy = - pango_matrix->xy;
fc_matrix.yx = - pango_matrix->yx;
fc_matrix.yy = pango_matrix->yy;
-
+
pattern = FcPatternDuplicate (match);
FcPatternAddMatrix (pattern, FC_MATRIX, &fc_matrix);
}
else
pattern = match;
-
+
fcfont = PANGO_FC_FONT_MAP_GET_CLASS (fontmap)->new_font (fcfontmap, pattern);
if (pango_matrix)
@@ -957,13 +957,13 @@ uniquify_pattern (PangoFcFontMap *fcfontmap,
{
PangoFcFontMapPrivate *priv = fcfontmap->priv;
FcPattern *old_pattern;
-
+
if (!priv->pattern_hash)
priv->pattern_hash =
g_hash_table_new_full ((GHashFunc)pango_fc_pattern_hash,
(GEqualFunc)pango_fc_pattern_equal,
(GDestroyNotify)FcPatternDestroy, NULL);
-
+
old_pattern = g_hash_table_lookup (priv->pattern_hash, pattern);
if (old_pattern)
{
@@ -996,7 +996,7 @@ pango_fc_font_map_get_resolution (PangoFcFontMap *fcfontmap,
{
if (PANGO_FC_FONT_MAP_GET_CLASS (fcfontmap)->get_resolution)
return PANGO_FC_FONT_MAP_GET_CLASS (fcfontmap)->get_resolution (fcfontmap, context);
-
+
if (fcfontmap->priv->dpi < 0)
{
FcResult result = FcResultNoMatch;
@@ -1010,7 +1010,7 @@ pango_fc_font_map_get_resolution (PangoFcFontMap *fcfontmap,
result = FcPatternGetDouble (tmp, FC_DPI, 0, &fcfontmap->priv->dpi);
FcPatternDestroy (tmp);
}
-
+
if (result != FcResultMatch)
{
g_warning ("Error getting DPI from fontconfig, using 72.0");
@@ -1027,7 +1027,7 @@ get_unscaled_size (PangoFcFontMap *fcfontmap,
const PangoFontDescription *desc)
{
int size = pango_font_description_get_size (desc);
-
+
if (pango_font_description_get_size_is_absolute (desc))
return size;
else
@@ -1067,7 +1067,7 @@ pango_fc_font_map_get_patterns (PangoFontMap *fontmap,
key.context_key = (gpointer)PANGO_FC_FONT_MAP_GET_CLASS (fcfontmap)->context_key_get (fcfontmap, context);
else
key.context_key = NULL;
-
+
patterns = g_hash_table_lookup (priv->fontset_hash, &key);
if (patterns == NULL)
@@ -1077,7 +1077,7 @@ pango_fc_font_map_get_patterns (PangoFontMap *fontmap,
pattern = pango_fc_make_pattern (desc, language,
scaled_size,
pango_fc_font_map_get_resolution (fcfontmap, context));
-
+
pango_fc_default_substitute (fcfontmap, context, pattern);
font_patterns = FcFontSort (NULL, pattern, FcTrue, NULL, &res);
@@ -1093,7 +1093,7 @@ pango_fc_font_map_get_patterns (PangoFontMap *fontmap,
/* There is no point in proceeding; we'll just get a segfault later
* on, and a bunch more possibly confusing error messages in between.
*/
-
+
/* return NULL; */
exit (1);
}
@@ -1121,9 +1121,9 @@ pango_fc_font_map_get_patterns (PangoFontMap *fontmap,
patterns->patterns[patterns->n_patterns++] = uniquify_pattern (fcfontmap, font_pattern);
}
}
-
+
FcPatternDestroy (pattern);
-
+
FcFontSetSortDestroy (font_patterns);
patterns->key = fontset_hash_key_copy (&key);
@@ -1147,7 +1147,7 @@ get_first_font (PangoFontset *fontset,
gpointer data)
{
*(PangoFont **)data = font;
-
+
return TRUE;
}
@@ -1173,10 +1173,10 @@ pango_fc_font_map_load_font (PangoFontMap *fontmap,
if (font)
g_object_ref (font);
-
+
g_object_unref (fontset);
}
-
+
return font;
}
@@ -1187,7 +1187,7 @@ pango_fc_pattern_set_free (PangoFcPatternSet *patterns)
if (patterns->fontset)
g_object_unref (patterns->fontset);
-
+
for (i = 0; i < patterns->n_patterns; i++)
FcPatternDestroy (patterns->patterns[i]);
@@ -1201,7 +1201,7 @@ pango_fc_font_map_cache_fontset (PangoFcFontMap *fcfontmap,
{
PangoFcFontMapPrivate *priv = fcfontmap->priv;
GQueue *cache = priv->fontset_cache;
-
+
if (patterns->cache_link)
{
/* Already in cache, move to head
@@ -1222,7 +1222,7 @@ pango_fc_font_map_cache_fontset (PangoFcFontMap *fcfontmap,
tmp_patterns->cache_link = NULL;
g_hash_table_remove (priv->fontset_hash, tmp_patterns->key);
}
-
+
patterns->cache_link = g_list_prepend (NULL, patterns);
}
@@ -1238,7 +1238,7 @@ pango_fc_font_map_load_fontset (PangoFontMap *fontmap,
PangoFcPatternSet *patterns = pango_fc_font_map_get_patterns (fontmap, context, desc, language);
PangoFontset *result;
int i;
-
+
if (!patterns)
return NULL;
@@ -1260,9 +1260,9 @@ pango_fc_font_map_load_fontset (PangoFontMap *fontmap,
patterns->fontset = PANGO_FONTSET (simple);
}
-
+
result = g_object_ref (patterns->fontset);
-
+
return result;
}
@@ -1271,7 +1271,7 @@ uncache_patterns (PangoFcPatternSet *patterns,
PangoFcFontMap *fcfontmap)
{
PangoFcFontMapPrivate *priv = fcfontmap->priv;
-
+
g_hash_table_remove (priv->fontset_hash, patterns->key);
}
@@ -1280,7 +1280,7 @@ pango_fc_font_map_clear_fontset_cache (PangoFcFontMap *fcfontmap)
{
PangoFcFontMapPrivate *priv = fcfontmap->priv;
GQueue *cache = priv->fontset_cache;
-
+
g_list_foreach (cache->head, (GFunc)uncache_patterns, fcfontmap);
g_list_free (cache->head);
cache->head = NULL;
@@ -1291,7 +1291,7 @@ pango_fc_font_map_clear_fontset_cache (PangoFcFontMap *fcfontmap)
/**
* pango_fc_font_map_cache_clear:
* @fcfontmap: a #PangoFcFontmap
- *
+ *
* Clear all cached information and fontsets for this font map;
* this should be called whenever there is a change in the
* output of the default_substitute() virtual function.
@@ -1305,7 +1305,7 @@ void
pango_fc_font_map_cache_clear (PangoFcFontMap *fcfontmap)
{
fcfontmap->priv->dpi = -1;
-
+
pango_fc_font_map_clear_fontset_cache (fcfontmap);
}
@@ -1321,7 +1321,7 @@ pango_fc_font_map_set_coverage (PangoFcFontMap *fcfontmap,
key_dup->id = key->id;
key_dup->filename = (char *) (key_dup + 1);
strcpy (key_dup->filename, key->filename);
-
+
g_hash_table_insert (priv->coverage_hash,
key_dup, pango_coverage_ref (coverage));
}
@@ -1334,7 +1334,7 @@ _pango_fc_font_map_get_coverage (PangoFcFontMap *fcfontmap,
PangoFcCoverageKey key;
PangoCoverage *coverage;
FcCharSet *charset;
-
+
/*
* Assume that coverage information is identified by
* a filename/index pair; there shouldn't be any reason
@@ -1345,7 +1345,7 @@ _pango_fc_font_map_get_coverage (PangoFcFontMap *fcfontmap,
if (FcPatternGetInteger (fcfont->font_pattern, FC_INDEX, 0, &key.id) != FcResultMatch)
return NULL;
-
+
coverage = g_hash_table_lookup (priv->coverage_hash, &key);
if (coverage)
return pango_coverage_ref (coverage);
@@ -1360,7 +1360,7 @@ _pango_fc_font_map_get_coverage (PangoFcFontMap *fcfontmap,
coverage = _pango_fc_font_map_fc_to_coverage (charset);
pango_fc_font_map_set_coverage (fcfontmap, &key, coverage);
-
+
return coverage;
}
@@ -1426,14 +1426,14 @@ _pango_fc_font_map_fc_to_coverage (FcCharSet *charset)
/**
* pango_fc_font_map_create_context:
* @fcfontmap: a #PangoFcFontMap
- *
+ *
* Creates a new context for this fontmap. This function is intended
* only for backend implementations deriving from #PangoFcFontmap;
* it is possible that a backend will store additional information
* needed for correct operation on the #PangoContext after calling
* this function.
- *
- * Return value: a new #PangoContext
+ *
+ * Return value: a new #PangoContext
*
* Since: 1.4
**/
@@ -1459,7 +1459,7 @@ cleanup_font (gpointer key,
/**
* pango_fc_font_map_shutdown:
* @fcfontmap: a #PangoFcFontmap
- *
+ *
* 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
@@ -1477,7 +1477,7 @@ pango_fc_font_map_shutdown (PangoFcFontMap *fcfontmap)
pango_fc_font_map_cache_clear (fcfontmap);
g_hash_table_destroy (priv->fontset_hash);
priv->fontset_hash = NULL;
-
+
g_hash_table_foreach (priv->font_hash, (GHFunc)cleanup_font, NULL);
g_hash_table_destroy (priv->font_hash);
priv->font_hash = NULL;
@@ -1519,7 +1519,7 @@ pango_fc_convert_weight_to_pango (int fc_weight)
return PANGO_WEIGHT_BOLD;
else
return PANGO_WEIGHT_ULTRABOLD;
-#endif
+#endif
}
static PangoStyle
@@ -1574,12 +1574,12 @@ pango_fc_convert_width_to_pango (int fc_stretch)
* @include_size: if %TRUE, the pattern will include the size from
* the @pattern; otherwise the resulting pattern will be unsized.
* (only %FC_SIZE is examined, not %FC_PIXEL_SIZE)
- *
+ *
* Creates a #PangoFontDescription that matches the specified
* Fontconfig pattern as closely as possible. Many possible Fontconfig
* pattern values, such as %FC_RASTERIZER or %FC_DPI, don't make sense in
* the context of #PangoFontDescription, so will be ignored.
- *
+ *
* Return value: a new #PangoFontDescription. Free with
* pango_font_description_free().
*
@@ -1594,7 +1594,7 @@ pango_fc_font_description_from_pattern (FcPattern *pattern, gboolean include_siz
PangoStretch stretch;
double size;
PangoGravity gravity;
-
+
FcChar8 *s;
int i;
FcResult res;
@@ -1605,7 +1605,7 @@ pango_fc_font_description_from_pattern (FcPattern *pattern, gboolean include_siz
g_assert (res == FcResultMatch);
pango_font_description_set_family (desc, (gchar *)s);
-
+
if (FcPatternGetInteger (pattern, FC_SLANT, 0, &i) == FcResultMatch)
style = pango_fc_convert_slant_to_pango (i);
else
@@ -1617,7 +1617,7 @@ pango_fc_font_description_from_pattern (FcPattern *pattern, gboolean include_siz
weight = pango_fc_convert_weight_to_pango (i);
else
weight = PANGO_WEIGHT_NORMAL;
-
+
pango_font_description_set_weight (desc, weight);
#ifdef FC_WIDTH
@@ -1628,7 +1628,7 @@ pango_fc_font_description_from_pattern (FcPattern *pattern, gboolean include_siz
stretch = PANGO_STRETCH_NORMAL;
pango_font_description_set_stretch (desc, stretch);
-
+
pango_font_description_set_variant (desc, PANGO_VARIANT_NORMAL);
if (include_size && FcPatternGetDouble (pattern, FC_SIZE, 0, &size) == FcResultMatch)
@@ -1647,7 +1647,7 @@ pango_fc_font_description_from_pattern (FcPattern *pattern, gboolean include_siz
return desc;
}
-/*
+/*
* PangoFcFace
*/
@@ -1680,13 +1680,13 @@ pango_fc_face_describe (PangoFontFace *face)
if (strcmp (fcface->style, "Regular") == 0)
return make_alias_description (fcfamily, FALSE, FALSE);
else if (strcmp (fcface->style, "Bold") == 0)
- return make_alias_description (fcfamily, TRUE, FALSE);
+ return make_alias_description (fcfamily, TRUE, FALSE);
else if (strcmp (fcface->style, "Italic") == 0)
return make_alias_description (fcfamily, FALSE, TRUE);
else /* Bold Italic */
return make_alias_description (fcfamily, TRUE, TRUE);
}
-
+
match_pattern = FcPatternBuild (NULL,
FC_FAMILY, FcTypeString, fcfamily->family_name,
FC_STYLE, FcTypeString, fcface->style,
@@ -1709,7 +1709,7 @@ pango_fc_face_describe (PangoFontFace *face)
}
FcPatternDestroy (match_pattern);
-
+
return desc;
}
@@ -1760,7 +1760,7 @@ pango_fc_face_list_sizes (PangoFontFace *face,
GArray *size_array;
double size, dpi = -1.0;
int i, size_i;
-
+
size_array = g_array_new (FALSE, FALSE, sizeof (int));
for (i = 0; i < fontset->nfont; i++)
@@ -1769,14 +1769,14 @@ pango_fc_face_list_sizes (PangoFontFace *face,
{
if (dpi < 0)
dpi = pango_fc_font_map_get_resolution (fcface->family->fontmap, NULL);
-
+
size_i = (int) (PANGO_SCALE * size * 72.0 / dpi);
g_array_append_val (size_array, size_i);
}
}
g_array_sort (size_array, compare_ints);
-
+
if (size_array->len == 0)
{
*n_sizes = 0;
@@ -1814,7 +1814,7 @@ pango_fc_family_is_monospace (PangoFontFamily *family)
{
PangoFcFamily *fcfamily = PANGO_FC_FAMILY (family);
- return fcfamily->spacing == FC_MONO ||
+ return fcfamily->spacing == FC_MONO ||
#ifdef FC_DUAL
fcfamily->spacing == FC_DUAL ||
#endif
@@ -1849,12 +1849,12 @@ pango_fc_face_get_type (void)
(GInstanceInitFunc) NULL,
NULL /* value_table */
};
-
+
object_type = g_type_register_static (PANGO_TYPE_FONT_FACE,
I_("PangoFcFace"),
&object_info, 0);
}
-
+
return object_type;
}
@@ -1882,12 +1882,12 @@ pango_fc_family_list_faces (PangoFontFamily *family,
PangoFcFamily *fcfamily = PANGO_FC_FAMILY (family);
PangoFcFontMap *fcfontmap = fcfamily->fontmap;
PangoFcFontMapPrivate *priv = fcfontmap->priv;
-
+
if (fcfamily->n_faces < 0)
{
FcFontSet *fontset;
int i;
-
+
if (is_alias_family (fcfamily->family_name) || priv->closed)
{
fcfamily->n_faces = 4;
@@ -1902,7 +1902,7 @@ pango_fc_family_list_faces (PangoFontFamily *family,
else
{
FcObjectSet *os = FcObjectSetBuild (FC_STYLE, FC_WEIGHT, FC_SLANT, NULL);
- FcPattern *pat = FcPatternBuild (NULL,
+ FcPattern *pat = FcPatternBuild (NULL,
FC_FAMILY, FcTypeString, fcfamily->family_name,
NULL);
@@ -1990,10 +1990,10 @@ pango_fc_family_list_faces (PangoFontFamily *family,
FcFontSetDestroy (fontset);
}
}
-
+
if (n_faces)
*n_faces = fcfamily->n_faces;
-
+
if (faces)
*faces = g_memdup (fcfamily->faces, fcfamily->n_faces * sizeof (PangoFontFace *));
}
@@ -2040,11 +2040,11 @@ pango_fc_family_get_type (void)
(GInstanceInitFunc) pango_fc_family_init,
NULL /* value_table */
};
-
+
object_type = g_type_register_static (PANGO_TYPE_FONT_FAMILY,
I_("PangoFcFamily"),
&object_info, 0);
}
-
+
return object_type;
}
diff --git a/pango/pangofc-fontmap.h b/pango/pangofc-fontmap.h
index ff540b5d..0fa7ab58 100644
--- a/pango/pangofc-fontmap.h
+++ b/pango/pangofc-fontmap.h
@@ -45,7 +45,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
* backend using Fontconfig and FreeType, you derive from this class
@@ -114,7 +114,7 @@ struct _PangoFcFontMapClass
double (*get_resolution) (PangoFcFontMap *fcfontmap,
PangoContext *context);
-
+
gconstpointer (*context_key_get) (PangoFcFontMap *fcfontmap,
PangoContext *context);
gpointer (*context_key_copy) (PangoFcFontMap *fcfontmap,
@@ -126,7 +126,7 @@ struct _PangoFcFontMapClass
gboolean (*context_key_equal) (PangoFcFontMap *fcfontmap,
gconstpointer key_a,
gconstpointer key_b);
-
+
void (*context_substitute) (PangoFcFontMap *fontmap,
PangoContext *context,
FcPattern *pattern);
@@ -155,9 +155,9 @@ GType pango_fc_font_map_get_type (void);
* PangoFcDecoderFindFunc:
* @pattern: a fully resolved #FcPattern specifying the font on the system
* @user_data: user data passed to pango_fc_font_map_add_decoder_find_func()
- *
+ *
* Callback function passed to pango_fc_font_map_add_decoder_find_func().
- *
+ *
* Return value: a new reference to a custom decoder for this pattern,
* or %NULL if the default decoder handling should be used.
**/
diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c
index 6a1b0ca5..0feae27d 100644
--- a/pango/pangoft2-fontmap.c
+++ b/pango/pangoft2-fontmap.c
@@ -76,7 +76,7 @@ pango_ft2_font_map_class_init (PangoFT2FontMapClass *class)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (class);
PangoFcFontMapClass *fcfontmap_class = PANGO_FC_FONT_MAP_CLASS (class);
-
+
gobject_class->finalize = pango_ft2_font_map_finalize;
fcfontmap_class->default_substitute = _pango_ft2_font_map_default_substitute;
fcfontmap_class->new_font = pango_ft2_font_map_new_font;
@@ -95,7 +95,7 @@ static void
pango_ft2_font_map_finalize (GObject *object)
{
PangoFT2FontMap *ft2fontmap = PANGO_FT2_FONT_MAP (object);
-
+
if (ft2fontmap->renderer)
g_object_unref (ft2fontmap->renderer);
@@ -109,13 +109,13 @@ pango_ft2_font_map_finalize (GObject *object)
/**
* pango_ft2_font_map_new:
- *
+ *
* Create a new #PangoFT2FontMap object; a fontmap is used
* to cache information about available fonts, and holds
* certain global parameters such as the resolution and
* the default substitute function (see
* pango_ft2_font_map_set_default_substitute()).
- *
+ *
* Return value: the newly created fontmap object. Unref
* with g_object_unref() when you are finished with it.
*
@@ -126,12 +126,12 @@ pango_ft2_font_map_new (void)
{
PangoFT2FontMap *ft2fontmap;
FT_Error error;
-
+
/* Make sure that the type system is initialized */
g_type_init ();
-
+
ft2fontmap = g_object_new (PANGO_TYPE_FT2_FONT_MAP, NULL);
-
+
error = FT_Init_FreeType (&ft2fontmap->library);
if (error != FT_Err_Ok)
g_critical ("pango_ft2_font_map_new: Could not initialize freetype");
@@ -146,7 +146,7 @@ pango_ft2_font_map_new (void)
* on #FcPattern objects.
* @data: data to pass to @func
* @notify: function to call when @data is no longer used.
- *
+ *
* Sets a function that will be called to do final configuration
* substitution on a #FcPattern before it is used to load
* the font. This function can be used to do things like set
@@ -166,14 +166,14 @@ pango_ft2_font_map_set_default_substitute (PangoFT2FontMap *fontmap,
fontmap->substitute_func = func;
fontmap->substitute_data = data;
fontmap->substitute_destroy = notify;
-
+
pango_fc_font_map_cache_clear (PANGO_FC_FONT_MAP (fontmap));
}
/**
* pango_ft2_font_map_substitute_changed:
* @fontmap: a #PangoFT2Fontmap
- *
+ *
* Call this function any time the results of the
* default substitution function set with
* pango_ft2_font_map_set_default_substitute() change.
@@ -190,10 +190,10 @@ pango_ft2_font_map_substitute_changed (PangoFT2FontMap *fontmap)
/**
* pango_ft2_font_map_set_resolution:
- * @fontmap: a #PangoFT2Fontmap
+ * @fontmap: a #PangoFT2Fontmap
* @dpi_x: dots per inch in the X direction
* @dpi_y: dots per inch in the Y direction
- *
+ *
* Sets the horizontal and vertical resolutions for the fontmap.
*
* Since: 1.2
@@ -204,7 +204,7 @@ pango_ft2_font_map_set_resolution (PangoFT2FontMap *fontmap,
double dpi_y)
{
g_return_if_fail (PANGO_FT2_IS_FONT_MAP (fontmap));
-
+
fontmap->dpi_x = dpi_x;
fontmap->dpi_y = dpi_y;
@@ -214,9 +214,9 @@ pango_ft2_font_map_set_resolution (PangoFT2FontMap *fontmap,
/**
* pango_ft2_font_map_create_context:
* @fontmap: a #PangoFT2Fontmap
- *
+ *
* Create a #PangoContext for the given fontmap.
- *
+ *
* Return value: the newly created context; free with g_object_unref().
*
* Since: 1.2
@@ -225,7 +225,7 @@ PangoContext *
pango_ft2_font_map_create_context (PangoFT2FontMap *fontmap)
{
g_return_val_if_fail (PANGO_FT2_IS_FONT_MAP (fontmap), NULL);
-
+
return pango_fc_font_map_create_context (PANGO_FC_FONT_MAP (fontmap));
}
@@ -233,21 +233,21 @@ 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
- *
+ *
* Retrieves a #PangoContext for the default PangoFT2 fontmap
* (see pango_ft2_fontmap_get_for_display()) and sets the resolution
* for the default fontmap to @dpi_x by @dpi_y.
*
* Use of this function is deprecated; see pango_ft2_fontmap_create_context()
* instead.
- *
+ *
* Return value: the new #PangoContext
**/
PangoContext *
pango_ft2_get_context (double dpi_x, double dpi_y)
{
PangoFontMap *fontmap;
-
+
fontmap = pango_ft2_font_map_for_display ();
pango_ft2_font_map_set_resolution (PANGO_FT2_FONT_MAP (fontmap), dpi_x, dpi_y);
@@ -259,7 +259,7 @@ pango_ft2_get_context (double dpi_x, double dpi_y)
*
* Returns a #PangoFT2FontMap. This font map is cached and should
* not be freed. If the font map is no longer needed, it can
- * be released with pango_ft2_shutdown_display(). Use of the
+ * be released with pango_ft2_shutdown_display(). Use of the
* global PangoFT2 fontmap is deprecated; use pango_ft2_font_map_new()
* instead.
*
@@ -278,7 +278,7 @@ pango_ft2_font_map_for_display (void)
/**
* pango_ft2_shutdown_display:
- *
+ *
* Free the global fontmap. (See pango_ft2_font_map_for_display())
* Use of the global PangoFT2 fontmap is deprecated.
**/
@@ -288,9 +288,9 @@ pango_ft2_shutdown_display (void)
if (pango_ft2_global_fontmap)
{
pango_fc_font_map_cache_clear (PANGO_FC_FONT_MAP (pango_ft2_global_fontmap));
-
+
g_object_unref (pango_ft2_global_fontmap);
-
+
pango_ft2_global_fontmap = NULL;
}
}
@@ -299,7 +299,7 @@ FT_Library
_pango_ft2_font_map_get_library (PangoFontMap *fontmap)
{
PangoFT2FontMap *ft2fontmap = (PangoFT2FontMap *)fontmap;
-
+
return ft2fontmap->library;
}
@@ -307,10 +307,10 @@ _pango_ft2_font_map_get_library (PangoFontMap *fontmap)
/**
* _pango_ft2_font_map_get_renderer:
* @fontmap: a #PangoFT2Fontmap
- *
+ *
* Gets the singleton PangoFT2Renderer for this fontmap.
- *
- * Return value:
+ *
+ * Return value:
**/
PangoRenderer *
_pango_ft2_font_map_get_renderer (PangoFT2FontMap *ft2fontmap)
diff --git a/pango/pangoft2-private.h b/pango/pangoft2-private.h
index b79f3b5c..60b9c684 100644
--- a/pango/pangoft2-private.h
+++ b/pango/pangoft2-private.h
@@ -119,7 +119,7 @@ typedef struct _PangoFT2WarningHistory PangoFT2WarningHistory;
struct _PangoFT2WarningHistory {
guint get_face : 1;
-};
+};
extern PangoFT2WarningHistory _pango_ft2_warning_history;
diff --git a/pango/pangoft2-render.c b/pango/pangoft2-render.c
index 00bfeff4..0a7b172b 100644
--- a/pango/pangoft2-render.c
+++ b/pango/pangoft2-render.c
@@ -180,7 +180,7 @@ pango_ft2_font_render_glyph (PangoFont *font,
}
face = pango_ft2_font_get_face (font);
-
+
if (face)
{
PangoFT2RenderedGlyph *rendered;
@@ -308,7 +308,7 @@ pango_ft2_renderer_draw_glyph (PangoRenderer *renderer,
{
if ((*s) & (1 << (7 - (ix % 8))))
*d |= 0xff;
-
+
if ((ix % 8) == 7)
s++;
d++;
@@ -318,7 +318,7 @@ pango_ft2_renderer_draw_glyph (PangoRenderer *renderer,
src += rendered_glyph->bitmap.pitch;
}
break;
-
+
default:
g_warning ("pango_ft2_render: "
"Unrecognized glyph bitmap pixel mode %d\n",
@@ -549,10 +549,10 @@ pango_ft2_renderer_draw_trapezoid (PangoRenderer *renderer,
*
* Since: 1.6
*/
-void
+void
pango_ft2_render_layout_subpixel (FT_Bitmap *bitmap,
PangoLayout *layout,
- int x,
+ int x,
int y)
{
PangoContext *context;
@@ -567,7 +567,7 @@ pango_ft2_render_layout_subpixel (FT_Bitmap *bitmap,
renderer = _pango_ft2_font_map_get_renderer (PANGO_FT2_FONT_MAP (fontmap));
pango_ft2_renderer_set_bitmap (PANGO_FT2_RENDERER (renderer), bitmap);
-
+
pango_renderer_draw_layout (renderer, layout, x, y);
}
@@ -580,10 +580,10 @@ pango_ft2_render_layout_subpixel (FT_Bitmap *bitmap,
*
* Render a #PangoLayout onto a FreeType2 bitmap
*/
-void
+void
pango_ft2_render_layout (FT_Bitmap *bitmap,
PangoLayout *layout,
- int x,
+ int x,
int y)
{
pango_ft2_render_layout_subpixel (bitmap, layout, x * PANGO_SCALE, y * PANGO_SCALE);
@@ -604,10 +604,10 @@ pango_ft2_render_layout (FT_Bitmap *bitmap,
*
* Since: 1.6
*/
-void
+void
pango_ft2_render_layout_line_subpixel (FT_Bitmap *bitmap,
PangoLayoutLine *line,
- int x,
+ int x,
int y)
{
PangoContext *context;
@@ -622,7 +622,7 @@ pango_ft2_render_layout_line_subpixel (FT_Bitmap *bitmap,
renderer = _pango_ft2_font_map_get_renderer (PANGO_FT2_FONT_MAP (fontmap));
pango_ft2_renderer_set_bitmap (PANGO_FT2_RENDERER (renderer), bitmap);
-
+
pango_renderer_draw_layout_line (renderer, line, x, y);
}
@@ -635,10 +635,10 @@ pango_ft2_render_layout_line_subpixel (FT_Bitmap *bitmap,
*
* Render a #PangoLayoutLine onto a FreeType2 bitmap
*/
-void
+void
pango_ft2_render_layout_line (FT_Bitmap *bitmap,
PangoLayoutLine *line,
- int x,
+ int x,
int y)
{
pango_ft2_render_layout_line_subpixel (bitmap, line, x * PANGO_SCALE, y * PANGO_SCALE);
@@ -664,12 +664,12 @@ pango_ft2_render_layout_line (FT_Bitmap *bitmap,
*
* Since: 1.6
**/
-void
+void
pango_ft2_render_transformed (FT_Bitmap *bitmap,
const PangoMatrix *matrix,
PangoFont *font,
PangoGlyphString *glyphs,
- int x,
+ int x,
int y)
{
PangoFontMap *fontmap;
@@ -684,7 +684,7 @@ pango_ft2_render_transformed (FT_Bitmap *bitmap,
pango_ft2_renderer_set_bitmap (PANGO_FT2_RENDERER (renderer), bitmap);
pango_renderer_set_matrix (renderer, matrix);
-
+
pango_renderer_draw_glyphs (renderer, font, glyphs, x, y);
}
@@ -698,11 +698,11 @@ pango_ft2_render_transformed (FT_Bitmap *bitmap,
*
* Renders a #PangoGlyphString onto a FreeType2 bitmap.
**/
-void
+void
pango_ft2_render (FT_Bitmap *bitmap,
PangoFont *font,
PangoGlyphString *glyphs,
- int x,
+ int x,
int y)
{
pango_ft2_render_transformed (bitmap, NULL, font, glyphs, x * PANGO_SCALE, y * PANGO_SCALE);
diff --git a/pango/pangoft2.c b/pango/pangoft2.c
index c888467a..d6833e06 100644
--- a/pango/pangoft2.c
+++ b/pango/pangoft2.c
@@ -94,26 +94,26 @@ load_fallback_face (PangoFT2Font *ft2font,
FcChar8 *filename2 = NULL;
gchar *name;
int id;
-
+
sans = FcPatternBuild (NULL,
FC_FAMILY, FcTypeString, "sans",
FC_PIXEL_SIZE, FcTypeDouble, (double)ft2font->size / PANGO_SCALE,
NULL);
-
+
_pango_ft2_font_map_default_substitute (fcfont->fontmap, sans);
matched = FcFontMatch (NULL, sans, &result);
-
+
if (FcPatternGetString (matched, FC_FILE, 0, &filename2) != FcResultMatch)
goto bail1;
-
+
if (FcPatternGetInteger (matched, FC_INDEX, 0, &id) != FcResultMatch)
goto bail1;
-
+
error = FT_New_Face (_pango_ft2_font_map_get_library (fcfont->fontmap),
(char *) filename2, id, &ft2font->face);
-
-
+
+
if (error)
{
bail1:
@@ -141,7 +141,7 @@ set_transform (PangoFT2Font *ft2font)
if (FcPatternGetMatrix (fcfont->font_pattern, FC_MATRIX, 0, &fc_matrix) == FcResultMatch)
{
FT_Matrix ft_matrix;
-
+
ft_matrix.xx = 0x10000L * fc_matrix->xx;
ft_matrix.yy = 0x10000L * fc_matrix->yy;
ft_matrix.xy = 0x10000L * fc_matrix->xy;
@@ -154,14 +154,14 @@ set_transform (PangoFT2Font *ft2font)
/**
* pango_ft2_font_get_face:
* @font: a #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 <type>FT_Face</type> structure, with the size set correctly
**/
FT_Face
@@ -219,7 +219,7 @@ pango_ft2_font_get_face (PangoFont *font)
if (FcPatternGetString (pattern, FC_FILE, 0, &filename) != FcResultMatch)
goto bail0;
-
+
if (FcPatternGetInteger (pattern, FC_INDEX, 0, &id) != FcResultMatch)
goto bail0;
@@ -242,13 +242,13 @@ pango_ft2_font_get_face (PangoFont *font)
if (error)
g_warning ("Error in FT_Set_Char_Size: %d", error);
}
-
+
return ft2font->face;
}
G_DEFINE_TYPE (PangoFT2Font, pango_ft2_font, PANGO_TYPE_FC_FONT)
-static void
+static void
pango_ft2_font_init (PangoFT2Font *ft2font)
{
ft2font->face = NULL;
@@ -264,11 +264,11 @@ pango_ft2_font_class_init (PangoFT2FontClass *class)
GObjectClass *object_class = G_OBJECT_CLASS (class);
PangoFontClass *font_class = PANGO_FONT_CLASS (class);
PangoFcFontClass *fc_font_class = PANGO_FC_FONT_CLASS (class);
-
+
object_class->finalize = pango_ft2_font_finalize;
-
+
font_class->get_glyph_extents = pango_ft2_font_get_glyph_extents;
-
+
fc_font_class->lock_face = pango_ft2_font_real_lock_face;
fc_font_class->unlock_face = pango_ft2_font_real_unlock_face;
}
@@ -298,7 +298,7 @@ pango_ft2_font_get_glyph_info (PangoFont *font,
return info;
}
-
+
static void
pango_ft2_font_get_glyph_extents (PangoFont *font,
PangoGlyph glyph,
@@ -367,12 +367,12 @@ pango_ft2_font_get_glyph_extents (PangoFont *font,
* @font: a #PangoFont
* @left: the left #PangoGlyph
* @right: the right #PangoGlyph
- *
+ *
* Retrieves kerning information for a combination of two glyphs.
*
* Use pango_fc_font_kern_glyphs() instead.
- *
- * Return value: The amount of kerning (in Pango units) to apply for
+ *
+ * Return value: The amount of kerning (in Pango units) to apply for
* the given combination of glyphs.
**/
int
@@ -381,7 +381,7 @@ pango_ft2_font_get_kerning (PangoFont *font,
PangoGlyph right)
{
PangoFcFont *fc_font = PANGO_FC_FONT (font);
-
+
FT_Face face;
FT_Error error;
FT_Vector kerning;
@@ -425,7 +425,7 @@ pango_ft2_free_glyph_info_callback (gpointer key,
{
PangoFT2Font *font = PANGO_FT2_FONT (data);
PangoFT2GlyphInfo *info = value;
-
+
if (font->glyph_cache_destroy && info->cached_glyph)
(*font->glyph_cache_destroy) (info->cached_glyph);
@@ -447,7 +447,7 @@ pango_ft2_font_finalize (GObject *object)
g_hash_table_foreach_remove (ft2font->glyph_info,
pango_ft2_free_glyph_info_callback, object);
g_hash_table_destroy (ft2font->glyph_info);
-
+
G_OBJECT_CLASS (pango_ft2_font_parent_class)->finalize (object);
}
@@ -456,7 +456,7 @@ pango_ft2_font_finalize (GObject *object)
* @font: a #PangoFT2Font.
* @language: a language tag.
* @returns: a #PangoCoverage.
- *
+ *
* Gets the #PangoCoverage for a #PangoFT2Font. Use pango_font_get_coverage() instead.
**/
PangoCoverage *
@@ -471,14 +471,14 @@ pango_ft2_font_get_coverage (PangoFont *font,
/**
* pango_ft2_get_unknown_glyph:
* @font: a #PangoFont
- *
+ *
* Return the index of a glyph suitable for drawing unknown characters with
* @font, or %PANGO_GLYPH_EMPTY if no suitable glyph found.
- *
+ *
* If you want to draw an unknown-box for a character that is not covered
* by the font,
* use PANGO_GET_UNKNOWN_GLYPH() instead.
- *
+ *
* Return value: a glyph index into @font, or %PANGO_GLYPH_EMPTY
**/
PangoGlyph
@@ -545,12 +545,12 @@ _pango_ft2_font_get_cache_glyph_data (PangoFont *font,
if (!PANGO_FT2_IS_FONT (font))
return NULL;
-
+
info = pango_ft2_font_get_glyph_info (font, glyph_index, FALSE);
if (info == NULL)
return NULL;
-
+
return info->cached_glyph;
}
@@ -563,7 +563,7 @@ _pango_ft2_font_set_cache_glyph_data (PangoFont *font,
if (!PANGO_FT2_IS_FONT (font))
return;
-
+
info = pango_ft2_font_get_glyph_info (font, glyph_index, TRUE);
info->cached_glyph = cached_glyph;
@@ -577,6 +577,6 @@ _pango_ft2_font_set_glyph_cache_destroy (PangoFont *font,
{
if (!PANGO_FT2_IS_FONT (font))
return;
-
+
PANGO_FT2_FONT (font)->glyph_cache_destroy = destroy_notify;
}
diff --git a/pango/pangowin32-fontcache.c b/pango/pangowin32-fontcache.c
index cec852f2..96005e59 100644
--- a/pango/pangowin32-fontcache.c
+++ b/pango/pangowin32-fontcache.c
@@ -67,7 +67,7 @@ free_cache_entry (LOGFONT *logfont,
/**
* pango_win32_font_cache_free:
* @cache: a #PangoWin32FontCache
- *
+ *
* Frees a #PangoWin32FontCache and all associated memory. All fonts loaded
* through this font cache will be freed along with the cache.
**/
@@ -75,9 +75,9 @@ void
pango_win32_font_cache_free (PangoWin32FontCache *cache)
{
g_return_if_fail (cache != NULL);
-
+
g_hash_table_foreach (cache->forward, (GHFunc)free_cache_entry, cache);
-
+
g_hash_table_destroy (cache->forward);
g_hash_table_destroy (cache->back);
@@ -115,12 +115,12 @@ logfont_equal (gconstpointer v1,
&& lfp1->lfWidth == lfp2->lfWidth
&& lfp1->lfHeight == lfp2->lfHeight);
}
-
+
/**
* pango_win32_font_cache_new:
- *
+ *
* Creates a font cache.
- *
+ *
* Return value: The new font cache. This must be freed with
* pango_win32_font_cache_free().
**/
@@ -133,11 +133,11 @@ pango_win32_font_cache_new (void)
cache->forward = g_hash_table_new (logfont_hash, logfont_equal);
cache->back = g_hash_table_new (g_direct_hash, g_direct_equal);
-
+
cache->mru = NULL;
cache->mru_tail = NULL;
cache->mru_count = 0;
-
+
return cache;
}
@@ -161,11 +161,11 @@ cache_entry_unref (PangoWin32FontCache *cache,
* pango_win32_font_cache_load:
* @cache: a #PangoWin32FontCache
* @logfont: a pointer to a LOGFONT structure describing the font to load.
- *
+ *
* Creates a HFONT from a LOGFONT. The
* result may be newly loaded, or it may have been previously
* stored
- *
+ *
* Return value: The font structure, or %NULL if the font could
* not be loaded. In order to free this structure, you must call
* pango_win32_font_cache_unload().
@@ -204,7 +204,7 @@ pango_win32_font_cache_load (PangoWin32FontCache *cache,
{
UINT smoothing_type;
-#ifndef SPI_GETFONTSMOOTHINGTYPE
+#ifndef SPI_GETFONTSMOOTHINGTYPE
#define SPI_GETFONTSMOOTHINGTYPE 0x200a
#endif
#ifndef FE_FONTSMOOTHINGCLEARTYPE
@@ -243,7 +243,7 @@ pango_win32_font_cache_load (PangoWin32FontCache *cache,
PING (("Success! hfont=%p", hfont));
break;
}
-
+
/* If we fail, try some similar fonts often found on Windows. */
if (tries == 0)
{
@@ -288,10 +288,10 @@ pango_win32_font_cache_load (PangoWin32FontCache *cache,
break;
tries++;
}
-
+
if (!hfont)
return NULL;
-
+
entry = g_slice_new (CacheEntry);
entry->logfont = lf;
@@ -301,15 +301,15 @@ pango_win32_font_cache_load (PangoWin32FontCache *cache,
entry->mru = NULL;
g_hash_table_insert (cache->forward, &entry->logfont, entry);
- g_hash_table_insert (cache->back, entry->hfont, entry);
+ g_hash_table_insert (cache->back, entry->hfont, entry);
}
-
+
if (entry->mru)
{
if (cache->mru_count > 1 && entry->mru->prev)
{
/* Move to the head of the mru list */
-
+
if (entry->mru == cache->mru_tail)
{
cache->mru_tail = cache->mru_tail->prev;
@@ -320,7 +320,7 @@ pango_win32_font_cache_load (PangoWin32FontCache *cache,
entry->mru->prev->next = entry->mru->next;
entry->mru->next->prev = entry->mru->prev;
}
-
+
entry->mru->next = cache->mru;
entry->mru->prev = NULL;
cache->mru->prev = entry->mru;
@@ -330,13 +330,13 @@ pango_win32_font_cache_load (PangoWin32FontCache *cache,
else
{
entry->ref_count++;
-
+
/* Insert into the mru list */
-
+
if (cache->mru_count == CACHE_SIZE)
{
CacheEntry *old_entry = cache->mru_tail->data;
-
+
cache->mru_tail = cache->mru_tail->prev;
cache->mru_tail->next = NULL;
@@ -360,7 +360,7 @@ pango_win32_font_cache_load (PangoWin32FontCache *cache,
* pango_win32_font_cache_unload:
* @cache: a #PangoWin32FontCache
* @hfont: the HFONT to unload
- *
+ *
* Frees a font structure previously loaded with pango_win32_font_cache_load().
**/
void
@@ -375,5 +375,5 @@ pango_win32_font_cache_unload (PangoWin32FontCache *cache,
entry = g_hash_table_lookup (cache->back, hfont);
g_return_if_fail (entry != NULL);
- cache_entry_unref (cache, entry);
+ cache_entry_unref (cache, entry);
}
diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c
index 167f8a13..554ee71f 100644
--- a/pango/pangowin32-fontmap.c
+++ b/pango/pangowin32-fontmap.c
@@ -77,7 +77,7 @@ static PangoFont *pango_win32_font_map_load_font (PangoFontMap
static void pango_win32_font_map_list_families (PangoFontMap *fontmap,
PangoFontFamily ***families,
int *n_families);
-
+
static PangoFont *pango_win32_font_map_real_find_font (PangoWin32FontMap *win32fontmap,
PangoContext *context,
PangoWin32Face *face,
@@ -136,7 +136,7 @@ logfont_nosize_equal (const LOGFONT *lfp1,
&& lfp1->lfItalic == lfp2->lfItalic
&& lfp1->lfWeight == lfp2->lfWeight);
}
-
+
static int CALLBACK
pango_win32_inner_enum_proc (LOGFONT *lfp,
TEXTMETRIC *metrics,
@@ -144,7 +144,7 @@ pango_win32_inner_enum_proc (LOGFONT *lfp,
LPARAM lParam)
{
PangoWin32FontMap *win32fontmap = (PangoWin32FontMap *)lParam;
-
+
/* Windows generates synthetic vertical writing versions of East
* Asian fonts with @ prepended to their name, ignore them.
*/
@@ -176,15 +176,15 @@ pango_win32_enum_proc (LOGFONT *lfp,
return 1;
}
-static gboolean
-first_match (gpointer key,
- gpointer value,
+static gboolean
+first_match (gpointer key,
+ gpointer value,
gpointer user_data)
{
LOGFONT *lfp = (LOGFONT *)key;
LOGFONT *lfp2 = (LOGFONT *)((PangoWin32SizeInfo *)value)->logfonts->data;
gchar *name = (gchar *)user_data;
-
+
if (strcmp (lfp->lfFaceName, name) == 0 && lfp->lfWeight == lfp2->lfWeight)
return TRUE;
return FALSE;
@@ -229,7 +229,7 @@ ensure_italic (gpointer key,
}
}
-static void
+static void
pango_win32_font_map_init (PangoWin32FontMap *win32fontmap)
{
LOGFONT logfont;
@@ -239,13 +239,13 @@ pango_win32_font_map_init (PangoWin32FontMap *win32fontmap)
win32fontmap->size_infos =
g_hash_table_new ((GHashFunc) logfont_nosize_hash, (GEqualFunc) logfont_nosize_equal);
win32fontmap->n_fonts = 0;
-
+
win32fontmap->font_cache = pango_win32_font_cache_new ();
win32fontmap->freed_fonts = g_queue_new ();
memset (&logfont, 0, sizeof (logfont));
logfont.lfCharSet = DEFAULT_CHARSET;
- EnumFontFamiliesExA (pango_win32_hdc, &logfont, (FONTENUMPROC) pango_win32_enum_proc,
+ EnumFontFamiliesExA (pango_win32_hdc, &logfont, (FONTENUMPROC) pango_win32_enum_proc,
(LPARAM)win32fontmap, 0);
/* create synthetic italic entries */
@@ -281,7 +281,7 @@ pango_win32_font_map_class_init (PangoWin32FontMapClass *class)
fontmap_class->load_font = pango_win32_font_map_load_font;
fontmap_class->list_families = pango_win32_font_map_list_families;
fontmap_class->shape_engine_type = PANGO_RENDER_TYPE_WIN32;
-
+
pango_win32_get_dc ();
for (i = 0; _pango_included_win32_modules[i].list; i++)
@@ -302,18 +302,18 @@ pango_win32_font_map_for_display (void)
{
/* Make sure that the type system is initialized */
g_type_init ();
-
+
if (default_fontmap != NULL)
return PANGO_FONT_MAP (default_fontmap);
default_fontmap = g_object_new (PANGO_TYPE_WIN32_FONT_MAP, NULL);
-
+
return PANGO_FONT_MAP (default_fontmap);
}
/**
* pango_win32_shutdown_display:
- *
+ *
* Free cached resources.
**/
void
@@ -332,10 +332,10 @@ static void
pango_win32_font_map_finalize (GObject *object)
{
PangoWin32FontMap *win32fontmap = PANGO_WIN32_FONT_MAP (object);
-
+
g_list_foreach (win32fontmap->freed_fonts->head, (GFunc)g_object_unref, NULL);
g_queue_free (win32fontmap->freed_fonts);
-
+
pango_win32_font_cache_free (win32fontmap->font_cache);
G_OBJECT_CLASS (pango_win32_font_map_parent_class)->finalize (object);
@@ -350,13 +350,13 @@ pango_win32_family_list_faces (PangoFontFamily *family,
int *n_faces)
{
PangoWin32Family *win32family = PANGO_WIN32_FAMILY (family);
-
+
*n_faces = g_slist_length (win32family->font_entries);
if (faces)
{
GSList *tmp_list;
int i = 0;
-
+
*faces = g_new (PangoFontFace *, *n_faces);
tmp_list = win32family->font_entries;
@@ -410,12 +410,12 @@ pango_win32_family_get_type (void)
0, /* n_preallocs */
(GInstanceInitFunc) NULL,
};
-
+
object_type = g_type_register_static (PANGO_TYPE_FONT_FAMILY,
I_("PangoWin32Family"),
&object_info, 0);
}
-
+
return object_type;
}
@@ -448,7 +448,7 @@ pango_win32_font_map_list_families (PangoFontMap *fontmap,
if (families)
{
int i = 0;
-
+
*families = g_new (PangoFontFamily *, *n_families);
tmp_list = family_list;
@@ -459,7 +459,7 @@ pango_win32_font_map_list_families (PangoFontMap *fontmap,
tmp_list = tmp_list->next;
}
}
-
+
g_slist_free (family_list);
}
@@ -473,7 +473,7 @@ pango_win32_get_font_family (PangoWin32FontMap *win32fontmap,
win32family = g_object_new (PANGO_WIN32_TYPE_FAMILY, NULL);
win32family->family_name = g_strdup (family_name);
win32family->font_entries = NULL;
-
+
g_hash_table_insert (win32fontmap->families, win32family->family_name, win32family);
}
@@ -491,7 +491,7 @@ pango_win32_font_map_load_font (PangoFontMap *fontmap,
GSList *tmp_list;
g_return_val_if_fail (description != NULL, NULL);
-
+
PING(("name=%s", pango_font_description_get_family (description)));
win32family = g_hash_table_lookup (win32fontmap->families,
@@ -499,7 +499,7 @@ pango_win32_font_map_load_font (PangoFontMap *fontmap,
if (win32family)
{
PangoWin32Face *best_match = NULL;
-
+
PING (("got win32family"));
tmp_list = win32family->font_entries;
while (tmp_list)
@@ -510,7 +510,7 @@ pango_win32_font_map_load_font (PangoFontMap *fontmap,
best_match ? best_match->description : NULL,
face->description))
best_match = face;
-
+
tmp_list = tmp_list->next;
}
@@ -536,37 +536,37 @@ pango_win32_font_map_real_find_font (PangoWin32FontMap *win32fontmap,
PangoWin32Font *win32font;
GSList *tmp_list = face->cached_fonts;
int size = pango_font_description_get_size (description);
-
+
if (pango_font_description_get_size_is_absolute (description))
size = (int) 0.5 + (size * win32fontmap->resolution) / PANGO_SCALE;
-
+
PING(("got best match:%s size=%d",face->logfont.lfFaceName,size));
-
+
while (tmp_list)
{
win32font = tmp_list->data;
if (win32font->size == size)
{
PING (("size matches"));
-
+
g_object_ref (win32font);
if (win32font->in_cache)
pango_win32_fontmap_cache_remove (fontmap, win32font);
-
+
return (PangoFont *)win32font;
}
tmp_list = tmp_list->next;
}
-
+
win32font = pango_win32_font_new (fontmap, &face->logfont, size);
if (!win32font)
return NULL;
-
+
win32font->fontmap = fontmap;
win32font->win32face = face;
face->cached_fonts = g_slist_prepend (face->cached_fonts, win32font);
-
+
return (PangoFont *)win32font;
}
@@ -604,13 +604,13 @@ get_family_name (const LOGFONT *lfp)
if ((hfont = CreateFontIndirect (lfp)) == NULL)
goto fail0;
-
+
if ((oldhfont = SelectObject (pango_win32_hdc, hfont)) == NULL)
goto fail1;
if (!pango_win32_get_name_header (pango_win32_hdc, &header))
goto fail2;
-
+
PING (("%d name records", header.num_records));
for (i = 0; i < header.num_records; i++)
@@ -623,7 +623,7 @@ get_family_name (const LOGFONT *lfp)
PING(("platform:%d encoding:%d language:%04x name_id:%d",
record.platform_id, record.encoding_id, record.language_id, record.name_id));
-
+
if (record.platform_id == APPLE_UNICODE_PLATFORM_ID ||
record.platform_id == ISO_PLATFORM_ID)
unicode_ix = i;
@@ -648,18 +648,18 @@ get_family_name (const LOGFONT *lfp)
name_ix = unicode_ix;
else
goto fail2;
-
+
if (!pango_win32_get_name_record (pango_win32_hdc, name_ix, &record))
goto fail2;
-
+
string = g_malloc (record.string_length + 1);
if (GetFontData (pango_win32_hdc, NAME,
header.string_storage_offset + record.string_offset,
string, record.string_length) != record.string_length)
goto fail2;
-
+
string[record.string_length] = '\0';
-
+
if (name_ix == microsoft_ix)
if (record.encoding_id == SYMBOL_ENCODING_ID ||
record.encoding_id == UNICODE_ENCODING_ID)
@@ -670,7 +670,7 @@ get_family_name (const LOGFONT *lfp)
codeset = "MacRoman";
else /* name_ix == unicode_ix */
codeset = "UCS-4BE";
-
+
name = g_convert (string, record.string_length, "UTF-8", codeset, NULL, &nbytes, NULL);
if (name == NULL)
goto fail2;
@@ -689,7 +689,7 @@ get_family_name (const LOGFONT *lfp)
fail1:
DeleteObject (hfont);
-
+
fail0:
return g_locale_to_utf8 (lfp->lfFaceName, -1, NULL, NULL, NULL);
}
@@ -731,7 +731,7 @@ pango_win32_font_description_from_logfont (const LOGFONT *lfp)
style = PANGO_STYLE_ITALIC;
variant = PANGO_VARIANT_NORMAL;
-
+
/* The PangoWeight values PANGO_WEIGHT_* map exactly do Windows FW_*
* values. Is this on purpose? Quantize the weight to exact
* PANGO_WEIGHT_* values. Is this a good idea?
@@ -753,7 +753,7 @@ pango_win32_font_description_from_logfont (const LOGFONT *lfp)
/* XXX No idea how to figure out the stretch */
stretch = PANGO_STRETCH_NORMAL;
-
+
description = pango_font_description_new ();
pango_font_description_set_family (description, family);
pango_font_description_set_style (description, style);
@@ -781,7 +781,7 @@ pango_win32_insert_font (PangoWin32FontMap *win32fontmap,
gint i;
PING(("face=%s,charset=%d,it=%d,wt=%ld,ht=%ld",lfp->lfFaceName,lfp->lfCharSet,lfp->lfItalic,lfp->lfWeight,lfp->lfHeight));
-
+
/* Ignore Symbol fonts (which don't have any Unicode mapping
* table). We could also be fancy and use the PostScript glyph name
* table for such if present, and build a Unicode map by mapping
@@ -811,7 +811,7 @@ pango_win32_insert_font (PangoWin32FontMap *win32fontmap,
while (tmp_list)
{
LOGFONT *rover = tmp_list->data;
-
+
/* We know that lfWeight, lfItalic and lfFaceName match. We
* don't check lfHeight and lfWidth, those are used
* when creating a font.
@@ -824,7 +824,7 @@ pango_win32_insert_font (PangoWin32FontMap *win32fontmap,
PING(("already have it"));
return;
}
-
+
tmp_list = tmp_list->next;
}
}
@@ -836,14 +836,14 @@ pango_win32_insert_font (PangoWin32FontMap *win32fontmap,
}
size_info->logfonts = g_slist_prepend (size_info->logfonts, lfp2);
-
+
PING(("g_slist_length(size_info->logfonts)=%d", g_slist_length(size_info->logfonts)));
win32face = g_object_new (PANGO_WIN32_TYPE_FACE, NULL);
win32face->description = pango_win32_font_description_from_logfont (lfp2);
win32face->cached_fonts = NULL;
-
+
for (i = 0; i < PANGO_WIN32_N_COVERAGES; i++)
win32face->coverages[i] = NULL;
win32face->logfont = *lfp;
@@ -868,7 +868,7 @@ pango_win32_insert_font (PangoWin32FontMap *win32fontmap,
* Maybe a memory leak ...
*/
switch (lfp->lfPitchAndFamily & 0xF0)
- {
+ {
case FF_MODERN : /* monospace */
PING(("monospace"));
font_family->is_monospace = TRUE; /* modify before reuse */
@@ -919,7 +919,7 @@ pango_win32_make_matching_logfont (PangoFontMap *fontmap,
PING(("lfp.face=%s,wt=%ld,ht=%ld,size:%d",lfp->lfFaceName,lfp->lfWeight,lfp->lfHeight,size));
win32fontmap = PANGO_WIN32_FONT_MAP (fontmap);
-
+
size_info = g_hash_table_lookup (win32fontmap->size_infos, lfp);
if (!size_info)
@@ -937,7 +937,7 @@ pango_win32_make_matching_logfont (PangoFontMap *fontmap,
if (size != -1)
{
int new_distance = (font_size == 0) ? 0 : abs (font_size - size);
-
+
if (!closest_match ||
new_distance < match_distance ||
(new_distance < PANGO_SCALE && font_size != 0))
@@ -1003,7 +1003,7 @@ pango_win32_face_get_face_name (PangoFontFace *face)
if (!win32face->face_name)
{
PangoFontDescription *desc = pango_font_face_describe (face);
-
+
pango_font_description_unset_fields (desc,
PANGO_FONT_MASK_FAMILY | PANGO_FONT_MASK_SIZE);
@@ -1054,12 +1054,12 @@ pango_win32_face_get_type (void)
0, /* n_preallocs */
(GInstanceInitFunc) NULL,
};
-
+
object_type = g_type_register_static (PANGO_TYPE_FONT_FACE,
I_("PangoWin32Face"),
&object_info, 0);
}
-
+
return object_type;
}
diff --git a/pango/pangowin32-private.h b/pango/pangowin32-private.h
index 1557faed..504e3c24 100644
--- a/pango/pangowin32-private.h
+++ b/pango/pangowin32-private.h
@@ -132,7 +132,7 @@ struct _PangoWin32Font
/* Written by pango_win32_get_hfont: */
HFONT hfont;
- gint tm_ascent;
+ gint tm_ascent;
gint tm_descent;
gint tm_overhang;
@@ -222,14 +222,14 @@ struct format_4_cmap
guint16 search_range;
guint16 entry_selector;
guint16 range_shift;
-
+
guint16 reserved;
-
+
guint16 arrays[1];
};
struct format_12_cmap
-{
+{
guint16 format;
guint16 reserved;
guint32 length;
diff --git a/pango/pangowin32.c b/pango/pangowin32.c
index 22eabb7e..26ca290e 100644
--- a/pango/pangowin32.c
+++ b/pango/pangowin32.c
@@ -92,7 +92,7 @@ pango_win32_get_hfont (PangoFont *font)
if (!win32font->hfont)
{
cache = pango_win32_font_map_get_font_cache (win32font->fontmap);
-
+
win32font->hfont = pango_win32_font_cache_load (cache, &win32font->logfont);
if (!win32font->hfont)
{
@@ -110,15 +110,15 @@ pango_win32_get_hfont (PangoFont *font)
win32font->tm_descent = tm.tmDescent;
win32font->tm_ascent = tm.tmAscent;
}
-
+
return win32font->hfont;
}
/**
* pango_win32_get_context:
- *
+ *
* Retrieves a #PangoContext appropriate for rendering with Windows fonts.
- *
+ *
* Return value: the new #PangoContext
**/
PangoContext *
@@ -134,7 +134,7 @@ pango_win32_get_context (void)
G_DEFINE_TYPE (PangoWin32Font, pango_win32_font, PANGO_TYPE_FONT)
-static void
+static void
pango_win32_font_init (PangoWin32Font *win32font)
{
win32font->size = -1;
@@ -146,9 +146,9 @@ pango_win32_font_init (PangoWin32Font *win32font)
/**
* pango_win32_get_dc:
- *
+ *
* Obtains a handle to the Windows device context that is used by Pango.
- *
+ *
* Return value: A handle to the Windows device context that is used by Pango.
**/
HDC
@@ -170,19 +170,19 @@ pango_win32_get_dc (void)
#ifdef PANGO_WIN32_DEBUGGING
if (getenv ("PANGO_WIN32_DEBUG") != NULL)
pango_win32_debug = TRUE;
-#endif
+#endif
}
return pango_win32_hdc;
-}
+}
/**
* pango_win32_get_debug_flag:
*
* Returns whether debugging is turned on.
- *
+ *
* Return value: %TRUE if debugging is turned on.
- *
+ *
* Since: 1.2
*/
gboolean
@@ -199,7 +199,7 @@ pango_win32_font_class_init (PangoWin32FontClass *class)
object_class->finalize = pango_win32_font_finalize;
object_class->dispose = pango_win32_font_dispose;
-
+
font_class->describe = pango_win32_font_describe;
font_class->describe_absolute = pango_win32_font_describe_absolute;
font_class->get_coverage = pango_win32_font_get_coverage;
@@ -226,7 +226,7 @@ pango_win32_font_new (PangoFontMap *fontmap,
g_return_val_if_fail (lfp != NULL, NULL);
result = (PangoWin32Font *)g_object_new (PANGO_TYPE_WIN32_FONT, NULL);
-
+
result->fontmap = fontmap;
g_object_ref (fontmap);
@@ -247,11 +247,11 @@ pango_win32_font_new (PangoFontMap *fontmap,
*
* Render a #PangoGlyphString onto a Windows DC
*/
-void
+void
pango_win32_render (HDC hdc,
PangoFont *font,
PangoGlyphString *glyphs,
- int x,
+ int x,
int y)
{
HFONT hfont, old_hfont = NULL;
@@ -270,7 +270,7 @@ pango_win32_render (HDC hdc,
for (i = 0; i < glyphs->num_glyphs; i++)
{
g_print (" %d:%d", glyphs->glyphs[i].glyph, glyphs->glyphs[i].geometry.width);
- if (glyphs->glyphs[i].geometry.x_offset != 0 ||
+ if (glyphs->glyphs[i].geometry.x_offset != 0 ||
glyphs->glyphs[i].geometry.y_offset != 0)
g_print (":%d,%d", glyphs->glyphs[i].geometry.x_offset,
glyphs->glyphs[i].geometry.y_offset);
@@ -287,7 +287,7 @@ pango_win32_render (HDC hdc,
return;
old_hfont = SelectObject (hdc, hfont);
-
+
glyph_indexes = g_new (guint16, glyphs->num_glyphs);
dX = g_new (INT, glyphs->num_glyphs);
@@ -417,12 +417,12 @@ pango_win32_render (HDC hdc,
* must have been loaded using a #PangoContext with an identical
* transformation matrix to that passed in to this function.
**/
-void
+void
pango_win32_render_transformed (HDC hdc,
const PangoMatrix *matrix,
PangoFont *font,
PangoGlyphString *glyphs,
- int x,
+ int x,
int y)
{
XFORM xForm;
@@ -479,7 +479,7 @@ pango_win32_font_get_glyph_extents (PangoFont *font,
glyph_index = glyph = 0;
info = g_hash_table_lookup (win32font->glyph_info, GUINT_TO_POINTER (glyph));
-
+
if (!info)
{
info = g_new0 (PangoWin32GlyphInfo, 1);
@@ -490,13 +490,13 @@ pango_win32_font_get_glyph_extents (PangoFont *font,
SelectObject (pango_win32_hdc, hfont);
/* FIXME: (Alex) This constant reuse of pango_win32_hdc is
not thread-safe */
- res = GetGlyphOutlineA (pango_win32_hdc,
+ res = GetGlyphOutlineA (pango_win32_hdc,
glyph_index,
GGO_METRICS | GGO_GLYPH_INDEX,
- &gm,
+ &gm,
0, NULL,
&m);
-
+
if (res == GDI_ERROR)
{
gchar *error = g_win32_error_message (GetLastError ());
@@ -558,14 +558,14 @@ pango_win32_font_get_metrics (PangoFont *font,
PangoWin32MetricsInfo *info = NULL; /* Quiet gcc */
PangoWin32Font *win32font = (PangoWin32Font *)font;
GSList *tmp_list;
-
+
const char *sample_str = pango_language_get_sample_string (language);
-
+
tmp_list = win32font->metrics_by_lang;
while (tmp_list)
{
info = tmp_list->data;
-
+
if (info->sample_str == sample_str) /* We _don't_ need strcmp */
break;
@@ -576,7 +576,7 @@ pango_win32_font_get_metrics (PangoFont *font,
{
HFONT hfont;
PangoFontMetrics *metrics;
-
+
info = g_new (PangoWin32MetricsInfo, 1);
win32font->metrics_by_lang = g_slist_prepend (win32font->metrics_by_lang, info);
@@ -588,7 +588,7 @@ pango_win32_font_get_metrics (PangoFont *font,
{
PangoCoverage *coverage;
TEXTMETRIC tm;
-
+
SelectObject (pango_win32_hdc, hfont);
GetTextMetrics (pango_win32_hdc, &tm);
@@ -603,7 +603,7 @@ pango_win32_font_get_metrics (PangoFont *font,
PangoContext *context;
PangoFontDescription *font_desc;
PangoLayout *layout;
-
+
/* Get the average width of the chars in "0123456789" */
context = pango_win32_get_context ();
pango_context_set_language (context, language);
@@ -631,7 +631,7 @@ pango_win32_font_get_metrics (PangoFont *font,
metrics->strikethrough_position = metrics->ascent / 3;
}
}
-
+
return pango_font_metrics_ref (info->metrics);
}
@@ -651,13 +651,13 @@ pango_win32_font_real_select_font (PangoFont *font,
if (!hfont)
return FALSE;
-
+
if (!SelectObject (hdc, hfont))
{
g_warning ("pango_win32_font_real_select_font: Cannot select font\n");
return FALSE;
}
-
+
return TRUE;
}
@@ -675,9 +675,9 @@ 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 font.
- *
+ *
* Return value: A newly allocated LOGFONT struct. It must be
* freed with g_free().
**/
@@ -700,7 +700,7 @@ pango_win32_font_logfont (PangoFont *font)
* pango_win32_font_select_font:
* @font: a #PangoFont from the Win32 backend
* @hdc: a windows device context
- *
+ *
* 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
@@ -710,7 +710,7 @@ pango_win32_font_logfont (PangoFont *font)
* See pango_win32_font_get_metrics_factor() for information about
* converting from the coordinate space used by this function
* into Pango units.
- *
+ *
* Return value: %TRUE if the operation succeeded.
**/
gboolean
@@ -718,7 +718,7 @@ pango_win32_font_select_font (PangoFont *font,
HDC hdc)
{
g_return_val_if_fail (PANGO_WIN32_IS_FONT (font), FALSE);
-
+
return PANGO_WIN32_FONT_GET_CLASS (font)->select_font (font, hdc);
}
@@ -732,18 +732,18 @@ void
pango_win32_font_done_font (PangoFont *font)
{
g_return_if_fail (PANGO_WIN32_IS_FONT (font));
-
+
PANGO_WIN32_FONT_GET_CLASS (font)->done_font (font);
}
/**
* pango_win32_font_get_metrics_factor:
* @font: a #PangoFont from the win32 backend
- *
+ *
* Returns the scale factor from logical units in the coordinate
* space used by pango_win32_font_select_font() to Pango units
* in user space.
- *
+ *
* Return value: factor to multiply logical units by to get Pango
* units.
**/
@@ -751,7 +751,7 @@ double
pango_win32_font_get_metrics_factor (PangoFont *font)
{
g_return_val_if_fail (PANGO_WIN32_IS_FONT (font), 1.);
-
+
return PANGO_WIN32_FONT_GET_CLASS (font)->get_metrics_factor (font);
}
@@ -788,12 +788,12 @@ pango_win32_font_finalize (GObject *object)
g_slist_foreach (win32font->metrics_by_lang, (GFunc)free_metrics_info, NULL);
g_slist_free (win32font->metrics_by_lang);
-
+
if (win32font->win32face)
pango_win32_font_entry_remove (win32font->win32face, PANGO_FONT (win32font));
-
+
g_hash_table_destroy (win32font->glyph_info);
-
+
g_object_unref (win32font->fontmap);
G_OBJECT_CLASS (pango_win32_font_parent_class)->finalize (object);
@@ -807,7 +807,7 @@ pango_win32_font_describe (PangoFont *font)
desc = pango_font_description_copy (win32font->win32face->description);
pango_font_description_set_size (desc, win32font->size / (PANGO_SCALE / PANGO_WIN32_FONT_MAP (win32font->fontmap)->resolution));
-
+
return desc;
}
@@ -819,7 +819,7 @@ pango_win32_font_describe_absolute (PangoFont *font)
desc = pango_font_description_copy (win32font->win32face->description);
pango_font_description_set_absolute_size (desc, win32font->size);
-
+
return desc;
}
@@ -828,13 +828,13 @@ pango_win32_get_shaper_map (PangoLanguage *lang)
{
static guint engine_type_id = 0;
static guint render_type_id = 0;
-
+
if (engine_type_id == 0)
{
engine_type_id = g_quark_from_static_string (PANGO_ENGINE_TYPE_SHAPE);
render_type_id = g_quark_from_static_string (PANGO_RENDER_TYPE_WIN32);
}
-
+
return pango_find_map (lang, engine_type_id, render_type_id);
}
@@ -850,7 +850,7 @@ pango_win32_font_get_coverage (PangoFont *font,
{
coverage = pango_coverage_new ();
pango_win32_font_calc_coverage (font, coverage, lang);
-
+
pango_win32_font_entry_set_coverage (win32font->win32face, coverage, lang);
}
@@ -876,12 +876,12 @@ pango_win32_font_find_shaper (PangoFont *font,
* pango_win32_get_unknown_glyph:
* @font: a #PangoFont
* @wc: the Unicode character for which a glyph is needed.
- *
+ *
* Returns the index of a glyph suitable for drawing @wc as an
* unknown character.
*
* Use PANGO_GET_UNKNOWN_GLYPH() instead.
- *
+ *
* Return value: a glyph index into @font
**/
PangoGlyph
@@ -902,21 +902,21 @@ pango_win32_get_unknown_glyph (PangoFont *font,
* work property the text alignment of the DC should have TA_BASELINE
* and TA_LEFT.
*/
-void
+void
pango_win32_render_layout_line (HDC hdc,
PangoLayoutLine *line,
- int x,
+ int x,
int y)
{
GSList *tmp_list = line->runs;
PangoRectangle overall_rect;
PangoRectangle logical_rect;
PangoRectangle ink_rect;
-
+
int x_off = 0;
pango_layout_line_get_extents (line,NULL, &overall_rect);
-
+
while (tmp_list)
{
HBRUSH oldfg = NULL;
@@ -926,7 +926,7 @@ pango_win32_render_layout_line (HDC hdc,
PangoLayoutRun *run = tmp_list->data;
PangoAttrColor fg_color, bg_color;
gboolean fg_set, bg_set;
-
+
tmp_list = tmp_list->next;
pango_win32_get_item_properties (run->item, &uline, &fg_color, &fg_set, &bg_color, &bg_set);
@@ -1019,7 +1019,7 @@ pango_win32_render_layout_line (HDC hdc,
SelectObject (hdc, oldfg);
DeleteObject (brush);
}
-
+
x_off += logical_rect.width;
}
}
@@ -1033,10 +1033,10 @@ pango_win32_render_layout_line (HDC hdc,
*
* Render a #PangoLayoutLine onto an X drawable
*/
-void
+void
pango_win32_render_layout (HDC hdc,
PangoLayout *layout,
- int x,
+ int x,
int y)
{
PangoLayoutIter *iter;
@@ -1051,12 +1051,12 @@ pango_win32_render_layout (HDC hdc,
PangoRectangle logical_rect;
PangoLayoutLine *line;
int baseline;
-
+
line = pango_layout_iter_get_line_readonly (iter);
-
+
pango_layout_iter_get_line_extents (iter, NULL, &logical_rect);
baseline = pango_layout_iter_get_baseline (iter);
-
+
pango_win32_render_layout_line (hdc,
line,
x + PANGO_PIXELS (logical_rect.x),
@@ -1064,7 +1064,7 @@ pango_win32_render_layout (HDC hdc,
}
while (pango_layout_iter_next_line (iter));
- pango_layout_iter_free (iter);
+ pango_layout_iter_free (iter);
}
/* This utility function is duplicated here and in pango-layout.c; should it be
@@ -1082,10 +1082,10 @@ pango_win32_get_item_properties (PangoItem *item,
if (fg_set)
*fg_set = FALSE;
-
+
if (bg_set)
*bg_set = FALSE;
-
+
while (tmp_list)
{
PangoAttribute *attr = tmp_list->data;
@@ -1096,23 +1096,23 @@ pango_win32_get_item_properties (PangoItem *item,
if (uline)
*uline = ((PangoAttrInt *)attr)->value;
break;
-
+
case PANGO_ATTR_FOREGROUND:
if (fg_color)
*fg_color = *((PangoAttrColor *)attr);
if (fg_set)
*fg_set = TRUE;
-
+
break;
-
+
case PANGO_ATTR_BACKGROUND:
if (bg_color)
*bg_color = *((PangoAttrColor *)attr);
if (bg_set)
*bg_set = TRUE;
-
+
break;
-
+
default:
break;
}
@@ -1120,7 +1120,7 @@ pango_win32_get_item_properties (PangoItem *item,
}
}
-static guint
+static guint
get_cmap_offset (HDC hdc,
guint16 encoding_id)
{
@@ -1136,9 +1136,9 @@ get_cmap_offset (HDC hdc,
return 0;
n_tables = GUINT16_FROM_BE (n_tables);
-
+
table = g_malloc (ENCODING_TABLE_SIZE*n_tables);
-
+
res = GetFontData (hdc, CMAP, CMAP_HEADER_SIZE, table, ENCODING_TABLE_SIZE*n_tables);
if (res != ENCODING_TABLE_SIZE*n_tables)
return 0;
@@ -1166,7 +1166,7 @@ get_format_4_cmap (HDC hdc)
guint16 *tbl, *tbl_end;
struct format_4_cmap *table;
- /* FIXME: Could look here at the CRC for the font in the DC
+ /* FIXME: Could look here at the CRC for the font in the DC
and return a cached copy if the same */
offset = get_cmap_offset (hdc, UNICODE_ENCODING_ID);
@@ -1188,7 +1188,7 @@ get_format_4_cmap (HDC hdc)
g_free (table);
return NULL;
}
-
+
table->format = GUINT16_FROM_BE (table->format);
table->length = GUINT16_FROM_BE (table->length);
table->language = GUINT16_FROM_BE (table->language);
@@ -1234,13 +1234,13 @@ static guint16 *
get_end_count (struct format_4_cmap *table)
{
gint32 seg_count = table->seg_count_x_2/2;
- /* Apparently the reseved spot is not reserved for
+ /* Apparently the reseved spot is not reserved for
the end_count array!? */
return (&table->arrays[seg_count*0])-1;
}
static gboolean
-find_segment (struct format_4_cmap *table,
+find_segment (struct format_4_cmap *table,
guint16 wc,
guint16 *segment)
{
@@ -1249,7 +1249,7 @@ find_segment (struct format_4_cmap *table,
guint16 *end_count = get_end_count (table);
guint16 *start_count = get_start_count (table);
static guint last = 0; /* Cache of one */
-
+
if (last < seg_count &&
wc >= start_count[last] &&
wc <= end_count[last])
@@ -1257,12 +1257,12 @@ find_segment (struct format_4_cmap *table,
*segment = last;
return TRUE;
}
-
+
/* Binary search for the segment */
start = 0; /* inclusive */
end = seg_count; /* not inclusive */
- while (start < end)
+ while (start < end)
{
/* Look at middle pos */
i = (start + end)/2;
@@ -1270,7 +1270,7 @@ find_segment (struct format_4_cmap *table,
if (i == start)
{
/* We made no progress. Look if this is the one. */
-
+
if (wc >= start_count[i] &&
wc <= end_count[i])
{
@@ -1308,7 +1308,7 @@ get_format_12_cmap (HDC hdc)
guint32 length;
guint32 *tbl, *tbl_end;
struct format_12_cmap *table;
-
+
offset = get_cmap_offset (hdc, UCS4_ENCODING_ID);
if (offset == 0)
return NULL;
@@ -1340,7 +1340,7 @@ get_format_12_cmap (HDC hdc)
g_free (table);
return NULL;
}
-
+
tbl_end = (guint32 *) ((char *) table + length);
tbl = table->groups;
@@ -1352,7 +1352,7 @@ get_format_12_cmap (HDC hdc)
return table;
}
-
+
static gpointer
font_get_cmap (PangoFont *font)
{
@@ -1414,7 +1414,7 @@ pango_win32_font_get_glyph_index (PangoFont *font,
guint16 segment;
guint16 id;
guint16 ch = wc;
-
+
if (wc > 0xFFFF)
return 0;
@@ -1471,7 +1471,7 @@ pango_win32_get_name_header (HDC hdc,
return TRUE;
}
-
+
gboolean
pango_win32_get_name_record (HDC hdc,
gint i,
@@ -1480,7 +1480,7 @@ pango_win32_get_name_record (HDC hdc,
if (GetFontData (hdc, NAME, 6 + i * sizeof (*record),
record, sizeof (*record)) != sizeof (*record))
return FALSE;
-
+
record->platform_id = GUINT16_FROM_BE (record->platform_id);
record->encoding_id = GUINT16_FROM_BE (record->encoding_id);
record->language_id = GUINT16_FROM_BE (record->language_id);
@@ -1564,7 +1564,7 @@ pango_win32_font_calc_coverage (PangoFont *font,
guint32 i;
PangoWin32CoverageLanguageClass cjkv;
gboolean hide_unihan = FALSE;
-
+
PING(("font:%s lang:%s",
pango_font_description_to_string (pango_font_describe (font)),
pango_language_to_string (lang)));
@@ -1584,7 +1584,7 @@ pango_win32_font_calc_coverage (PangoFont *font,
PING(("no table"));
return;
}
-
+
PING (("coverage:"));
if (win32font->win32face->cmap_format == 4)
{
@@ -1612,7 +1612,7 @@ pango_win32_font_calc_coverage (PangoFont *font,
else
g_print ("%04x:%04x ", start_count[i], end_count[i]);
}
-#endif
+#endif
for (ch = start_count[i]; ch <= end_count[i]; ch++)
if (hide_unihan && CH_IS_UNIHAN_BMP (ch))
pango_coverage_set (coverage, ch, PANGO_COVERAGE_APPROXIMATE);
@@ -1628,7 +1628,7 @@ pango_win32_font_calc_coverage (PangoFont *font,
{
if (ch == 0xFFFF)
break;
-
+
id = *(id_range_offset[i]/2 +
(ch - start_count[i]) +
&id_range_offset[i]);
diff --git a/pango/pangowin32.h b/pango/pangowin32.h
index 986f3a11..64f0ed19 100644
--- a/pango/pangowin32.h
+++ b/pango/pangowin32.h
@@ -54,14 +54,14 @@ void pango_win32_render_layout_line (HDC hdc,
int y);
void pango_win32_render_layout (HDC hdc,
PangoLayout *layout,
- int x,
+ int x,
int y);
void pango_win32_render_transformed (HDC hdc,
const PangoMatrix *matrix,
PangoFont *font,
PangoGlyphString *glyphs,
- int x,
+ int x,
int y);
#ifdef PANGO_ENABLE_ENGINE
@@ -91,10 +91,10 @@ double pango_win32_font_get_metrics_factor (PangoFont *font);
* Win32 fonts.
*/
typedef struct _PangoWin32FontCache PangoWin32FontCache;
-
+
PangoWin32FontCache *pango_win32_font_cache_new (void);
void pango_win32_font_cache_free (PangoWin32FontCache *cache);
-
+
HFONT pango_win32_font_cache_load (PangoWin32FontCache *cache,
const LOGFONT *logfont);
void pango_win32_font_cache_unload (PangoWin32FontCache *cache,
diff --git a/pango/pangox-fontcache.c b/pango/pangox-fontcache.c
index 301d8b2f..ed556e74 100644
--- a/pango/pangox-fontcache.c
+++ b/pango/pangox-fontcache.c
@@ -34,7 +34,7 @@ typedef struct _CacheEntry CacheEntry;
struct _PangoXFontCache
{
Display *display;
-
+
GHashTable *forward;
GHashTable *back;
@@ -66,7 +66,7 @@ free_cache_entry (char *xlfd,
/**
* pango_x_font_cache_free:
* @cache: a #PangoXFontCache
- *
+ *
* Frees a #PangoXFontCache and all associated memory. All fonts loaded
* through this font cache will be freed along with the cache.
**/
@@ -74,9 +74,9 @@ void
pango_x_font_cache_free (PangoXFontCache *cache)
{
g_return_if_fail (cache != NULL);
-
+
g_hash_table_foreach (cache->forward, (GHFunc)free_cache_entry, cache);
-
+
g_hash_table_destroy (cache->forward);
g_hash_table_destroy (cache->back);
@@ -86,9 +86,9 @@ pango_x_font_cache_free (PangoXFontCache *cache)
/**
* pango_x_font_cache_new:
* @display: an X display.
- *
+ *
* Creates a font cache for the specified display.
- *
+ *
* Return value: The newly allocated #PangoXFontCache, which should be
* freed with pango_x_font_cache_free().
**/
@@ -98,18 +98,18 @@ pango_x_font_cache_new (Display *display)
PangoXFontCache *cache;
g_return_val_if_fail (display != NULL, NULL);
-
+
cache = g_new (PangoXFontCache, 1);
cache->display = display;
-
+
cache->forward = g_hash_table_new (g_str_hash, g_str_equal);
cache->back = g_hash_table_new (g_direct_hash, g_direct_equal);
-
+
cache->mru = NULL;
cache->mru_tail = NULL;
cache->mru_count = 0;
-
+
return cache;
}
@@ -130,11 +130,11 @@ cache_entry_unref (PangoXFontCache *cache, CacheEntry *entry)
* pango_x_font_cache_load:
* @cache: a #PangoXFontCache
* @xlfd: the X Logical Font Description to load.
- *
+ *
* Loads a #XFontStruct from a X Logical Font Description. The
* result may be newly loaded, or it may have been previously
* stored.
- *
+ *
* Return value: The font structure, or %NULL if the font could
* not be loaded. In order to free this structure, you must call
* pango_x_font_cache_unload().
@@ -160,7 +160,7 @@ pango_x_font_cache_load (PangoXFontCache *cache,
if (!fs)
return NULL;
-
+
entry = g_new (CacheEntry, 1);
entry->xlfd = g_strdup (xlfd);
@@ -170,15 +170,15 @@ pango_x_font_cache_load (PangoXFontCache *cache,
entry->mru = NULL;
g_hash_table_insert (cache->forward, entry->xlfd, entry);
- g_hash_table_insert (cache->back, entry->fs, entry);
+ g_hash_table_insert (cache->back, entry->fs, entry);
}
-
+
if (entry->mru)
{
if (cache->mru_count > 1 && entry->mru->prev)
{
/* Move to the head of the mru list */
-
+
if (entry->mru == cache->mru_tail)
{
cache->mru_tail = cache->mru_tail->prev;
@@ -189,7 +189,7 @@ pango_x_font_cache_load (PangoXFontCache *cache,
entry->mru->prev->next = entry->mru->next;
entry->mru->next->prev = entry->mru->prev;
}
-
+
entry->mru->next = cache->mru;
entry->mru->prev = NULL;
cache->mru->prev = entry->mru;
@@ -199,13 +199,13 @@ pango_x_font_cache_load (PangoXFontCache *cache,
else
{
entry->ref_count++;
-
+
/* Insert into the mru list */
-
+
if (cache->mru_count == CACHE_SIZE)
{
CacheEntry *old_entry = cache->mru_tail->data;
-
+
cache->mru_tail = cache->mru_tail->prev;
cache->mru_tail->next = NULL;
@@ -229,7 +229,7 @@ pango_x_font_cache_load (PangoXFontCache *cache,
* pango_x_font_cache_unload:
* @cache: a #PangoXFontCache
* @fs: the font structure to unload
- *
+ *
* Frees a font structure previously loaded with pango_x_font_cache_load().
**/
void
@@ -244,5 +244,5 @@ pango_x_font_cache_unload (PangoXFontCache *cache,
entry = g_hash_table_lookup (cache->back, fs);
g_return_if_fail (entry != NULL);
- cache_entry_unref (cache, entry);
+ cache_entry_unref (cache, entry);
}
diff --git a/pango/pangox-fontmap.c b/pango/pangox-fontmap.c
index c8f8556b..360f680c 100644
--- a/pango/pangox-fontmap.c
+++ b/pango/pangox-fontmap.c
@@ -67,13 +67,13 @@ typedef enum
XLFD_SPACING = 10,
XLFD_AVERAGE_WIDTH = 11,
XLFD_CHARSET = 12,
- XLFD_NUM_FIELDS
+ XLFD_NUM_FIELDS
} FontField;
struct _PangoXFamily
{
PangoFontFamily parent_instance;
-
+
char *family_name;
GSList *font_entries;
};
@@ -81,7 +81,7 @@ struct _PangoXFamily
struct _PangoXFace
{
PangoFontFace parent_instance;
-
+
char *xlfd;
PangoFontDescription *description;
PangoCoverage *coverage;
@@ -193,16 +193,16 @@ pango_x_font_map_get_type (void)
(GInstanceInitFunc) pango_x_font_map_init,
NULL /* value_table */
};
-
+
object_type = g_type_register_static (PANGO_TYPE_FONT_MAP,
I_("PangoXFontMap"),
&object_info, 0);
}
-
+
return object_type;
}
-static void
+static void
pango_x_font_map_init (PangoXFontMap *xfontmap)
{
xfontmap->families = g_hash_table_new (g_str_hash, g_str_equal);
@@ -216,9 +216,9 @@ static void
pango_x_font_map_class_init (PangoFontMapClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
-
+
font_map_parent_class = g_type_class_peek_parent (class);
-
+
object_class->finalize = pango_x_font_map_finalize;
class->load_font = pango_x_font_map_load_font;
class->list_families = pango_x_font_map_list_families;
@@ -253,7 +253,7 @@ register_display (Display *display)
}
registered_displays = g_slist_prepend (registered_displays, display);
-
+
extcodes = XAddExtension (display);
XESetCloseDisplay (display, extcodes->extension, close_display_cb);
}
@@ -264,8 +264,8 @@ static GList *fontmaps = NULL;
* pango_x_font_map_for_display:
* @display: an X #Display.
*
- * Returns a #PangoXFontMap for @display. Font maps are cached and should
- * not be freed. If the font map for a display is no longer needed, it can
+ * Returns a #PangoXFontMap for @display. Font maps are cached and should
+ * not be freed. If the font map for a display is no longer needed, it can
* be released with pango_x_shutdown_display().
*
* Return value: a #PangoXFontMap for @display.
@@ -280,10 +280,10 @@ pango_x_font_map_for_display (Display *display)
int screen;
g_return_val_if_fail (display != NULL, NULL);
-
+
/* Make sure that the type system is initialized */
g_type_init ();
-
+
while (tmp_list)
{
xfontmap = tmp_list->data;
@@ -295,11 +295,11 @@ pango_x_font_map_for_display (Display *display)
}
xfontmap = g_object_new (PANGO_TYPE_X_FONT_MAP, NULL);
-
+
xfontmap->display = display;
xfontmap->font_cache = pango_x_font_cache_new (display);
xfontmap->freed_fonts = g_queue_new ();
-
+
/* Get a maximum of MAX_FONTS fontnames from the X server.
Use "-*" as the pattern rather than "-*-*-*-*-*-*-*-*-*-*-*-*-*-*" since
the latter may result in fonts being returned which don't actually exist.
@@ -314,7 +314,7 @@ pango_x_font_map_for_display (Display *display)
if (pango_x_is_xlfd_font_name (xfontnames[i]))
pango_x_insert_font (xfontmap, xfontnames[i]);
}
-
+
XFreeFontNames (xfontnames);
pango_x_font_map_read_aliases (xfontmap);
@@ -336,7 +336,7 @@ pango_x_font_map_for_display (Display *display)
/**
* pango_x_shutdown_display:
* @display: an X #Display
- *
+ *
* Free cached resources for the given X display structure.
**/
void
@@ -368,16 +368,16 @@ static void
pango_x_font_map_finalize (GObject *object)
{
PangoXFontMap *xfontmap = PANGO_X_FONT_MAP (object);
-
+
g_list_foreach (xfontmap->freed_fonts->head, (GFunc)g_object_unref, NULL);
g_queue_free (xfontmap->freed_fonts);
-
+
pango_x_font_cache_free (xfontmap->font_cache);
/* FIXME: Lots more here */
fontmaps = g_list_remove (fontmaps, xfontmap);
-
+
G_OBJECT_CLASS (font_map_parent_class)->finalize (object);
}
@@ -410,7 +410,7 @@ pango_x_font_map_list_families (PangoFontMap *fontmap,
if (families)
{
int i = 0;
-
+
*families = g_new (PangoFontFamily *, *n_families);
tmp_list = family_list;
@@ -421,7 +421,7 @@ pango_x_font_map_list_families (PangoFontMap *fontmap,
tmp_list = tmp_list->next;
}
}
-
+
g_slist_free (family_list);
}
@@ -435,7 +435,7 @@ pango_x_get_font_family (PangoXFontMap *xfontmap,
font_family = g_object_new (PANGO_X_TYPE_FAMILY, NULL);
font_family->family_name = g_strdup (family_name);
font_family->font_entries = NULL;
-
+
g_hash_table_insert (xfontmap->families, font_family->family_name, font_family);
}
@@ -466,20 +466,20 @@ pango_x_font_map_load_font (PangoFontMap *fontmap,
if (font_family)
{
PangoXFace *best_match = NULL;
-
+
tmp_list = font_family->font_entries;
while (tmp_list)
{
PangoXFace *font_entry = tmp_list->data;
-
+
if (pango_font_description_better_match (description,
best_match ? best_match->description : NULL,
font_entry->description))
best_match = font_entry;
-
+
tmp_list = tmp_list->next;
}
-
+
if (best_match)
{
GSList *tmp_list = best_match->cached_fonts;
@@ -494,7 +494,7 @@ pango_x_font_map_load_font (PangoFontMap *fontmap,
g_object_ref (result);
if (xfont->in_cache)
pango_x_fontmap_cache_remove (fontmap, xfont);
-
+
break;
}
tmp_list = tmp_list->next;
@@ -503,7 +503,7 @@ pango_x_font_map_load_font (PangoFontMap *fontmap,
if (!result)
{
PangoXFont *xfont = pango_x_font_new (fontmap, best_match->xlfd, size);
-
+
xfont->fontmap = fontmap;
xfont->xface = best_match;
best_match->cached_fonts = g_slist_prepend (best_match->cached_fonts, xfont);
@@ -530,7 +530,7 @@ pango_x_font_map_load_font (PangoFontMap *fontmap,
*/
static gboolean error_occurred;
-static int
+static int
ignore_error (Display *d,
XErrorEvent *e)
{
@@ -554,11 +554,11 @@ pango_x_real_get_coverage_win (Display *display)
guchar *data;
Window retval = None;
int (*old_handler) (Display *, XErrorEvent *);
-
+
Atom coverage_win_atom = XInternAtom (display,
"PANGO_COVERAGE_WIN",
False);
-
+
XGetWindowProperty (display,
DefaultRootWindow (display),
coverage_win_atom,
@@ -566,12 +566,12 @@ pango_x_real_get_coverage_win (Display *display)
False, XA_WINDOW,
&type, &format, &n_items, &bytes_after,
&data);
-
+
if (type == XA_WINDOW)
{
if (format == 32 && n_items == 1 && bytes_after == 0)
retval = *(Atom *)data;
-
+
XFree (data);
}
@@ -589,7 +589,7 @@ pango_x_real_get_coverage_win (Display *display)
if (format != 32 || n_items != 1 || bytes_after != 0 ||
*(Atom *)data != retval)
retval = None;
-
+
XFree (data);
}
else
@@ -631,18 +631,18 @@ pango_x_get_coverage_win (PangoXFontMap *xfontmap)
if (!xfontmap->coverage_win)
{
XSetWindowAttributes attr;
-
+
attr.override_redirect = True;
-
+
XSetCloseDownMode (persistant_display, RetainPermanent);
-
- xfontmap->coverage_win =
+
+ xfontmap->coverage_win =
XCreateWindow (persistant_display,
DefaultRootWindow (persistant_display),
-100, -100, 10, 10, 0, 0,
InputOnly, CopyFromParent,
CWOverrideRedirect, &attr);
-
+
XChangeProperty (persistant_display,
DefaultRootWindow (persistant_display),
XInternAtom (persistant_display,
@@ -651,7 +651,7 @@ pango_x_get_coverage_win (PangoXFontMap *xfontmap)
XA_WINDOW,
32, PropModeReplace,
(guchar *)&xfontmap->coverage_win, 1);
-
+
XChangeProperty (persistant_display,
xfontmap->coverage_win,
@@ -662,9 +662,9 @@ pango_x_get_coverage_win (PangoXFontMap *xfontmap)
32, PropModeReplace,
(guchar *)&xfontmap->coverage_win, 1);
}
-
+
XUngrabServer (persistant_display);
-
+
XSync (persistant_display, False);
XCloseDisplay (persistant_display);
}
@@ -694,16 +694,16 @@ pango_x_get_cached_coverage (PangoXFontMap *xfontmap,
guchar *data;
*atom = XInternAtom (xfontmap->display, str, False);
-
+
while (tries--)
{
coverage_win = pango_x_get_coverage_win (xfontmap);
-
+
if (!coverage_win)
return NULL;
-
+
old_handler= XSetErrorHandler (ignore_error);
-
+
if (XGetWindowProperty (xfontmap->display,
coverage_win, *atom,
0, G_MAXLONG,
@@ -714,7 +714,7 @@ pango_x_get_cached_coverage (PangoXFontMap *xfontmap,
{
if (format == 8 && bytes_after == 0)
result = pango_coverage_from_bytes (data, n_items);
-
+
XSetErrorHandler (old_handler);
XFree (data);
break;
@@ -727,7 +727,7 @@ pango_x_get_cached_coverage (PangoXFontMap *xfontmap,
}
}
-
+
return result;
}
@@ -745,7 +745,7 @@ pango_x_store_cached_coverage (PangoXFontMap *xfontmap,
gint size;
int tries = 5;
-
+
pango_coverage_to_bytes (coverage, &bytes, &size);
while (tries--)
@@ -757,14 +757,14 @@ pango_x_store_cached_coverage (PangoXFontMap *xfontmap,
old_handler = XSetErrorHandler (ignore_error);
error_occurred = False;
-
+
XChangeProperty (xfontmap->display,
coverage_win,
- atom,
+ atom,
XA_STRING,
8, PropModeReplace,
bytes, size);
-
+
XSync (xfontmap->display, False);
XSetErrorHandler (old_handler);
@@ -775,9 +775,9 @@ pango_x_store_cached_coverage (PangoXFontMap *xfontmap,
/* Window disappeared out from under us */
XSetErrorHandler (old_handler);
xfontmap->coverage_win = None;
- }
+ }
}
-
+
g_free (bytes);
}
@@ -808,7 +808,7 @@ pango_x_font_map_read_alias_file (PangoXFontMap *xfontmap,
PangoStretch stretch;
const char *p = line_buf->str;
-
+
lineno += lines_read;
if (!pango_skip_space (&p))
@@ -820,7 +820,7 @@ pango_x_font_map_read_alias_file (PangoXFontMap *xfontmap,
xface = g_object_new (PANGO_X_TYPE_FACE, NULL);
xface->xlfd = NULL;
xface->description = pango_font_description_new ();
-
+
g_string_ascii_down (tmp_buf);
pango_font_description_set_family (xface->description, tmp_buf->str);
@@ -837,14 +837,14 @@ pango_x_font_map_read_alias_file (PangoXFontMap *xfontmap,
if (!pango_parse_variant (tmp_buf->str, &variant, TRUE))
goto error;
pango_font_description_set_variant (xface->description, variant);
-
+
if (!pango_scan_string (&p, tmp_buf))
goto error;
if (!pango_parse_weight (tmp_buf->str, &weight, TRUE))
goto error;
pango_font_description_set_weight (xface->description, weight);
-
+
if (!pango_scan_string (&p, tmp_buf))
goto error;
@@ -863,7 +863,7 @@ pango_x_font_map_read_alias_file (PangoXFontMap *xfontmap,
char *trimmed = pango_trim_string (xlfds[i]);
g_free (xlfds[i]);
xlfds[i] = trimmed;
-
+
if (!pango_x_is_xlfd_font_name (xlfds[i]))
{
g_warning ("XLFD '%s' must be complete (14 fields)", xlfds[i]);
@@ -924,7 +924,7 @@ pango_x_font_map_read_aliases (PangoXFontMap *xfontmap)
files_str = g_strdup ("~/.pangox_aliases:" SYSCONFDIR "/pango/pangox.aliases");
files = pango_split_file_list (files_str);
-
+
n = 0;
while (files[n])
n++;
@@ -947,7 +947,7 @@ pango_x_is_xlfd_font_name (const char *fontname)
{
int i = 0;
int field_len = 0;
-
+
while (*fontname)
{
if (*fontname++ == '-')
@@ -959,7 +959,7 @@ pango_x_is_xlfd_font_name (const char *fontname)
else
field_len++;
}
-
+
return (i == 14) ? TRUE : FALSE;
}
@@ -1031,25 +1031,25 @@ pango_x_get_xlfd_field (const char *fontname,
const char *t1, *t2;
char *p;
int countdown, len, num_dashes;
-
+
if (!fontname)
return NULL;
-
+
/* we assume this is a valid fontname...that is, it has 14 fields */
-
+
countdown = field_num;
t1 = fontname;
while (*t1 && (countdown >= 0))
if (*t1++ == '-')
countdown--;
-
+
num_dashes = (field_num == XLFD_CHARSET) ? 2 : 1;
for (t2 = t1; *t2; t2++)
- {
+ {
if (*t2 == '-' && --num_dashes == 0)
break;
}
-
+
if (t1 != t2)
{
/* Check we don't overflow the buffer */
@@ -1064,7 +1064,7 @@ pango_x_get_xlfd_field (const char *fontname,
}
else
strcpy(buffer, "(nil)");
-
+
return buffer;
}
@@ -1110,13 +1110,13 @@ pango_x_insert_font (PangoXFontMap *xfontmap,
g_free (identifier);
size_info->xlfds = g_slist_prepend (size_info->xlfds, g_strdup (fontname));
-
+
/* Convert the XLFD into a PangoFontDescription */
-
+
family_name = pango_x_get_xlfd_field (fontname, XLFD_FAMILY, family_buffer);
if (!family_name)
return;
-
+
style = PANGO_STYLE_NORMAL;
if (pango_x_get_xlfd_field (fontname, XLFD_SLANT, slant_buffer))
{
@@ -1133,7 +1133,7 @@ pango_x_insert_font (PangoXFontMap *xfontmap,
strcpy (slant_buffer, "*");
variant = PANGO_VARIANT_NORMAL;
-
+
weight = PANGO_WEIGHT_NORMAL;
if (pango_x_get_xlfd_field (fontname, XLFD_WEIGHT, weight_buffer))
{
@@ -1227,7 +1227,7 @@ char *
pango_x_make_matching_xlfd (PangoFontMap *fontmap, char *xlfd, const char *charset, int size)
{
PangoXFontMap *xfontmap;
-
+
GSList *tmp_list;
PangoXSizeInfo *size_info;
char *identifier;
@@ -1239,7 +1239,7 @@ pango_x_make_matching_xlfd (PangoFontMap *fontmap, char *xlfd, const char *chars
char *dash_charset;
xfontmap = PANGO_X_FONT_MAP (fontmap);
-
+
dash_charset = g_strconcat ("-", charset, NULL);
if (!match_end (xlfd, "-*-*") && !match_end (xlfd, dash_charset))
@@ -1262,7 +1262,7 @@ pango_x_make_matching_xlfd (PangoFontMap *fontmap, char *xlfd, const char *chars
while (tmp_list)
{
char *tmp_xlfd = tmp_list->data;
-
+
if (match_end (tmp_xlfd, dash_charset))
{
int font_size = pango_x_get_size (xfontmap, tmp_xlfd);
@@ -1293,7 +1293,7 @@ pango_x_make_matching_xlfd (PangoFontMap *fontmap, char *xlfd, const char *chars
int n_dashes = 0;
int target_size;
char *prefix;
-
+
/* OK, we have a match; let's modify it to fit this size and charset */
p = closest_match;
@@ -1303,16 +1303,16 @@ pango_x_make_matching_xlfd (PangoFontMap *fontmap, char *xlfd, const char *chars
n_dashes++;
p++;
}
-
+
prefix_end = p - 1;
-
+
while (n_dashes < 9)
{
if (*p == '-')
n_dashes++;
p++;
}
-
+
target_size = (int)((double)size / xfontmap->resolution + 0.5);
prefix = g_strndup (closest_match, prefix_end - closest_match);
result = g_strdup_printf ("%s--%d-*-*-*-*-*-%s", prefix, target_size, charset);
@@ -1385,7 +1385,7 @@ pango_x_fontmap_cache_remove (PangoFontMap *fontmap,
if (xfontmap->freed_fonts->tail)
xfontmap->freed_fonts->tail->next = NULL;
}
-
+
xfontmap->freed_fonts->head = g_list_delete_link (xfontmap->freed_fonts->head, link);
xfontmap->freed_fonts->length--;
xfont->in_cache = FALSE;
@@ -1405,7 +1405,7 @@ pango_x_fontmap_cache_clear (PangoXFontMap *xfontmap)
Atom
-pango_x_fontmap_atom_from_name (PangoFontMap *fontmap,
+pango_x_fontmap_atom_from_name (PangoFontMap *fontmap,
const char *atomname)
{
PangoXFontMap *xfm = PANGO_X_FONT_MAP(fontmap);
@@ -1414,11 +1414,11 @@ pango_x_fontmap_atom_from_name (PangoFontMap *fontmap,
found = g_hash_table_lookup (xfm->to_atom_cache, atomname);
- if (found)
+ if (found)
return (Atom)(GPOINTER_TO_UINT(found));
atom = XInternAtom (xfm->display, atomname, FALSE);
- g_hash_table_insert (xfm->to_atom_cache, g_strdup (atomname),
+ g_hash_table_insert (xfm->to_atom_cache, g_strdup (atomname),
(gpointer)atom);
return atom;
@@ -1426,7 +1426,7 @@ pango_x_fontmap_atom_from_name (PangoFontMap *fontmap,
G_CONST_RETURN char *
-pango_x_fontmap_name_from_atom (PangoFontMap *fontmap,
+pango_x_fontmap_name_from_atom (PangoFontMap *fontmap,
Atom atom)
{
PangoXFontMap *xfm = PANGO_X_FONT_MAP(fontmap);
@@ -1435,7 +1435,7 @@ pango_x_fontmap_name_from_atom (PangoFontMap *fontmap,
found = g_hash_table_lookup (xfm->from_atom_cache, GUINT_TO_POINTER(atom));
- if (found)
+ if (found)
return (const char *)found;
name = XGetAtomName (xfm->display, atom);
@@ -1447,7 +1447,7 @@ pango_x_fontmap_name_from_atom (PangoFontMap *fontmap,
return name2;
}
-/*
+/*
* PangoXFace
*/
@@ -1467,7 +1467,7 @@ pango_x_face_get_face_name (PangoFontFace *face)
if (!xface->face_name)
{
PangoFontDescription *desc = pango_font_face_describe (face);
-
+
pango_font_description_unset_fields (desc,
PANGO_FONT_MASK_FAMILY | PANGO_FONT_MASK_SIZE);
@@ -1505,12 +1505,12 @@ pango_x_face_get_type (void)
(GInstanceInitFunc) NULL,
NULL /* value_table */
};
-
+
object_type = g_type_register_static (PANGO_TYPE_FONT_FACE,
I_("PangoXFace"),
&object_info, 0);
}
-
+
return object_type;
}
@@ -1547,14 +1547,14 @@ pango_x_face_get_coverage (PangoXFace *xface,
pango_coverage_ref (xface->coverage);
return xface->coverage;
}
-
+
xfont = (PangoXFont *)font;
-
+
xfontmap = (PangoXFontMap *)pango_x_font_map_for_display (xfont->display);
if (xface->xlfd)
{
const char *lang_str = language ? pango_language_to_string (language) : "*";
-
+
char *str = g_strconcat (lang_str, "|", xface->xlfd, NULL);
result = pango_x_get_cached_coverage (xfontmap, str, &atom);
g_free (str);
@@ -1568,10 +1568,10 @@ pango_x_face_get_coverage (PangoXFace *xface,
gunichar wc;
result = pango_coverage_new ();
-
+
shape_map = pango_x_get_shaper_map (language);
engine = (PangoEngineShape *)pango_map_get_engine (shape_map, PANGO_SCRIPT_COMMON);
-
+
for (wc = 0; wc < 65536; wc++)
{
PangoCoverageLevel level;
@@ -1580,17 +1580,17 @@ pango_x_face_get_coverage (PangoXFace *xface,
if (level != PANGO_COVERAGE_NONE)
pango_coverage_set (result, wc, level);
}
-
+
if (atom)
pango_x_store_cached_coverage (xfontmap, atom, result);
}
-
+
if (xface)
{
xface->coverage = result;
pango_coverage_ref (result);
}
-
+
return result;
}
@@ -1617,7 +1617,7 @@ pango_x_family_list_faces (PangoFontFamily *family,
{
GSList *tmp_list;
int i = 0;
-
+
*faces = g_new (PangoFontFace *, *n_faces);
tmp_list = xfamily->font_entries;
@@ -1664,12 +1664,12 @@ pango_x_family_get_type (void)
(GInstanceInitFunc) NULL,
NULL /* value_table */
};
-
+
object_type = g_type_register_static (PANGO_TYPE_FONT_FAMILY,
I_("PangoXFamily"),
&object_info, 0);
}
-
+
return object_type;
}
diff --git a/pango/pangox-private.h b/pango/pangox-private.h
index e2cb12f1..2ce8f58b 100644
--- a/pango/pangox-private.h
+++ b/pango/pangox-private.h
@@ -42,7 +42,7 @@ struct _PangoXFont
* of length n_fonts
*/
GHashTable *subfonts_by_charset;
-
+
PangoXSubfontInfo **subfonts;
int n_subfonts;
@@ -55,7 +55,7 @@ struct _PangoXFont
* in use.
*/
gboolean in_cache;
-
+
PangoXFace *xface; /* Used to remove cached fonts */
};
@@ -114,7 +114,7 @@ void pango_x_fontmap_cache_add (PangoFontMap *fontmap,
void pango_x_fontmap_cache_remove (PangoFontMap *fontmap,
PangoXFont *xfont);
-Atom pango_x_fontmap_atom_from_name (PangoFontMap *fontmap,
+Atom pango_x_fontmap_atom_from_name (PangoFontMap *fontmap,
const char *atomname);
const char *pango_x_fontmap_name_from_atom (PangoFontMap *fontmap,
Atom atom);
diff --git a/pango/pangox.c b/pango/pangox.c
index cdab10bd..a99b9d86 100644
--- a/pango/pangox.c
+++ b/pango/pangox.c
@@ -115,13 +115,13 @@ pango_x_find_subfont (PangoFont *font,
PangoXSubfont subfont_index)
{
PangoXFont *xfont = (PangoXFont *)font;
-
+
if (subfont_index < 1 || subfont_index > xfont->n_subfonts)
{
g_warning ("Invalid subfont %d", subfont_index);
return NULL;
}
-
+
return xfont->subfonts[subfont_index-1];
}
@@ -132,7 +132,7 @@ pango_x_make_font_struct (PangoFont *font, PangoXSubfontInfo *info)
PangoXFontCache *cache;
cache = pango_x_font_map_get_font_cache (xfont->fontmap);
-
+
info->font_struct = pango_x_font_cache_load (cache, info->xlfd);
if (!info->font_struct)
{
@@ -141,7 +141,7 @@ pango_x_make_font_struct (PangoFont *font, PangoXSubfontInfo *info)
/* Prevent a segfault, but probably not much more */
info->font_struct = pango_x_font_cache_load (cache, "fixed");
}
-
+
info->is_1byte = (info->font_struct->min_byte1 == 0 && info->font_struct->max_byte1 == 0);
info->range_byte1 = info->font_struct->max_byte1 - info->font_struct->min_byte1 + 1;
info->range_byte2 = info->font_struct->max_char_or_byte2 - info->font_struct->min_char_or_byte2 + 1;
@@ -152,17 +152,17 @@ pango_x_get_font_struct (PangoFont *font, PangoXSubfontInfo *info)
{
if (!info->font_struct)
pango_x_make_font_struct (font, info);
-
+
return info->font_struct;
}
/**
* pango_x_get_context:
* @display: an X display (As returned by XOpenDisplay().)
- *
+ *
* Retrieves a #PangoContext appropriate for rendering with X fonts on the
* given display.
- *
+ *
* Return value: the new #PangoContext.
**/
PangoContext *
@@ -172,26 +172,26 @@ pango_x_get_context (Display *display)
PangoXContextInfo *info;
int i;
static gboolean registered_modules = FALSE;
-
- g_return_val_if_fail (display != NULL, NULL);
+
+ g_return_val_if_fail (display != NULL, NULL);
if (!registered_modules)
{
registered_modules = TRUE;
-
+
for (i = 0; _pango_included_x_modules[i].list; i++)
pango_module_register (&_pango_included_x_modules[i]);
}
-
+
result = pango_context_new ();
-
+
info = g_new (PangoXContextInfo, 1);
info->get_gc_func = NULL;
info->free_gc_func = NULL;
g_object_set_qdata_full (G_OBJECT (result),
g_quark_from_static_string ("pango-x-info"),
info, (GDestroyNotify)g_free);
-
+
pango_context_set_font_map (result, pango_x_font_map_for_display (display));
return result;
@@ -202,7 +202,7 @@ pango_x_get_context (Display *display)
* @context: a #PangoContext.
* @get_gc_func: function called to create a new GC for a given color.
* @free_gc_func: function called to free a GC created with @get_gc_func.
- *
+ *
* Sets the functions that will be used to get GC's in various colors when
* rendering layouts with this context.
**/
@@ -212,7 +212,7 @@ pango_x_context_set_funcs (PangoContext *context,
PangoFreeGCFunc free_gc_func)
{
PangoXContextInfo *info;
-
+
g_return_if_fail (context != NULL);
info = g_object_get_qdata (G_OBJECT (context),
@@ -242,16 +242,16 @@ pango_x_font_get_type (void)
(GInstanceInitFunc) pango_x_font_init,
NULL /* value_table */
};
-
+
object_type = g_type_register_static (PANGO_TYPE_FONT,
I_("PangoXFont"),
&object_info, 0);
}
-
+
return object_type;
}
-static void
+static void
pango_x_font_init (PangoXFont *xfont)
{
xfont->subfonts_by_charset = g_hash_table_new (g_str_hash, g_str_equal);
@@ -273,10 +273,10 @@ pango_x_font_class_init (PangoXFontClass *class)
PangoFontClass *font_class = PANGO_FONT_CLASS (class);
parent_class = g_type_class_peek_parent (class);
-
+
object_class->finalize = pango_x_font_finalize;
object_class->dispose = pango_x_font_dispose;
-
+
font_class->describe = pango_x_font_describe;
font_class->get_coverage = pango_x_font_get_coverage;
font_class->find_shaper = pango_x_font_find_shaper;
@@ -294,7 +294,7 @@ pango_x_font_new (PangoFontMap *fontmap, const char *spec, int size)
g_return_val_if_fail (spec != NULL, NULL);
result = g_object_new (PANGO_TYPE_X_FONT, NULL);
-
+
result->fontmap = fontmap;
g_object_ref (fontmap);
result->display = pango_x_fontmap_get_display (fontmap);
@@ -329,7 +329,7 @@ pango_x_load_font (Display *display,
g_return_val_if_fail (display != NULL, NULL);
g_return_val_if_fail (spec != NULL, NULL);
-
+
result = pango_x_font_new (pango_x_font_map_for_display (display), spec, -1);
return (PangoFont *)result;
@@ -347,7 +347,7 @@ pango_x_load_font (Display *display,
} \
} G_STMT_END
-
+
/**
* pango_x_render:
* @display: the X display.
@@ -360,13 +360,13 @@ pango_x_load_font (Display *display,
*
* Renders a #PangoGlyphString onto an X drawable.
*/
-void
+void
pango_x_render (Display *display,
Drawable d,
GC gc,
PangoFont *font,
PangoGlyphString *glyphs,
- int x,
+ int x,
int y)
{
Font old_fid = None;
@@ -386,7 +386,7 @@ pango_x_render (Display *display,
g_return_if_fail (display != NULL);
g_return_if_fail (glyphs != NULL);
-
+
for (i=0; i<glyphs->num_glyphs; i++)
{
PangoGlyph glyph = glyphs->glyphs[i].glyph;
@@ -403,20 +403,20 @@ pango_x_render (Display *display,
glyph_x >= -16384 && glyph_x <= 32767 &&
glyph_y >= -16384 && glyph_y <= 32767))
goto next_glyph;
-
+
if ((glyph & PANGO_GLYPH_UNKNOWN_FLAG) == 0)
{
guint16 index = PANGO_X_GLYPH_INDEX (glyph);
guint16 subfont_index = PANGO_X_GLYPH_SUBFONT (glyph);
PangoXSubfontInfo *subfont;
-
+
subfont = pango_x_find_subfont (font, subfont_index);
if (subfont)
{
fs = pango_x_get_font_struct (font, subfont);
if (!fs)
continue;
-
+
if (fs->fid != old_fid)
{
FLUSH;
@@ -448,7 +448,7 @@ pango_x_render (Display *display,
int baseline;
int stroke_thick;
gunichar wc;
-
+
unknown_glyph:
FLUSH;
@@ -473,7 +473,7 @@ pango_x_render (Display *display,
baseline = glyph_y;
stroke_thick = MAX ((int) (0.5 + 0.075 * (y2 - y1)), 1);
-
+
if (glyph & PANGO_GLYPH_UNKNOWN_FLAG)
wc = glyph & (~PANGO_GLYPH_UNKNOWN_FLAG);
else
@@ -509,7 +509,7 @@ pango_x_render (Display *display,
baseline - stroke_thick + (stroke_thick - tmp_height) / 2,
arrow_x,
baseline - stroke_thick + (stroke_thick - tmp_height) / 2 + tmp_height - 1);
-
+
if ((arrow_x - x1 - hborder) % 2 == 1)
tmp_height += 2;
}
@@ -565,7 +565,7 @@ pango_x_render (Display *display,
XFillRectangle (display, d, gc,
x1, y2 - stroke_thick,
x2 - x1, stroke_thick);
-
+
break;
}
}
@@ -621,12 +621,12 @@ pango_x_font_get_glyph_extents (PangoFont *font,
gunichar wc;
gdouble width_factor;
int w;
-
+
if (glyph & PANGO_GLYPH_UNKNOWN_FLAG)
wc = glyph & (~PANGO_GLYPH_UNKNOWN_FLAG);
else
wc = 0;
-
+
switch (wc)
{
case '\n':
@@ -646,14 +646,14 @@ pango_x_font_get_glyph_extents (PangoFont *font,
width_factor = 1.0;
}
}
-
+
metrics = pango_font_get_metrics (font, NULL);
if (metrics)
{
w = metrics->approximate_char_width * width_factor;
w = PANGO_SCALE * PANGO_PIXELS (w);
-
+
if (ink_rect)
{
ink_rect->x = PANGO_SCALE;
@@ -689,7 +689,7 @@ get_int_prop (Atom atom,
int i;
*val = 0;
-
+
i = 0;
while (i < fs->n_properties)
{
@@ -727,7 +727,7 @@ itemize_string_foreach (PangoFont *font,
guint8 *embedding_levels;
PangoDirection base_dir = PANGO_DIRECTION_LTR;
gboolean finished = FALSE;
-
+
embedding_levels = pango_log2vis_get_embedding_levels (str, -1, &base_dir);
last_shaper = NULL;
@@ -749,8 +749,8 @@ itemize_string_foreach (PangoFont *font,
finished = TRUE;
shaper = NULL;
}
-
- if (p > start &&
+
+ if (p > start &&
(finished ||
(shaper != last_shaper || last_level != embedding_levels[i])))
{
@@ -763,25 +763,25 @@ itemize_string_foreach (PangoFont *font,
analysis.language = language;
analysis.level = last_level;
analysis.extra_attrs = NULL;
-
+
pango_shape (start, p - start, &analysis, glyph_str);
for (j = 0; j < glyph_str->num_glyphs; j++)
(*func) (font, &glyph_str->glyphs[j], data);
-
+
start = p;
}
if (!finished)
{
p = g_utf8_next_char (p);
-
+
last_shaper = shaper;
last_level = embedding_levels[i];
i++;
}
}
-
+
pango_glyph_string_free (glyph_str);
g_free (embedding_levels);
}
@@ -797,24 +797,24 @@ get_font_metrics_from_subfonts (PangoFont *font,
GSList *tmp_list = subfonts;
gboolean first = TRUE;
int total_avg_widths = 0;
- int n_avg_widths = 0;
+ int n_avg_widths = 0;
Atom avg_width_atom;
avg_width_atom = pango_x_fontmap_atom_from_name (xfont->fontmap,
"AVERAGE_WIDTH");
-
+
metrics->ascent = 0;
metrics->descent = 0;
-
+
while (tmp_list)
{
PangoXSubfontInfo *subfont = pango_x_find_subfont (font, GPOINTER_TO_UINT (tmp_list->data));
-
+
if (subfont)
{
XFontStruct *fs = pango_x_get_font_struct (font, subfont);
gint avg_width = 0;
-
+
if (fs)
{
if (first)
@@ -847,7 +847,7 @@ get_font_metrics_from_subfonts (PangoFont *font,
avg_width = PANGO_SCALE * ((fs->min_bounds.width + fs->max_bounds.width) / 2);
}
}
-
+
if (avg_width)
{
total_avg_widths += avg_width;
@@ -856,7 +856,7 @@ get_font_metrics_from_subfonts (PangoFont *font,
}
else
g_warning ("Invalid subfont %d in get_font_metrics_from_subfonts", GPOINTER_TO_UINT (tmp_list->data));
-
+
tmp_list = tmp_list->next;
}
@@ -908,7 +908,7 @@ get_font_metrics_from_string (PangoFont *font,
PangoFontMetrics *metrics)
{
GSList *subfonts = NULL;
-
+
itemize_string_foreach (font, language, str, get_subfonts_foreach, &subfonts);
get_font_metrics_from_subfonts (font, subfonts, metrics);
g_slist_free (subfonts);
@@ -933,7 +933,7 @@ get_total_width_for_string (PangoFont *font,
const char *str)
{
int width = 0;
-
+
itemize_string_foreach (font, language, str, average_width_foreach, &width);
return width;
@@ -946,14 +946,14 @@ pango_x_font_get_metrics (PangoFont *font,
PangoXMetricsInfo *info = NULL; /* Quiet gcc */
PangoXFont *xfont = (PangoXFont *)font;
GSList *tmp_list;
-
+
const char *sample_str = pango_language_get_sample_string (language);
-
+
tmp_list = xfont->metrics_by_lang;
while (tmp_list)
{
info = tmp_list->data;
-
+
if (info->sample_str == sample_str) /* We _don't_ need strcmp */
break;
@@ -977,7 +977,7 @@ pango_x_font_get_metrics (PangoFont *font,
info->metrics = metrics;
}
-
+
return pango_font_metrics_ref (info->metrics);
}
@@ -1017,7 +1017,7 @@ name_for_charset (char *xlfd, char *charset)
for (p = xlfd; *p; p++)
if (*p == '-')
ndashes++;
-
+
if (ndashes == 14) /* Complete XLFD */
{
if (match_end (xlfd, "-*-*"))
@@ -1061,22 +1061,22 @@ pango_x_insert_subfont (PangoFont *font, const char *xlfd)
{
PangoXFont *xfont = (PangoXFont *)font;
PangoXSubfontInfo *info;
-
+
info = g_new (PangoXSubfontInfo, 1);
-
+
info->xlfd = g_strdup (xlfd);
info->font_struct = NULL;
xfont->n_subfonts++;
-
+
if (xfont->n_subfonts > xfont->max_subfonts)
{
xfont->max_subfonts *= 2;
xfont->subfonts = g_renew (PangoXSubfontInfo *, xfont->subfonts, xfont->max_subfonts);
}
-
+
xfont->subfonts[xfont->n_subfonts - 1] = info;
-
+
return xfont->n_subfonts;
}
@@ -1089,11 +1089,11 @@ pango_x_insert_subfont (PangoFont *font, const char *xlfd)
* the result must be freed using g_free().
* @subfont_charsets: location to store a pointer to an array of subfont IDs for each found subfont;
* the result must be freed using g_free().
- *
+ *
* Lists the subfonts of a given font. The result is ordered first by charset,
* and then within each charset, by the order of fonts in the font specification.
*
- * Return value: length of the arrays stored in @subfont_ids and
+ * Return value: length of the arrays stored in @subfont_ids and
* @subfont_charsets.
**/
int
@@ -1113,7 +1113,7 @@ pango_x_list_subfonts (PangoFont *font,
g_return_val_if_fail (n_charsets == 0 || charsets != NULL, 0);
fontmap = pango_x_font_map_for_display (xfont->display);
-
+
subfont_lists = g_new (PangoXSubfont *, n_charsets);
for (j=0; j<n_charsets; j++)
@@ -1122,7 +1122,7 @@ pango_x_list_subfonts (PangoFont *font,
if (!subfont_lists[j])
{
subfont_lists[j] = g_new (PangoXSubfont, xfont->n_fonts);
-
+
for (i = 0; i < xfont->n_fonts; i++)
{
PangoXSubfont subfont = 0;
@@ -1131,14 +1131,14 @@ pango_x_list_subfonts (PangoFont *font,
if (xfont->size == -1)
{
xlfd = name_for_charset (xfont->fonts[i], charsets[j]);
-
+
if (xlfd)
{
int count;
char **names = XListFonts (xfont->display, xlfd, 1, &count);
if (count > 0)
subfont = pango_x_insert_subfont (font, names[0]);
-
+
XFreeFontNames (names);
g_free (xlfd);
}
@@ -1152,7 +1152,7 @@ pango_x_list_subfonts (PangoFont *font,
g_free (xlfd);
}
}
-
+
subfont_lists[j][i] = subfont;
}
@@ -1188,9 +1188,9 @@ pango_x_list_subfonts (PangoFont *font,
* @font: a #PangoFont which must be from the X backend.
* @glyph: the index of a glyph in the font. (Formed
* using the #PANGO_X_MAKE_GLYPH macro)
- *
+ *
* Checks if the given glyph is present in a X font.
- *
+ *
* Return value: %TRUE if the glyph is present.
**/
gboolean
@@ -1206,7 +1206,7 @@ pango_x_has_glyph (PangoFont *font,
subfont = pango_x_find_subfont (font, subfont_index);
if (!subfont)
return FALSE;
-
+
cs = pango_x_get_per_char (font, subfont, char_index);
if (cs && (cs->lbearing != cs->rbearing || cs->width != 0))
@@ -1219,10 +1219,10 @@ pango_x_has_glyph (PangoFont *font,
* pango_x_font_subfont_xlfd:
* @font: a #PangoFont which must be from the X backend.
* @subfont_id: the id of a subfont within the font.
- *
+ *
* Determines the X Logical Font Description for the specified
* subfont.
- *
+ *
* Return value: A newly-allocated string containing the XLFD for the
* subfont. This string must be freed with g_free().
**/
@@ -1302,7 +1302,7 @@ pango_x_font_finalize (GObject *object)
g_slist_foreach (xfont->metrics_by_lang, (GFunc)free_metrics_info, NULL);
g_slist_free (xfont->metrics_by_lang);
-
+
if (xfont->xface)
pango_x_face_remove (xfont->xface, (PangoFont *)xfont);
@@ -1336,13 +1336,13 @@ pango_x_get_shaper_map (PangoLanguage *language)
{
static guint engine_type_id = 0;
static guint render_type_id = 0;
-
+
if (engine_type_id == 0)
{
engine_type_id = g_quark_from_static_string (PANGO_ENGINE_TYPE_SHAPE);
render_type_id = g_quark_from_static_string (PANGO_RENDER_TYPE_X);
}
-
+
return pango_find_map (language, engine_type_id, render_type_id);
}
@@ -1396,14 +1396,14 @@ pango_x_get_per_char (PangoFont *font,
byte1 = (int)(char_index / 256) - fs->min_byte1;
if (byte1 < 0 || byte1 >= subfont->range_byte1)
return NULL;
-
+
byte2 = (int)(char_index % 256) - fs->min_char_or_byte2;
if (byte2 < 0 || byte2 >= subfont->range_byte2)
return NULL;
index = byte1 * subfont->range_byte2 + byte2;
}
-
+
if (fs->per_char)
return &fs->per_char[index];
else
@@ -1425,7 +1425,7 @@ pango_x_find_glyph (PangoFont *font,
subfont = pango_x_find_subfont (font, subfont_index);
if (!subfont)
return FALSE;
-
+
cs = pango_x_get_per_char (font, subfont, char_index);
if (cs && (cs->lbearing != cs->rbearing || cs->width != 0))
@@ -1435,7 +1435,7 @@ pango_x_find_glyph (PangoFont *font,
if (charstruct_return)
*charstruct_return = cs;
-
+
return TRUE;
}
else
@@ -1445,13 +1445,13 @@ pango_x_find_glyph (PangoFont *font,
/**
* pango_x_get_unknown_glyph:
* @font: a #PangoFont.
- *
+ *
* Returns the index of a glyph suitable for drawing unknown characters;
* 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
* representative of a certain Unicode range.)
- *
+ *
* Return value: a glyph index into @font.
**/
PangoGlyph
@@ -1471,12 +1471,12 @@ pango_x_get_unknown_glyph (PangoFont *font)
*
* Renders a #PangoLayoutLine onto an X drawable.
*/
-void
+void
pango_x_render_layout_line (Display *display,
Drawable drawable,
GC gc,
PangoLayoutLine *line,
- int x,
+ int x,
int y)
{
GSList *tmp_list = line->runs;
@@ -1487,11 +1487,11 @@ pango_x_render_layout_line (Display *display,
PangoXContextInfo *info =
g_object_get_qdata (G_OBJECT (context),
g_quark_from_static_string ("pango-x-info"));
-
+
int x_off = 0;
pango_layout_line_get_extents (line,NULL, &overall_rect);
-
+
while (tmp_list)
{
PangoUnderline uline = PANGO_UNDERLINE_NONE;
@@ -1499,7 +1499,7 @@ pango_x_render_layout_line (Display *display,
PangoAttrColor fg_color, bg_color;
gboolean fg_set, bg_set;
GC fg_gc;
-
+
tmp_list = tmp_list->next;
pango_x_get_item_properties (run->item, &uline, &fg_color, &fg_set, &bg_color, &bg_set);
@@ -1563,7 +1563,7 @@ pango_x_render_layout_line (Display *display,
else
XDrawLine (display, drawable, gc,
point_x, y + 3, MIN (point_x + 1, end_x), y + 3);
-
+
counter = (counter + 1) % 2;
}
}
@@ -1577,7 +1577,7 @@ pango_x_render_layout_line (Display *display,
if (fg_set && info->get_gc_func && info->free_gc_func)
info->free_gc_func (context, fg_gc);
-
+
x_off += logical_rect.width;
}
}
@@ -1593,12 +1593,12 @@ pango_x_render_layout_line (Display *display,
*
* Renders a #PangoLayout onto an X drawable.
*/
-void
+void
pango_x_render_layout (Display *display,
Drawable drawable,
GC gc,
PangoLayout *layout,
- int x,
+ int x,
int y)
{
PangoLayoutIter *iter;
@@ -1613,12 +1613,12 @@ pango_x_render_layout (Display *display,
PangoRectangle logical_rect;
PangoLayoutLine *line;
int baseline;
-
+
line = pango_layout_iter_get_line_readonly (iter);
-
+
pango_layout_iter_get_line_extents (iter, NULL, &logical_rect);
baseline = pango_layout_iter_get_baseline (iter);
-
+
pango_x_render_layout_line (display, drawable, gc,
line,
x + PANGO_PIXELS (logical_rect.x),
@@ -1644,10 +1644,10 @@ pango_x_get_item_properties (PangoItem *item,
if (fg_set)
*fg_set = FALSE;
-
+
if (bg_set)
*bg_set = FALSE;
-
+
while (tmp_list)
{
PangoAttribute *attr = tmp_list->data;
@@ -1658,23 +1658,23 @@ pango_x_get_item_properties (PangoItem *item,
if (uline)
*uline = ((PangoAttrInt *)attr)->value;
break;
-
+
case PANGO_ATTR_FOREGROUND:
if (fg_color)
*fg_color = *((PangoAttrColor *)attr);
if (fg_set)
*fg_set = TRUE;
-
+
break;
-
+
case PANGO_ATTR_BACKGROUND:
if (bg_color)
*bg_color = *((PangoAttrColor *)attr);
if (bg_set)
*bg_set = TRUE;
-
+
break;
-
+
default:
break;
}
@@ -1695,29 +1695,29 @@ pango_x_get_item_properties (PangoItem *item,
* Return value: %FALSE, always.
*/
gboolean
-pango_x_apply_ligatures (PangoFont *font,
+pango_x_apply_ligatures (PangoFont *font,
PangoXSubfont subfont_id,
- gunichar **glyphs,
+ gunichar **glyphs,
int *n_glyphs,
- int **clusters)
+ int **clusters)
{
return FALSE;
}
-
+
/**
* pango_x_find_first_subfont:
* @font: A #PangoFont.
* @rfont: A pointer to a #PangoXSubfont.
* @charsets: An array of charsets.
* @n_charsets: The number of charsets in @charsets.
- *
+ *
* Looks for subfonts with the @charset charset,
* in @font, and puts the first one in *@rfont.
*
* Return value: %TRUE if *@rfont now contains a font.
*/
gboolean
-pango_x_find_first_subfont (PangoFont *font,
+pango_x_find_first_subfont (PangoFont *font,
char **charsets,
int n_charsets,
PangoXSubfont *rfont)
@@ -1751,22 +1751,22 @@ pango_x_find_first_subfont (PangoFont *font,
* @glyphs: A pointer to a #PangoGlyphString.
* @text: UTF-8 string.
* @n_chars: Number of UTF-8 seqs in @text.
- *
+ *
* This is a simple fallback shaper, that can be used
- * if no subfont that supports a given script is found.
+ * if no subfont that supports a given script is found.
* For every character in @text, it puts the unknown glyph.
*/
-void
-pango_x_fallback_shape (PangoFont *font,
- PangoGlyphString *glyphs,
- const char *text,
- int n_chars)
+void
+pango_x_fallback_shape (PangoFont *font,
+ PangoGlyphString *glyphs,
+ const char *text,
+ int n_chars)
{
PangoGlyph unknown_glyph = pango_x_get_unknown_glyph (font);
PangoRectangle logical_rect;
const char *p;
int i;
-
+
g_return_if_fail (font);
g_return_if_fail (glyphs);
g_return_if_fail (text);
@@ -1784,7 +1784,7 @@ pango_x_fallback_shape (PangoFont *font,
glyphs->glyphs[i].geometry.width = logical_rect.width;
glyphs->log_clusters[i] = p - text;
-
+
p = g_utf8_next_char (p);
}
}
diff --git a/pango/pangox.h b/pango/pangox.h
index 7944a635..c11e1fa1 100644
--- a/pango/pangox.h
+++ b/pango/pangox.h
@@ -63,7 +63,7 @@ void pango_x_render_layout (Display *display,
Drawable drawable,
GC gc,
PangoLayout *layout,
- int x,
+ int x,
int y);
/* API for rendering modules
@@ -106,21 +106,21 @@ PangoXFontCache *pango_x_font_map_get_font_cache (PangoFontMap *font_map);
char *pango_x_font_subfont_xlfd (PangoFont *font,
PangoXSubfont subfont_id);
-
-
-gboolean pango_x_find_first_subfont (PangoFont *font,
+
+
+gboolean pango_x_find_first_subfont (PangoFont *font,
char **charsets,
int n_charsets,
PangoXSubfont *rfont);
-void pango_x_fallback_shape (PangoFont *font,
- PangoGlyphString *glyphs,
- const char *text,
+void pango_x_fallback_shape (PangoFont *font,
+ PangoGlyphString *glyphs,
+ const char *text,
int n_chars);
-gboolean pango_x_apply_ligatures (PangoFont *font,
- PangoXSubfont subfont,
- gunichar **glyphs,
+gboolean pango_x_apply_ligatures (PangoFont *font,
+ PangoXSubfont subfont,
+ gunichar **glyphs,
int *n_glyphs,
int **clusters);
diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c
index 477cc62c..b5063d60 100644
--- a/pango/pangoxft-font.c
+++ b/pango/pangoxft-font.c
@@ -67,7 +67,7 @@ pango_xft_font_class_init (PangoXftFontClass *class)
PangoFcFontClass *fc_font_class = PANGO_FC_FONT_CLASS (class);
object_class->finalize = pango_xft_font_finalize;
-
+
font_class->get_glyph_extents = pango_xft_font_get_glyph_extents;
fc_font_class->lock_face = pango_xft_font_real_lock_face;
@@ -101,7 +101,7 @@ _pango_xft_font_new (PangoXftFontMap *xftfontmap,
* want integer line spacing, underline positions, etc
*/
PANGO_FC_FONT (xfont)->is_hinted = TRUE;
-
+
xfont->xft_font = NULL;
return xfont;
@@ -110,10 +110,10 @@ _pango_xft_font_new (PangoXftFontMap *xftfontmap,
/**
* _pango_xft_font_get_mini_font:
* @xfont: a #PangoXftFont
- *
+ *
* Gets the font used for drawing the digits in the
* missing-character hex squares
- *
+ *
* 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.
@@ -137,7 +137,7 @@ _pango_xft_font_get_mini_font (PangoXftFont *xfont)
XGlyphInfo extents;
XftFont *mini_xft;
int new_size;
-
+
_pango_xft_font_map_get_info (fcfont->fontmap, &display, &screen);
context = pango_xft_get_context (display, screen);
@@ -146,7 +146,7 @@ _pango_xft_font_get_mini_font (PangoXftFont *xfont)
pango_font_description_set_family_static (desc, "monospace");
new_size = pango_font_description_get_size (fcfont->description) / 2;
-
+
if (pango_font_description_get_size_is_absolute (fcfont->description))
pango_font_description_set_absolute_size (desc, new_size);
else
@@ -158,9 +158,9 @@ _pango_xft_font_get_mini_font (PangoXftFont *xfont)
pango_font_description_free (desc);
g_object_unref (context);
-
+
mini_xft = xft_font_get_font (xfont->mini_font);
-
+
for (i = 0 ; i < 16 ; i++)
{
char c = i < 10 ? '0' + i : 'A' + i - 10;
@@ -169,7 +169,7 @@ _pango_xft_font_get_mini_font (PangoXftFont *xfont)
height = MAX (height, extents.height);
}
-
+
xfont->mini_width = PANGO_SCALE * width;
xfont->mini_height = PANGO_SCALE * height;
xfont->mini_pad = PANGO_SCALE * MIN (height / 2, MAX ((int)(2.2 * height + 27) / 28, 1));
@@ -190,7 +190,7 @@ pango_xft_font_finalize (GObject *object)
if (xfont->xft_font)
{
Display *display;
-
+
_pango_xft_font_map_get_info (fcfont->fontmap, &display, NULL);
XftFontClose (display, xfont->xft_font);
}
@@ -210,11 +210,11 @@ get_glyph_extents_missing (PangoXftFont *xfont,
{
PangoFont *font = PANGO_FONT (xfont);
XftFont *xft_font = xft_font_get_font (font);
-
+
gint cols = (glyph & ~PANGO_GLYPH_UNKNOWN_FLAG) > 0xffff ? 3 : 2;
-
+
_pango_xft_font_get_mini_font (xfont);
-
+
if (ink_rect)
{
ink_rect->x = 0;
@@ -222,7 +222,7 @@ get_glyph_extents_missing (PangoXftFont *xfont,
ink_rect->width = xfont->mini_width * cols + xfont->mini_pad * (2 * cols + 1);
ink_rect->height = xfont->mini_height * 2 + xfont->mini_pad * 5;
}
-
+
if (logical_rect)
{
logical_rect->x = 0;
@@ -242,7 +242,7 @@ get_glyph_extents_xft (PangoFcFont *fcfont,
XGlyphInfo extents;
Display *display;
FT_UInt ft_glyph = glyph;
-
+
_pango_xft_font_map_get_info (fcfont->fontmap, &display, NULL);
XftGlyphExtents (display, xft_font, &ft_glyph, 1, &extents);
@@ -254,7 +254,7 @@ get_glyph_extents_xft (PangoFcFont *fcfont,
ink_rect->width = extents.width * PANGO_SCALE;
ink_rect->height = extents.height * PANGO_SCALE;
}
-
+
if (logical_rect)
{
logical_rect->x = 0;
@@ -294,7 +294,7 @@ get_glyph_extents_raw (PangoXftFont *xfont,
if (!extents)
{
extents = g_slice_new (Extents);
-
+
pango_fc_font_get_raw_extents (PANGO_FC_FONT (xfont),
FT_LOAD_NO_BITMAP | FT_LOAD_NO_HINTING,
glyph,
@@ -305,7 +305,7 @@ get_glyph_extents_raw (PangoXftFont *xfont,
GUINT_TO_POINTER (glyph),
extents);
}
-
+
if (ink_rect)
*ink_rect = extents->ink_rect;
@@ -356,17 +356,17 @@ load_fallback_font (PangoXftFont *xfont)
XftFont *xft_font;
gboolean size_is_absolute;
double size;
-
+
_pango_xft_font_map_get_info (fcfont->fontmap, &display, &screen);
-
+
size_is_absolute = pango_font_description_get_size_is_absolute (fcfont->description);
size = pango_font_description_get_size (fcfont->description) / PANGO_SCALE;
-
+
xft_font = XftFontOpen (display, screen,
FC_FAMILY, FcTypeString, "sans",
size_is_absolute ? FC_PIXEL_SIZE : FC_SIZE, FcTypeDouble, size,
NULL);
-
+
if (!xft_font)
{
g_warning ("Cannot open fallback font, nothing to do");
@@ -400,11 +400,11 @@ xft_font_get_font (PangoFont *font)
gchar *name = pango_font_description_to_string (fcfont->description);
g_warning ("Cannot open font file for font %s", name);
g_free (name);
-
+
load_fallback_font (xfont);
}
}
-
+
return xfont->xft_font;
}
@@ -412,7 +412,7 @@ static FT_Face
pango_xft_font_real_lock_face (PangoFcFont *font)
{
XftFont *xft_font = xft_font_get_font ((PangoFont *)font);
-
+
return XftLockFace (xft_font);
}
@@ -420,7 +420,7 @@ static void
pango_xft_font_real_unlock_face (PangoFcFont *font)
{
XftFont *xft_font = xft_font_get_font ((PangoFont *)font);
-
+
XftUnlockFace (xft_font);
}
@@ -429,7 +429,7 @@ pango_xft_font_real_has_char (PangoFcFont *font,
gunichar wc)
{
XftFont *xft_font = xft_font_get_font ((PangoFont *)font);
-
+
return XftCharExists (NULL, xft_font, wc);
}
@@ -438,7 +438,7 @@ pango_xft_font_real_get_glyph (PangoFcFont *font,
gunichar wc)
{
XftFont *xft_font = xft_font_get_font ((PangoFont *)font);
-
+
return XftCharIndex (NULL, xft_font, wc);
}
@@ -446,7 +446,7 @@ static void
pango_xft_font_real_shutdown (PangoFcFont *fcfont)
{
PangoXftFont *xfont = PANGO_XFT_FONT (fcfont);
-
+
if (xfont->xft_font)
{
Display *display;
@@ -477,7 +477,7 @@ pango_xft_font_get_font (PangoFont *font)
}
return NULL;
}
-
+
return xft_font_get_font (font);
}
@@ -569,11 +569,11 @@ pango_xft_font_unlock_face (PangoFont *font)
* pango_xft_font_get_glyph:
* @font: a #PangoFont for the Xft backend
* @wc: Unicode codepoint to look up
- *
+ *
* Gets the glyph index for a given Unicode character
* for @font. If you only want to determine
* whether the font has the glyph, use pango_xft_font_has_char().
- *
+ *
* Use pango_fc_font_get_glyph() instead.
*
* Return value: the glyph index, or 0, if the Unicode
@@ -594,9 +594,9 @@ pango_xft_font_get_glyph (PangoFont *font,
* pango_xft_font_has_char:
* @font: a #PangoFont for the Xft backend
* @wc: Unicode codepoint to look up
- *
+ *
* Determines whether @font has a glyph for the codepoint @wc.
- *
+ *
* Use pango_fc_font_has_char() instead.
*
* Return value: %TRUE if @font has the requested codepoint.
diff --git a/pango/pangoxft-fontmap.c b/pango/pangoxft-fontmap.c
index 2e6f8996..6c361282 100644
--- a/pango/pangoxft-fontmap.c
+++ b/pango/pangoxft-fontmap.c
@@ -43,7 +43,7 @@ struct _PangoXftFontMap
Display *display;
int screen;
-
+
/* Function to call on prepared patterns to do final
* config tweaking.
*/
@@ -89,7 +89,7 @@ static void
pango_xft_font_map_finalize (GObject *object)
{
PangoXftFontMap *xftfontmap = PANGO_XFT_FONT_MAP (object);
-
+
if (xftfontmap->renderer)
g_object_unref (xftfontmap->renderer);
@@ -107,14 +107,14 @@ pango_xft_find_font_map (Display *display,
int screen)
{
GSList *tmp_list;
-
+
tmp_list = fontmaps;
while (tmp_list)
{
PangoXftFontMap *xftfontmap = tmp_list->data;
if (xftfontmap->display == display &&
- xftfontmap->screen == screen)
+ xftfontmap->screen == screen)
return PANGO_FONT_MAP (xftfontmap);
tmp_list = tmp_list->next;
@@ -133,7 +133,7 @@ close_display_cb (Display *display,
XExtCodes *extcodes)
{
GSList *tmp_list;
-
+
tmp_list = fontmaps;
while (tmp_list)
{
@@ -162,7 +162,7 @@ register_display (Display *display)
}
registered_displays = g_slist_prepend (registered_displays, display);
-
+
extcodes = XAddExtension (display);
XESetCloseDisplay (display, extcodes->extension, close_display_cb);
}
@@ -171,11 +171,11 @@ register_display (Display *display)
* pango_xft_get_font_map:
* @display: an X display
* @screen: the screen number of a screen within @display
- *
+ *
* Returns the #PangoXftFontmap for the given display and screen.
* The fontmap is owned by Pango and will be valid until
* the display is closed.
- *
+ *
* Return value: a #PangoFontMap object, owned by Pango.
*
* Since: 1.2
@@ -188,16 +188,16 @@ pango_xft_get_font_map (Display *display,
PangoXftFontMap *xftfontmap;
g_return_val_if_fail (display != NULL, NULL);
-
+
fontmap = pango_xft_find_font_map (display, screen);
if (fontmap)
return fontmap;
-
+
/* Make sure that the type system is initialized */
g_type_init ();
xftfontmap = (PangoXftFontMap *)g_object_new (PANGO_TYPE_XFT_FONT_MAP, NULL);
-
+
xftfontmap->display = display;
xftfontmap->screen = screen;
@@ -212,7 +212,7 @@ pango_xft_get_font_map (Display *display,
* pango_xft_shutdown_display:
* @display: an X display
* @screen: the screen number of a screen within @display
- *
+ *
* Release any resources that have been cached for the
* combination of @display and @screen. Note that when the
* X display is closed, resources are released automatically,
@@ -225,7 +225,7 @@ pango_xft_shutdown_display (Display *display,
int screen)
{
PangoFontMap *fontmap;
-
+
fontmap = pango_xft_find_font_map (display, screen);
if (fontmap)
{
@@ -233,11 +233,11 @@ pango_xft_shutdown_display (Display *display,
fontmaps = g_slist_remove (fontmaps, fontmap);
pango_fc_font_map_shutdown (PANGO_FC_FONT_MAP (fontmap));
-
+
xftfontmap->display = NULL;
g_object_unref (fontmap);
}
-}
+}
/**
* pango_xft_set_default_substitute:
@@ -247,7 +247,7 @@ pango_xft_shutdown_display (Display *display,
* on #FcPattern objects.
* @data: data to pass to @func
* @notify: function to call when @data is no longer used.
- *
+ *
* Sets a function that will be called to do final configuration
* substitution on a #FcPattern before it is used to load
* the font. This function can be used to do things like set
@@ -263,14 +263,14 @@ pango_xft_set_default_substitute (Display *display,
GDestroyNotify notify)
{
PangoXftFontMap *xftfontmap = (PangoXftFontMap *)pango_xft_get_font_map (display, screen);
-
+
if (xftfontmap->substitute_destroy)
xftfontmap->substitute_destroy (xftfontmap->substitute_data);
xftfontmap->substitute_func = func;
xftfontmap->substitute_data = data;
xftfontmap->substitute_destroy = notify;
-
+
pango_fc_font_map_cache_clear (PANGO_FC_FONT_MAP (xftfontmap));
}
@@ -278,7 +278,7 @@ pango_xft_set_default_substitute (Display *display,
* pango_xft_substitute_changed:
* @display: an X Display
* @screen: the screen number of a screen within @display
- *
+ *
* Call this function any time the results of the
* default substitution function set with
* pango_xft_set_default_substitute() change.
@@ -292,7 +292,7 @@ pango_xft_substitute_changed (Display *display,
int screen)
{
PangoXftFontMap *xftfontmap = (PangoXftFontMap *)pango_xft_get_font_map (display, screen);
-
+
pango_fc_font_map_cache_clear (PANGO_FC_FONT_MAP (xftfontmap));
}
@@ -315,9 +315,9 @@ _pango_xft_font_map_get_info (PangoFontMap *fontmap,
* @screen: an X screen.
*
* Retrieves a #PangoContext appropriate for rendering with
- * Xft fonts on the given screen of the given display.
+ * Xft fonts on the given screen of the given display.
*
- * Return value: the new #PangoContext.
+ * Return value: the new #PangoContext.
**/
PangoContext *
pango_xft_get_context (Display *display,
@@ -334,10 +334,10 @@ pango_xft_get_context (Display *display,
/**
* _pango_xft_font_map_get_renderer:
* @fontmap: a #PangoXftFontmap
- *
+ *
* Gets the singleton #PangoXFTRenderer for this fontmap.
- *
- * Return value:
+ *
+ * Return value:
**/
PangoRenderer *
_pango_xft_font_map_get_renderer (PangoXftFontMap *xftfontmap)
@@ -355,7 +355,7 @@ pango_xft_font_map_default_substitute (PangoFcFontMap *fcfontmap,
{
PangoXftFontMap *xftfontmap = PANGO_XFT_FONT_MAP (fcfontmap);
double d;
-
+
FcConfigSubstitute (NULL, pattern, FcMatchPattern);
if (xftfontmap->substitute_func)
xftfontmap->substitute_func (pattern, xftfontmap->substitute_data);
diff --git a/pango/pangoxft-private.h b/pango/pangoxft-private.h
index ee5598f1..1ee2da68 100644
--- a/pango/pangoxft-private.h
+++ b/pango/pangoxft-private.h
@@ -59,7 +59,7 @@ typedef struct _PangoXftWarningHistory PangoXftWarningHistory;
struct _PangoXftWarningHistory {
guint get_font : 1;
-};
+};
extern PangoXftWarningHistory _pango_xft_warning_history;
diff --git a/pango/pangoxft-render.c b/pango/pangoxft-render.c
index 0d104191..22cf71c6 100644
--- a/pango/pangoxft-render.c
+++ b/pango/pangoxft-render.c
@@ -38,7 +38,7 @@ struct _PangoXftRendererPrivate
Picture src_picture;
Picture dest_picture;
-
+
XRenderPictFormat *mask_format;
GArray *trapezoids;
@@ -146,7 +146,7 @@ pango_xft_renderer_set_property (GObject *object,
GParamSpec *pspec)
{
PangoXftRenderer *xftrenderer = PANGO_XFT_RENDERER (object);
-
+
switch (prop_id)
{
case PROP_DISPLAY:
@@ -162,8 +162,8 @@ pango_xft_renderer_set_property (GObject *object,
xftrenderer->screen = g_value_get_int (value);
break;
default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
}
}
@@ -230,18 +230,18 @@ draw_glyph (PangoRenderer *renderer,
if (pixel_x < -32768 || pixel_x > 32767 ||
pixel_y < -32768 || pixel_y > 32767)
return;
-
+
flush_trapezoids (xftrenderer);
if (!xftrenderer->priv->glyphs)
xftrenderer->priv->glyphs = g_array_new (FALSE, FALSE,
sizeof (XftGlyphSpec));
-
+
if (xftrenderer->priv->glyph_font != font ||
xftrenderer->priv->glyphs->len == MAX_GLYPHS)
{
flush_glyphs (xftrenderer);
-
+
xftrenderer->priv->glyph_font = g_object_ref (font);
}
@@ -336,7 +336,7 @@ _pango_xft_renderer_draw_unknown_glyph (PangoRenderer *renderer,
int row, col;
int cols;
PangoGlyph glyph;
-
+
PangoFont *mini_font = _pango_xft_font_get_mini_font (xfont);
XftFont *mini_xft_font = pango_xft_font_get_font (mini_font);
if (!mini_xft_font)
@@ -344,14 +344,14 @@ _pango_xft_renderer_draw_unknown_glyph (PangoRenderer *renderer,
_pango_xft_renderer_draw_box_glyph (renderer, gi, glyph_x, glyph_y);
return;
}
-
+
glyph = gi->glyph & ~PANGO_GLYPH_UNKNOWN_FLAG;
-
+
ys[0] = glyph_y - PANGO_SCALE * xft_font->ascent + PANGO_SCALE * (((xft_font->ascent + xft_font->descent) - (xfont->mini_height * 2 + xfont->mini_pad * 5 + PANGO_SCALE / 2) / PANGO_SCALE) / 2);
ys[1] = ys[0] + 2 * xfont->mini_pad + xfont->mini_height;
ys[2] = ys[1] + xfont->mini_height + xfont->mini_pad;
- xs[0] = glyph_x;
+ xs[0] = glyph_x;
xs[1] = xs[0] + 2 * xfont->mini_pad;
xs[2] = xs[1] + xfont->mini_width + xfont->mini_pad;
xs[3] = xs[2] + xfont->mini_width + xfont->mini_pad;
@@ -377,7 +377,7 @@ _pango_xft_renderer_draw_unknown_glyph (PangoRenderer *renderer,
xs[0], ys[0],
xfont->mini_width * cols + xfont->mini_pad * (2 * cols + 1),
xfont->mini_height * 2 + xfont->mini_pad * 5);
-
+
for (row = 0; row < 2; row++)
for (col = 0; col < cols; col++)
{
@@ -448,7 +448,7 @@ pango_xft_renderer_draw_glyphs (PangoRenderer *renderer,
draw_glyph (renderer, font, gi->glyph, glyph_x, glyph_y);
}
}
-
+
x_off += gi->geometry.width;
}
}
@@ -486,7 +486,7 @@ pango_xft_renderer_draw_trapezoid (PangoRenderer *renderer,
if (!xftrenderer->priv->trapezoids)
xftrenderer->priv->trapezoids = g_array_new (FALSE, FALSE,
sizeof (XTrapezoid));
-
+
if (xftrenderer->draw)
{
if (xftrenderer->priv->trapezoids->len > 0 &&
@@ -556,7 +556,7 @@ pango_xft_renderer_real_composite_trapezoids (PangoXftRenderer *xftrenderer,
part);
if (!color)
color = &xftrenderer->priv->default_color;
-
+
xft_color.color.red = color->red;
xft_color.color.green = color->green;
xft_color.color.blue = color->blue;
@@ -595,7 +595,7 @@ pango_xft_renderer_real_composite_glyphs (PangoXftRenderer *xftrenderer,
PANGO_RENDER_PART_FOREGROUND);
if (!color)
color = &xftrenderer->priv->default_color;
-
+
xft_color.color.red = color->red;
xft_color.color.green = color->green;
xft_color.color.blue = color->blue;
@@ -615,10 +615,10 @@ get_renderer (PangoFontMap *fontmap,
PangoRenderer *renderer;
PangoXftRenderer *xftrenderer;
PangoColor pango_color;
-
+
renderer = _pango_xft_font_map_get_renderer (PANGO_XFT_FONT_MAP (fontmap));
xftrenderer = PANGO_XFT_RENDERER (renderer);
-
+
pango_xft_renderer_set_draw (xftrenderer, draw);
pango_color.red = color->color.red;
@@ -634,7 +634,7 @@ static void
release_renderer (PangoRenderer *renderer)
{
PangoXftRenderer *xftrenderer = PANGO_XFT_RENDERER (renderer);
-
+
xftrenderer->priv->alpha = 0xffff;
}
@@ -651,11 +651,11 @@ release_renderer (PangoRenderer *renderer)
*
* Since: 1.8
*/
-void
+void
pango_xft_render_layout (XftDraw *draw,
XftColor *color,
PangoLayout *layout,
- int x,
+ int x,
int y)
{
PangoContext *context;
@@ -688,11 +688,11 @@ pango_xft_render_layout (XftDraw *draw,
*
* Since: 1.8
*/
-void
+void
pango_xft_render_layout_line (XftDraw *draw,
XftColor *color,
PangoLayoutLine *line,
- int x,
+ int x,
int y)
{
PangoContext *context;
@@ -706,7 +706,7 @@ pango_xft_render_layout_line (XftDraw *draw,
context = pango_layout_get_context (line->layout);
fontmap = pango_context_get_font_map (context);
renderer = get_renderer (fontmap, draw, color);
-
+
pango_renderer_draw_layout_line (renderer, line, x, y);
release_renderer (renderer);
@@ -733,13 +733,13 @@ pango_xft_render_layout_line (XftDraw *draw,
*
* Since: 1.8
**/
-void
+void
pango_xft_render_transformed (XftDraw *draw,
XftColor *color,
PangoMatrix *matrix,
PangoFont *font,
PangoGlyphString *glyphs,
- int x,
+ int x,
int y)
{
PangoFontMap *fontmap;
@@ -754,7 +754,7 @@ pango_xft_render_transformed (XftDraw *draw,
renderer = get_renderer (fontmap, draw, color);
pango_renderer_set_matrix (renderer, matrix);
-
+
pango_renderer_draw_glyphs (renderer, font, glyphs, x, y);
release_renderer (renderer);
@@ -783,7 +783,7 @@ pango_xft_render (XftDraw *draw,
g_return_if_fail (color != NULL);
g_return_if_fail (PANGO_XFT_IS_FONT (font));
g_return_if_fail (glyphs != NULL);
-
+
pango_xft_render_transformed (draw, color, NULL, font, glyphs,
x * PANGO_SCALE, y * PANGO_SCALE);
}
@@ -817,16 +817,16 @@ pango_xft_picture_render (Display *display,
g_return_if_fail (dest_picture != None);
g_return_if_fail (PANGO_XFT_IS_FONT (font));
g_return_if_fail (glyphs != NULL);
-
+
fontmap = PANGO_FC_FONT (font)->fontmap;
renderer = _pango_xft_font_map_get_renderer (PANGO_XFT_FONT_MAP (fontmap));
pango_xft_renderer_set_pictures (PANGO_XFT_RENDERER (renderer),
src_picture, dest_picture);
pango_renderer_set_matrix (renderer, NULL);
-
+
pango_renderer_draw_glyphs (renderer, font, glyphs, x * PANGO_SCALE, y * PANGO_SCALE);
-
+
pango_xft_renderer_set_pictures (PANGO_XFT_RENDERER (renderer),
None, None);
}
@@ -835,7 +835,7 @@ pango_xft_picture_render (Display *display,
* pango_xft_renderer_new:
* @display: an X display
* @screen: the index of the screen for @display to which rendering will be done
- *
+ *
* Create a new #PangoXftRenderer to allow rendering Pango objects
* with the Xft library. You must call pango_xft_renderer_set_draw() before
* using the renderer.
@@ -855,7 +855,7 @@ pango_xft_renderer_new (Display *display,
"display", display,
"screen", screen,
NULL);
-
+
return PANGO_RENDERER (xftrenderer);
}
@@ -863,7 +863,7 @@ pango_xft_renderer_new (Display *display,
* pango_xft_renderer_set_draw:
* @xftrenderer: a #PangoXftRenderer
* @draw: a #XftDraw
- *
+ *
* Sets the #XftDraw object that the renderer is drawing to.
* The renderer must not be currently active.
*
@@ -882,7 +882,7 @@ pango_xft_renderer_set_draw (PangoXftRenderer *xftrenderer,
* pango_xft_renderer_set_default_color:
* @xftrenderer: a #XftRenderer
* @default_color: the default foreground color
- *
+ *
* Sets the default foreground color for a #XftRenderer.
*
* Since: 1.8
@@ -892,6 +892,6 @@ pango_xft_renderer_set_default_color (PangoXftRenderer *xftrenderer,
PangoColor *default_color)
{
g_return_if_fail (PANGO_IS_XFT_RENDERER (xftrenderer));
-
+
xftrenderer->priv->default_color = *default_color;
}
diff --git a/pango/pangoxft-render.h b/pango/pangoxft-render.h
index 5313d802..45bd672c 100644
--- a/pango/pangoxft-render.h
+++ b/pango/pangoxft-render.h
@@ -57,7 +57,7 @@ typedef struct _PangoXftRendererPrivate PangoXftRendererPrivate;
*/
struct _PangoXftRenderer
{
- /*< private >*/
+ /*< private >*/
PangoRenderer parent_instance;
Display *display;
@@ -73,7 +73,7 @@ struct _PangoXftRenderer
* the current color and other attributes for @part
* @composite_glyphs: draw the specified glyphs using
* the current foreground color and other foreground
- * attributes
+ * attributes
*
* The class structure for #PangoXftRenderer
*
@@ -81,7 +81,7 @@ struct _PangoXftRenderer
*/
struct _PangoXftRendererClass
{
- /*< private >*/
+ /*< private >*/
PangoRendererClass parent_class;
/*< public >*/
diff --git a/pango/querymodules.c b/pango/querymodules.c
index b30d4d59..cf721423 100644
--- a/pango/querymodules.c
+++ b/pango/querymodules.c
@@ -66,7 +66,7 @@ escape_string (const char *str)
while (TRUE)
{
char c = *str++;
-
+
switch (c)
{
case '\0':
@@ -99,7 +99,7 @@ string_from_script (PangoScript script)
GEnumValue *value;
if (!class)
class = g_type_class_ref (PANGO_TYPE_SCRIPT);
-
+
value = g_enum_get_value (class, script);
if (!value)
{
@@ -110,7 +110,7 @@ string_from_script (PangoScript script)
return value->value_nick;
}
-static void
+static void
query_module (const char *dir, const char *name)
{
void (*list) (PangoEngineInfo **engines, gint *n_engines);
@@ -125,12 +125,12 @@ query_module (const char *dir, const char *name)
path = g_strdup (name);
else
path = g_build_filename (dir, name, NULL);
-
+
module = g_module_open (path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
if (!module)
g_printerr ("Cannot load module %s: %s\n", path, g_module_error ());
-
+
if (module &&
GET_SYMBOL (module, "script_engine_list", list) &&
GET_SYMBOL (module, "script_engine_init", init) &&
@@ -158,7 +158,7 @@ query_module (const char *dir, const char *name)
quote = "";
quoted_path = g_strdup (path);
}
-
+
g_printf ("%s%s%s %s %s %s", quote, quoted_path, quote,
engines[i].id, engines[i].engine_type, engines[i].render_type);
g_free (quoted_path);
@@ -176,11 +176,11 @@ query_module (const char *dir, const char *name)
{
g_printerr ("%s does not export Pango module API\n", path);
}
-
+
g_free (path);
if (module)
g_module_close (module);
-}
+}
static gboolean
show_version(const char *name,
@@ -207,10 +207,10 @@ main (int argc, char **argv)
"Show version numbers", NULL},
{NULL}
};
-
+
context = g_option_context_new ("- [MODULE]...");
g_option_context_add_main_entries (context, entries, NULL);
-
+
if (!g_option_context_parse (context, &argc, &argv, &parse_error))
{
if (parse_error != NULL)
@@ -223,11 +223,11 @@ main (int argc, char **argv)
}
exit(1);
}
-
+
g_option_context_free(context);
-
+
g_type_init ();
-
+
g_printf ("# Pango Modules file\n"
"# Automatically generated file, do not edit\n"
"#\n");
@@ -236,7 +236,7 @@ main (int argc, char **argv)
{
char **dirs;
int i;
-
+
path = pango_config_key_get ("Pango/ModulesPath");
if (!path)
path = g_build_filename (pango_get_lib_subdirectory (),
@@ -263,7 +263,7 @@ main (int argc, char **argv)
if (len > SOEXT_LEN && strcmp (dent + len - SOEXT_LEN, SOEXT) == 0)
query_module (dirs[i], dent);
}
-
+
g_dir_close (dir);
}
}
@@ -273,12 +273,12 @@ main (int argc, char **argv)
else
{
cwd = g_get_current_dir ();
-
+
for (i=1; i<argc; i++)
query_module (cwd, argv[i]);
g_free (cwd);
}
-
+
return 0;
}
diff --git a/pango/reorder-items.c b/pango/reorder-items.c
index aa9bd8c0..23ba5836 100644
--- a/pango/reorder-items.c
+++ b/pango/reorder-items.c
@@ -98,7 +98,7 @@ reorder_items_recurse (GList *items, int n_items)
tmp_list = tmp_list->next;
}
-
+
if (min_level % 2)
{
if (i > level_start_i)
diff --git a/pango/shape.c b/pango/shape.c
index fc165fbe..8bf5c366 100644
--- a/pango/shape.c
+++ b/pango/shape.c
@@ -32,14 +32,14 @@
* @analysis: #PangoAnalysis structure from pango_itemize()
* @glyphs: glyph string in which to store results
*
- * Given a segment of text and the corresponding
+ * Given a segment of text and the corresponding
* #PangoAnalysis structure returned from pango_itemize(),
* convert the characters into glyphs. You may also pass
* in only a substring of the item from pango_itemize().
*/
void
-pango_shape (const gchar *text,
- gint length,
+pango_shape (const gchar *text,
+ gint length,
const PangoAnalysis *analysis,
PangoGlyphString *glyphs)
{
@@ -55,7 +55,7 @@ pango_shape (const gchar *text,
{
/* If a font has been correctly chosen, but no glyphs are output,
* there's probably something wrong with the shaper. Trying to be
- * informative, we print out the font description, but to not
+ * informative, we print out the font description, but to not
* flood the terminal with zillions of the message, we set a flag
* on the font to only err once per font.
*/
@@ -63,7 +63,7 @@ pango_shape (const gchar *text,
if (!warned_quark)
warned_quark = g_quark_from_static_string ("pango-shaper-warned");
-
+
if (!g_object_get_qdata (G_OBJECT (analysis->font), warned_quark))
{
PangoFontDescription *desc;