2009-02-06 [holger] 3.7.0cvs55
[claws.git] / src / printing.c
index 6f45d127f496c4b2d480348051dfc7122c01e2bd..d5c389adeec94f17f0daac2a1b1d3b58bd6b8576 100644 (file)
@@ -1,5 +1,5 @@
 /* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2007 Holger Berndt <hb@claws-mail.org>,
+ * Copyright (C) 2007-2009 Holger Berndt <hb@claws-mail.org>,
  * Colin Leroy <colin@colino.net>, and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
 #include <string.h>
 #include <math.h>
 
-typedef struct {
+struct _PrintData {
+  PrintRenderer *renderer;
+  gpointer renderer_data;
   PangoLayout *layout;
   PangoContext *pango_context;
-  char *text;
+  gpointer to_print;
   GList *page_breaks;
   guint npages;
-  GtkTextBuffer *buffer;
   gint sel_start;
   gint sel_end;
   GHashTable *images;
   gint img_cnt;
   gdouble zoom;
-} PrintData;
+  gdouble ypos_line;
+};
 
 typedef struct {
   GtkPrintOperation *op;
@@ -76,8 +78,8 @@ typedef struct {
 } PreviewData;
 
 /* callbacks */
-static void     cb_begin_print(GtkPrintOperation*, GtkPrintContext*, gpointer);
-static void     cb_draw_page(GtkPrintOperation*, GtkPrintContext*, gint,
+static void     printing_textview_cb_begin_print(GtkPrintOperation*, GtkPrintContext*, gpointer);
+static void     printing_textview_cb_draw_page(GtkPrintOperation*, GtkPrintContext*, gint,
                             gpointer);
 static gboolean cb_preview(GtkPrintOperation*, GtkPrintOperationPreview*,
                           GtkPrintContext*, GtkWindow*, gpointer);
@@ -114,6 +116,8 @@ static void     printing_layout_set_text_attributes(PrintData*, GtkPrintContext
 static gboolean printing_is_pango_gdk_color_equal(PangoColor*, GdkColor*); 
 static gint     printing_text_iter_get_offset_bytes(PrintData *, const GtkTextIter*);
 
+#define PAGE_SETUP_STORAGE_FILE "print_page_setup"
+#define PAGE_MARGIN_STORAGE_UNIT GTK_UNIT_MM
 #define PREVIEW_SCALE 72
 #define PREVIEW_SHADOW_OFFSET 3
 #define PREVIEW_ZOOM_FAC 1.41
@@ -126,38 +130,29 @@ static void free_pixbuf(gpointer key, gpointer value, gpointer data)
   g_object_unref(G_OBJECT(attr->data));
 }
 
-void printing_print(GtkTextView *text_view, GtkWindow *parent, gint sel_start, gint sel_end)
+gpointer printing_get_renderer_data(PrintData *print_data)
 {
-  GtkPrintOperation *op;
-  GtkPrintOperationResult res;
-  PrintData *print_data;
-  GtkTextIter start, end;
-  GtkTextBuffer *buffer;
-
-  op = gtk_print_operation_new();
-
-  print_data = g_new0(PrintData,1);
-
-  print_data->zoom = 1.;
-
-  print_data->images = g_hash_table_new(g_direct_hash, g_direct_equal);
-  print_data->pango_context=gtk_widget_get_pango_context(GTK_WIDGET(text_view));
+       if (!print_data)
+               return NULL;
+       return print_data->renderer_data;
+}
 
-  /* get text */
-  buffer = gtk_text_view_get_buffer(text_view);
-  print_data->buffer = buffer;
-  print_data->sel_start = sel_start;
-  print_data->sel_end = sel_end;
-  if (print_data->sel_start < 0 || print_data->sel_end <= print_data->sel_start) {
-    gtk_text_buffer_get_start_iter(buffer, &start);
-    gtk_text_buffer_get_end_iter(buffer, &end);
-  } else {
-    gtk_text_buffer_get_iter_at_offset(buffer, &start, print_data->sel_start);
-    gtk_text_buffer_get_iter_at_offset(buffer, &end, print_data->sel_end);
-  }
+gdouble printing_get_zoom(PrintData *print_data)
+{
+       if (!print_data)
+               return 1.0;
+       return print_data->zoom;
+}
 
-  print_data->text = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
+void printing_set_n_pages(PrintData *print_data, gint n_pages)
+{
+       if (!print_data)
+               return;
+       print_data->npages = n_pages;
+}
 
+GtkPrintSettings *printing_get_settings(void)
+{
   if (settings == NULL) {
     settings = gtk_print_settings_new();
     gtk_print_settings_set_use_color(settings, prefs_common.print_use_color);
@@ -165,23 +160,113 @@ void printing_print(GtkTextView *text_view, GtkWindow *parent, gint sel_start, g
     gtk_print_settings_set_reverse(settings, prefs_common.print_use_reverse);
     gtk_print_settings_set_duplex(settings, prefs_common.print_use_duplex);
   }
+  return settings;
+}
+
+void printing_store_settings(GtkPrintSettings *new_settings)
+{
+    if(settings != NULL)
+      g_object_unref(settings);
+    settings = g_object_ref(new_settings);
+    prefs_common.print_use_color = gtk_print_settings_get_use_color(settings);
+    prefs_common.print_use_collate = gtk_print_settings_get_collate(settings);
+    prefs_common.print_use_reverse = gtk_print_settings_get_reverse(settings);
+    prefs_common.print_use_duplex = gtk_print_settings_get_duplex(settings);
+
+}
+GtkPageSetup *printing_get_page_setup(void)
+{
   if (page_setup == NULL) {
+    gboolean read_from_file;
+    char *page_setup_filename;
+    GKeyFile *keyfile;
+    gboolean key_file_read;
+    
     page_setup = gtk_page_setup_new();
-    if (prefs_common.print_paper_type && *prefs_common.print_paper_type) {
-      GtkPaperSize *paper = gtk_paper_size_new(prefs_common.print_paper_type);
-      gtk_page_setup_set_paper_size(page_setup, paper);
-      gtk_paper_size_free(paper);
+
+    read_from_file = FALSE;
+
+#if GTK_CHECK_VERSION(2,14,0)
+    /* try reading the page setup from file */
+    page_setup_filename = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, PAGE_SETUP_STORAGE_FILE, NULL);
+    keyfile = g_key_file_new();
+    key_file_read = g_key_file_load_from_file(keyfile, page_setup_filename, 0, NULL);
+    g_free(page_setup_filename);
+    
+    if(key_file_read)
+      read_from_file = gtk_page_setup_load_key_file(page_setup, keyfile, NULL, NULL);
+    g_key_file_free(keyfile);
+
+    if(read_from_file) {
+      debug_print("Printing: Read page setup from key file\n");
+    }
+    else {
+      debug_print("Printing: Could not read page setup from key file\n");
+    }
+#else
+    key_file_read = FALSE;
+    keyfile = NULL;
+    page_setup_filename = NULL;
+#endif
+
+    /* if reading from file did not work, or has not been tried (GTK+ < 2.14), use prefs */
+    if(!read_from_file) {
+      /* paper size */
+      if (prefs_common.print_paper_type && *prefs_common.print_paper_type) {
+        GtkPaperSize *paper = gtk_paper_size_new(prefs_common.print_paper_type);
+        gtk_page_setup_set_paper_size(page_setup, paper);
+        gtk_paper_size_free(paper);
+      }
+      /* orientation */
+      gtk_page_setup_set_orientation(page_setup, prefs_common.print_paper_orientation);
+      /* margins */
+      if(prefs_common.print_margin_top != -1)
+        gtk_page_setup_set_top_margin(page_setup, 0.01*prefs_common.print_margin_top, PAGE_MARGIN_STORAGE_UNIT);
+      if(prefs_common.print_margin_bottom != -1)
+        gtk_page_setup_set_bottom_margin(page_setup, 0.01*prefs_common.print_margin_bottom, PAGE_MARGIN_STORAGE_UNIT);
+      if(prefs_common.print_margin_left != -1)
+        gtk_page_setup_set_left_margin(page_setup, 0.01*prefs_common.print_margin_left, PAGE_MARGIN_STORAGE_UNIT);
+      if(prefs_common.print_margin_right != -1)
+        gtk_page_setup_set_right_margin(page_setup, 0.01*prefs_common.print_margin_right, PAGE_MARGIN_STORAGE_UNIT);
     }
-    gtk_page_setup_set_orientation(page_setup, prefs_common.print_paper_orientation);
   }
+  return page_setup;
+}
+
+void printing_print_full(GtkWindow *parent, PrintRenderer *renderer, gpointer renderer_data, 
+                        gint sel_start, gint sel_end)
+{                       
+  GtkPrintOperation *op;
+  GtkPrintOperationResult res;
+  PrintData *print_data;
+
+  op = gtk_print_operation_new();
+
+  print_data = g_new0(PrintData,1);
+
+  print_data->renderer = renderer;
+  print_data->renderer_data = renderer_data;
+  print_data->sel_start = sel_start;
+  print_data->sel_end = sel_end;
+
+  print_data->zoom = 1.;
+
+  print_data->images = g_hash_table_new(g_direct_hash, g_direct_equal);
+  
+  print_data->pango_context = renderer->get_pango_context(renderer_data);
+
+  print_data->to_print = renderer->get_data_to_print(renderer_data, sel_start, sel_end);
+
+  printing_get_settings();
+  printing_get_page_setup();
   
   /* Config for printing */
   gtk_print_operation_set_print_settings(op, settings);
   gtk_print_operation_set_default_page_setup(op, page_setup);
 
   /* signals */
-  g_signal_connect(op, "begin_print", G_CALLBACK(cb_begin_print), print_data);
-  g_signal_connect(op, "draw_page", G_CALLBACK(cb_draw_page), print_data);
+  g_signal_connect(op, "begin_print", G_CALLBACK(renderer->cb_begin_print), print_data);
+  g_signal_connect(op, "draw_page", G_CALLBACK(renderer->cb_draw_page), print_data);
   g_signal_connect(op, "preview", G_CALLBACK(cb_preview), print_data);
 
   /* Start printing process */
@@ -191,24 +276,18 @@ void printing_print(GtkTextView *text_view, GtkWindow *parent, gint sel_start, g
   if(res == GTK_PRINT_OPERATION_RESULT_ERROR) {
     GError *error = NULL;
     gtk_print_operation_get_error(op, &error);
-    debug_print("Error printing message: %s",
+    debug_print("Error printing message: %s\n",
            error ? error->message : "no details");
   }
   else if(res == GTK_PRINT_OPERATION_RESULT_APPLY) {
     /* store settings for next printing session */
-    if(settings != NULL)
-      g_object_unref(settings);
-    settings = g_object_ref(gtk_print_operation_get_print_settings(op));
-    prefs_common.print_use_color = gtk_print_settings_get_use_color(settings);
-    prefs_common.print_use_collate = gtk_print_settings_get_collate(settings);
-    prefs_common.print_use_reverse = gtk_print_settings_get_reverse(settings);
-    prefs_common.print_use_duplex = gtk_print_settings_get_duplex(settings);
+    printing_store_settings(gtk_print_operation_get_print_settings(op));
   }
 
   g_hash_table_foreach(print_data->images, free_pixbuf, NULL);
   g_hash_table_destroy(print_data->images);
-  if(print_data->text)
-    g_free(print_data->text);
+  if(print_data->to_print)
+    g_free(print_data->to_print);
   g_list_free(print_data->page_breaks);
   if(print_data->layout)
     g_object_unref(print_data->layout);
@@ -219,26 +298,51 @@ void printing_print(GtkTextView *text_view, GtkWindow *parent, gint sel_start, g
   debug_print("printing_print finished\n");
 }
 
+static PangoContext *printing_textview_get_pango_context(gpointer data)
+{
+       return gtk_widget_get_pango_context(GTK_WIDGET(data));
+}
+
+static gpointer printing_textview_get_data_to_print(gpointer data, gint sel_start, gint sel_end)
+{
+  GtkTextView *text_view = GTK_TEXT_VIEW(data);
+  GtkTextBuffer *buffer = gtk_text_view_get_buffer(text_view);
+  GtkTextIter start, end;
+  
+  if (sel_start < 0 || sel_end <= sel_start) {
+    gtk_text_buffer_get_start_iter(buffer, &start);
+    gtk_text_buffer_get_end_iter(buffer, &end);
+  } else {
+    gtk_text_buffer_get_iter_at_offset(buffer, &start, sel_start);
+    gtk_text_buffer_get_iter_at_offset(buffer, &end, sel_end);
+  }
+
+  return gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
+}
+
+void printing_print(GtkTextView *text_view, GtkWindow *parent, gint sel_start, gint sel_end)
+{
+       PrintRenderer *textview_renderer = g_new0(PrintRenderer, 1);
+       
+       textview_renderer->get_pango_context = printing_textview_get_pango_context;
+       textview_renderer->get_data_to_print = printing_textview_get_data_to_print;
+       textview_renderer->cb_begin_print    = printing_textview_cb_begin_print;
+       textview_renderer->cb_draw_page      = printing_textview_cb_draw_page;
+
+       printing_print_full(parent, textview_renderer, text_view, sel_start, sel_end);
+       
+       g_free(textview_renderer);
+}
+
 void printing_page_setup(GtkWindow *parent)
 {
   GtkPageSetup *new_page_setup;
+  char *keyfile;
 
-  if(settings == NULL) {
-    settings = gtk_print_settings_new();
-    gtk_print_settings_set_use_color(settings, prefs_common.print_use_color);
-    gtk_print_settings_set_collate(settings, prefs_common.print_use_collate);
-    gtk_print_settings_set_reverse(settings, prefs_common.print_use_reverse);
-    gtk_print_settings_set_duplex(settings, prefs_common.print_use_duplex);
-  }
-  if (page_setup == NULL) {
-    page_setup = gtk_page_setup_new();
-    if (prefs_common.print_paper_type && *prefs_common.print_paper_type) {
-      GtkPaperSize *paper = gtk_paper_size_new(prefs_common.print_paper_type);
-      gtk_page_setup_set_paper_size(page_setup, paper);
-      gtk_paper_size_free(paper);
-    }
-    gtk_page_setup_set_orientation(page_setup, prefs_common.print_paper_orientation);
-  }
+  keyfile = NULL;
+
+  printing_get_settings();
+  printing_get_page_setup();
 
   new_page_setup = gtk_print_run_page_setup_dialog(parent,page_setup,settings);
 
@@ -251,6 +355,20 @@ void printing_page_setup(GtkWindow *parent)
   prefs_common.print_paper_type = g_strdup(gtk_paper_size_get_name(
                gtk_page_setup_get_paper_size(page_setup)));
   prefs_common.print_paper_orientation = gtk_page_setup_get_orientation(page_setup);
+  /* store 100th millimeters */
+  prefs_common.print_margin_top    = (int) (100*gtk_page_setup_get_top_margin(page_setup, PAGE_MARGIN_STORAGE_UNIT));
+  prefs_common.print_margin_bottom = (int) (100*gtk_page_setup_get_bottom_margin(page_setup, PAGE_MARGIN_STORAGE_UNIT));
+  prefs_common.print_margin_left   = (int) (100*gtk_page_setup_get_left_margin(page_setup, PAGE_MARGIN_STORAGE_UNIT));
+  prefs_common.print_margin_right  = (int) (100*gtk_page_setup_get_right_margin(page_setup, PAGE_MARGIN_STORAGE_UNIT));
+
+#if GTK_CHECK_VERSION(2,14,0)
+  /* save to file */
+    keyfile = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, PAGE_SETUP_STORAGE_FILE, NULL);
+    if(!gtk_page_setup_to_file(page_setup, keyfile, NULL)) {
+      debug_print("Printing: Could not store page setup in file `%s'\n", keyfile);
+    }
+    g_free(keyfile);
+#endif
 }
 
 static gboolean cb_preview(GtkPrintOperation        *operation,
@@ -270,8 +388,9 @@ static gboolean cb_preview(GtkPrintOperation        *operation,
   GtkToolItem *separator;
   static GdkGeometry geometry;
   GtkWidget *dialog = NULL;
-  GtkTooltips *toolbar_tips = gtk_tooltips_new();
   GtkWidget *statusbar = gtk_hbox_new(2, FALSE);
+  CLAWS_TIP_DECL();
+
   debug_print("Creating internal print preview\n");
 
   print_data = (PrintData*) data;
@@ -319,14 +438,25 @@ static gboolean cb_preview(GtkPrintOperation        *operation,
        
   gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0);
 
+#if !(GTK_CHECK_VERSION(2,12,0))
+#define CLAWS_SET_TOOL_ITEM_TIP(widget,tip) { \
+       gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(widget), GTK_TOOLTIPS(tips),                    \
+                       tip, NULL);                                                             \
+}
+#else
+#define CLAWS_SET_TOOL_ITEM_TIP(widget,tip) { \
+       gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), tip);                             \
+}
+#endif 
+
 #define TOOLBAR_ITEM(item,text,tooltip,cb,cbdata) {                                                            \
        item = GTK_WIDGET(gtk_tool_button_new_from_stock(text));                                        \
        gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE);                                      \
        gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE);                                      \
        gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item), -1);                              \
        g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(cb), cbdata);                           \
