[dw-free] customizable font options & headers

[fu]

[commit: http://hg.dwscoalition.org/dw-free/rev/b3a009d28385]

http://bugs.dwscoalition.org/show_bug.cgi?id=2195

Apply module title and journal title properties.

Patch by ninetydegrees.

Files modified:

• bin/upgrading/s2layers/skittlishdreams/layout.s2

--------------------------------------------------------------------------------
diff -r 5a02442865c2 -r b3a009d28385 bin/upgrading/s2layers/skittlishdreams/layout.s2
--- a/bin/upgrading/s2layers/skittlishdreams/layout.s2	Fri Oct 29 17:21:37 2010 +0800
+++ b/bin/upgrading/s2layers/skittlishdreams/layout.s2	Fri Oct 29 17:25:47 2010 +0800
@@ -163,12 +163,14 @@ propgroup fonts {
     property use font_fallback;
     property use font_base_size;
     property use font_base_units;
+    property use font_journal_title;
     property use font_journal_title_size;
     property use font_journal_title_units;
     property use font_entry_title;
     property use font_entry_title_size;
     property use font_entry_title_units;
     property use font_module_heading_size;
+    property use font_module_heading;
     property use font_module_heading_units;
     property use font_module_text;
     property use font_module_text_size;
@@ -385,10 +387,10 @@ function Page::print_default_stylesheet 
     var string theme_base_color =  $image_base->substr(0, $image_base->index("_"));
 
     var string page_font = generate_font_css("", $*font_base, $*font_fallback, $*font_base_size, $*font_base_units );
-    var string journal_title_font = generate_font_css("", "", "", $*font_journal_title_size, $*font_journal_title_units);
+    var string journal_title_font = generate_font_css($*font_journal_title, $*font_base, $*font_fallback, $*font_journal_title_size, $*font_journal_title_units);
     var string entry_title_font = generate_font_css($*font_entry_title, $*font_base, $*font_fallback, $*font_entry_title_size, $*font_entry_title_units);
     var string module_font = generate_font_css($*font_module_text, $*font_base, $*font_fallback, $*font_module_text_size, $*font_module_text_units);
-    var string module_title_font = generate_font_css("", "", "", $*font_module_heading_size, $*font_module_heading_units);
+    var string module_title_font = generate_font_css($*font_module_heading, $*font_base, $*font_fallback, $*font_module_heading_size, $*font_module_heading_units);
     
 
     var string page_background = generate_background_css( $*image_background_page_url, $*image_background_page_repeat, $*image_background_page_position, $*color_page_background );
--------------------------------------------------------------------------------