diff options
author | Owen Taylor <otaylor@redhat.com> | 2001-09-18 20:05:20 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2001-09-18 20:05:20 +0000 |
commit | a49e070d24242c0297e6325587c4bc135e13e26c (patch) | |
tree | 0510d066cc185e9d0b1b736736da5266d259878e /pango/pango-utils.h | |
parent | 39f3626e34e0522e0bdec591f6c0334307d39625 (diff) | |
download | pango-a49e070d24242c0297e6325587c4bc135e13e26c.tar.gz |
Up to 0.19.
Tue Sep 18 15:47:08 2001 Owen Taylor <otaylor@redhat.com>
* configure.in (PANGO_MINOR_VERSION): Up to 0.19.
* pango/pango-font.h pango/pango-fontmap.[ch] pango/fonts.c
pango/pangoxft-fontmap.c pango/pangoft-fontmap.c pango/pango-context.[ch]
pango/pangox-fontmap.c: Add new PangoFontFace and PangoFontFamily
object types, and change the font listing API to list faces and
families, instead of face names and font descriptions.
* pango/pango-font.h pango/fonts.c: Make PangoFontDescription
an opaque heap-allocated structure, add accessors and
convenience functions.
* pango/pango-font.h pango/pango-private.h: Make PangoFontMetrics
heap allocated, protect the structure definition with
#ifdef PANGO_ENABLE_BACKEND, and add getters for the fields.
* pango/pango-attributes.[ch] ( pango_attr_iterator_get_font):
instead of providing a base font description and one to fill
in, provide a single font description to modify based on
the attributes.
* pango/pango-attributes.[ch]: Fix PangoAttrFontDesc to have
a PangoFontDescription by reference, not by value.
* pango/pango-utils.[ch]: make pango_parse_style() and friends
take pointers to individual enumerations instead of to a
PangoFontDescription structure.
* pango/*.c: Fix for the PangoFontDescription and PangoFontMetrics
changes.
* pango/pango-{break,engine,indic,ot,xft}.h pango/Makefile.am
pango/opentype/Makefile.am: Protect portions with
PANGO_ENABLE_ENGINE to shrink the public API.
* modules/*/Makefile.am: -DPANGO_ENABLE_ENGINE.
* pango/{pangox.h,pangox-private.h} modules/basic/basic-x.c: Move
pango_x_font_get_unknown_glyph() into public header since it is
used from modules.
* pango/pango-{context,font,fontmap,modules.utils}.h pango/Makefile.am:
Protect portions with PANGO_ENABLE_BACKEND to shrink the public API.
* pango/*.h: Use G_BEGIN/END_DECLS
* examples/viewer-qt.[cc,h]: Fix for changes to font listing API,
PangoFontDescription.
* pango/pango-indic.h modules/indic/*: Since we install this
header fix it up to Pango conventions, namespece
ZERO_WIDTH_JOINER, ZERO_WIDTH_NON_JOINER.
* docs/pango-sections.txt: Updated.
Diffstat (limited to 'pango/pango-utils.h')
-rw-r--r-- | pango/pango-utils.h | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/pango/pango-utils.h b/pango/pango-utils.h index 995f772b..e45d219c 100644 --- a/pango/pango-utils.h +++ b/pango/pango-utils.h @@ -23,12 +23,13 @@ #include <glib.h> #include <pango/pango-font.h> -char *pango_trim_string (const char *str); char ** pango_split_file_list (const char *str); +#ifdef PANGO_ENABLE_BACKEND + +char *pango_trim_string (const char *str); gint pango_read_line (FILE *stream, GString *str); - gboolean pango_skip_space (const char **pos); gboolean pango_scan_word (const char **pos, GString *out); @@ -39,6 +40,8 @@ gboolean pango_scan_int (const char **pos, char * pango_config_key_get (const char *key); +#endif /* PANGO_ENABLE_BACKEND */ + /* Functions for parsing textual representations * of PangoFontDescription fields. They return TRUE if the input string * contains a valid value, which then has been assigned to the corresponding @@ -46,18 +49,20 @@ char * pango_config_key_get (const char *key); * a warning is printed (with g_warning) if the string does not * contain a valid value. */ -gboolean pango_parse_style (const char *str, - PangoFontDescription *desc, - gboolean warn); -gboolean pango_parse_variant (const char *str, - PangoFontDescription *desc, - gboolean warn); -gboolean pango_parse_weight (const char *str, - PangoFontDescription *desc, - gboolean warn); -gboolean pango_parse_stretch (const char *str, - PangoFontDescription *desc, - gboolean warn); +gboolean pango_parse_style (const char *str, + PangoStyle *style, + gboolean warn); +gboolean pango_parse_variant (const char *str, + PangoVariant *variant, + gboolean warn); +gboolean pango_parse_weight (const char *str, + PangoWeight *weight, + gboolean warn); +gboolean pango_parse_stretch (const char *str, + PangoStretch *stretch, + gboolean warn); + +#ifdef PANGO_ENABLE_BACKEND /* On Unix, return the name of the "pango" subdirectory of SYSCONFDIR * (which is set at compile time). On Win32, return the Pango @@ -73,6 +78,8 @@ G_CONST_RETURN char * pango_get_sysconf_subdirectory (void); */ G_CONST_RETURN char * pango_get_lib_subdirectory (void); +#endif /* PANGO_ENABLE_BACKEND */ + /* A couple of routines from fribidi that we either wrap or * provide ourselves. */ @@ -81,7 +88,6 @@ gboolean pango_log2vis_get_embedding_levels (gunichar *str, PangoDirection *pbase_dir, guint8 *embedding_level_list); gboolean pango_get_mirror_char (gunichar ch, - gunichar *mirrored_ch); G_CONST_RETURN char *pango_language_get_sample_string (PangoLanguage *language); |