Memory management functions for PangoItem.

Mon Mar 13 10:54:48 2000  Owen Taylor  <otaylor@redhat.com>

	* pango/pango-item.[ch]: Memory management functions for PangoItem.

	* pango/*.[ch]: Random constification.

	* pango/pangox.c pango/pango-layout.c pango/pango-context.c:
	Add an extra_attrs field to PangoItem. Use this to handle underlining
	for PangoLayout.

	* examples/viewer.c (reload_font): Make paragraphs global
	to save the complexity of passing it around all over the place.

	* pango/pango-layout.[ch] (pango_layout_context_changed): Add
	a function to reset the layout on changes to the layout's
	context.

	* pango/pangox.c (pango_x_make_matching_xlfd): Prefer bitmap
	to scaleable if the discrepancy is < 1 pixel. (Probably not
	the ideal criterion.)

	* pango/pangox.c (pango_x_font_map_for_display): Fix resolution
	computation error.

	* pango/pango-layout.c (pango_layout_check_lines): Handle
	text with embedded newlines.

	* pango/pangox.c (pango_x_render_layout): Fix y to refer
	to the top of the layout, not the baseline of the first
	line.

	* pango/pango-layout.c (process_item): Don't wrap if width is
	set to -1.

	* Makefile.am configure.in **/*.[ch]: move libpango/ directory
	and fix all headers to install under include/pango/

1 files changed, 26 insertions, 18 deletions

diff --git a/pango/pango-attributes.h b/pango/pango-attributes.h
index 8c72d750..19b9b638 100644
--- a/pango/pango-attributes.h
+++ b/pango/pango-attributes.h
@@ -22,7 +22,7 @@
 #ifndef __PANGO_ATTRIBUTES_H__
 #define __PANGO_ATTRIBUTES_H__
 
-#include <pango-font.h>
+#include <pango/pango-font.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -53,6 +53,13 @@ typedef enum {
   PANGO_ATTR_RISE		/* PangoAttrInt */
 } PangoAttrType;
 
+typedef enum {
+  PANGO_UNDERLINE_NONE,
+  PANGO_UNDERLINE_SINGLE,
+  PANGO_UNDERLINE_DOUBLE,
+  PANGO_UNDERLINE_LOW
+} PangoUnderline;
+
 struct _PangoAttribute
 {
   const PangoAttrClass *klass;
@@ -95,22 +102,22 @@ void             pango_attribute_destroy       (PangoAttribute       *attr);
 gboolean         pango_attribute_compare       (const PangoAttribute *attr1,
 						const PangoAttribute *attr2);
 
-PangoAttribute *pango_attr_lang_new          (const char   *lang);
-PangoAttribute *pango_attr_family_new        (const char   *family);
-PangoAttribute *pango_attr_foreground_new    (guint16       red,
-					      guint16       green,
-					      guint16       blue);
-PangoAttribute *pango_attr_background_new    (guint16       red,
-					      guint16       green,
-					      guint16       blue);
-PangoAttribute *pango_attr_size_new          (int           size);
-PangoAttribute *pango_attr_style_new         (PangoStyle    style);
-PangoAttribute *pango_attr_weight_new        (PangoWeight   weight);
-PangoAttribute *pango_attr_variant_new       (PangoVariant  variant);
-PangoAttribute *pango_attr_stretch_new       (PangoStretch  stretch);
-PangoAttribute *pango_attr_underline_new     (gboolean      underline);
-PangoAttribute *pango_attr_strikethrough_new (gboolean      strikethrough);
-PangoAttribute *pango_attr_rise_new          (int           rise);
+PangoAttribute *pango_attr_lang_new          (const char    *lang);
+PangoAttribute *pango_attr_family_new        (const char    *family);
+PangoAttribute *pango_attr_foreground_new    (guint16        red,
+					      guint16        green,
+					      guint16        blue);
+PangoAttribute *pango_attr_background_new    (guint16        red,
+					      guint16        green,
+					      guint16        blue);
+PangoAttribute *pango_attr_size_new          (int            size);
+PangoAttribute *pango_attr_style_new         (PangoStyle     style);
+PangoAttribute *pango_attr_weight_new        (PangoWeight    weight);
+PangoAttribute *pango_attr_variant_new       (PangoVariant   variant);
+PangoAttribute *pango_attr_stretch_new       (PangoStretch   stretch);
+PangoAttribute *pango_attr_underline_new     (PangoUnderline underline);
+PangoAttribute *pango_attr_strikethrough_new (gboolean       strikethrough);
+PangoAttribute *pango_attr_rise_new          (int            rise);
 
 PangoAttrList *     pango_attr_list_new          (void);
 void                pango_attr_list_ref          (PangoAttrList  *list);
@@ -130,7 +137,8 @@ PangoAttribute *pango_attr_iterator_get      (PangoAttrIterator    *iterator,
 					      PangoAttrType         type);
 void            pango_attr_iterator_get_font (PangoAttrIterator    *iterator,
 					      PangoFontDescription *base,
-					      PangoFontDescription *current);
+					      PangoFontDescription *current,
+					      GSList              **extra_attrs);
 
 #ifdef __cplusplus
 }