Merge branch 'master' of ssh://git.stderr.nl/projects/chimara/chimara

Conflicts:
	libchimara/style.c

diff --combined libchimara/style.c
index 076d5363b4b77b9bb84761c180d383517e93f85f,02d9ab2d01300e1f5adda0cab6b57bdedc207561..125dbd6d38128c41032eba935b7a34a4c1d25ca7
--- 1/libchimara/style.c
--- 2/libchimara/style.c
+++ b/libchimara/style.c
@@@ -146,6 -146,9 +146,9 @@@ style_init_textbuffer(GtkTextBuffer *bu
  
        /* Copy the override text tags to the textbuffers's tag table */
        g_hash_table_foreach(glk_data->glk_styles->text_buffer, style_copy_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer));
+ 
+       /* Assign the 'default' tag the lowest priority */
+       gtk_text_tag_set_priority( gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(buffer), "default"), 0 );
  }
  
  
@@@ -162,6 -165,9 +165,9 @@@ style_init_textgrid(GtkTextBuffer *buff
  
        /* Copy the current text tags to the textbuffers's tag table */
        g_hash_table_foreach(glk_data->glk_styles->text_grid, style_copy_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer));
+ 
+       /* Assign the 'default' tag the lowest priority */
+       gtk_text_tag_set_priority( gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(buffer), "default"), 0 );
  }
  
  /* Internal function used to iterate over a style table, copying it */
@@@ -233,9 -239,12 +239,9 @@@ style_init(ChimaraGlk *glk
        GHashTable *glk_text_buffer_styles = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_object_unref);
        GtkTextTag *tag;
  
 -      PangoFontDescription *default_font_desc = pango_font_description_from_string("Serif");
 -      PangoFontDescription *monospace_font_desc = pango_font_description_from_string("Monospace");
 -      
        /* Initialise the default styles for a text grid */
        tag = gtk_text_tag_new("default");
-       g_object_set(tag, "family", "Monospace", NULL);
+       g_object_set(tag, "family", "Monospace", "family-set", TRUE, NULL);
        g_hash_table_insert(default_text_grid_styles, "default", tag);
  
        tag = gtk_text_tag_new("normal");
@@@ -249,19 -258,19 +255,19 @@@
        g_hash_table_insert(default_text_grid_styles, "preformatted", tag);
  
        tag = gtk_text_tag_new("header");
-       g_object_set(tag, "weight", PANGO_WEIGHT_BOLD, NULL);
+       g_object_set(tag, "weight", PANGO_WEIGHT_BOLD, "weight-set", TRUE, NULL);
        g_hash_table_insert(default_text_grid_styles, "header", tag);
  
        tag = gtk_text_tag_new("subheader");
-       g_object_set(tag, "weight", PANGO_WEIGHT_BOLD, NULL);
+       g_object_set(tag, "weight", PANGO_WEIGHT_BOLD, "weight-set", TRUE, NULL);
        g_hash_table_insert(default_text_grid_styles, "subheader", tag);
  
        tag = gtk_text_tag_new("alert");
-       g_object_set(tag, "foreground", "#aa0000", "weight", PANGO_WEIGHT_BOLD, NULL);
+       g_object_set(tag, "foreground", "#aa0000", "foreground-set", TRUE, "weight", PANGO_WEIGHT_BOLD, "weight-set", TRUE, NULL);
        g_hash_table_insert(default_text_grid_styles, "alert", tag);
  
        tag = gtk_text_tag_new("note");
-       g_object_set(tag, "foreground", "#aaaa00", "weight", PANGO_WEIGHT_BOLD, NULL);
+       g_object_set(tag, "foreground", "#aaaa00", "foreground-set", TRUE, "weight", PANGO_WEIGHT_BOLD, "weight-set", TRUE, NULL);
        g_hash_table_insert(default_text_grid_styles, "note", tag);
  
        tag = gtk_text_tag_new("block-quote");
@@@ -278,12 -287,12 +284,12 @@@
        g_hash_table_insert(default_text_grid_styles, "user2", tag);
  
        tag = gtk_text_tag_new("hyperlink");
