Now using the style's background color when syntax highlighting.

golden-files/results/bcpp-hello_cpp

@@ -1,8 +1,8 @@
-#include <iostream>               
+#include <iostream>               
-                                  
+                                  
-using namespace std;              
+using namespace std;              
-                                  
+                                  
-int main()                        
+int main()                        
-{                                 
+{                                 
-    cout << "Hello World" << endl;
+    cout << "Hello World" << endl;
-}                                 
+}                                 

golden-files/results/contents-hi3_py

@@ -1,2 +1,2 @@
-def hi():      
+def hi():      
-    print("hi")
+    print("hi")

golden-files/results/perltidy-perl_pl

@@ -1,2 +1,2 @@
-#!/usr/bin/perl         
+#!/usr/bin/perl         
-print "Hello, world!\n";
+print "Hello, world!\n";

golden-files/results/python_gut-hi3_py

@@ -1,2 +1,2 @@
-def hi():
+def hi():
 

golden-files/results/python_gut-hi_py

@@ -1,2 +1,2 @@
-def hi():
+def hi():
 

golden-files/results/uncrustify-closure-util_java

@@ -1,2 +1,2 @@
-
+
 

golden-files/results/uncrustify-hello_c

@@ -1,7 +1,7 @@
-#include <stdio.h>          
+#include <stdio.h>          
-                            
+                            
-int main()                  
+int main()                  
-{                           
+{                           
-    printf("Hello World\n");
+    printf("Hello World\n");
-    return 0;               
+    return 0;               
-}                           
+}                           

golden-files/results/uncrustify-hello_cpp

@@ -1,8 +1,8 @@
-#include <iostream>               
+#include <iostream>               
-                                  
+                                  
-using namespace std;              
+using namespace std;              
-                                  
+                                  
-int main()                        
+int main()                        
-{                                 
+{                                 
-    cout << "Hello World" << endl;
+    cout << "Hello World" << endl;
-}                                 
+}                                 

golden-files/results/uncrustify-hello_h

@@ -1,6 +1,6 @@
-#ifndef HELLO_H
+#ifndef HELLO_H
-#define HELLO_H
+#define HELLO_H
-               
+               
-void hello();  
+void hello();  
-               
+               
-#endif         
+#endif         

tools.py

@@ -123,24 +123,27 @@ def _run_command(command, status_text=Status.ok):
     return status, fill3.Text(_fix_input(output))
 
 
-def _syntax_highlight(text, lexer, style, pad_char=" "):
+def _syntax_highlight(text, lexer, style):
     def _parse_rgb(hex_rgb):
         if hex_rgb.startswith("#"):
             hex_rgb = hex_rgb[1:]
         return tuple(eval("0x"+hex_rgb[index:index+2]) for index in [0, 2, 4])
-    def _char_style_for_token_type(token_type):
+    def _char_style_for_token_type(token_type, default_bg_color):
         token_style = style.style_for_token(token_type)
         fg_color = (None if token_style["color"] is None
                     else _parse_rgb(token_style["color"]))
-        bg_color = (None if token_style["bgcolor"] is None
+        bg_color = (default_bg_color if token_style["bgcolor"] is None
                     else _parse_rgb(token_style["bgcolor"]))
         return termstr.CharStyle(fg_color, bg_color, token_style["bold"],
                                  token_style["italic"],
                                  token_style["underline"])
+    default_bg_color = _parse_rgb(style.background_color)
     text = fill3.join("",
-        [termstr.TermStr(text, _char_style_for_token_type(token_type))
+        [termstr.TermStr(text, _char_style_for_token_type(token_type,
+                                                          default_bg_color))
          for token_type, text in pygments.lex(text, lexer)])
-    return fill3.Text(text, pad_char=pad_char)
+    return fill3.Text(text, pad_char=termstr.TermStr(" ").bg_color(
+        default_bg_color))
 
 
 def _syntax_highlight_using_path(text, path):