From 117d73cea35658d5d6d7f58cb519375f00e9ab1b Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Wed, 30 Jul 2003 16:48:12 +0000 Subject: [PATCH] fixed UTF-8 reversed check. 2003-07-30 Manish Singh * tools/pdbgen/app.pl: fixed UTF-8 reversed check. * libgimp/gimptexttool_pdb.c: regenerated (doc string changes, forgot to commit from previous change) --- ChangeLog | 9 ++++++++- libgimp/gimptexttool_pdb.c | 36 ++++++++++++++++++------------------ tools/pdbgen/app.pl | 1 + 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0bfb90b823..2afc712fde 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-07-30 Manish Singh + + * tools/pdbgen/app.pl: fixed UTF-8 reversed check. + + * libgimp/gimptexttool_pdb.c: regenerated (doc string changes, forgot + to commit from previous change) + 2003-07-30 Sven Neumann * app/config/gimprc-blurbs.h: tweaked some blurbs. @@ -10,7 +17,7 @@ 2003-07-30 Dave Neary - plug-ins/common/edge.c: Trivial clean-up. + * plug-ins/common/edge.c: Trivial clean-up. 2003-07-29 Manish Singh diff --git a/libgimp/gimptexttool_pdb.c b/libgimp/gimptexttool_pdb.c index 47fea66ef2..2563ea317d 100644 --- a/libgimp/gimptexttool_pdb.c +++ b/libgimp/gimptexttool_pdb.c @@ -36,7 +36,7 @@ * @antialias: Antialiasing. * @size: The size of text in either pixels or points. * @size_type: The units of specified size. - * @fontname: The fontname (conforming to the X Logical Font Description Conventions). + * @fontname: The name of the font. * * Add text at the specified location as a floating selection or a new * layer. @@ -97,7 +97,7 @@ gimp_text_fontname (gint32 image_ID, * @text: The text to generate. * @size: The size of text in either pixels or points. * @size_type: The units of specified size. - * @fontname: The fontname (conforming to the X Logical Font Description Conventions). + * @fontname: The name of the font. * @width: The width of the specified font. * @height: The height of the specified font. * @ascent: The ascent of the specified font. @@ -164,14 +164,14 @@ gimp_text_get_extents_fontname (const gchar *text, * @antialias: Antialiasing. * @size: The size of text in either pixels or points. * @size_type: The units of specified size. - * @foundry: The font foundry, \"*\" for any. - * @family: The font family, \"*\" for any. - * @weight: The font weight, \"*\" for any. - * @slant: The font slant, \"*\" for any. - * @set_width: The font set-width, \"*\" for any. - * @spacing: The font spacing, \"*\" for any. - * @registry: The font registry, \"*\" for any. - * @encoding: The font encoding, \"*\" for any. + * @foundry: The font foundry. + * @family: The font family. + * @weight: The font weight. + * @slant: The font slant. + * @set_width: The font set-width. + * @spacing: The font spacing. + * @registry: The font registry. + * @encoding: The font encoding. * * Add text at the specified location as a floating selection or a new * layer. @@ -253,14 +253,14 @@ gimp_text (gint32 image_ID, * @text: The text to generate. * @size: The size of text in either pixels or points. * @size_type: The units of specified size. - * @foundry: The font foundry, \"*\" for any. - * @family: The font family, \"*\" for any. - * @weight: The font weight, \"*\" for any. - * @slant: The font slant, \"*\" for any. - * @set_width: The font set-width, \"*\" for any. - * @spacing: The font spacing, \"*\" for any. - * @registry: The font registry, \"*\" for any. - * @encoding: The font encoding, \"*\" for any. + * @foundry: The font foundry. + * @family: The font family. + * @weight: The font weight. + * @slant: The font slant. + * @set_width: The font set-width. + * @spacing: The font spacing. + * @registry: The font registry. + * @encoding: The font encoding. * @width: The width of the specified font. * @height: The height of the specified font. * @ascent: The ascent of the specified font. diff --git a/tools/pdbgen/app.pl b/tools/pdbgen/app.pl index 52302ffecb..e56e93725f 100644 --- a/tools/pdbgen/app.pl +++ b/tools/pdbgen/app.pl @@ -258,6 +258,7 @@ sub marshal_inargs { if ($_->{utf8}) { $reverse = sub { ${$_[0]} =~ s/!//; + ${$_[0]} =~ s/||/&&/; ${$_[0]} =~ s/==/!=/ }; $test = "$var == NULL || " . "!g_utf8_validate ($var, -1, NULL)"