Merge lp:~vikoadi/pantheon-print/fix-markup-print into lp:~elementary-apps/pantheon-print/trunk

[Viko Adi Rahmawan]

Use set_text to ensure escaped text (lp:1086015)

pantheon-print cannot print text with markup
for example try to print html text.
so this replace greater than and lower than with &gt and &lt

nb:I cannot try with printer as i have none, but at least it work in print to file

[Niclas Lockner (niclasl)]

The markup shouldn't be manually escaped, but escaped with Markup.escape_text. After that change, printing from Scratch to a PDF works for me.

review: Needs Fixing

[lp:~vikoadi/pantheon-print/fix-markup-print]

11. By Viko Adi Rahmawan on 2014-08-06

use set_text instead of set_markup

[Niclas Lockner (niclasl)]

Printing works as in I can print the generated pantheon-print.c, a simple text file with some åäö%"/€ characters, and a simple html page. I get the same result with set_text as with set_markup, so it's OK for me to just use set_text.

Remove the lines you commented out.

review: Needs Fixing

[lp:~vikoadi/pantheon-print/fix-markup-print]

12. By Viko Adi Rahmawan on 2014-08-06

remove commented code

[Niclas Lockner (niclasl)]

review: Approve

[Cody Garver (codygarver)]

Works with real printer too

review: Approve

=== modified file 'src/pantheon-print.vala'
--- src/pantheon-print.vala	2014-04-03 19:04:01 +0000
+++ src/pantheon-print.vala	2014-08-06 07:58:55 +0000
@@ -45,8 +45,6 @@
             }
         }        
 
-        content = content.replace("&", "&");       
-
         var setup = new Gtk.PageSetup ();
 
         setup.set_top_margin (15, Gtk.Unit.MM);
@@ -71,7 +69,7 @@
         layout.set_width (Pango.SCALE*width);
         height = (int)print_context.get_height ();     
   
-        layout.set_markup (content, -1);             
+        layout.set_text (content, -1);
         line_count = layout.get_line_count ();
         Pango.LayoutLine layout_line;
 
@@ -131,4 +129,4 @@
   	var operation = new CustomOperation (args, main_window);
 
   	operation.run (Gtk.PrintOperationAction.PRINT_DIALOG, main_window);
-}
+}
 \ No newline at end of file