GNOME.org
 

[gnumeric] Fix some divergence between character weight in the label properties dialog and the label itself.

commit 1e999fc4fba44d8d1d2d635c733dab1a5e556b8d
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Sun Apr 26 22:43:01 2009 -0600

    Fix some divergence between character weight in the label properties dialog and the label itself.
    
    2009-04-26  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* src/gui-util.h (gnm_create_std_tags_for_buffer): new
    	* src/gui-util.c (gnm_create_std_tags_for_buffer): new
    	(gnm_load_pango_attributes_into_buffer_filter): weight will use named tags
    	(gnm_load_pango_attributes_into_buffer_named_filter): ditto
    	(gnm_load_pango_attributes_into_buffer): The standard tags will exist.
    	  Classify the weight into the standard values.
    
    2009-04-26  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* dialog-preferences.c: pref_window_page_initializer: fix some capitalization
    	  inconsistencies
    	(pref_copypaste_page_initializer): ditto
    	* dialog-so-styled.c (cb_dialog_so_styled_text_widget_set_italic): the tags
    	  should exist
    	(cb_dialog_so_styled_text_widget_set_strikethrough): ditto
    	(dialog_so_styled_bold_button_activated): ditto, attach the tag name rather than
    	  the weight
    	(dialog_so_styled_remove_weight_tags): new
    	(dialog_so_styled_build_button_bold): attach the tag name rather than the weight
    	(dialog_so_styled_text_widget): make sure that we create all standard tags
---
 ChangeLog                        |    9 +++
 NEWS                             |    3 +
 src/dialogs/ChangeLog            |   14 +++++
 src/dialogs/dialog-preferences.c |    6 +-
 src/dialogs/dialog-so-styled.c   |   82 +++++++++++++++---------------
 src/gui-util.c                   |  103 +++++++++++++++++++++++++++++--------
 src/gui-util.h                   |    1 +
 7 files changed, 152 insertions(+), 66 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fb916dd..b05ae43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-04-26  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* src/gui-util.h (gnm_create_std_tags_for_buffer): new
+	* src/gui-util.c (gnm_create_std_tags_for_buffer): new
+	(gnm_load_pango_attributes_into_buffer_filter): weight will use named tags
+	(gnm_load_pango_attributes_into_buffer_named_filter): ditto
+	(gnm_load_pango_attributes_into_buffer): The standard tags will exist.
+	  Classify the weight into the standard values.
+	
 2009-04-26  Morten Welinder  <terra gnome org>
 
 	* src/xml-sax-read.c (handle_delayed_names): Parse position here
diff --git a/NEWS b/NEWS
index ec7f398..d1674b2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 Gnumeric 1.9.7
 
+Andreas:
+	* Fix some divergence between character weight in the label properties
+	  dialog and the label itself.
 Morten:
 	* Fix xls save problem with sheets that are too big for the format.
 	* Fix global-name .gnumeric warning.  [#580227]
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index 3d67d9a..52f1a15 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -1,3 +1,17 @@
+2009-04-26  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* dialog-preferences.c: pref_window_page_initializer: fix some capitalization
+	  inconsistencies
+	(pref_copypaste_page_initializer): ditto
+	* dialog-so-styled.c (cb_dialog_so_styled_text_widget_set_italic): the tags
+	  should exist
+	(cb_dialog_so_styled_text_widget_set_strikethrough): ditto
+	(dialog_so_styled_bold_button_activated): ditto, attach the tag name rather than
+	  the weight
+	(dialog_so_styled_remove_weight_tags): new
+	(dialog_so_styled_build_button_bold): attach the tag name rather than the weight
+	(dialog_so_styled_text_widget): make sure that we create all standard tags
+
 2009-04-25  Morten Welinder <terra gnome org>
 
 	* Release 1.9.6
diff --git a/src/dialogs/dialog-preferences.c b/src/dialogs/dialog-preferences.c
index a09f98d..2d13891 100644
--- a/src/dialogs/dialog-preferences.c
+++ b/src/dialogs/dialog-preferences.c
@@ -599,11 +599,11 @@ pref_window_page_initializer (PrefState *state,
 	int_pref_create_widget (state->root, GNM_CONF_WORKBOOK_NROWS,
 				page, row++, GNM_DEFAULT_ROWS, GNM_MIN_ROWS, GNM_MAX_ROWS, GNM_MIN_ROWS, 
 				gnm_gconf_set_workbook_nrows,
-				_("Default number of rows in a sheet"));
+				_("Default Number of Rows in a Sheet"));
 	int_pref_create_widget (state->root, GNM_CONF_WORKBOOK_NCOLS,
 				page, row++, GNM_DEFAULT_COLS, GNM_MIN_COLS, GNM_MAX_COLS, GNM_MIN_COLS, 
 				gnm_gconf_set_workbook_ncols,
-				_("Default number of columns in a sheet"));
+				_("Default Number of Columns in a Sheet"));
 
 	bool_pref_create_widget (node, GNM_CONF_GUI_ED_LIVESCROLLING,
 				 page, row++, 
@@ -746,7 +746,7 @@ pref_copypaste_page_initializer (PrefState *state,
 				 GNM_CONF_CUTANDPASTE_DIR "/" GNM_CONF_CUTANDPASTE_PREFER_CLIPBOARD,
 				 page, row++, 
 				 gnm_gconf_set_prefer_clipboard,
-				 _("Prefer CLIPBOARD over PRIMARY selection"));
+				 _("Prefer CLIPBOARD Over PRIMARY Selection"));
 	
 	gtk_widget_show_all (page);
 	return page;
