Commit 361b1f56 authored by Manish Singh's avatar Manish Singh Committed by Manish Singh

tools/Makefile.am app/Makefile.am app, tools, and user dir bumped to

2004-04-15  Manish Singh  <yosh@gimp.org>

        * tools/Makefile.am
        * app/Makefile.am
        * configure.in: app, tools, and user dir bumped to version 2.1 names.

        * app/text/gimpfontlist.c: since we now depend on pango 1.4, we can
	use pango_fc_font_description_from_pattern() instead of our
	cut-n-paste function, gimp_font_list_font_desc_from_pattern().
parent 2e103fa8
......@@ -12,7 +12,7 @@ config.guess
config.sub
ltmain.sh
gimp.spec
gimptool-2.0
gimptool-2.1
gimptool-win32.c
gimp-2.0.pc
gimpthumb-2.0.pc
......
......@@ -3,4 +3,4 @@ Makefile.in
makefile.mingw
.deps
.libs
gimp-2.0
gimp-2.1
......@@ -28,12 +28,12 @@ SUBDIRS = \
scriptdata =
if ENABLE_GIMP_CONSOLE
bin_PROGRAMS = gimp-2.0 gimp-console-2.0
bin_PROGRAMS = gimp-2.1 gimp-console-2.1
else
bin_PROGRAMS = gimp-2.0
bin_PROGRAMS = gimp-2.1
endif
gimp_2_0_SOURCES = \
gimp_2_1_SOURCES = \
app_procs.c \
app_procs.h \
main.c \
......@@ -74,13 +74,13 @@ INCLUDES = \
$(PANGOFT2_CFLAGS) \
-I$(includedir)
gimp_2_0_LDFLAGS = \
gimp_2_1_LDFLAGS = \
$(mwindows) \
-u $(SYMPREFIX)gimp_container_filter \
-u $(SYMPREFIX)gimp_xml_parser_new \
-u $(SYMPREFIX)gimp_drawable_stroke_vectors
gimp_2_0_LDADD = \
gimp_2_1_LDADD = \
config/libappconfig.a \
gui/libappgui.a \
display/libappdisplay.a \
......@@ -115,10 +115,10 @@ gimp_2_0_LDADD = \
$(REGEXREPL)
if ENABLE_GIMP_CONSOLE
gimp_console_2_0_SOURCES = $(gimp_2_0_SOURCES)
gimp_console_2_0_LDFLAGS = $(gimp_2_0_LDFLAGS)
gimp_console_2_1_SOURCES = $(gimp_2_1_SOURCES)
gimp_console_2_1_LDFLAGS = $(gimp_2_1_LDFLAGS)
gimp_console_2_0_LDADD = \
gimp_console_2_1_LDADD = \
config/libappconfig.a \
pdb/libapppdb.a \
core/libappcore.a \
......
......@@ -27,6 +27,7 @@
#include <glib-object.h>
#include <pango/pangoft2.h>
#include <pango/pangofc-fontmap.h>
#include "text-types.h"
......@@ -222,117 +223,6 @@ gimp_font_list_load_aliases (GimpFontList *list,
}
}
/* This is copied straight from _pango_fc_font_desc_from_pattern, minus
* the size bits.
* FIXME: Use pango_fc_font_description_from_pattern from 1.4 when we can.
*/
static PangoFontDescription *
gimp_font_list_font_desc_from_pattern (FcPattern *pattern)
{
PangoFontDescription *desc;
PangoStyle style;
PangoWeight weight;
PangoStretch stretch;
FcChar8 *s;
gint i;
FcResult res;
desc = pango_font_description_new ();
res = FcPatternGetString (pattern, FC_FAMILY, 0, (FcChar8 **) &s);
g_assert (res == FcResultMatch);
pango_font_description_set_family (desc, (gchar *)s);
if (FcPatternGetInteger (pattern, FC_SLANT, 0, &i) == FcResultMatch)
{
switch (i)
{
case FC_SLANT_ROMAN:
style = PANGO_STYLE_NORMAL;
break;
case FC_SLANT_ITALIC:
style = PANGO_STYLE_ITALIC;
break;
case FC_SLANT_OBLIQUE:
style = PANGO_STYLE_OBLIQUE;
break;
default:
style = PANGO_STYLE_NORMAL;
break;
}
}
else
style = PANGO_STYLE_NORMAL;
pango_font_description_set_style (desc, style);
if (FcPatternGetInteger (pattern, FC_WEIGHT, 0, &i) == FcResultMatch)
{
if (i < FC_WEIGHT_LIGHT)
weight = PANGO_WEIGHT_ULTRALIGHT;
else if (i < (FC_WEIGHT_LIGHT + FC_WEIGHT_MEDIUM) / 2)
weight = PANGO_WEIGHT_LIGHT;
else if (i < (FC_WEIGHT_MEDIUM + FC_WEIGHT_DEMIBOLD) / 2)
weight = PANGO_WEIGHT_NORMAL;
else if (i < (FC_WEIGHT_DEMIBOLD + FC_WEIGHT_BOLD) / 2)
weight = 600;
else if (i < (FC_WEIGHT_BOLD + FC_WEIGHT_BLACK) / 2)
weight = PANGO_WEIGHT_BOLD;
else
weight = PANGO_WEIGHT_ULTRABOLD;
}
else
weight = PANGO_WEIGHT_NORMAL;
pango_font_description_set_weight (desc, weight);
if (FcPatternGetInteger (pattern, FC_WIDTH, 0, &i) == FcResultMatch)
{
switch (i)
{
case FC_WIDTH_NORMAL:
stretch = PANGO_STRETCH_NORMAL;
break;
case FC_WIDTH_ULTRACONDENSED:
stretch = PANGO_STRETCH_ULTRA_CONDENSED;
break;
case FC_WIDTH_EXTRACONDENSED:
stretch = PANGO_STRETCH_EXTRA_CONDENSED;
break;
case FC_WIDTH_CONDENSED:
stretch = PANGO_STRETCH_CONDENSED;
break;
case FC_WIDTH_SEMICONDENSED:
stretch = PANGO_STRETCH_SEMI_CONDENSED;
break;
case FC_WIDTH_SEMIEXPANDED:
stretch = PANGO_STRETCH_SEMI_EXPANDED;
break;
case FC_WIDTH_EXPANDED:
stretch = PANGO_STRETCH_EXPANDED;
break;
case FC_WIDTH_EXTRAEXPANDED:
stretch = PANGO_STRETCH_EXTRA_EXPANDED;
break;
case FC_WIDTH_ULTRAEXPANDED:
stretch = PANGO_STRETCH_ULTRA_EXPANDED;
break;
default:
stretch = PANGO_STRETCH_NORMAL;
break;
}
}
else
stretch = PANGO_STRETCH_NORMAL;
pango_font_description_set_stretch (desc, stretch);
pango_font_description_set_variant (desc, PANGO_VARIANT_NORMAL);
return desc;
}
static void
gimp_font_list_load_names (GimpFontList *list,
PangoFontMap *fontmap,
......@@ -358,7 +248,7 @@ gimp_font_list_load_names (GimpFontList *list,
{
PangoFontDescription *desc;
desc = gimp_font_list_font_desc_from_pattern (fontset->fonts[i]);
desc = pango_fc_font_description_from_pattern (fontset->fonts[i], FALSE);
gimp_font_list_add_font (list, context, desc);
pango_font_description_free (desc);
}
......
......@@ -27,13 +27,13 @@ m4_define([gimp_api_version], [2.0])
# Versions used for apps, plugins, tools, pkg-config files, and data,
# as well as global and user prefs
m4_define([gimp_app_version], [2.0])
m4_define([gimp_app_version], [2.1])
m4_define([gimp_plugin_version], [2.0])
m4_define([gimp_tool_version], [2.0])
m4_define([gimp_tool_version], [2.1])
m4_define([gimp_pkgconfig_version], [2.0])
m4_define([gimp_data_version], [2.0])
m4_define([gimp_sysconf_version], [2.0])
m4_define([gimp_user_version], [2.0])
m4_define([gimp_user_version], [2.1])
m4_define([gimp_unstable],
m4_if(m4_eval(gimp_minor_version % 2), [1], [yes], [no]))
......
Makefile
Makefile.in
.xvpics
gimp-2.0.1
gimprc-2.0.5
gimp-remote-2.0.1
gimptool-2.0.1
gimp-2.1.1
gimprc-2.1.5
gimp-remote-2.1.1
gimptool-2.1.1
Wilber.xcf
Wilber_Construction_Kit.xcf
quick_reference
......@@ -3,4 +3,4 @@ Makefile.in
.deps
.libs
kernelgen
gimp-remote-2.0
gimp-remote-2.1
......@@ -17,12 +17,12 @@ SUBDIRS = $(D_pdbgen) $(D_authorgen)
bin_PROGRAMS = $(GIMP_REMOTE)
EXTRA_PROGRAMS = \
gimp-remote-2.0 \
gimp-remote-2.1 \
kernelgen
gimp_remote_2_0_SOURCES = gimp-remote.c
gimp_remote_2_1_SOURCES = gimp-remote.c
gimp_remote_2_0_LDADD = \
gimp_remote_2_1_LDADD = \
$(GTK_LIBS) \
$(LIBXMU)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment