summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog10
-rw-r--r--ChangeLog.pre-1-010
-rw-r--r--ChangeLog.pre-1-1010
-rw-r--r--ChangeLog.pre-1-210
-rw-r--r--ChangeLog.pre-1-410
-rw-r--r--ChangeLog.pre-1-610
-rw-r--r--ChangeLog.pre-1-810
-rw-r--r--pango/makefile.msc2
-rw-r--r--pango/pango.def8
-rw-r--r--pango/pangowin32-fontmap.c4
-rw-r--r--pango/pangowin32-private.h4
-rw-r--r--pango/pangowin32.c33
12 files changed, 97 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog
index 572613b2..4a857ac5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-06-22 Hans Breuer <hans@breuer.org>
+
+ * pango/makefile.msc : changed version to 0.17
+
+ * pango/pango.def : updated externals
+
+ * pango/pangowin32-fontmap.c :
+ * pango/pangowin32-private.h :
+ * pango/pangowin32.c : adapted to PangoLanguage usage
+
Sat Jun 9 17:36:09 2001 Owen Taylor <otaylor@redhat.com>
* pango/pango-types.h pango/pango-utils.c: Add a new PangoLanguage
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 572613b2..4a857ac5 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,13 @@
+2001-06-22 Hans Breuer <hans@breuer.org>
+
+ * pango/makefile.msc : changed version to 0.17
+
+ * pango/pango.def : updated externals
+
+ * pango/pangowin32-fontmap.c :
+ * pango/pangowin32-private.h :
+ * pango/pangowin32.c : adapted to PangoLanguage usage
+
Sat Jun 9 17:36:09 2001 Owen Taylor <otaylor@redhat.com>
* pango/pango-types.h pango/pango-utils.c: Add a new PangoLanguage
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 572613b2..4a857ac5 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,13 @@
+2001-06-22 Hans Breuer <hans@breuer.org>
+
+ * pango/makefile.msc : changed version to 0.17
+
+ * pango/pango.def : updated externals
+
+ * pango/pangowin32-fontmap.c :
+ * pango/pangowin32-private.h :
+ * pango/pangowin32.c : adapted to PangoLanguage usage
+
Sat Jun 9 17:36:09 2001 Owen Taylor <otaylor@redhat.com>
* pango/pango-types.h pango/pango-utils.c: Add a new PangoLanguage
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 572613b2..4a857ac5 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,13 @@
+2001-06-22 Hans Breuer <hans@breuer.org>
+
+ * pango/makefile.msc : changed version to 0.17
+
+ * pango/pango.def : updated externals
+
+ * pango/pangowin32-fontmap.c :
+ * pango/pangowin32-private.h :
+ * pango/pangowin32.c : adapted to PangoLanguage usage
+
Sat Jun 9 17:36:09 2001 Owen Taylor <otaylor@redhat.com>
* pango/pango-types.h pango/pango-utils.c: Add a new PangoLanguage
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 572613b2..4a857ac5 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,13 @@
+2001-06-22 Hans Breuer <hans@breuer.org>
+
+ * pango/makefile.msc : changed version to 0.17
+
+ * pango/pango.def : updated externals
+
+ * pango/pangowin32-fontmap.c :
+ * pango/pangowin32-private.h :
+ * pango/pangowin32.c : adapted to PangoLanguage usage
+
Sat Jun 9 17:36:09 2001 Owen Taylor <otaylor@redhat.com>
* pango/pango-types.h pango/pango-utils.c: Add a new PangoLanguage
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 572613b2..4a857ac5 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,13 @@
+2001-06-22 Hans Breuer <hans@breuer.org>
+
+ * pango/makefile.msc : changed version to 0.17
+
+ * pango/pango.def : updated externals
+
+ * pango/pangowin32-fontmap.c :
+ * pango/pangowin32-private.h :
+ * pango/pangowin32.c : adapted to PangoLanguage usage
+
Sat Jun 9 17:36:09 2001 Owen Taylor <otaylor@redhat.com>
* pango/pango-types.h pango/pango-utils.c: Add a new PangoLanguage
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 572613b2..4a857ac5 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,13 @@
+2001-06-22 Hans Breuer <hans@breuer.org>
+
+ * pango/makefile.msc : changed version to 0.17
+
+ * pango/pango.def : updated externals
+
+ * pango/pangowin32-fontmap.c :
+ * pango/pangowin32-private.h :
+ * pango/pangowin32.c : adapted to PangoLanguage usage
+
Sat Jun 9 17:36:09 2001 Owen Taylor <otaylor@redhat.com>
* pango/pango-types.h pango/pango-utils.c: Add a new PangoLanguage
diff --git a/pango/makefile.msc b/pango/makefile.msc
index 3e8a8d5d..a4afd2fd 100644
--- a/pango/makefile.msc
+++ b/pango/makefile.msc
@@ -6,7 +6,7 @@ PERL = perl
!ENDIF
# Possibly override Pango version from build/win32/module.defs
-PANGO_VER = 0.16
+PANGO_VER = 0.17
# INCLUDES = -I .. -I .
# DEFINES =
diff --git a/pango/pango.def b/pango/pango.def
index 780a5dce..036aac79 100644
--- a/pango/pango.def
+++ b/pango/pango.def
@@ -9,7 +9,7 @@ EXPORTS
pango_attr_iterator_get_font
pango_attr_iterator_next
pango_attr_iterator_range
- pango_attr_lang_new
+ pango_attr_language_new
pango_attr_list_change
pango_attr_list_copy
pango_attr_list_get_iterator
@@ -21,6 +21,7 @@ EXPORTS
pango_attr_list_splice
pango_attr_list_unref
pango_attr_rise_new
+ pango_attr_scale_new
pango_attr_shape_new
pango_attr_size_new
pango_attr_stretch_new
@@ -38,7 +39,7 @@ EXPORTS
pango_context_add_font_map
pango_context_get_base_dir
pango_context_get_font_description
- pango_context_get_lang
+ pango_context_get_language
pango_context_get_type
pango_context_list_families
pango_context_list_fonts
@@ -46,7 +47,7 @@ EXPORTS
pango_context_new
pango_context_set_base_dir
pango_context_set_font_description
- pango_context_set_lang
+ pango_context_set_language
pango_coverage_copy
pango_coverage_from_bytes
pango_coverage_get
@@ -96,6 +97,7 @@ EXPORTS
pango_item_free
pango_item_new
pango_itemize
+ pango_language_from_string
pango_layout_context_changed
pango_layout_copy
pango_layout_get_alignment
diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c
index 5282b2bb..6a025e16 100644
--- a/pango/pangowin32-fontmap.c
+++ b/pango/pangowin32-fontmap.c
@@ -1367,7 +1367,7 @@ free_coverages_foreach (gpointer key,
PangoCoverage *
pango_win32_font_entry_get_coverage (PangoWin32FontEntry *entry,
PangoFont *font,
- const char *lang)
+ PangoLanguage *lang)
{
guint32 ch;
PangoMap *shape_map;
@@ -1393,7 +1393,7 @@ pango_win32_font_entry_get_coverage (PangoWin32FontEntry *entry,
"\\cache.win32\\",
pango_font_description_to_filename (description),
".",
- lang ? lang : "",
+ lang ? pango_language_to_string (lang) : "",
NULL);
pango_font_description_free (description);
diff --git a/pango/pangowin32-private.h b/pango/pangowin32-private.h
index 0fc0dd94..238326d2 100644
--- a/pango/pangowin32-private.h
+++ b/pango/pangowin32-private.h
@@ -95,7 +95,7 @@ PangoWin32Font *pango_win32_font_new (PangoFontMap *fontmap,
const LOGFONT *lfp,
int n_fonts,
int size);
-PangoMap * pango_win32_get_shaper_map (const char *lang);
+PangoMap * pango_win32_get_shaper_map (PangoLanguage *lang);
gboolean pango_win32_logfont_has_subrange (PangoFontMap *fontmap,
LOGFONT *lfp,
PangoWin32UnicodeSubrange subrange);
@@ -104,7 +104,7 @@ LOGFONT * pango_win32_make_matching_logfont (PangoFontMap *fontmap,
int size);
PangoCoverage * pango_win32_font_entry_get_coverage (PangoWin32FontEntry *entry,
PangoFont *font,
- const char *lang);
+ PangoLanguage *lang);
void pango_win32_font_entry_remove (PangoWin32FontEntry *entry,
PangoFont *font);
diff --git a/pango/pangowin32.c b/pango/pangowin32.c
index 6bfe0293..cd6c8388 100644
--- a/pango/pangowin32.c
+++ b/pango/pangowin32.c
@@ -80,7 +80,7 @@ struct _PangoWin32SubfontInfo
struct _PangoWin32MetricsInfo
{
- const char *lang;
+ PangoLanguage *lang;
PangoFontMetrics metrics;
};
@@ -99,10 +99,10 @@ static void pango_win32_font_finalize (GObject *object);
static PangoFontDescription *pango_win32_font_describe (PangoFont *font);
static PangoCoverage *pango_win32_font_get_coverage (PangoFont *font,
- const char *lang);
+ PangoLanguage *lang);
static PangoEngineShape *pango_win32_font_find_shaper (PangoFont *font,
- const char *lang,
+ PangoLanguage *lang,
guint32 ch);
static void pango_win32_font_get_glyph_extents (PangoFont *font,
@@ -111,7 +111,7 @@ static void pango_win32_font_get_glyph_extents (PangoFont *font,
PangoRectangle *logical_rect);
static void pango_win32_font_get_metrics (PangoFont *font,
- const gchar *lang,
+ PangoLanguage *lang,
PangoFontMetrics *metrics);
static PangoWin32SubfontInfo *pango_win32_find_subfont (PangoFont *font,
@@ -682,7 +682,7 @@ get_font_metrics_from_subfonts (PangoFont *font,
*/
static void
get_font_metrics_from_string (PangoFont *font,
- const char *lang,
+ PangoLanguage *lang,
const char *str,
PangoFontMetrics *metrics)
{
@@ -800,36 +800,37 @@ LangInfo lang_texts[] = {
static void
pango_win32_font_get_metrics (PangoFont *font,
- const gchar *lang,
+ PangoLanguage *lang,
PangoFontMetrics *metrics)
{
PangoWin32MetricsInfo *info;
PangoWin32Font *win32font = (PangoWin32Font *)font;
GSList *tmp_list;
- const char *lookup_lang;
+ const char *lang_str = pango_language_to_string (lang);
+ PangoLanguage *lookup_lang;
const char *str;
if (lang)
{
- LangInfo *lang_info = bsearch (lang, lang_texts,
+ LangInfo *lang_info = bsearch (lang_str, lang_texts,
G_N_ELEMENTS (lang_texts), sizeof (LangInfo),
lang_info_compare);
if (lang_info)
{
- lookup_lang = lang_info->lang;
+ lookup_lang = pango_language_from_string (lang_info->lang);
str = lang_info->str;
}
else
{
- lookup_lang = "UNKNOWN";
+ lookup_lang = pango_language_to_string ("UNKNOWN");
str = "French (Français)"; /* Assume iso-8859-1 */
}
}
else
{
- lookup_lang = "NONE";
+ lookup_lang = pango_language_to_string ("NONE");
/* Complete junk
*/
@@ -868,7 +869,7 @@ pango_win32_font_get_metrics (PangoFont *font,
* chars in "0123456789"
*/
context = pango_win32_get_context ();
- pango_context_set_lang (context, lookup_lang);
+ pango_context_set_language (context, lookup_lang);
layout = pango_layout_new (context);
pango_layout_set_text (layout, "0123456789", -1);
@@ -1283,7 +1284,7 @@ pango_win32_font_describe (PangoFont *font)
}
PangoMap *
-pango_win32_get_shaper_map (const char *lang)
+pango_win32_get_shaper_map (PangoLanguage *lang)
{
static guint engine_type_id = 0;
static guint render_type_id = 0;
@@ -1299,7 +1300,7 @@ pango_win32_get_shaper_map (const char *lang)
static PangoCoverage *
pango_win32_font_get_coverage (PangoFont *font,
- const char *lang)
+ PangoLanguage *lang)
{
PangoWin32Font *win32font = (PangoWin32Font *)font;
@@ -1308,7 +1309,7 @@ pango_win32_font_get_coverage (PangoFont *font,
static PangoEngineShape *
pango_win32_font_find_shaper (PangoFont *font,
- const gchar *lang,
+ PangoLanguage *lang,
guint32 ch)
{
PangoMap *shape_map = NULL;
@@ -1575,7 +1576,7 @@ pango_win32_get_item_properties (PangoItem *item,
PangoAttrColor *bg_color,
gboolean *bg_set)
{
- GSList *tmp_list = item->extra_attrs;
+ GSList *tmp_list = item->analysis.extra_attrs;
if (fg_set)
*fg_set = FALSE;
View Lorry Controller Status