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.

1 files changed, 36 insertions, 23 deletions

diff --git a/pango/pango-context.h b/pango/pango-context.h
index 64fe06ac..bc8badf9 100644
--- a/pango/pango-context.h
+++ b/pango/pango-context.h
@@ -23,6 +23,7 @@
 #define __PANGO_CONTEXT_H__
 
 #include <pango-font.h>
+#include <pango-attributes.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -33,31 +34,43 @@ extern "C" {
  */
 typedef struct _PangoContext PangoContext;
 
-PangoContext * pango_context_new          (void);
-void           pango_context_ref          (PangoContext           *context);
-void           pango_context_unref        (PangoContext           *context);
+PangoContext *pango_context_new           (void);
+void          pango_context_ref           (PangoContext                 *context);
+void          pango_context_unref         (PangoContext                 *context);
+void          pango_context_add_font_map  (PangoContext                 *context,
+					   PangoFontMap                 *font_map);
+void          pango_context_list_fonts    (PangoContext                 *context,
+					   const char                   *family,
+					   PangoFontDescription       ***descs,
+					   int                          *n_descs);
+void          pango_context_list_families (PangoContext                 *context,
+					   gchar                      ***families,
+					   int                          *n_families);
+PangoFont *   pango_context_load_font     (PangoContext                 *context,
+					   const PangoFontDescription   *desc,
+					   gdouble                       size);
 
-void	       pango_context_add_font_map (PangoContext           *context,
-					   PangoFontMap           *font_map);
-
-void           pango_context_list_fonts   (PangoContext           *context,
-					   const char             *family,
-					   PangoFontDescription ***descs,
-					   int                    *n_descs);
-void           pango_context_list_families (PangoContext          *context,
-					    gchar              ***families,
-					    int                   *n_families);
-PangoFont *    pango_context_load_font    (PangoContext           *context,
-					   PangoFontDescription   *desc,
-					   gdouble                 size);
-
-void           pango_context_set_lang     (PangoContext           *context,
-					   const char             *lang);
-char *         pango_context_get_lang     (PangoContext           *context);
-void           pango_context_set_base_dir (PangoContext           *context,
-					   PangoDirection          direction);
-PangoDirection pango_context_get_base_dir (PangoContext           *context);
+void                  pango_context_set_font_description (PangoContext               *context,
+							  const PangoFontDescription *desc);
+PangoFontDescription *pango_context_get_font_description (PangoContext               *context);
+char *                pango_context_get_lang             (PangoContext               *context);
+void                  pango_context_set_lang             (PangoContext               *context,
+							  const char                 *lang);
+int                   pango_context_get_size             (PangoContext               *context);
+void                  pango_context_set_size             (PangoContext               *context,
+							  int                         size);
+void                  pango_context_set_base_dir         (PangoContext               *context,
+							  PangoDirection              direction);
+PangoDirection        pango_context_get_base_dir         (PangoContext               *context);
 
+/* 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,
+		      PangoAttrList  *attrs);
 
 #ifdef __cplusplus
 }