[dw-free] Some styles do not set base font to 1em

[fu]

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

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

Set the base font to 1em; adjust some of the other font sizes to prevent
them from being extremely large. Fix capitalization of some fonts so that
Linux-based systems will display these properly.

Patch by zvi.

Files modified:

• bin/upgrading/s2layers/bases/layout.s2
• bin/upgrading/s2layers/blanket/layout.s2
• bin/upgrading/s2layers/funkycircles/layout.s2

--------------------------------------------------------------------------------
diff -r c33b18fe21de -r 18a840d5d368 bin/upgrading/s2layers/bases/layout.s2
--- a/bin/upgrading/s2layers/bases/layout.s2	Mon Apr 19 11:06:25 2010 -0500
+++ b/bin/upgrading/s2layers/bases/layout.s2	Mon Apr 19 22:22:51 2010 -0700
@@ -237,29 +237,29 @@ set num_items_reading = 10;
 
 set linklist_support = true;
 
-set font_base = "arial";
+set font_base = "Arial";
 set font_fallback = "sans-serif";
-set font_base_size  = "12";
-set font_base_units = "px";
+set font_base_size  = "1";
+set font_base_units = "em";
 
-set font_journal_title  = "arial";
-set font_journal_title_size  = "3";
+set font_journal_title  = "Arial";
+set font_journal_title_size  = "2.25";
 set font_journal_title_units = "em";
 
-set font_journal_subtitle  = "arial";
-set font_journal_subtitle_size  = "1.5";
+set font_journal_subtitle  = "Arial";
+set font_journal_subtitle_size  = "1.125";
 set font_journal_subtitle_units = "em";
 
-set font_module_text  = "arial";
+set font_module_text  = "Arial";
 set font_module_text_size  = "1";
 set font_module_text_units = "em";
 
-set font_module_heading  = "arial";
+set font_module_heading  = "Arial";
 set font_module_heading_size  = "1";
 set font_module_heading_units = "em";
 
-set font_entry_title  = "arial";
-set font_entry_title_size  = "1.667";
+set font_entry_title  = "Arial";
+set font_entry_title_size  = "1.25";
 set font_entry_title_units = "em";
 
 function Page::print_default_stylesheet()
diff -r c33b18fe21de -r 18a840d5d368 bin/upgrading/s2layers/blanket/layout.s2
--- a/bin/upgrading/s2layers/blanket/layout.s2	Mon Apr 19 11:06:25 2010 -0500
+++ b/bin/upgrading/s2layers/blanket/layout.s2	Mon Apr 19 22:22:51 2010 -0700
@@ -209,14 +209,14 @@ set module_customtext_order = 20;
 
 set font_base = "'Lucida Grande', 'Lucida Sans Unicode', Helvetica";
 set font_fallback = "sans-serif";
-set font_base_size = "0.625";
+set font_base_size = "1";
 set font_base_units = "em";
 
-set font_journal_title_size = "1.3";
+set font_journal_title_size = "1.25";
 set font_journal_title_units = "em";
 set font_journal_subtitle_size = "1";
 set font_journal_subtitle_units = "em";
-set font_entry_title_size = "1.6";
+set font_entry_title_size = "1.5";
 set font_entry_title_units = "em";
 
 function Page::print_default_stylesheet () {
diff -r c33b18fe21de -r 18a840d5d368 bin/upgrading/s2layers/funkycircles/layout.s2
--- a/bin/upgrading/s2layers/funkycircles/layout.s2	Mon Apr 19 11:06:25 2010 -0500
+++ b/bin/upgrading/s2layers/funkycircles/layout.s2	Mon Apr 19 22:22:51 2010 -0700
@@ -69,8 +69,8 @@ set layout_authors = [ { "name" => "900d
 
 set font_base = "Trebuchet MS, DejaVu Sans";
 set font_fallback = "sans-serif";
-set font_base_size = "15";
-set font_base_units = "px";
+set font_base_size = "1";
+set font_base_units = "em";
 set font_journal_title = "Impact, MgOpen Moderna";
 set font_journal_title_size = "2";
 set font_journal_title_units ="em";
--------------------------------------------------------------------------------