X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fstyle.c;h=9779a37e2c474ebf9ad0c6022e88637ee41ff70b;hb=ae15de3b9d5bfa1246c4c11d0ff851ac9a7b5f7c;hp=0aa4db282bccbcc031d3d4f9dccae2a6450d6b96;hpb=090a87d90e12fd7ad43ba888539238069b4241f4;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/style.c b/libchimara/style.c
index 0aa4db2..9779a37 100644
--- a/libchimara/style.c
+++ b/libchimara/style.c
@@ -38,8 +38,8 @@ glk_set_style(glui32 styl)
 	glk_set_style_stream(glk_data->current_stream, styl);
 }
 
+/* The first 11 tag names must correspond to the first 11 glk tag names as defined below */
 static const gchar* TAG_NAMES[] = {
-	"default",
 	"normal",
 	"emphasized",
 	"preformatted",
@@ -52,9 +52,11 @@ static const gchar* TAG_NAMES[] = {
 	"user1",
 	"user2",
 	"hyperlink",
-	"pager"
+	"pager",
+	"default"
 };
 
+/* The first 11 glk tag names must correspond to the first 11 tag names as defined above */
 static const gchar* GLK_TAG_NAMES[] = {
 	"glk-normal",
 	"glk-emphasized",
@@ -317,12 +319,12 @@ style_init(ChimaraGlk *glk)
 
 	tag = gtk_text_tag_new("header");
 	//g_object_set(tag, "font-desc", default_font_desc, "size-points", 18.0, "weight", PANGO_WEIGHT_BOLD, NULL);
-	g_object_set(tag, "size-points", 18.0, "weight", PANGO_WEIGHT_BOLD, NULL);
+	g_object_set(tag, "weight", PANGO_WEIGHT_BOLD, NULL);
 	g_hash_table_insert(default_text_buffer_styles, "header", tag);
 
 	tag = gtk_text_tag_new("subheader");
 	//g_object_set(tag, "font-desc", default_font_desc, "size-points", 14.0, "weight", PANGO_WEIGHT_BOLD, NULL);
-	g_object_set(tag, "size-points", 14.0, "weight", PANGO_WEIGHT_BOLD, NULL);
+	g_object_set(tag, "weight", PANGO_WEIGHT_BOLD, NULL);
 	g_hash_table_insert(default_text_buffer_styles, "subheader", tag);
 
 	tag = gtk_text_tag_new("alert");
@@ -374,6 +376,7 @@ style_init(ChimaraGlk *glk)
 	for(i=0; i<style_NUMSTYLES; i++) {
 		tag = gtk_text_tag_new(GLK_TAG_NAMES[i]);
 		g_hash_table_insert(glk_text_grid_styles, (gchar*) GLK_TAG_NAMES[i], tag);
+		tag = gtk_text_tag_new(GLK_TAG_NAMES[i]);
 		g_hash_table_insert(glk_text_buffer_styles, (gchar*) GLK_TAG_NAMES[i], tag);
 	}
 
@@ -1080,21 +1083,21 @@ PangoFontDescription *
 get_current_font(guint32 wintype)
 {
 	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
-	GtkTextTag *normal;
+	GtkTextTag *tag;
 
 	switch(wintype) {
 	case wintype_TextGrid:
-		normal = g_hash_table_lookup(glk_data->styles->text_grid, "normal");
+		tag = g_hash_table_lookup(glk_data->styles->text_grid, "default");
 		break;
 	case wintype_TextBuffer:
-		normal = g_hash_table_lookup(glk_data->styles->text_buffer, "normal");
+		tag = g_hash_table_lookup(glk_data->styles->text_buffer, "default");
 		break;
 	default:
 		return NULL;
 	}
 
 	PangoFontDescription *font;
-	g_object_get( G_OBJECT(normal), "font-desc", &font, NULL );
+	g_object_get( G_OBJECT(tag), "font-desc", &font, NULL );
 
 	return font;
 }