-       g_object_set(tag, "foreground", "#0000ff", "underline", PANGO_UNDERLINE_SINGLE, "underline-set", TRUE, NULL);
+       g_object_set(tag, "foreground", "#0000ff", "foreground-set", TRUE, "underline", PANGO_UNDERLINE_SINGLE, "underline-set", TRUE, NULL);
        g_hash_table_insert(default_text_grid_styles, "hyperlink", tag);
  
        /* Initialise the default styles for a text buffer */
        tag = gtk_text_tag_new("default");
-       g_object_set(tag, "family", "Serif", NULL);
+       g_object_set(tag, "family", "Serif", "family-set", TRUE, NULL);
        g_hash_table_insert(default_text_buffer_styles, "default", tag);
  
        tag = gtk_text_tag_new("normal");
@@@ -294,27 -303,27 +300,27 @@@
        g_hash_table_insert(default_text_buffer_styles, "emphasized", tag);
  
        tag = gtk_text_tag_new("preformatted");
-       g_object_set(tag, "family", "Monospace", NULL);
+       g_object_set(tag, "family", "Monospace", "family-set", TRUE, NULL);
        g_hash_table_insert(default_text_buffer_styles, "preformatted", tag);
  
        tag = gtk_text_tag_new("header");
-       g_object_set(tag, "weight", PANGO_WEIGHT_BOLD, NULL);
+       g_object_set(tag, "weight", PANGO_WEIGHT_BOLD, "weight-set", TRUE, NULL);
        g_hash_table_insert(default_text_buffer_styles, "header", tag);
  
        tag = gtk_text_tag_new("subheader");
-       g_object_set(tag, "weight", PANGO_WEIGHT_BOLD, NULL);
+       g_object_set(tag, "weight", PANGO_WEIGHT_BOLD, "weight-set", TRUE, NULL);
        g_hash_table_insert(default_text_buffer_styles, "subheader", tag);
  
        tag = gtk_text_tag_new("alert");
-       g_object_set(tag, "foreground", "#aa0000", "weight", PANGO_WEIGHT_BOLD, NULL);
+       g_object_set(tag, "foreground", "#aa0000", "foreground-set", TRUE, "weight", PANGO_WEIGHT_BOLD, "weight-set", TRUE, NULL);
        g_hash_table_insert(default_text_buffer_styles, "alert", tag);
  
        tag = gtk_text_tag_new("note");
-       g_object_set(tag, "foreground", "#aaaa00", "weight", PANGO_WEIGHT_BOLD, NULL);
+       g_object_set(tag, "foreground", "#aaaa00", "foreground-set", TRUE, "weight", PANGO_WEIGHT_BOLD, "weight-set", TRUE, NULL);
        g_hash_table_insert(default_text_buffer_styles, "note", tag);
  
        tag = gtk_text_tag_new("block-quote");
-       g_object_set(tag, "justification", GTK_JUSTIFY_CENTER, "style", PANGO_STYLE_ITALIC, "style-set", TRUE, NULL);
+       g_object_set(tag, "justification", GTK_JUSTIFY_CENTER, "justification-set", TRUE, "style", PANGO_STYLE_ITALIC, "style-set", TRUE, NULL);
        g_hash_table_insert(default_text_buffer_styles, "block-quote", tag);
  
        tag = gtk_text_tag_new("input");
@@@ -327,14 -336,17 +333,14 @@@
        g_hash_table_insert(default_text_buffer_styles, "user2", tag);
  
        tag = gtk_text_tag_new("hyperlink");
-       g_object_set(tag, "foreground", "#0000ff", "underline", PANGO_UNDERLINE_SINGLE, "underline-set", TRUE, NULL);
+       g_object_set(tag, "foreground", "#0000ff", "foreground-set", TRUE, "underline", PANGO_UNDERLINE_SINGLE, "underline-set", TRUE, NULL);
        g_hash_table_insert(default_text_buffer_styles, "hyperlink", tag);
  
        GtkTextTag *pager_tag = gtk_text_tag_new("pager");
