From 38dcbb203cb855b435301c8e27c4427213b75a14 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sun, 2 Jul 2000 22:08:48 +0000 Subject: Fix up set_font_description() for tab spaces. Sun Jul 2 18:06:01 2000 Owen Taylor * pango/pango-layout.c (get_tab_pos): Fix up set_font_description() for tab spaces. --- ChangeLog | 5 +++++ ChangeLog.pre-1-0 | 5 +++++ ChangeLog.pre-1-10 | 5 +++++ ChangeLog.pre-1-2 | 5 +++++ ChangeLog.pre-1-4 | 5 +++++ ChangeLog.pre-1-6 | 5 +++++ ChangeLog.pre-1-8 | 5 +++++ pango/pango-layout.c | 9 +++++++++ 8 files changed, 44 insertions(+) diff --git a/ChangeLog b/ChangeLog index af83b906..c1ac1cff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jul 2 18:06:01 2000 Owen Taylor + + * pango/pango-layout.c (get_tab_pos): Fix up set_font_description() + for tab spaces. + Sun Jul 2 17:59:56 2000 Owen Taylor * pango/pango-attributes.[ch] (pango_attr_list_insert_before): New diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index af83b906..c1ac1cff 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,8 @@ +Sun Jul 2 18:06:01 2000 Owen Taylor + + * pango/pango-layout.c (get_tab_pos): Fix up set_font_description() + for tab spaces. + Sun Jul 2 17:59:56 2000 Owen Taylor * pango/pango-attributes.[ch] (pango_attr_list_insert_before): New diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index af83b906..c1ac1cff 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +Sun Jul 2 18:06:01 2000 Owen Taylor + + * pango/pango-layout.c (get_tab_pos): Fix up set_font_description() + for tab spaces. + Sun Jul 2 17:59:56 2000 Owen Taylor * pango/pango-attributes.[ch] (pango_attr_list_insert_before): New diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index af83b906..c1ac1cff 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,8 @@ +Sun Jul 2 18:06:01 2000 Owen Taylor + + * pango/pango-layout.c (get_tab_pos): Fix up set_font_description() + for tab spaces. + Sun Jul 2 17:59:56 2000 Owen Taylor * pango/pango-attributes.[ch] (pango_attr_list_insert_before): New diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index af83b906..c1ac1cff 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,8 @@ +Sun Jul 2 18:06:01 2000 Owen Taylor + + * pango/pango-layout.c (get_tab_pos): Fix up set_font_description() + for tab spaces. + Sun Jul 2 17:59:56 2000 Owen Taylor * pango/pango-attributes.[ch] (pango_attr_list_insert_before): New diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index af83b906..c1ac1cff 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,8 @@ +Sun Jul 2 18:06:01 2000 Owen Taylor + + * pango/pango-layout.c (get_tab_pos): Fix up set_font_description() + for tab spaces. + Sun Jul 2 17:59:56 2000 Owen Taylor * pango/pango-attributes.[ch] (pango_attr_list_insert_before): New diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index af83b906..c1ac1cff 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +Sun Jul 2 18:06:01 2000 Owen Taylor + + * pango/pango-layout.c (get_tab_pos): Fix up set_font_description() + for tab spaces. + Sun Jul 2 17:59:56 2000 Owen Taylor * pango/pango-attributes.[ch] (pango_attr_list_insert_before): New diff --git a/pango/pango-layout.c b/pango/pango-layout.c index f8afe07a..c622873a 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -1560,6 +1560,15 @@ get_tab_pos (PangoLayout *layout, int index) int i; PangoAttrList *attrs = pango_attr_list_new (); + if (layout->font_desc) + { + PangoAttribute *attr = pango_attr_font_desc_new (layout->font_desc); + attr->start_index = 0; + attr->end_index = layout->length; + + pango_attr_list_insert_before (attrs, attr); + } + items = pango_itemize (layout->context, " ", 1, attrs); pango_attr_list_unref (attrs); -- cgit v1.2.1