X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcairo.c;h=befab0b4f8f6cac32ba883391c6efeeffea17e6f;hb=25418ddba0f237c3a76f45f28f0cd7ee4275dec3;hp=f959e14c2d37f091694ea704a015cdca3c1c2f75;hpb=b8d97ba13fa4e3c78d3a0bc87803219c88e581ea;p=pspp diff --git a/src/output/cairo.c b/src/output/cairo.c index f959e14c2d..befab0b4f8 100644 --- a/src/output/cairo.c +++ b/src/output/cairo.c @@ -156,6 +156,8 @@ struct xr_driver struct cell_color bg; /* Background color */ struct cell_color fg; /* Foreground color */ + bool transparent; /* true -> do not render background */ + bool systemcolors; /* true -> do not change colors */ int initial_page_number; @@ -164,16 +166,13 @@ struct xr_driver /* Internal state. */ struct render_params *params; + double font_scale; int char_width, char_height; - char *command_name; - char *title; - char *subtitle; cairo_t *cairo; cairo_surface_t *surface; int page_number; /* Current page number. */ int x, y; struct xr_render_fsm *fsm; - int nest; struct string_map heading_vars; }; @@ -190,7 +189,7 @@ static void xr_measure_cell_width (void *, const struct table_cell *, static int xr_measure_cell_height (void *, const struct table_cell *, int width); static void xr_draw_cell (void *, const struct table_cell *, int color_idx, - int bb[TABLE_N_AXES][2], + int bb[TABLE_N_AXES][2], int valign_offset, int spill[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2]); static int xr_adjust_break (void *, const struct table_cell *, @@ -432,7 +431,7 @@ parse_color__ (const char *s, struct cell_color *color) } /* rgb(r,g,b) */ - if (sscanf (s, "rgb (%"SCNi8" , %"SCNi8" , %"SCNi8" ) %n", + if (sscanf (s, "rgb (%"SCNi8" , %"SCNi8" , %"SCNi8") %n", &r, &g, &b, &len) == 3 && !s[len]) { @@ -443,7 +442,7 @@ parse_color__ (const char *s, struct cell_color *color) } /* rgba(r,g,b,a), ignoring a. */ - if (sscanf (s, "rgba (%"SCNi8" , %"SCNi8" , %"SCNi8", %*f ) %n", + if (sscanf (s, "rgba (%"SCNi8" , %"SCNi8" , %"SCNi8", %*f) %n", &r, &g, &b, &len) == 3 && !s[len]) { @@ -564,6 +563,9 @@ apply_options (struct xr_driver *xr, struct string_map *o) parse_color (d, o, "background-color", "#FFFFFFFFFFFF", &xr->bg); parse_color (d, o, "foreground-color", "#000000000000", &xr->fg); + xr->transparent = parse_boolean (opt (d, o, "transparent", "false")); + xr->systemcolors = parse_boolean (opt (d, o, "systemcolors", "false")); + /* Get dimensions. */ parse_paper_size (opt (d, o, "paper-size", ""), &paper_width, &paper_length); left_margin = parse_dimension (opt (d, o, "left-margin", ".5in")); @@ -592,7 +594,8 @@ apply_options (struct xr_driver *xr, struct string_map *o) } static struct xr_driver * -xr_allocate (const char *name, int device_type, struct string_map *o) +xr_allocate (const char *name, int device_type, struct string_map *o, + double font_scale) { struct xr_driver *xr = xzalloc (sizeof *xr); struct output_driver *d = &xr->driver; @@ -601,6 +604,13 @@ xr_allocate (const char *name, int device_type, struct string_map *o) string_map_init (&xr->heading_vars); + /* This is a nasty kluge for an issue that does not make sense. On any + surface other than a screen (e.g. for output to PDF or PS or SVG), the + fonts are way too big by default. A "9-point" font seems to appear about + 16 points tall. We use a scale factor for these surfaces to help, but the + underlying issue is a mystery. */ + xr->font_scale = font_scale; + apply_options (xr, o); return xr; @@ -797,22 +807,19 @@ xr_set_cairo (struct xr_driver *xr, cairo_t *cairo) xr->params->rtl = render_direction_rtl (); } - cairo_set_source_rgb (xr->cairo, - xr->fg.r / 255.0, xr->fg.g / 255.0, xr->fg.b / 255.0); + if (!xr->systemcolors) + cairo_set_source_rgb (xr->cairo, + xr->fg.r / 255.0, xr->fg.g / 255.0, xr->fg.b / 255.0); } static struct output_driver * -xr_create (const char *file_name, enum settings_output_devices device_type, +xr_create (struct file_handle *fh, enum settings_output_devices device_type, struct string_map *o, enum xr_output_type file_type) { - struct xr_driver *xr; - cairo_status_t status; - double width_pt, length_pt; - - xr = xr_allocate (file_name, device_type, o); - - width_pt = xr_to_pt (xr->width + xr->left_margin + xr->right_margin); - length_pt = xr_to_pt (xr->length + xr->top_margin + xr->bottom_margin); + const char *file_name = fh_get_file_name (fh); + struct xr_driver *xr = xr_allocate (file_name, device_type, o, 72.0 / 128.0); + double width_pt = xr_to_pt (xr->width + xr->left_margin + xr->right_margin); + double length_pt = xr_to_pt (xr->length + xr->top_margin + xr->bottom_margin); if (file_type == XR_PDF) xr->surface = cairo_pdf_surface_create (file_name, width_pt, length_pt); else if (file_type == XR_PS) @@ -822,20 +829,22 @@ xr_create (const char *file_name, enum settings_output_devices device_type, else NOT_REACHED (); - status = cairo_surface_status (xr->surface); + cairo_status_t status = cairo_surface_status (xr->surface); if (status != CAIRO_STATUS_SUCCESS) { msg (ME, _("error opening output file `%s': %s"), - file_name, cairo_status_to_string (status)); + file_name, cairo_status_to_string (status)); goto error; } if (!xr_check_fonts (xr->surface, xr->fonts, xr->width, xr->length)) goto error; + fh_unref (fh); return &xr->driver; error: + fh_unref (fh); output_driver_destroy (&xr->driver); return NULL; } @@ -844,27 +853,21 @@ static struct output_driver * xr_pdf_create (struct file_handle *fh, enum settings_output_devices device_type, struct string_map *o) { - struct output_driver *od = xr_create (fh_get_file_name (fh), device_type, o, XR_PDF); - fh_unref (fh); - return od ; + return xr_create (fh, device_type, o, XR_PDF); } static struct output_driver * xr_ps_create (struct file_handle *fh, enum settings_output_devices device_type, struct string_map *o) { - struct output_driver *od = xr_create (fh_get_file_name (fh), device_type, o, XR_PS); - fh_unref (fh); - return od ; + return xr_create (fh, device_type, o, XR_PS); } static struct output_driver * xr_svg_create (struct file_handle *fh, enum settings_output_devices device_type, struct string_map *o) { - struct output_driver *od = xr_create (fh_get_file_name (fh), device_type, o, XR_SVG); - fh_unref (fh); - return od ; + return xr_create (fh, device_type, o, XR_SVG); } static void @@ -880,9 +883,9 @@ xr_destroy (struct output_driver *driver) cairo_surface_finish (xr->surface); cairo_status_t status = cairo_status (xr->cairo); if (status != CAIRO_STATUS_SUCCESS) - msg (ME, _("error drawing output for %s driver: %s"), - output_driver_get_name (driver), - cairo_status_to_string (status)); + fprintf (stderr, _("error drawing output for %s driver: %s"), + output_driver_get_name (driver), + cairo_status_to_string (status)); cairo_surface_destroy (xr->surface); cairo_destroy (xr->cairo); @@ -995,13 +998,15 @@ xr_submit (struct output_driver *driver, const struct output_item *output_item) void xr_driver_next_page (struct xr_driver *xr, cairo_t *cairo) { - cairo_save (cairo); - cairo_set_source_rgb (cairo, - xr->bg.r / 255.0, xr->bg.g / 255.0, xr->bg.b / 255.0); - cairo_rectangle (cairo, 0, 0, xr->width, xr->length); - cairo_fill (cairo); - cairo_restore (cairo); - + if (!xr->transparent) + { + cairo_save (cairo); + cairo_set_source_rgb (cairo, + xr->bg.r / 255.0, xr->bg.g / 255.0, xr->bg.b / 255.0); + cairo_rectangle (cairo, 0, 0, xr->width, xr->length); + cairo_fill (cairo); + cairo_restore (cairo); + } cairo_translate (cairo, xr_to_pt (xr->left_margin), xr_to_pt (xr->top_margin + xr->headings_height[0])); @@ -1083,7 +1088,8 @@ dump_line (struct xr_driver *xr, int x0, int y0, int x1, int y1, int style, const struct cell_color *color) { cairo_new_path (xr->cairo); - set_source_rgba (xr->cairo, color); + if (!xr->systemcolors) + set_source_rgba (xr->cairo, color); cairo_set_line_width ( xr->cairo, xr_to_pt (style == RENDER_LINE_THICK ? XR_LINE_WIDTH * 2 @@ -1340,36 +1346,41 @@ static void xr_clip (struct xr_driver *, int clip[TABLE_N_AXES][2]); static void xr_draw_cell (void *xr_, const struct table_cell *cell, int color_idx, - int bb[TABLE_N_AXES][2], + int bb[TABLE_N_AXES][2], int valign_offset, int spill[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2]) { struct xr_driver *xr = xr_; int w, h, brk; - cairo_save (xr->cairo); - int bg_clip[TABLE_N_AXES][2]; - for (int axis = 0; axis < TABLE_N_AXES; axis++) + if (!xr->transparent) { - bg_clip[axis][0] = clip[axis][0]; - if (bb[axis][0] == clip[axis][0]) - bg_clip[axis][0] -= spill[axis][0]; - - bg_clip[axis][1] = clip[axis][1]; - if (bb[axis][1] == clip[axis][1]) - bg_clip[axis][1] += spill[axis][1]; + cairo_save (xr->cairo); + int bg_clip[TABLE_N_AXES][2]; + for (int axis = 0; axis < TABLE_N_AXES; axis++) + { + bg_clip[axis][0] = clip[axis][0]; + if (bb[axis][0] == clip[axis][0]) + bg_clip[axis][0] -= spill[axis][0]; + + bg_clip[axis][1] = clip[axis][1]; + if (bb[axis][1] == clip[axis][1]) + bg_clip[axis][1] += spill[axis][1]; + } + xr_clip (xr, bg_clip); + set_source_rgba (xr->cairo, &cell->style->font_style.bg[color_idx]); + fill_rectangle (xr, + bb[H][0] - spill[H][0], + bb[V][0] - spill[V][0], + bb[H][1] + spill[H][1], + bb[V][1] + spill[V][1]); + cairo_restore (xr->cairo); } - xr_clip (xr, bg_clip); - set_source_rgba (xr->cairo, &cell->style->font_style.bg[color_idx]); - fill_rectangle (xr, - bb[H][0] - spill[H][0], - bb[V][0] - spill[V][0], - bb[H][1] + spill[H][1], - bb[V][1] + spill[V][1]); - cairo_restore (xr->cairo); - cairo_save (xr->cairo); - set_source_rgba (xr->cairo, &cell->style->font_style.fg[color_idx]); + if (!xr->systemcolors) + set_source_rgba (xr->cairo, &cell->style->font_style.fg[color_idx]); + + bb[V][0] += valign_offset; for (int axis = 0; axis < TABLE_N_AXES; axis++) { @@ -1422,31 +1433,45 @@ xr_clip (struct xr_driver *xr, int clip[TABLE_N_AXES][2]) } static void -add_attr_with_start (PangoAttrList *list, PangoAttribute *attr, guint start_index) +add_attr (PangoAttrList *list, PangoAttribute *attr, + guint start_index, guint end_index) { attr->start_index = start_index; + attr->end_index = end_index; pango_attr_list_insert (list, attr); } static void -markup_escape (const char *in, struct string *out) -{ - for (int c = *in++; c; c = *in++) - switch (c) - { - case '&': - ds_put_cstr (out, "&"); - break; - case '<': - ds_put_cstr (out, "<"); - break; - case '>': - ds_put_cstr (out, ">"); - break; - default: - ds_put_byte (out, c); - break; - } +markup_escape (struct string *out, unsigned int options, + const char *in, size_t len) +{ + if (!(options & TAB_MARKUP)) + { + ds_put_substring (out, ss_buffer (in, len == -1 ? strlen (in) : len)); + return; + } + + while (len-- > 0) + { + int c = *in++; + switch (c) + { + case 0: + return; + case '&': + ds_put_cstr (out, "&"); + break; + case '<': + ds_put_cstr (out, "<"); + break; + case '>': + ds_put_cstr (out, ">"); + break; + default: + ds_put_byte (out, c); + break; + } + } } static int @@ -1477,7 +1502,7 @@ xr_layout_cell_text (struct xr_driver *xr, const struct table_cell *cell, { PangoFontDescription *desc = parse_font ( font_style->typeface, - font_style->size ? font_style->size * 1000 * 72 / 128 : 10000, + font_style->size ? font_style->size * 1000 * xr->font_scale : 10000, font_style->bold, font_style->italic); if (desc) { @@ -1510,6 +1535,7 @@ xr_layout_cell_text (struct xr_driver *xr, const struct table_cell *cell, } struct string tmp = DS_EMPTY_INITIALIZER; + PangoAttrList *attrs = NULL; /* Deal with an oddity of the Unicode line-breaking algorithm (or perhaps in Pango's implementation of it): it will break after a period or a comma @@ -1525,7 +1551,23 @@ xr_layout_cell_text (struct xr_driver *xr, const struct table_cell *cell, happen with grouping like 1,234,567.89 or 1.234.567,89 because if groups are present then there will always be a digit on both sides of every period and comma. */ - if (options & TAB_ROTATE || bb[H][1] != INT_MAX) + if (options & TAB_MARKUP) + { + PangoAttrList *new_attrs; + char *new_text; + if (pango_parse_markup (text, -1, 0, &new_attrs, &new_text, NULL, NULL)) + { + attrs = new_attrs; + tmp.ss = ss_cstr (new_text); + tmp.capacity = tmp.ss.length; + } + else + { + /* XXX should we report the error? */ + ds_put_cstr (&tmp, text); + } + } + else if (options & TAB_ROTATE || bb[H][1] != INT_MAX) { const char *decimal = text + strcspn (text, ".,"); if (decimal[0] @@ -1533,91 +1575,106 @@ xr_layout_cell_text (struct xr_driver *xr, const struct table_cell *cell, && (decimal == text || !c_isdigit (decimal[-1]))) { ds_extend (&tmp, strlen (text) + 16); - ds_put_substring (&tmp, ss_buffer (text, decimal - text + 1)); + markup_escape (&tmp, options, text, decimal - text + 1); ds_put_unichar (&tmp, 0x2060 /* U+2060 WORD JOINER */); - ds_put_cstr (&tmp, decimal + 1); + markup_escape (&tmp, options, decimal + 1, -1); } } - if (cell->n_footnotes) + if (font_style->underline) { - int footnote_adjustment; - if (cell->n_footnotes == 1 && halign == TABLE_HALIGN_RIGHT) - { - const char *marker = cell->footnotes[0]->marker; - pango_layout_set_text (font->layout, marker, strlen (marker)); - - PangoAttrList *attrs = pango_attr_list_new (); - pango_attr_list_insert (attrs, pango_attr_rise_new (7000)); - pango_layout_set_attributes (font->layout, attrs); - pango_attr_list_unref (attrs); - - int w = get_layout_dimension (font->layout, X); - int right_margin = px_to_xr (cell_style->margin[X][R]); - footnote_adjustment = MIN (w, right_margin); - - pango_layout_set_attributes (font->layout, NULL); - } - else - footnote_adjustment = px_to_xr (cell_style->margin[X][R]); - - if (R) - bb[X][R] += footnote_adjustment; - else - bb[X][R] -= footnote_adjustment; + if (!attrs) + attrs = pango_attr_list_new (); + pango_attr_list_insert (attrs, pango_attr_underline_new ( + PANGO_UNDERLINE_SINGLE)); + } + if (cell->n_footnotes || cell->n_subscripts || cell->superscript) + { + /* If we haven't already put TEXT into tmp, do it now. */ if (ds_is_empty (&tmp)) { ds_extend (&tmp, strlen (text) + 16); - ds_put_cstr (&tmp, text); + markup_escape (&tmp, options, text, -1); } - size_t initial_length = ds_length (&tmp); + size_t subscript_ofs = ds_length (&tmp); + for (size_t i = 0; i < cell->n_subscripts; i++) + { + if (i) + ds_put_byte (&tmp, ','); + ds_put_cstr (&tmp, cell->subscripts[i]); + } + + size_t superscript_ofs = ds_length (&tmp); + if (cell->superscript) + ds_put_cstr (&tmp, cell->superscript); + + size_t footnote_ofs = ds_length (&tmp); for (size_t i = 0; i < cell->n_footnotes; i++) { if (i) ds_put_byte (&tmp, ','); + ds_put_cstr (&tmp, cell->footnotes[i]->marker); + } - const char *marker = cell->footnotes[i]->marker; - if (options & TAB_MARKUP) - markup_escape (marker, &tmp); - else - ds_put_cstr (&tmp, marker); + /* Allow footnote markers to occupy the right margin. That way, numbers + in the column are still aligned. */ + if (cell->n_footnotes && halign == TABLE_HALIGN_RIGHT) + { + /* Measure the width of the footnote marker, so we know how much we + need to make room for. */ + pango_layout_set_text (font->layout, ds_cstr (&tmp) + footnote_ofs, + ds_length (&tmp) - footnote_ofs); + + PangoAttrList *fn_attrs = pango_attr_list_new (); + pango_attr_list_insert ( + fn_attrs, pango_attr_scale_new (PANGO_SCALE_SMALL)); + pango_attr_list_insert (fn_attrs, pango_attr_rise_new (3000)); + pango_layout_set_attributes (font->layout, fn_attrs); + pango_attr_list_unref (fn_attrs); + int footnote_width = get_layout_dimension (font->layout, X); + + /* Bound the adjustment by the width of the right margin. */ + int right_margin = px_to_xr (cell_style->margin[X][R]); + int footnote_adjustment = MIN (footnote_width, right_margin); + + /* Adjust the bounding box. */ + if (options & TAB_ROTATE) + footnote_adjustment = -footnote_adjustment; + bb[X][R] += footnote_adjustment; + + /* Clean up. */ + pango_layout_set_attributes (font->layout, NULL); } - if (options & TAB_MARKUP) - pango_layout_set_markup (font->layout, - ds_cstr (&tmp), ds_length (&tmp)); - else - pango_layout_set_text (font->layout, ds_cstr (&tmp), ds_length (&tmp)); - - PangoAttrList *attrs = pango_attr_list_new (); - if (font_style->underline) - pango_attr_list_insert (attrs, pango_attr_underline_new ( - PANGO_UNDERLINE_SINGLE)); - add_attr_with_start (attrs, pango_attr_rise_new (7000), initial_length); - add_attr_with_start ( - attrs, pango_attr_font_desc_new (font->desc), initial_length); + /* Set attributes. */ + if (!attrs) + attrs = pango_attr_list_new (); + add_attr (attrs, pango_attr_font_desc_new (font->desc), subscript_ofs, + PANGO_ATTR_INDEX_TO_TEXT_END); + add_attr (attrs, pango_attr_scale_new (PANGO_SCALE_SMALL), + subscript_ofs, PANGO_ATTR_INDEX_TO_TEXT_END); + if (cell->n_subscripts) + add_attr (attrs, pango_attr_rise_new (-3000), subscript_ofs, + superscript_ofs - subscript_ofs); + if (cell->superscript || cell->n_footnotes) + add_attr (attrs, pango_attr_rise_new (3000), superscript_ofs, + PANGO_ATTR_INDEX_TO_TEXT_END); + } + + /* Set the attributes, if any. */ + if (attrs) + { pango_layout_set_attributes (font->layout, attrs); pango_attr_list_unref (attrs); } - else - { - const char *content = ds_is_empty (&tmp) ? text : ds_cstr (&tmp); - if (options & TAB_MARKUP) - pango_layout_set_markup (font->layout, content, -1); - else - pango_layout_set_text (font->layout, content, -1); - if (font_style->underline) - { - PangoAttrList *attrs = pango_attr_list_new (); - pango_attr_list_insert (attrs, pango_attr_underline_new ( - PANGO_UNDERLINE_SINGLE)); - pango_layout_set_attributes (font->layout, attrs); - pango_attr_list_unref (attrs); - } - } + /* Set the text. */ + if (ds_is_empty (&tmp)) + pango_layout_set_text (font->layout, text, -1); + else + pango_layout_set_text (font->layout, ds_cstr (&tmp), ds_length (&tmp)); ds_destroy (&tmp); pango_layout_set_alignment (font->layout, @@ -1718,7 +1775,7 @@ xr_layout_cell_text (struct xr_driver *xr, const struct table_cell *cell, be useful for debugging issues with breaking. */ if (0) { - if (best && !xr->nest) + if (best) dump_line (xr, -xr->left_margin, best, xr->width + xr->right_margin, best, RENDER_LINE_SINGLE, @@ -1751,13 +1808,9 @@ xr_layout_cell (struct xr_driver *xr, const struct table_cell *cell, { if (clip[H][0] != clip[H][1]) { - int offset = (xr->nest) * XR_POINT; - cairo_save (xr->cairo); cairo_set_source_rgb (xr->cairo, 0, 0, 1); - dump_rectangle (xr, - bb[H][0] + offset, bb[V][0] + offset, - bb[H][1] - offset, bb[V][1] - offset); + dump_rectangle (xr, bb[H][0], bb[V][0], bb[H][1], bb[V][1]); cairo_restore (xr->cairo); } } @@ -1801,7 +1854,7 @@ struct xr_rendering struct xr_driver * xr_driver_create (cairo_t *cairo, struct string_map *options) { - struct xr_driver *xr = xr_allocate ("cairo", 0, options); + struct xr_driver *xr = xr_allocate ("cairo", 0, options, 1.0); xr_set_cairo (xr, cairo); return xr; } @@ -1981,10 +2034,10 @@ xr_draw_png_chart (const struct chart_item *item, number_pos = strchr (file_name_template, '#'); if (number_pos != NULL) - file_name = xasprintf ("%.*s%d%s", (int) (number_pos - file_name_template), + file_name = xasprintf ("%.*s%d%s.png", (int) (number_pos - file_name_template), file_name_template, number, number_pos + 1); else - file_name = xstrdup (file_name_template); + file_name = xasprintf ("%s.png", file_name_template); surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, width, length); cr = cairo_create (surface); @@ -2006,7 +2059,48 @@ xr_draw_png_chart (const struct chart_item *item, return file_name; } + + +char * +xr_draw_eps_chart (const struct chart_item *item, + const char *file_name_template, int number, + const struct cell_color *fg, + const struct cell_color *bg) +{ + const int width = 640; + const int length = 480; + + cairo_surface_t *surface; + const char *number_pos; + char *file_name; + cairo_t *cr; + + number_pos = strchr (file_name_template, '#'); + if (number_pos != NULL) + file_name = xasprintf ("%.*s%d%s.eps", (int) (number_pos - file_name_template), + file_name_template, number, number_pos + 1); + else + file_name = xasprintf ("%s.eps", file_name_template); + + surface = cairo_ps_surface_create (file_name, width, length); + cairo_ps_surface_set_eps (surface, true); + cr = cairo_create (surface); + + cairo_set_source_rgb (cr, bg->r / 255.0, bg->g / 255.0, bg->b / 255.0); + cairo_paint (cr); + + cairo_set_source_rgb (cr, fg->r / 255.0, fg->g / 255.0, fg->b / 255.0); + + xr_draw_chart (item, cr, 0.0, 0.0, width, length); + + cairo_destroy (cr); + cairo_surface_destroy (surface); + + return file_name; +} + + struct xr_table_state { struct xr_render_fsm fsm; @@ -2186,3 +2280,23 @@ xr_render_output_item (struct xr_driver *xr, else return NULL; } + +bool +xr_draw_svg_file (struct xr_rendering *r, + const char *filename) +{ + int width, height; + g_assert (r); + xr_rendering_measure (r, &width, &height); + cairo_surface_t *surface = cairo_svg_surface_create (filename, width, height); + if (!surface) + { + g_error ("Could not create cairo svg surface with file %s", filename); + return FALSE; + } + cairo_t *cr = cairo_create (surface); + xr_rendering_draw (r, cr, 0, 0, width, height); + cairo_destroy (cr); + cairo_surface_destroy (surface); + return TRUE; +}