diff options
| -rw-r--r-- | ChangeLog | 29 | ||||
| -rw-r--r-- | ChangeLog.pre-1-0 | 29 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 29 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 29 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 29 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 29 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 29 | ||||
| -rw-r--r-- | NEWS | 11 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | docs/pango-sections.txt | 2 | ||||
| -rw-r--r-- | docs/tmpl/pango-indic.sgml | 72 | ||||
| -rw-r--r-- | examples/Makefile.am | 5 | ||||
| -rw-r--r-- | pango/fonts.c | 43 | ||||
| -rw-r--r-- | pango/pangoft2-fontmap.c | 4 | ||||
| -rw-r--r-- | pango/pangowin32-fontmap.c | 2 | ||||
| -rw-r--r-- | pango/pangox-fontmap.c | 2 |
16 files changed, 311 insertions, 37 deletions
@@ -1,3 +1,32 @@ +Tue Sep 25 11:54:03 2001 Owen Taylor <otaylor@redhat.com> + + * configure.in: Version 0.20 + + * NEWS: Updated + + * configure.in (GLIB_REQUIRED_VERSION): Require GLib 1.3.9 + + * examples/Makefile.am (EXTRA_DIST): Add the viewer-qt + in case someone (say Tim) makes dist without qt installed. + (reported by Tony Graham) + + * examples/Makefile.am (pango.modules): Don't use + grep -q (reported by Tony Graham) + + * docs/pango-sections.txt: Fix small typo. + +Tue Sep 25 11:18:24 2001 Owen Taylor <otaylor@redhat.com> + + * pango/fonts.c (pango_font_description_unset_fields): Change + things so that when you unset fields, the old values are + kept around persistantly. I don't like this much, but it + makes some hacks using PangoFontDescription easier. (In + particular, with GtkCellRendererText, being able to + toggle on-and-off a setting with a boolean.) + + * pango/{pangoft2-fontmap.c, pangowin32-fontmap.c, pangox-fontmap.c}: + Fix for changed signature of g_ascii_strup/strdown. + Mon Sep 24 19:18:48 2001 Owen Taylor <otaylor@redhat.com> Patch from Alex Larsson diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index d8fbf30a..bd0be075 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,32 @@ +Tue Sep 25 11:54:03 2001 Owen Taylor <otaylor@redhat.com> + + * configure.in: Version 0.20 + + * NEWS: Updated + + * configure.in (GLIB_REQUIRED_VERSION): Require GLib 1.3.9 + + * examples/Makefile.am (EXTRA_DIST): Add the viewer-qt + in case someone (say Tim) makes dist without qt installed. + (reported by Tony Graham) + + * examples/Makefile.am (pango.modules): Don't use + grep -q (reported by Tony Graham) + + * docs/pango-sections.txt: Fix small typo. + +Tue Sep 25 11:18:24 2001 Owen Taylor <otaylor@redhat.com> + + * pango/fonts.c (pango_font_description_unset_fields): Change + things so that when you unset fields, the old values are + kept around persistantly. I don't like this much, but it + makes some hacks using PangoFontDescription easier. (In + particular, with GtkCellRendererText, being able to + toggle on-and-off a setting with a boolean.) + + * pango/{pangoft2-fontmap.c, pangowin32-fontmap.c, pangox-fontmap.c}: + Fix for changed signature of g_ascii_strup/strdown. + Mon Sep 24 19:18:48 2001 Owen Taylor <otaylor@redhat.com> Patch from Alex Larsson diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index d8fbf30a..bd0be075 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,32 @@ +Tue Sep 25 11:54:03 2001 Owen Taylor <otaylor@redhat.com> + + * configure.in: Version 0.20 + + * NEWS: Updated + + * configure.in (GLIB_REQUIRED_VERSION): Require GLib 1.3.9 + + * examples/Makefile.am (EXTRA_DIST): Add the viewer-qt + in case someone (say Tim) makes dist without qt installed. + (reported by Tony Graham) + + * examples/Makefile.am (pango.modules): Don't use + grep -q (reported by Tony Graham) + + * docs/pango-sections.txt: Fix small typo. + +Tue Sep 25 11:18:24 2001 Owen Taylor <otaylor@redhat.com> + + * pango/fonts.c (pango_font_description_unset_fields): Change + things so that when you unset fields, the old values are + kept around persistantly. I don't like this much, but it + makes some hacks using PangoFontDescription easier. (In + particular, with GtkCellRendererText, being able to + toggle on-and-off a setting with a boolean.) + + * pango/{pangoft2-fontmap.c, pangowin32-fontmap.c, pangox-fontmap.c}: + Fix for changed signature of g_ascii_strup/strdown. + Mon Sep 24 19:18:48 2001 Owen Taylor <otaylor@redhat.com> Patch from Alex Larsson diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index d8fbf30a..bd0be075 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,32 @@ +Tue Sep 25 11:54:03 2001 Owen Taylor <otaylor@redhat.com> + + * configure.in: Version 0.20 + + * NEWS: Updated + + * configure.in (GLIB_REQUIRED_VERSION): Require GLib 1.3.9 + + * examples/Makefile.am (EXTRA_DIST): Add the viewer-qt + in case someone (say Tim) makes dist without qt installed. + (reported by Tony Graham) + + * examples/Makefile.am (pango.modules): Don't use + grep -q (reported by Tony Graham) + + * docs/pango-sections.txt: Fix small typo. + +Tue Sep 25 11:18:24 2001 Owen Taylor <otaylor@redhat.com> + + * pango/fonts.c (pango_font_description_unset_fields): Change + things so that when you unset fields, the old values are + kept around persistantly. I don't like this much, but it + makes some hacks using PangoFontDescription easier. (In + particular, with GtkCellRendererText, being able to + toggle on-and-off a setting with a boolean.) + + * pango/{pangoft2-fontmap.c, pangowin32-fontmap.c, pangox-fontmap.c}: + Fix for changed signature of g_ascii_strup/strdown. + Mon Sep 24 19:18:48 2001 Owen Taylor <otaylor@redhat.com> Patch from Alex Larsson diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index d8fbf30a..bd0be075 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,32 @@ +Tue Sep 25 11:54:03 2001 Owen Taylor <otaylor@redhat.com> + + * configure.in: Version 0.20 + + * NEWS: Updated + + * configure.in (GLIB_REQUIRED_VERSION): Require GLib 1.3.9 + + * examples/Makefile.am (EXTRA_DIST): Add the viewer-qt + in case someone (say Tim) makes dist without qt installed. + (reported by Tony Graham) + + * examples/Makefile.am (pango.modules): Don't use + grep -q (reported by Tony Graham) + + * docs/pango-sections.txt: Fix small typo. + +Tue Sep 25 11:18:24 2001 Owen Taylor <otaylor@redhat.com> + + * pango/fonts.c (pango_font_description_unset_fields): Change + things so that when you unset fields, the old values are + kept around persistantly. I don't like this much, but it + makes some hacks using PangoFontDescription easier. (In + particular, with GtkCellRendererText, being able to + toggle on-and-off a setting with a boolean.) + + * pango/{pangoft2-fontmap.c, pangowin32-fontmap.c, pangox-fontmap.c}: + Fix for changed signature of g_ascii_strup/strdown. + Mon Sep 24 19:18:48 2001 Owen Taylor <otaylor@redhat.com> Patch from Alex Larsson diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index d8fbf30a..bd0be075 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,32 @@ +Tue Sep 25 11:54:03 2001 Owen Taylor <otaylor@redhat.com> + + * configure.in: Version 0.20 + + * NEWS: Updated + + * configure.in (GLIB_REQUIRED_VERSION): Require GLib 1.3.9 + + * examples/Makefile.am (EXTRA_DIST): Add the viewer-qt + in case someone (say Tim) makes dist without qt installed. + (reported by Tony Graham) + + * examples/Makefile.am (pango.modules): Don't use + grep -q (reported by Tony Graham) + + * docs/pango-sections.txt: Fix small typo. + +Tue Sep 25 11:18:24 2001 Owen Taylor <otaylor@redhat.com> + + * pango/fonts.c (pango_font_description_unset_fields): Change + things so that when you unset fields, the old values are + kept around persistantly. I don't like this much, but it + makes some hacks using PangoFontDescription easier. (In + particular, with GtkCellRendererText, being able to + toggle on-and-off a setting with a boolean.) + + * pango/{pangoft2-fontmap.c, pangowin32-fontmap.c, pangox-fontmap.c}: + Fix for changed signature of g_ascii_strup/strdown. + Mon Sep 24 19:18:48 2001 Owen Taylor <otaylor@redhat.com> Patch from Alex Larsson diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index d8fbf30a..bd0be075 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,32 @@ +Tue Sep 25 11:54:03 2001 Owen Taylor <otaylor@redhat.com> + + * configure.in: Version 0.20 + + * NEWS: Updated + + * configure.in (GLIB_REQUIRED_VERSION): Require GLib 1.3.9 + + * examples/Makefile.am (EXTRA_DIST): Add the viewer-qt + in case someone (say Tim) makes dist without qt installed. + (reported by Tony Graham) + + * examples/Makefile.am (pango.modules): Don't use + grep -q (reported by Tony Graham) + + * docs/pango-sections.txt: Fix small typo. + +Tue Sep 25 11:18:24 2001 Owen Taylor <otaylor@redhat.com> + + * pango/fonts.c (pango_font_description_unset_fields): Change + things so that when you unset fields, the old values are + kept around persistantly. I don't like this much, but it + makes some hacks using PangoFontDescription easier. (In + particular, with GtkCellRendererText, being able to + toggle on-and-off a setting with a boolean.) + + * pango/{pangoft2-fontmap.c, pangowin32-fontmap.c, pangox-fontmap.c}: + Fix for changed signature of g_ascii_strup/strdown. + Mon Sep 24 19:18:48 2001 Owen Taylor <otaylor@redhat.com> Patch from Alex Larsson @@ -1,3 +1,14 @@ +Changes between 0.19 and 0.20 + +* Change PangoFontDescription to save values for unset fields +* Fix for compilation with FreeType 2.0.4 [Havoc Pennington] +* Add PANGO_TYPE_FONT_METRICS [James Henstridge] +* Win32 fixes and updates [Hans Breuer +* PangoLayout bug fixes [Alex Larsson, Padraig O'Briain] +* Misc fixes and cleanups. + +Other contributors: Matthias Clasen, Tony Graham, Mario Motta, Sven Neumann + Changes between 0.18 and 0.19 * Change font listing API to be more extensible. Instead of diff --git a/configure.in b/configure.in index 780c6be4..c1f96dd2 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ dnl Process this file with autoconf to create configure. AC_INIT(ChangeLog) PANGO_MAJOR_VERSION=0 -PANGO_MINOR_VERSION=19 +PANGO_MINOR_VERSION=20 AC_SUBST(PANGO_MAJOR_VERSION) AC_SUBST(PANGO_MINOR_VERSION) @@ -125,7 +125,7 @@ AM_CONDITIONAL(HAVE_XFT, $have_xft) # # Checks for GLib # -GLIB_REQUIRED_VERSION=1.3.8 +GLIB_REQUIRED_VERSION=1.3.9 AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION, :, AC_MSG_ERROR([ diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt index 81f8ff33..92f5c825 100644 --- a/docs/pango-sections.txt +++ b/docs/pango-sections.txt @@ -445,7 +445,7 @@ pango_module_register </SECTION> <SECTION> -FILE>pango-indic</FILE> +<FILE>pango-indic</FILE> <TITLE>Indic Engine Support</TITLE> PANGO_ZERO_WIDTH_NON_JOINER PANGO_ZERO_WIDTH_JOINER diff --git a/docs/tmpl/pango-indic.sgml b/docs/tmpl/pango-indic.sgml index cddc77f9..37a64246 100644 --- a/docs/tmpl/pango-indic.sgml +++ b/docs/tmpl/pango-indic.sgml @@ -14,3 +14,75 @@ Indic Engine Support </para> +<!-- ##### MACRO PANGO_ZERO_WIDTH_NON_JOINER ##### --> +<para> + +</para> + + + +<!-- ##### MACRO PANGO_ZERO_WIDTH_JOINER ##### --> +<para> + +</para> + + + +<!-- ##### STRUCT PangoIndicScript ##### --> +<para> + +</para> + +@name: +@is_prefixing_vowel: +@is_vowel_sign: +@vowel_sign_to_matra: +@is_vowel_half: +@vowel_split: + +<!-- ##### FUNCTION pango_indic_shift_vowels ##### --> +<para> + +</para> + +@script: +@chars: +@end: + + +<!-- ##### FUNCTION pango_indic_compact ##### --> +<para> + +</para> + +@script: +@num: +@chars: +@cluster: + + +<!-- ##### FUNCTION pango_indic_convert_vowels ##### --> +<para> + +</para> + +@script: +@in_middle: +@num: +@chars: +@has_standalone_vowels: + + +<!-- ##### FUNCTION pango_indic_split_out_characters ##### --> +<para> + +</para> + +@script: +@text: +@n_chars: +@wc: +@n_glyph: +@glyphs: + + diff --git a/examples/Makefile.am b/examples/Makefile.am index c06c9f77..6f5c8330 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -31,7 +31,7 @@ endif all-local: pango.modules pango.modules: - if find ../modules -name '*.so' | grep -q 'so'; then \ + if find ../modules -name '*.so' | grep 'so' > /dev/null ; then \ echo "Writing a pango.modules file to use when running examples before installing Pango."; \ (cd ../modules && \ ../pango/pango-querymodules `find . -name '*.so'` > ../examples/pango.modules ) ;\ @@ -41,6 +41,9 @@ pango.modules: fi EXTRA_DIST= \ + moc_viewer-qt.cc \ + viewer-qt.cc \ + viewer-qt.h \ viewer-win32.c \ viewer-ft2.c \ makefile.mingw \ diff --git a/pango/fonts.c b/pango/fonts.c index 10cdad36..b32fab37 100644 --- a/pango/fonts.c +++ b/pango/fonts.c @@ -161,7 +161,7 @@ pango_font_description_set_family_static (PangoFontDescription *desc, * Gets the family name field of a font description. See * pango_font_description_set_family(). * - * Return value: The family name field, or %NULL if the family name is unset. + * Return value: The family name field. (Will be %NULL if not previously set.) **/ G_CONST_RETURN char * pango_font_description_get_family (const PangoFontDescription *desc) @@ -202,9 +202,8 @@ pango_font_description_set_style (PangoFontDescription *desc, * Gets the style field of a #PangoFontDescription. See * pango_font_description_set_style(). * - * Return value: the style field for the font description. Returns - * %PANGO_STYLE_NORMAL if the style field is unset. Use - * pango_font_description_get_set_fields() to find out if + * Return value: the style field for the font description. + * Use pango_font_description_get_set_fields() to find out if * the field was explicitely set or not. **/ PangoStyle @@ -240,8 +239,7 @@ pango_font_description_set_variant (PangoFontDescription *desc, * Gets the variant field of a #PangoFontDescription. See * pango_font_description_set_variant(). * - * Return value: the variant field for the font description. Returns - * %PANGO_VARIANT_NORMAL if the variant field is unset. Use + * Return value: the variant field for the font description. Use * pango_font_description_get_set_fields() to find out if * the field was explicitely set or not. **/ @@ -280,8 +278,7 @@ pango_font_description_set_weight (PangoFontDescription *desc, * Gets the weight field of a font description. See * pango_font_description_set_weight(). * - * Return value: the weight field for the font description. Returns - * %PANGO_WEIGHT_NORMAL if the weight field is unset. Use + * Return value: the weight field for the font description. Use * pango_font_description_get_set_fields() to find out if * the field was explicitely set or not. **/ @@ -318,8 +315,7 @@ pango_font_description_set_stretch (PangoFontDescription *desc, * Gets the stretch field of a font description. * See pango_font_description_set_stretch(). * - * Return value: the stretch field for the font description. Returns - * %PANGO_STRETCH_NORMAL if the stretch field is unset. Use + * Return value: the stretch field for the font description. Use * pango_font_description_get_set_fields() to find out if * the field was explicitely set or not. **/ @@ -357,8 +353,8 @@ pango_font_description_set_size (PangoFontDescription *desc, * See pango_font_description_get_size(). * * Return value: the size field for the font description in pango - * units. (PANGO_SCALE pango units equals one point.) Returns 0 if - * the stretch field is unset. Use + * units. (PANGO_SCALE pango units equals one point). Returns 0 if + * the stretch field has not previously been set. * pango_font_description_get_set_fields() to find out if the field * was explicitely set or not. **/ @@ -392,7 +388,12 @@ pango_font_description_get_set_fields (const PangoFontDescription *desc) * @desc: a #PangoFontDescription * @to_unset: bitmask of fields in the @desc to unset. * - * Unsets some of the fields in a #PangoFontDescription. + * Unsets some of the fields in a #PangoFontDescription. Note that + * this merely marks the fields cleared, it does not clear the + * settings for those fields, to clear a family name set with + * pango_font_description_set_family_static() so that it won't + * be returned by subsequent calls to pango_font_description_get_family(), + * you must actually call pango_font_description-set_family (desc, NULL); **/ void pango_font_description_unset_fields (PangoFontDescription *desc, @@ -400,22 +401,6 @@ pango_font_description_unset_fields (PangoFontDescription *desc, { g_return_if_fail (desc != NULL); - /* We reset cleared mask values back to defaults, to avoid - * having to check the mask for getters. - */ - if (to_unset & PANGO_FONT_MASK_FAMILY) - pango_font_description_set_family (desc, NULL); - if (to_unset & PANGO_FONT_MASK_STYLE) - desc->style = PANGO_STYLE_NORMAL; - if (to_unset & PANGO_FONT_MASK_VARIANT) - desc->variant = PANGO_VARIANT_NORMAL; - if (to_unset & PANGO_FONT_MASK_WEIGHT) - desc->weight = PANGO_WEIGHT_NORMAL; - if (to_unset & PANGO_FONT_MASK_STRETCH) - desc->stretch = PANGO_STRETCH_NORMAL; - if (to_unset & PANGO_FONT_MASK_SIZE) - desc->size = 0; - desc->mask &= ~to_unset; } diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c index 8b0cf67c..e2aa3bca 100644 --- a/pango/pangoft2-fontmap.c +++ b/pango/pangoft2-fontmap.c @@ -420,7 +420,7 @@ pango_ft2_font_map_load_font (PangoFontMap *fontmap, g_return_val_if_fail (description != NULL, NULL); - name = g_ascii_strdown (pango_font_description_get_family (description)); + name = g_ascii_strdown (pango_font_description_get_family (description), -1); family_entry = g_hash_table_lookup (ft2fontmap->families, name); g_free (name); @@ -753,7 +753,7 @@ pango_ft2_insert_face (PangoFT2FontMap *ft2fontmap, PangoFT2OA *oa; FT_Open_Args *open_args; - family_name = g_ascii_strdown (face->family_name); + family_name = g_ascii_strdown (face->family_name, -1); if (face->style_flags & FT_STYLE_FLAG_ITALIC) style = PANGO_STYLE_ITALIC; diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c index bcaa2275..3d4f48a9 100644 --- a/pango/pangowin32-fontmap.c +++ b/pango/pangowin32-fontmap.c @@ -429,7 +429,7 @@ pango_win32_font_map_load_font (PangoFontMap *fontmap, g_return_val_if_fail (description != NULL, NULL); - name = g_ascii_strdown (pango_font_description_get_family (description)); + name = g_ascii_strdown (pango_font_description_get_family (description), -1); win32family = g_hash_table_lookup (win32fontmap->families, name); if (win32family) diff --git a/pango/pangox-fontmap.c b/pango/pangox-fontmap.c index c84ec0fb..4deebe66 100644 --- a/pango/pangox-fontmap.c +++ b/pango/pangox-fontmap.c @@ -398,7 +398,7 @@ pango_x_font_map_load_font (PangoFontMap *fontmap, g_return_val_if_fail (description != NULL, NULL); - name = g_ascii_strdown (pango_font_description_get_family (description)); + name = g_ascii_strdown (pango_font_description_get_family (description), -1); size = pango_font_description_get_size (description); if (size <= 0) |