-       gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(item), GTK_TOOLTIPS(toolbar_tips),                      \
-                       tooltip, NULL);                                                                 \
+       CLAWS_SET_TOOL_ITEM_TIP(GTK_TOOL_ITEM(item),            \
+                       tooltip);                                                                       \
 }
 
   TOOLBAR_ITEM(preview_data->first, GTK_STOCK_GOTO_FIRST, _("First page"), cb_preview_go_first, preview_data);
@@ -697,7 +827,7 @@ static void cb_preview_request_page_setup(GtkPrintOperation *op,
                                  GTK_UNIT_INCH);
 }
 
-static void cb_begin_print(GtkPrintOperation *op, GtkPrintContext *context,
+static void printing_textview_cb_begin_print(GtkPrintOperation *op, GtkPrintContext *context,
                           gpointer user_data)
 {
   double width, height;
@@ -709,6 +839,11 @@ static void cb_begin_print(GtkPrintOperation *op, GtkPrintContext *context,
   int start, ii;
   PangoLayoutIter *iter;
   double start_pos;
+  gint header_end_pos;
+  gint num_header_lines;
+  gint dummy;
+  gboolean header_done;
+  const gchar *text;
   double line_height =0.;
 
   print_data = (PrintData*) user_data;
@@ -731,7 +866,7 @@ static void cb_begin_print(GtkPrintOperation *op, GtkPrintContext *context,
   pango_font_description_free(desc);
 
   pango_layout_set_width(print_data->layout, width * PANGO_SCALE);
-  pango_layout_set_text(print_data->layout, print_data->text, -1);
+  pango_layout_set_text(print_data->layout, (char *)print_data->to_print, -1);
 
   printing_layout_set_text_attributes(print_data, context);
 
@@ -743,6 +878,26 @@ static void cb_begin_print(GtkPrintOperation *op, GtkPrintContext *context,
   ii = 0;
   start_pos = 0.;
   iter = pango_layout_get_iter(print_data->layout);
+
+  /* find the last character of the header */
+  header_end_pos = 0;
+  header_done = FALSE;
+  text = pango_layout_get_text(print_data->layout);
+  if(text && *text && *text != '\n') {
+    do {
+      if(text[0] == '\n' && (text[1] != '\0') && (text[1] == '\n'))
+       header_done = TRUE;
+      else
+       header_end_pos++;
+      text++;
+    } while(*text && !header_done);
+  }
+  /* find line number for header end */
+  pango_layout_index_to_line_x(print_data->layout, header_end_pos, 1,
+                              &num_header_lines, &dummy);
+  /* line count is zero-based */
+  num_header_lines++;
+
   do {
     PangoRectangle logical_rect;
     PangoLayoutLine *line;
@@ -766,6 +921,12 @@ static void cb_begin_print(GtkPrintOperation *op, GtkPrintContext *context,
       page_height = 0;
     }
 
+    if(ii == num_header_lines) {
+      int y0, y1;
+      pango_layout_iter_get_line_yrange(iter,&y0,&y1);
+      print_data->ypos_line = (double)y0 + 1./3.*((double)(y1 - y0))/2.;
+    }
+
     page_height += line_height;
     ii++;
   } while(ii < num_lines && pango_layout_iter_next_line(iter));
@@ -858,7 +1019,7 @@ static cairo_surface_t *pixbuf_to_surface(GdkPixbuf *pixbuf)
        return surface;
 }
 
-static void cb_draw_page(GtkPrintOperation *op, GtkPrintContext *context,
+static void printing_textview_cb_draw_page(GtkPrintOperation *op, GtkPrintContext *context,
                         int page_nr, gpointer user_data)
 {
   cairo_t *cr;
@@ -905,7 +1066,26 @@ static void cb_draw_page(GtkPrintOperation *op, GtkPrintContext *context,
 
       if(ii == start)
        start_pos = ((double)logical_rect.y) / PANGO_SCALE;
-      
+
+      /* Draw header separator line */
+      if(ii == 0) {
+       cairo_surface_t *surface;
+       surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
+                                            gtk_print_context_get_width(context)/print_data->zoom,
+                                            gtk_print_context_get_height(context)/print_data->zoom);
+       cairo_set_line_width(cr, .5);
+       cairo_set_source_surface(cr, surface,
+                                ((double)logical_rect.x) / PANGO_SCALE, 
+                                ((double)baseline) / PANGO_SCALE - start_pos);
+       cairo_move_to(cr,
+                     ((double)logical_rect.x) / PANGO_SCALE,
+                     (double)print_data->ypos_line / PANGO_SCALE);
+       cairo_rel_line_to(cr, gtk_print_context_get_width(context)/print_data->zoom, 0);
+       cairo_set_source_rgb(cr, 0., 0., 0.);
+       cairo_stroke(cr);
+       cairo_surface_destroy(surface);
+      }
+
       cairo_move_to(cr,
                    ((double)logical_rect.x) / PANGO_SCALE,
                    ((double)baseline) / PANGO_SCALE - start_pos);
@@ -935,22 +1115,25 @@ static void printing_layout_set_text_attributes(PrintData *print_data, GtkPrintC
   PangoAttrList *attr_list;
   PangoAttribute *attr;
   GSList *open_attrs, *attr_walk;
+  GtkTextView *text_view = GTK_TEXT_VIEW(print_data->renderer_data);
+  GtkTextBuffer *buffer = gtk_text_view_get_buffer(text_view);
 
   attr_list = pango_attr_list_new();
   if (print_data->sel_start < 0 || print_data->sel_end <= print_data->sel_start) {
-    gtk_text_buffer_get_start_iter(print_data->buffer, &iter);
+    gtk_text_buffer_get_start_iter(buffer, &iter);
   } else {
-    gtk_text_buffer_get_iter_at_offset(print_data->buffer, &iter, print_data->sel_start);
+    gtk_text_buffer_get_iter_at_offset(buffer, &iter, print_data->sel_start);
   }
 
   open_attrs = NULL;
   do {
-    gboolean fg_set, bg_set, under_set, strike_set;
+    gboolean fg_set, bg_set, under_set, strike_set, weight_set;
     GSList *tags, *tag_walk;
     GtkTextTag *tag;
     GdkColor *color;
     PangoUnderline underline;
     gboolean strikethrough;
+    gint weight;
     GdkPixbuf *image;
 
     if (prefs_common.print_imgs && (image = gtk_text_iter_get_pixbuf(&iter)) != NULL) {
@@ -992,6 +1175,7 @@ static void printing_layout_set_text_attributes(PrintData *print_data, GtkPrintC
                     "foreground-set", &fg_set,
                     "underline-set",&under_set,
                     "strikethrough-set", &strike_set,
+                    "weight-set", &weight_set,
                     NULL);
 
        if(fg_set) {
@@ -1077,6 +1261,27 @@ static void printing_layout_set_text_attributes(PrintData *print_data, GtkPrintC
          if(!found)
            debug_print("Error generating attribute list.\n");
        }
+       
+       if(weight_set) {
+         found = FALSE;
+         for(attr_walk = open_attrs; attr_walk != NULL; attr_walk = attr_walk->next) {
+           attr = (PangoAttribute*)attr_walk->data;
+           if(attr->klass->type == PANGO_ATTR_WEIGHT) {
+             attr_int = (PangoAttrInt*)attr;
+             g_object_get(G_OBJECT(tag), "weight", &weight, NULL);
+             if(attr_int->value == weight) {
+               attr->end_index = printing_text_iter_get_offset_bytes(print_data, &iter);
+               pango_attr_list_insert(attr_list, attr);
+               found = TRUE;
+               open_attrs = g_slist_delete_link(open_attrs, attr_walk);
+               break;
+             }
+           }
+         }
+         if(!found)
+           debug_print("Error generating attribute list.\n");
+       }
+       
 
       }
       g_slist_free(tags);
@@ -1084,6 +1289,9 @@ static void printing_layout_set_text_attributes(PrintData *print_data, GtkPrintC
 
     if(gtk_text_iter_begins_tag(&iter, NULL)) {
       tags = gtk_text_iter_get_toggled_tags(&iter, TRUE);
+      /* Sometimes, an iter has several weights. Use only the first in this case */
+      gboolean weight_set_for_this_iter;
+      weight_set_for_this_iter = FALSE;
       for(tag_walk = tags; tag_walk != NULL; tag_walk = tag_walk->next) {
        tag = GTK_TEXT_TAG(tag_walk->data);
        g_object_get(G_OBJECT(tag),
@@ -1116,6 +1324,13 @@ static void printing_layout_set_text_attributes(PrintData *print_data, GtkPrintC
          attr->start_index = printing_text_iter_get_offset_bytes(print_data, &iter);
          open_attrs = g_slist_prepend(open_attrs, attr);         
        }
+       if(weight_set && !weight_set_for_this_iter) {
+               weight_set_for_this_iter = TRUE;
+               g_object_get(G_OBJECT(tag), "weight", &weight, NULL);
+               attr = pango_attr_weight_new(weight);
+               attr->start_index = printing_text_iter_get_offset_bytes(print_data, &iter);
+               open_attrs = g_slist_prepend(open_attrs, attr); 
+       }
       }
       g_slist_free(tags);
     }