-       g_object_set(pager_tag, "foreground", "#ffffff", "background", "#000000", NULL);
+       g_object_set(pager_tag, "family", "Monospace", "family-set", TRUE, "foreground", "#ffffff", "foreground-set", TRUE, "background", "#000000", "background-set", TRUE, NULL);
        g_hash_table_insert(default_text_buffer_styles, "pager", pager_tag);
        text_tag_to_attr_list(pager_tag, priv->pager_attr_list);
  
 -      pango_font_description_free(default_font_desc);
 -      pango_font_description_free(monospace_font_desc);
 -      
        priv->styles->text_grid = default_text_grid_styles;
        priv->styles->text_buffer = default_text_buffer_styles;
  
@@@ -377,8 -389,6 +383,6 @@@ create_css_file_scanner(void
  void
  scan_css_file(GScanner *scanner, ChimaraGlk *glk)
  {
-       CHIMARA_GLK_USE_PRIVATE(glk, priv);
- 
        while( g_scanner_peek_next_token(scanner) != G_TOKEN_EOF) {
                if( !style_accept_style_selector(scanner, glk) )
                        break;
@@@ -387,8 -397,7 +391,7 @@@
        g_scanner_destroy(scanner);
  
        /* Update the pager prompt to the new style */
-       GtkTextTag *pager_tag = GTK_TEXT_TAG( g_hash_table_lookup(priv->styles->text_buffer, "pager") );
-       text_tag_to_attr_list(pager_tag, priv->pager_attr_list);
+       style_update(glk);
  }
  
  /* Internal function: parses a token */
@@@ -718,11 -727,18 +721,18 @@@ apply_stylehint_to_tag(GtkTextTag *tag
        case stylehint_Proportional:
        {
                gchar *font_family;
-               GtkTextTag *font_tag = g_hash_table_lookup(
-                   wintype == wintype_TextBuffer? glk_data->styles->text_buffer : glk_data->styles->text_grid,
-                   val? "default" : "preformatted");
-               g_object_get(font_tag, "family", &font_family, NULL);
-               g_object_set(tag_object, "family", font_family, "family-set", TRUE, NULL);
+               gboolean family_set;
+ 
+               if(wintype != wintype_TextBuffer) {
+                       if(val)
+                               WARNING("Style hint 'propotional' only supported on text buffers.");
+ 
+                       break;
+               }
+ 
+               GtkTextTag *font_tag = g_hash_table_lookup(glk_data->styles->text_buffer, val? "default" : "preformatted");
+               g_object_get(font_tag, "family", &font_family, "family-set", &family_set, NULL);
+               g_object_set(tag_object, "family", font_family, "family-set", family_set, NULL);
                g_free(font_family);
        }
                break;
@@@ -1092,17 -1108,17 +1102,17 @@@ get_current_font(guint32 wintype
        switch(wintype) {
        case wintype_TextGrid:
                tag = g_hash_table_lookup(glk_data->styles->text_grid, "default");
 +              return pango_font_description_from_string("Monospace");
                break;
        case wintype_TextBuffer:
                tag = g_hash_table_lookup(glk_data->styles->text_buffer, "default");
 +              return pango_font_description_from_string("Serif");
                break;
        default:
                return NULL;
        }
  
        PangoFontDescription *font;
 -      g_object_get( G_OBJECT(tag), "font-desc", &font, NULL );
 -
        return font;
  }
  
@@@ -1140,8 -1156,7 +1150,8 @@@ text_tag_to_attr_list(GtkTextTag *tag, 
        }
  
        /* Font description updates the following properties simultaniously:
 -       * family, style, weight, variant, stretch, size
 +       * family, style, weight, variant, stretch, size.
 +       * FIXME: Except it doesn't really.
         */
        g_object_get(tag, "font-desc", &font_desc, NULL);
        pango_attr_list_insert(
@@@ -1165,7 -1180,7 +1175,7 @@@
        }
  }
  
- /* Update pager and reverse video tags */
+ /* Update pager tag */
  void
  style_update(ChimaraGlk *glk)
  {