Add a function pango_layout_line_get_x_ranges(), to allow handling

Mon Apr 17 12:04:20 2000  Owen Taylor  <otaylor@redhat.com>

	* pango/pango-layout.[ch]: Add a function pango_layout_line_get_x_ranges(),
	to allow handling selections not as attributes. Which is necessary,
	since currently setting the background/foreground results in
	splitting shaped runs.

Fri Apr 14 13:20:05 2000  Owen Taylor  <otaylor@redhat.com>

	* pango/pango-layout.c (pango_layout_check_lines): Fix bug with
	indent handling.

	* pango/pango-layout.c (process_item): Never break a line at
	a non-break position, even if that position ends an item.

Fri Apr 14 10:43:09 2000  Owen Taylor  <otaylor@redhat.com>

	* pango/pangox.c (pango_x_render_layout_line): Fix a missing
	PANGO_SCALE factor for UNDERLINE_SINGLE.

	* pango/pango-layout.c (pango_layout_get_cursor_pos): New function
	to determine cursor positions corresponding to a particular
	index.

Wed Apr 12 15:44:22 2000  Owen Taylor  <otaylor@redhat.com>

	* pango/pango-attributes.[ch]: Add PANGO_ATTR_FONT_DESC, which
	allows an entire font description to be specified as a single
	attribute, instead of as 6 separate attributes.

1 files changed, 25 insertions, 16 deletions

diff --git a/pango/pango-attributes.h b/pango/pango-attributes.h
index 19b9b638..a0af8975 100644
--- a/pango/pango-attributes.h
+++ b/pango/pango-attributes.h
@@ -34,6 +34,7 @@ typedef struct _PangoAttrClass    PangoAttrClass;
 typedef struct _PangoAttrString   PangoAttrString;
 typedef struct _PangoAttrInt      PangoAttrInt;
 typedef struct _PangoAttrColor    PangoAttrColor;
+typedef struct _PangoAttrFontDesc PangoAttrFontDesc;
 				  
 typedef struct _PangoAttrList     PangoAttrList;
 typedef struct _PangoAttrIterator PangoAttrIterator;
@@ -46,6 +47,7 @@ typedef enum {
   PANGO_ATTR_VARIANT,		/* PangoAttrInt */
   PANGO_ATTR_STRETCH,		/* PangoAttrInt */
   PANGO_ATTR_SIZE,		/* PangoAttrSize */
+  PANGO_ATTR_FONT_DESC,		/* PangoAttrFontDesc */
   PANGO_ATTR_FOREGROUND,	/* PangoAttrColor */
   PANGO_ATTR_BACKGROUND,	/* PangoAttrColor */
   PANGO_ATTR_UNDERLINE,		/* PangoAttrInt */
@@ -95,6 +97,12 @@ struct _PangoAttrColor
   guint16 blue;
 };
 
+struct _PangoAttrFontDesc
+{
+  PangoAttribute attr;
+  PangoFontDescription desc;
+};
+
 PangoAttrType    pango_attr_type_register (const gchar          *name);
 
 PangoAttribute * pango_attribute_copy          (const PangoAttribute *attr);
@@ -102,22 +110,23 @@ 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     (PangoUnderline 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_font_desc_new     (const PangoFontDescription *desc);
+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);