diff --git a/src/dialogs/dialog-so-styled.c b/src/dialogs/dialog-so-styled.c
index 9c26923..a877c9c 100644
--- a/src/dialogs/dialog-so-styled.c
+++ b/src/dialogs/dialog-so-styled.c
@@ -149,14 +149,6 @@ cb_dialog_so_styled_text_widget_set_italic (GtkToggleToolButton *toolbutton, Dia
 			(gtk_text_buffer_get_tag_table (state->buffer), "PANGO_STYLE_ITALIC");
 		GtkTextTag *tag_normal = gtk_text_tag_table_lookup 
 			(gtk_text_buffer_get_tag_table (state->buffer), "PANGO_STYLE_NORMAL");
-		if (tag_italic == NULL)
-			tag_italic = gtk_text_buffer_create_tag (state->buffer, "PANGO_STYLE_ITALIC", 
-								 "style", PANGO_STYLE_ITALIC, 
-								 "style-set", TRUE, NULL);
-		if (tag_normal == NULL)
-			tag_normal = gtk_text_buffer_create_tag (state->buffer, "PANGO_STYLE_NORMAL", 
-								 "style", PANGO_STYLE_NORMAL, 
-								 "style-set", TRUE, NULL);
 		
 		if (gtk_text_iter_has_tag (&start, tag_italic)) {
 			gtk_text_buffer_remove_tag (state->buffer, tag_italic,
@@ -181,14 +173,6 @@ cb_dialog_so_styled_text_widget_set_strikethrough (GtkToggleToolButton *toolbutt
 			(gtk_text_buffer_get_tag_table (state->buffer), "PANGO_STRIKETHROUGH_FALSE");
 		GtkTextTag *tag_strikethrough = gtk_text_tag_table_lookup 
 			(gtk_text_buffer_get_tag_table (state->buffer), "PANGO_STRIKETHROUGH_TRUE");
-		if (tag_no_strikethrough == NULL)
-			tag_no_strikethrough = gtk_text_buffer_create_tag (state->buffer, "PANGO_STRIKETHROUGH_FALSE", 
-								 "strikethrough", FALSE, 
-								 "strikethrough-set", TRUE, NULL);
-		if (tag_strikethrough == NULL)
-			tag_strikethrough = gtk_text_buffer_create_tag (state->buffer, "PANGO_STRIKETHROUGH_TRUE", 
-								 "strikethrough", TRUE, 
-								 "strikethrough-set", TRUE, NULL);
 		
 		if (gtk_text_iter_has_tag (&start, tag_strikethrough)) {
 			gtk_text_buffer_remove_tag (state->buffer, tag_strikethrough,
@@ -215,20 +199,42 @@ dialog_so_styled_build_toggle_button (GtkWidget *tb, DialogSOStyled *state, char
 }
 
 static void
+dialog_so_styled_remove_weight_tags (GtkTextBuffer *buffer, GtkTextIter *start, GtkTextIter *end)
+{
+	static char const *tag_names[] = {
+		"PANGO_WEIGHT_THIN",
+		"PANGO_WEIGHT_ULTRALIGHT",
+		"PANGO_WEIGHT_LIGHT",
+		"PANGO_WEIGHT_BOOK",
+		"PANGO_WEIGHT_NORMAL",
+		"PANGO_WEIGHT_MEDIUM",
+		"PANGO_WEIGHT_SEMIBOLD",
+		"PANGO_WEIGHT_BOLD",
+		"PANGO_WEIGHT_ULTRABOLD",
+		"PANGO_WEIGHT_HEAVY",
+		"PANGO_WEIGHT_ULTRAHEAVY",
+		NULL
+	};
+	char const **tag_names_ptr;
+
+	for (tag_names_ptr = tag_names; *tag_names_ptr != NULL; tag_names_ptr++)
+		gtk_text_buffer_remove_tag_by_name (buffer, *tag_names_ptr, start, end);
+}
+
+static void
 dialog_so_styled_bold_button_activated (GtkMenuItem *menuitem, DialogSOStyled *state)
 {
-	gpointer val = g_object_get_data (G_OBJECT (menuitem), "boldvalue");
+	char const *val = g_object_get_data (G_OBJECT (menuitem), "boldvalue");
 	if (val != NULL) {
 		GtkTextIter start, end;
 		if (gtk_text_buffer_get_selection_bounds (state->buffer, &start, &end)) {
-			GtkTextTag *tag = gtk_text_buffer_create_tag (state->buffer, 
-								      NULL, NULL);
-			g_object_set (G_OBJECT (tag), "weight", GPOINTER_TO_INT (val),
-				      "weight-set", TRUE, NULL);
+			GtkTextTag *tag = gtk_text_tag_table_lookup 
+				(gtk_text_buffer_get_tag_table (state->buffer), val);
+			dialog_so_styled_remove_weight_tags (state->buffer, &start, &end);
 			gtk_text_buffer_apply_tag (state->buffer, tag, &start, &end);
 			cb_dialog_so_styled_text_widget_changed (state->buffer, state);
 		}
-		g_object_set_data (G_OBJECT (state->bold), "boldvalue", val);
+		g_object_set_data (G_OBJECT (state->bold), "boldvalue", (char *) val);
 	}
 }
 
@@ -240,13 +246,8 @@ dialog_so_styled_bold_button_activated (GtkMenuItem *menuitem, DialogSOStyled *s
 			  G_CALLBACK (dialog_so_styled_bold_button_activated), \
                           state);                                              \
 	g_object_set_data (G_OBJECT (child), "boldvalue",                      \
-                           GINT_TO_POINTER (value));
+			   (char *) value);
 
-#ifndef HAVE_PANGO_WEIGHT_THIN_ETC
-#define PANGO_WEIGHT_THIN 100
-#define PANGO_WEIGHT_MEDIUM 500
-#define PANGO_WEIGHT_ULTRAHEAVY 1000
-#endif
 
 static GtkToolButton *
 dialog_so_styled_build_button_bold (GtkWidget *tb, DialogSOStyled *state)
@@ -257,26 +258,26 @@ dialog_so_styled_build_button_bold (GtkWidget *tb, DialogSOStyled *state)
 
 	menu = gtk_menu_new ();
 	
-	SETUPBPLDMENUITEM(_("Thin"), PANGO_WEIGHT_THIN)
-	SETUPBPLDMENUITEM(_("Ultralight"), PANGO_WEIGHT_ULTRALIGHT)
-	SETUPBPLDMENUITEM(_("Light"), PANGO_WEIGHT_LIGHT)
-	SETUPBPLDMENUITEM(_("Normal"), PANGO_WEIGHT_NORMAL)
-	SETUPBPLDMENUITEM(_("Medium"), PANGO_WEIGHT_MEDIUM)
-	SETUPBPLDMENUITEM(_("Semibold"), PANGO_WEIGHT_SEMIBOLD)
-	SETUPBPLDMENUITEM(_("Bold"), PANGO_WEIGHT_BOLD)
-	SETUPBPLDMENUITEM(_("Ultrabold"), PANGO_WEIGHT_ULTRABOLD)
-	SETUPBPLDMENUITEM(_("Heavy"), PANGO_WEIGHT_HEAVY)
-	SETUPBPLDMENUITEM(_("Ultraheavy"), PANGO_WEIGHT_ULTRAHEAVY)
+	SETUPBPLDMENUITEM(_("Thin"), "PANGO_WEIGHT_THIN")
+	SETUPBPLDMENUITEM(_("Ultralight"), "PANGO_WEIGHT_ULTRALIGHT")
+	SETUPBPLDMENUITEM(_("Light"), "PANGO_WEIGHT_LIGHT")
+	SETUPBPLDMENUITEM(_("Normal"), "PANGO_WEIGHT_NORMAL")
+	SETUPBPLDMENUITEM(_("Medium"), "PANGO_WEIGHT_MEDIUM")
+	SETUPBPLDMENUITEM(_("Semibold"), "PANGO_WEIGHT_SEMIBOLD")
+	SETUPBPLDMENUITEM(_("Bold"), "PANGO_WEIGHT_BOLD")
+	SETUPBPLDMENUITEM(_("Ultrabold"), "PANGO_WEIGHT_ULTRABOLD")
+	SETUPBPLDMENUITEM(_("Heavy"), "PANGO_WEIGHT_HEAVY")
+	SETUPBPLDMENUITEM(_("Ultraheavy"), "PANGO_WEIGHT_ULTRAHEAVY")
 
 	tb_button = gtk_menu_tool_button_new_from_stock (GTK_STOCK_BOLD);
 	gtk_toolbar_insert(GTK_TOOLBAR(tb), tb_button, -1);
 	gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (tb_button), menu);
 	g_object_set_data (G_OBJECT (tb_button), "boldvalue",
-                           GINT_TO_POINTER (PANGO_WEIGHT_BOLD));
+                           (char *) "PANGO_WEIGHT_BOLD");
 	g_signal_connect (G_OBJECT (tb_button), "clicked",
 			  G_CALLBACK (dialog_so_styled_bold_button_activated),
                           state);
-	return tb_button;
+	return GTK_TOOL_BUTTON (tb_button);
 }
 
 #undef SETUPBPLDMENUITEM
@@ -291,6 +292,7 @@ dialog_so_styled_text_widget (DialogSOStyled *state)
 	PangoAttrList  *markup;
 
 	state->buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (tv));
+	gnm_create_std_tags_for_buffer (state->buffer);
 
 	state->italic = dialog_so_styled_build_toggle_button 
 		(tb, state, GTK_STOCK_ITALIC, 
diff --git a/src/gui-util.c b/src/gui-util.c
index 9b8a9d9..9341916 100644
--- a/src/gui-util.c
+++ b/src/gui-util.c
@@ -667,7 +667,6 @@ gnm_load_pango_attributes_into_buffer_filter (PangoAttribute *attribute,
 					  G_GNUC_UNUSED gpointer data)
 {
 	return ((PANGO_ATTR_FOREGROUND == attribute->klass->type) ||
-		(PANGO_ATTR_WEIGHT == attribute->klass->type) ||
 		(PANGO_ATTR_UNDERLINE == attribute->klass->type) ||
 		(PANGO_ATTR_RISE == attribute->klass->type));
 }
@@ -676,9 +675,53 @@ gnm_load_pango_attributes_into_buffer_named_filter (PangoAttribute *attribute,
 						    G_GNUC_UNUSED gpointer data)
 {
 	return ((PANGO_ATTR_STYLE == attribute->klass->type) ||
+		(PANGO_ATTR_WEIGHT == attribute->klass->type) ||
 		(PANGO_ATTR_STRIKETHROUGH == attribute->klass->type));
 }
 
+#ifndef HAVE_PANGO_WEIGHT_THIN_ETC
+#define PANGO_WEIGHT_THIN 100
+#define PANGO_WEIGHT_BOOK 380
+#define PANGO_WEIGHT_MEDIUM 500
+#define PANGO_WEIGHT_ULTRAHEAVY 1000
+#endif
+
+void 
+gnm_create_std_tags_for_buffer (GtkTextBuffer *buffer)
+{
+	gtk_text_buffer_create_tag (buffer, "PANGO_STYLE_NORMAL", "style", PANGO_STYLE_NORMAL,
+				    "style-set", TRUE, NULL);
+	gtk_text_buffer_create_tag (buffer, "PANGO_STYLE_ITALIC", "style", PANGO_STYLE_ITALIC,
+				    "style-set", TRUE, NULL);
+	gtk_text_buffer_create_tag (buffer, "PANGO_STRIKETHROUGH_TRUE", "strikethrough", TRUE,
+				    "strikethrough-set", TRUE, NULL);
+	gtk_text_buffer_create_tag (buffer, "PANGO_STRIKETHROUGH_FALSE", "strikethrough", FALSE,
+				    "strikethrough-set", TRUE, NULL);
+	gtk_text_buffer_create_tag (buffer, "PANGO_WEIGHT_THIN", "weight", PANGO_WEIGHT_THIN,
+				    "weight-set", TRUE, NULL);
+	gtk_text_buffer_create_tag (buffer, "PANGO_WEIGHT_ULTRALIGHT", "weight", PANGO_WEIGHT_ULTRALIGHT,
+				    "weight-set", TRUE, NULL);
+	gtk_text_buffer_create_tag (buffer, "PANGO_WEIGHT_LIGHT", "weight", PANGO_WEIGHT_LIGHT,
+				    "weight-set", TRUE, NULL);
+	gtk_text_buffer_create_tag (buffer, "PANGO_WEIGHT_BOOK", "weight", PANGO_WEIGHT_BOOK,
+				    "weight-set", TRUE, NULL);
+	gtk_text_buffer_create_tag (buffer, "PANGO_WEIGHT_NORMAL", "weight", PANGO_WEIGHT_NORMAL,
+				    "weight-set", TRUE, NULL);
+	gtk_text_buffer_create_tag (buffer, "PANGO_WEIGHT_MEDIUM", "weight", PANGO_WEIGHT_MEDIUM,
+				    "weight-set", TRUE, NULL);
+	gtk_text_buffer_create_tag (buffer, "PANGO_WEIGHT_SEMIBOLD", "weight", PANGO_WEIGHT_SEMIBOLD,
+				    "weight-set", TRUE, NULL);
+	gtk_text_buffer_create_tag (buffer, "PANGO_WEIGHT_BOLD", "weight", PANGO_WEIGHT_BOLD,
+				    "weight-set", TRUE, NULL);
+	gtk_text_buffer_create_tag (buffer, "PANGO_WEIGHT_ULTRABOLD", "weight", PANGO_WEIGHT_ULTRABOLD,
+				    "weight-set", TRUE, NULL);
+	gtk_text_buffer_create_tag (buffer, "PANGO_WEIGHT_HEAVY", "weight", PANGO_WEIGHT_HEAVY,
+				    "weight-set", TRUE, NULL);
+	gtk_text_buffer_create_tag (buffer, "PANGO_WEIGHT_ULTRAHEAVY", "weight", PANGO_WEIGHT_ULTRAHEAVY,
+				    "weight-set", TRUE, NULL);
+}
+
+
 void 
 gnm_load_pango_attributes_into_buffer (PangoAttrList  *markup, GtkTextBuffer *buffer) 
 {
@@ -714,6 +757,7 @@ gnm_load_pango_attributes_into_buffer (PangoAttrList  *markup, GtkTextBuffer *bu
 				for (ptr = attr; ptr != NULL; ptr = ptr->next) {
 					PangoAttribute *attribute = ptr->data;
 					GtkTextTag *tag;
+					int val;
 
 					switch (attribute->klass->type) {
 					case PANGO_ATTR_STYLE:
@@ -724,13 +768,6 @@ gnm_load_pango_attributes_into_buffer (PangoAttrList  *markup, GtkTextBuffer *bu
 						tag = gtk_text_tag_table_lookup 
 							(gtk_text_buffer_get_tag_table (buffer), 
 							 name);
-						if (tag == NULL)
-							tag = gtk_text_buffer_create_tag 
-								(buffer, 
-								 name, 
-								 "style", ((PangoAttrInt *)attribute)->value,
-								 "style-set", TRUE,
-								 NULL);
 						gtk_text_buffer_apply_tag (buffer, tag, 
 									   &start_iter, &end_iter);
 						break;
@@ -741,17 +778,44 @@ gnm_load_pango_attributes_into_buffer (PangoAttrList  *markup, GtkTextBuffer *bu
 						tag = gtk_text_tag_table_lookup 
 							(gtk_text_buffer_get_tag_table (buffer), 
 							 name);
-						if (tag == NULL)
-							tag = gtk_text_buffer_create_tag 
-								(buffer, 
-								 name, 
-								 "strikethrough", 
-								 (((PangoAttrInt *)attribute)->value) != 0,
-								 "strikethrough-set", TRUE,
-								 NULL);
 						gtk_text_buffer_apply_tag (buffer, tag, 
 									   &start_iter, &end_iter);
 						break;
+					case PANGO_ATTR_WEIGHT:
+						val = ((PangoAttrInt *)attribute)->value;
+						if (val < (PANGO_WEIGHT_THIN + PANGO_WEIGHT_ULTRALIGHT)/2)
+							gtk_text_buffer_apply_tag_by_name (buffer,"PANGO_WEIGHT_THIN",
+											   &start_iter, &end_iter);
+						else if (val < (PANGO_WEIGHT_ULTRALIGHT + PANGO_WEIGHT_LIGHT)/2)
+							gtk_text_buffer_apply_tag_by_name (buffer,"PANGO_WEIGHT_ULTRALIGHT",
+											   &start_iter, &end_iter);
+						else if (val < (PANGO_WEIGHT_LIGHT + PANGO_WEIGHT_BOOK)/2)
+							gtk_text_buffer_apply_tag_by_name (buffer,"PANGO_WEIGHT_LIGHT",
+											   &start_iter, &end_iter);
+						else if (val < (PANGO_WEIGHT_BOOK + PANGO_WEIGHT_NORMAL)/2)
+							gtk_text_buffer_apply_tag_by_name (buffer,"PANGO_WEIGHT_BOOK",
+											   &start_iter, &end_iter);
+						else if (val < (PANGO_WEIGHT_NORMAL + PANGO_WEIGHT_MEDIUM)/2)
+							gtk_text_buffer_apply_tag_by_name (buffer,"PANGO_WEIGHT_NORMAL",
+											   &start_iter, &end_iter);
+						else if (val < (PANGO_WEIGHT_MEDIUM + PANGO_WEIGHT_SEMIBOLD)/2)
+							gtk_text_buffer_apply_tag_by_name (buffer,"PANGO_WEIGHT_MEDIUM",
+											   &start_iter, &end_iter);
+						else if (val < (PANGO_WEIGHT_SEMIBOLD + PANGO_WEIGHT_BOLD)/2)
+							gtk_text_buffer_apply_tag_by_name (buffer,"PANGO_WEIGHT_SEMIBOLD",
+											   &start_iter, &end_iter);
+						else if (val < (PANGO_WEIGHT_BOLD + PANGO_WEIGHT_ULTRABOLD)/2)
+							gtk_text_buffer_apply_tag_by_name (buffer,"PANGO_WEIGHT_BOLD",
+											   &start_iter, &end_iter);
+						else if (val < (PANGO_WEIGHT_ULTRABOLD + PANGO_WEIGHT_HEAVY)/2)
+							gtk_text_buffer_apply_tag_by_name (buffer,"PANGO_WEIGHT_ULTRABOLD",
+											   &start_iter, &end_iter);
+						else if (val < (PANGO_WEIGHT_HEAVY + PANGO_WEIGHT_ULTRAHEAVY)/2)
+							gtk_text_buffer_apply_tag_by_name (buffer,"PANGO_WEIGHT_HEAVY",
+											   &start_iter, &end_iter);
+						else gtk_text_buffer_apply_tag_by_name (buffer,"PANGO_WEIGHT_ULTRAHEAVY",
+											&start_iter, &end_iter);
+						break;
 					default:
 						break;
 					}
@@ -793,13 +857,6 @@ gnm_load_pango_attributes_into_buffer (PangoAttrList  *markup, GtkTextBuffer *bu
 							      NULL);
 						g_free (string);
 						break;
-					case PANGO_ATTR_WEIGHT:
-						g_object_set (G_OBJECT (tag), 
-							      "weight", 
-							      ((PangoAttrInt *)attribute)->value,
-							      "weight-set", TRUE,
-							      NULL);
-						break;
 					case PANGO_ATTR_UNDERLINE:
 						g_object_set (G_OBJECT (tag), 
 							      "underline", 
diff --git a/src/gui-util.h b/src/gui-util.h
index df68d94..01e80d8 100644
--- a/src/gui-util.h
+++ b/src/gui-util.h
@@ -76,6 +76,7 @@ void  gnumeric_textview_set_text (GtkTextView *text_view, char const *txt);
 void  gnm_load_pango_attributes_into_buffer (PangoAttrList  *markup, 
 					     GtkTextBuffer *buffer);
 PangoAttrList *gnm_get_pango_attributes_from_buffer (GtkTextBuffer *buffer);
+void gnm_create_std_tags_for_buffer (GtkTextBuffer *buffer);
 
 void focus_on_entry (GtkEntry *entry);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]