summaryrefslogtreecommitdiff
path: root/pango/pango.h
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2000-02-16 22:05:43 +0000
committerOwen Taylor <otaylor@src.gnome.org>2000-02-16 22:05:43 +0000
commit7f846326d416e9ab3eadca9f02b9a0129095f30b (patch)
tree4b2812b858cd830ca1282e3697d029ca347df24a /pango/pango.h
parent4f335d6e4a3f5b4e6ddd1cd78f919aa80c990262 (diff)
downloadpango-7f846326d416e9ab3eadca9f02b9a0129095f30b.tar.gz
Make refcounted.
Wed Feb 16 16:39:46 2000 Owen Taylor <otaylor@redhat.com> * libpango/pango-coverage.c (pango_coverage_get): Make refcounted. * libpango/modules.c (struct _PangoEnginePair): Since we don't currently unload engines, cache loaded engines. (Not really quite satisfactory, but should work OK) * libpango/pango-context.c (pango_context_get_font_description): Added a global font description. * libpango/modules.c (_pango_find_map): Allow NULL language tags. * libpango/pango-context.c (pango_itemize) examples/viewer.c: Switch itemize over to take a PangoAttrList. * examples/viewer.c: Conform to changes in itemization interface * libpango/font.[ch]: Add a compare function for FontDescription * libpango/pango-attributes.[ch]: Change the iteration iterface to be more convenient. * libpango/pango-context.[ch]: Add the ability to set a default font. * libpango/pango-context.[ch]: Take the font for itemization from the attributes on the text. * libpango/pangox.c: Cache currently loaded fonts, and cache coverages.
Diffstat (limited to 'pango/pango.h')
-rw-r--r--pango/pango.h14
1 files changed, 2 insertions, 12 deletions
diff --git a/pango/pango.h b/pango/pango.h
index 60993938..f06c52cd 100644
--- a/pango/pango.h
+++ b/pango/pango.h
@@ -28,6 +28,7 @@
extern "C" {
#endif /* __cplusplus */
+#include <pango-attributes.h>
#include <pango-context.h>
#include <pango-coverage.h>
#include <pango-engine.h>
@@ -36,16 +37,6 @@ extern "C" {
#include <pango-layout.h>
#include <pango-types.h>
-/* Break a string of Unicode characters into segments with
- * consistent shaping/language engine and bidrectional level.
- * Returns a GList of PangoItem's
- */
-GList *pango_itemize (PangoContext *context,
- gchar *text,
- gint length,
- PangoLangRange *lang_info,
- gint n_langs);
-
/* Logical attributes of a character
*/
struct _PangoLogAttr {
@@ -66,8 +57,7 @@ void pango_break (gchar *text,
/* Turn a string of characters into a string of glyphs
*/
-void pango_shape (PangoFont *font,
- gchar *text,
+void pango_shape (gchar *text,
gint length,
PangoAnalysis *analysis,
PangoGlyphString *glyphs);