[dw-free] Some fonts in themes are not formatted properly
[commit: http://hg.dwscoalition.org/dw-free/rev/eca28858bfd6]
http://bugs.dwscoalition.org/show_bug.cgi?id=4093
Clean up capitalization and quoting of font names in layouts and themes.
Patch by
fu.
Files modified:
http://bugs.dwscoalition.org/show_bug.cgi?id=4093
Clean up capitalization and quoting of font names in layouts and themes.
Patch by
Files modified:
- bin/upgrading/s2layers/blanket/themes.s2
- bin/upgrading/s2layers/brittle/themes.s2
- bin/upgrading/s2layers/colorside/themes.s2
- bin/upgrading/s2layers/compartmentalize/layout.s2
- bin/upgrading/s2layers/crisped/layout.s2
- bin/upgrading/s2layers/crisped/themes.s2
- bin/upgrading/s2layers/crossroads/layout.s2
- bin/upgrading/s2layers/drifting/layout.s2
- bin/upgrading/s2layers/drifting/themes.s2
- bin/upgrading/s2layers/dustyfoot/themes.s2
- bin/upgrading/s2layers/fiveam/themes.s2
- bin/upgrading/s2layers/fluidmeasure/themes.s2
- bin/upgrading/s2layers/funkycircles/layout.s2
- bin/upgrading/s2layers/modular/layout.s2
- bin/upgrading/s2layers/modular/themes.s2
- bin/upgrading/s2layers/negatives/themes.s2
- bin/upgrading/s2layers/practicality/layout.s2
- bin/upgrading/s2layers/practicality/themes.s2
- bin/upgrading/s2layers/skittlishdreams/layout.s2
- bin/upgrading/s2layers/tranquilityiii/themes.s2
- cgi-bin/DW/Controller/Entry.pm
--------------------------------------------------------------------------------
diff -r 8b3b20063226 -r eca28858bfd6 bin/upgrading/s2layers/blanket/themes.s2
--- a/bin/upgrading/s2layers/blanket/themes.s2 Mon Dec 05 18:09:53 2011 +0800
+++ b/bin/upgrading/s2layers/blanket/themes.s2 Mon Dec 05 18:41:11 2011 +0800
@@ -417,7 +417,7 @@
## Fonts
##===============================
-set font_base = "'Lucida Grande', 'Lucida'";
+set font_base = "'Lucida Grande', Lucida";
#NEWLAYER: blanket/jewels
diff -r 8b3b20063226 -r eca28858bfd6 bin/upgrading/s2layers/brittle/themes.s2
--- a/bin/upgrading/s2layers/brittle/themes.s2 Mon Dec 05 18:09:53 2011 +0800
+++ b/bin/upgrading/s2layers/brittle/themes.s2 Mon Dec 05 18:41:11 2011 +0800
@@ -178,17 +178,17 @@
## Fonts
##===============================
-set font_base = "News Gothic MT";
-set font_date_time = "News Gothic MT";
+set font_base = "'News Gothic MT'";
+set font_date_time = "'News Gothic MT'";
set font_date_time_size = ".9";
-set font_entry_text = "News Gothic MT";
+set font_entry_text = "'News Gothic MT'";
set font_entry_text_size = "1";
-set font_entry_title = "News Gothic MT";
+set font_entry_title = "'News Gothic MT'";
set font_entry_title_size = ".9";
-set font_module_heading = "News Gothic MT";
-set font_navigation_module_text = "News Gothic MT";
+set font_module_heading = "'News Gothic MT'";
+set font_navigation_module_text = "'News Gothic MT'";
set font_navigation_module_text_size = ".9";
-set font_other_module_text = "News Gothic MT";
+set font_other_module_text = "'News Gothic MT'";
set font_other_module_text_size = ".9";
##===============================
@@ -772,17 +772,17 @@
## Fonts
##===============================
-set font_base = "News Gothic MT";
-set font_date_time = "News Gothic MT";
+set font_base = "'News Gothic MT'";
+set font_date_time = "'News Gothic MT'";
set font_date_time_size = ".9";
-set font_entry_text = "News Gothic MT";
+set font_entry_text = "'News Gothic MT'";
set font_entry_text_size = "1";
-set font_entry_title = "News Gothic MT";
+set font_entry_title = "'News Gothic MT'";
set font_entry_title_size = ".9";
-set font_module_heading = "News Gothic MT";
-set font_navigation_module_text = "News Gothic MT";
+set font_module_heading = "'News Gothic MT'";
+set font_navigation_module_text = "'News Gothic MT'";
set font_navigation_module_text_size = ".9";
-set font_other_module_text = "News Gothic MT";
+set font_other_module_text = "'News Gothic MT'";
set font_other_module_text_size = ".9";
##===============================
@@ -1026,17 +1026,17 @@
## Fonts
##===============================
-set font_base = "News Gothic MT";
-set font_date_time = "News Gothic MT";
+set font_base = "'News Gothic MT'";
+set font_date_time = "'News Gothic MT'";
set font_date_time_size = ".9";
-set font_entry_text = "News Gothic MT";
+set font_entry_text = "'News Gothic MT'";
set font_entry_text_size = "1";
-set font_entry_title = "News Gothic MT";
+set font_entry_title = "'News Gothic MT'";
set font_entry_title_size = ".9";
-set font_module_heading = "News Gothic MT";
-set font_navigation_module_text = "News Gothic MT";
+set font_module_heading = "'News Gothic MT'";
+set font_navigation_module_text = "'News Gothic MT'";
set font_navigation_module_text_size = ".9";
-set font_other_module_text = "News Gothic MT";
+set font_other_module_text = "'News Gothic MT'";
set font_other_module_text_size = ".9";
##===============================
@@ -1251,17 +1251,17 @@
## Fonts
##===============================
-set font_base = "News Gothic MT";
-set font_date_time = "News Gothic MT";
+set font_base = "'News Gothic MT'";
+set font_date_time = "'News Gothic MT'";
set font_date_time_size = ".9";
-set font_entry_text = "News Gothic MT";
+set font_entry_text = "'News Gothic MT'";
set font_entry_text_size = "1";
-set font_entry_title = "News Gothic MT";
+set font_entry_title = "'News Gothic MT'";
set font_entry_title_size = ".9";
-set font_module_heading = "News Gothic MT";
-set font_navigation_module_text = "News Gothic MT";
+set font_module_heading = "'News Gothic MT'";
+set font_navigation_module_text = "'News Gothic MT'";
set font_navigation_module_text_size = ".9";
-set font_other_module_text = "News Gothic MT";
+set font_other_module_text = "'News Gothic MT'";
set font_other_module_text_size = ".9";
##===============================
diff -r 8b3b20063226 -r eca28858bfd6 bin/upgrading/s2layers/colorside/themes.s2
--- a/bin/upgrading/s2layers/colorside/themes.s2 Mon Dec 05 18:09:53 2011 +0800
+++ b/bin/upgrading/s2layers/colorside/themes.s2 Mon Dec 05 18:41:11 2011 +0800
@@ -687,10 +687,10 @@
## Fonts
##===============================
-set font_base = "Trebuchet MS, Helvetica";
-set font_entry_title = "Trebuchet MS, Helvetica";
-set font_journal_title = "Trebuchet MS, Helvetica";
-set font_module_heading = "Trebuchet MS, Helvetica";
+set font_base = "'Trebuchet MS', Helvetica";
+set font_entry_title = "'Trebuchet MS', Helvetica";
+set font_journal_title = "'Trebuchet MS', Helvetica";
+set font_module_heading = "'Trebuchet MS', Helvetica";
function Page::print_theme_stylesheet () {
"""
diff -r 8b3b20063226 -r eca28858bfd6 bin/upgrading/s2layers/compartmentalize/layout.s2
--- a/bin/upgrading/s2layers/compartmentalize/layout.s2 Mon Dec 05 18:09:53 2011 +0800
+++ b/bin/upgrading/s2layers/compartmentalize/layout.s2 Mon Dec 05 18:41:11 2011 +0800
@@ -19,27 +19,27 @@
## Fonts
##===============================
-set font_base = "Franklin Gothic Book, Arial Narrow, Arial";
+set font_base = "'Franklin Gothic Book', Arial Narrow, Arial";
set font_fallback = "sans-serif";
set font_base_size = "1";
set font_base_units = "em";
-set font_journal_title = "Franklin Gothic Book, Arial Narrow, Arial";
+set font_journal_title = "'Franklin Gothic Book', Arial Narrow, Arial";
set font_journal_title_size = "1.5";
set font_journal_title_units = "em";
-set font_journal_subtitle = "Franklin Gothic Book, Arial Narrow, Arial";
+set font_journal_subtitle = "'Franklin Gothic Book', Arial Narrow, Arial";
set font_journal_subtitle_size = "1.1";
set font_journal_subtitle_units = "em";
-set font_entry_title = "Franklin Gothic Book, Arial Narrow, Arial";
+set font_entry_title = "'Franklin Gothic Book', Arial Narrow, Arial";
set font_entry_title_size = "1.1";
set font_entry_title_units = "em";
set font_comment_title_size = "1.1";
set font_comment_title_units = "em";
-set font_module_heading = "Franklin Gothic Book, Arial Narrow, Arial";
+set font_module_heading = "'Franklin Gothic Book', Arial Narrow, Arial";
set font_module_heading_size = "1.1";
set font_module_heading_units = "em";
diff -r 8b3b20063226 -r eca28858bfd6 bin/upgrading/s2layers/crisped/layout.s2
--- a/bin/upgrading/s2layers/crisped/layout.s2 Mon Dec 05 18:09:53 2011 +0800
+++ b/bin/upgrading/s2layers/crisped/layout.s2 Mon Dec 05 18:41:11 2011 +0800
@@ -34,7 +34,7 @@
## Fonts
##===============================
-set font_base = "Palatino Linotype, Book Antiqua, Georgia, Times New Roman";
+set font_base = "'Palatino Linotype', 'Book Antiqua', Georgia, 'Times New Roman'";
set font_fallback = "serif";
set font_journal_title_size = "1.8";
set font_journal_title_units = "em";
diff -r 8b3b20063226 -r eca28858bfd6 bin/upgrading/s2layers/crisped/themes.s2
--- a/bin/upgrading/s2layers/crisped/themes.s2 Mon Dec 05 18:09:53 2011 +0800
+++ b/bin/upgrading/s2layers/crisped/themes.s2 Mon Dec 05 18:41:11 2011 +0800
@@ -2061,16 +2061,16 @@
## Fonts
##===============================
-set font_base = "Gourier New";
-set font_comment_title = "Courier New";
+set font_base = "'Courier New'";
+set font_comment_title = "'Courier New'";
set font_comment_title_units = "em";
-set font_entry_title = "Courier New";
-set font_journal_subtitle = "Courier New";
+set font_entry_title = "'Courier New'";
+set font_journal_subtitle = "'Courier New'";
set font_journal_subtitle_size = "1.5";
-set font_journal_title = "Courier New";
+set font_journal_title = "'Courier New'";
set font_journal_title_size = "2";
-set font_module_heading = "Courier New";
-set font_module_text = "Courier New";
+set font_module_heading = "'Courier New'";
+set font_module_text = "'Courier New'";
set font_module_text_units = "em";
diff -r 8b3b20063226 -r eca28858bfd6 bin/upgrading/s2layers/crossroads/layout.s2
--- a/bin/upgrading/s2layers/crossroads/layout.s2 Mon Dec 05 18:09:53 2011 +0800
+++ b/bin/upgrading/s2layers/crossroads/layout.s2 Mon Dec 05 18:41:11 2011 +0800
@@ -29,11 +29,11 @@
set font_base = "Verdana, Helvetica";
set font_fallback = "sans-serif";
-set font_journal_title = "Century Gothic, Verdana, sans-serif";
-set font_journal_subtitle = "Century Gothic, Verdana, sans-serif";
-set font_entry_title = "Century Gothic, Verdana, sans-serif";
-set font_comment_title = "Century Gothic, Verdana, sans-serif";
-set font_module_heading = "Century Gothic, Verdana, sans-serif";
+set font_journal_title = "'Century Gothic', Verdana, sans-serif";
+set font_journal_subtitle = "'Century Gothic', Verdana, sans-serif";
+set font_entry_title = "'Century Gothic', Verdana, sans-serif";
+set font_comment_title = "'Century Gothic', Verdana, sans-serif";
+set font_module_heading = "'Century Gothic', Verdana, sans-serif";
set font_module_text = "Verdana, Helvetica, sans-serif";
##===============================
diff -r 8b3b20063226 -r eca28858bfd6 bin/upgrading/s2layers/drifting/layout.s2
--- a/bin/upgrading/s2layers/drifting/layout.s2 Mon Dec 05 18:09:53 2011 +0800
+++ b/bin/upgrading/s2layers/drifting/layout.s2 Mon Dec 05 18:41:11 2011 +0800
@@ -136,7 +136,7 @@
set font_fallback = "sans-serif";
set font_base_size = "1";
set font_base_units = "em";
-set font_journal_title = "Times New Roman";
+set font_journal_title = "'Times New Roman'";
set font_journal_title_size = "2.8";
set font_journal_title_units = "em";
set font_entry_title_size = "1.2";
diff -r 8b3b20063226 -r eca28858bfd6 bin/upgrading/s2layers/drifting/themes.s2
--- a/bin/upgrading/s2layers/drifting/themes.s2 Mon Dec 05 18:09:53 2011 +0800
+++ b/bin/upgrading/s2layers/drifting/themes.s2 Mon Dec 05 18:41:11 2011 +0800
@@ -699,11 +699,11 @@
## Fonts
##===============================
-set font_base = "Trebuchet MS, Arial";
-set font_entry_title = "Trebuchet MS, Arial";
+set font_base = "'Trebuchet MS', Arial";
+set font_entry_title = "'Trebuchet MS', Arial";
set font_journal_title = "Verdana";
set font_journal_title_size = "2.5";
-set font_module_heading = "Trebuchet MS, Arial";
+set font_module_heading = "'Trebuchet MS', Arial";
set font_title_fallback = "sans-serif";
diff -r 8b3b20063226 -r eca28858bfd6 bin/upgrading/s2layers/dustyfoot/themes.s2
--- a/bin/upgrading/s2layers/dustyfoot/themes.s2 Mon Dec 05 18:09:53 2011 +0800
+++ b/bin/upgrading/s2layers/dustyfoot/themes.s2 Mon Dec 05 18:41:11 2011 +0800
@@ -114,7 +114,7 @@
## Fonts
##===============================
-set font_base = "Trebuchet MS";
+set font_base = "'Trebuchet MS'";
function Page::print_theme_stylesheet() {
"""
@@ -223,7 +223,7 @@
## Fonts
##===============================
-set font_base = "Trebuchet MS";
+set font_base = "'Trebuchet MS'";
#NEWLAYER: dustyfoot/dreamer
@@ -324,7 +324,7 @@
## Fonts
##===============================
-set font_base = "Century Gothic";
+set font_base = "'Century Gothic'";
#NEWLAYER: dustyfoot/garden
@@ -421,7 +421,7 @@
## Fonts
##===============================
-set font_base = "Calisto MT";
+set font_base = "'Calisto MT'";
set font_fallback = "serif";
@@ -558,7 +558,7 @@
## Fonts
##===============================
-set font_base = "Trebuchet MS";
+set font_base = "'Trebuchet MS'";
#NEWLAYER: dustyfoot/sunnyblush
diff -r 8b3b20063226 -r eca28858bfd6 bin/upgrading/s2layers/fiveam/themes.s2
--- a/bin/upgrading/s2layers/fiveam/themes.s2 Mon Dec 05 18:09:53 2011 +0800
+++ b/bin/upgrading/s2layers/fiveam/themes.s2 Mon Dec 05 18:41:11 2011 +0800
@@ -275,16 +275,16 @@
## Fonts
##===============================
-set font_base = "News Gothic MT, Helvetica";
-set font_comment_title = "Britannic Bold, Calibri";
+set font_base = "'News Gothic MT', Helvetica";
+set font_comment_title = "'Britannic Bold', Calibri";
set font_comment_title_size = "1.28";
-set font_entry_title = "Britannic Bold, Calibri";
+set font_entry_title = "'Britannic Bold', Calibri";
set font_entry_title_size = "1.28";
-set font_journal_subtitle = "News Gothic MT, Helvetica";
-set font_journal_title = "Britannic Bold, Calibri";
-set font_module_heading = "Britannic Bold, Calibri";
+set font_journal_subtitle = "'News Gothic MT', Helvetica";
+set font_journal_title = "'Britannic Bold', Calibri";
+set font_module_heading = "'Britannic Bold', Calibri";
set font_module_heading_size = "1.28";
-set font_module_text = "News Gothic MT, Helvetica";
+set font_module_text = "'News Gothic MT', Helvetica";
function Page::print_theme_stylesheet() {
"""
@@ -386,16 +386,16 @@
## Fonts
##===============================
-set font_base = "News Gothic MT, Helvetica";
-set font_comment_title = "Britannic Bold, Calibri";
+set font_base = "'News Gothic MT', Helvetica";
+set font_comment_title = "'Britannic Bold', Calibri";
set font_comment_title_size = "1.28";
-set font_entry_title = "Britannic Bold, Calibri";
+set font_entry_title = "'Britannic Bold', Calibri";
set font_entry_title_size = "1.28";
-set font_journal_subtitle = "News Gothic MT, Helvetica";
-set font_journal_title = "Britannic Bold, Calibri";
-set font_module_heading = "Britannic Bold, Calibri";
+set font_journal_subtitle = "'News Gothic MT', Helvetica";
+set font_journal_title = "'Britannic Bold', Calibri";
+set font_module_heading = "'Britannic Bold', Calibri";
set font_module_heading_size = "1.28";
-set font_module_text = "News Gothic MT, Helvetica";
+set font_module_text = "'News Gothic MT', Helvetica";
function Page::print_theme_stylesheet() {
"""
@@ -583,7 +583,7 @@
## Fonts
##===============================
-set font_base = "News Gothic MT, Helvetica";
+set font_base = "'News Gothic MT', Helvetica";
set font_comment_title = "Impact, Calibri";
set font_comment_title_size = "1.28";
set font_entry_title = "Impact, Calibri";
@@ -592,7 +592,7 @@
set font_journal_title = "Impact, Calibri";
set font_module_heading = "Impact, Calibri";
set font_module_heading_size = "1.28";
-set font_module_text = "News Gothic MT, Helvetica";
+set font_module_text = "'News Gothic MT', Helvetica";
function Page::print_theme_stylesheet() {
"""
@@ -701,16 +701,16 @@
## Fonts
##===============================
-set font_base = "News Gothic MT, Helvetica";
-set font_comment_title = "Britannic Bold, Calibri";
+set font_base = "'News Gothic MT', Helvetica";
+set font_comment_title = "'Britannic Bold', Calibri";
set font_comment_title_size = "1.28";
-set font_entry_title = "Britannic Bold, Calibri";
+set font_entry_title = "'Britannic Bold', Calibri";
set font_entry_title_size = "1.28";
-set font_journal_subtitle = "News Gothic MT, Helvetica";
-set font_journal_title = "Britannic Bold, Calibri";
-set font_module_heading = "Britannic Bold, Calibri";
+set font_journal_subtitle = "'News Gothic MT', Helvetica";
+set font_journal_title = "'Britannic Bold', Calibri";
+set font_module_heading = "'Britannic Bold', Calibri";
set font_module_heading_size = "1.28";
-set font_module_text = "News Gothic MT, Helvetica";
+set font_module_text = "'News Gothic MT', Helvetica";
function Page::print_theme_stylesheet() {
"""
@@ -928,16 +928,16 @@
## Fonts
##===============================
-set font_base = "News Gothic MT, Helvetica";
-set font_comment_title = "Britannic Bold, Calibri";
+set font_base = "'News Gothic MT', Helvetica";
+set font_comment_title = "'Britannic Bold', Calibri";
set font_comment_title_size = "1.28";
-set font_entry_title = "Britannic Bold, Calibri";
+set font_entry_title = "'Britannic Bold', Calibri";
set font_entry_title_size = "1.28";
-set font_journal_subtitle = "News Gothic MT, Helvetica";
-set font_journal_title = "Britannic Bold, Calibri";
-set font_module_heading = "Britannic Bold, Calibri";
+set font_journal_subtitle = "'News Gothic MT', Helvetica";
+set font_journal_title = "'Britannic Bold', Calibri";
+set font_module_heading = "'Britannic Bold', Calibri";
set font_module_heading_size = "1.28";
-set font_module_text = "News Gothic MT, Helvetica";
+set font_module_text = "'News Gothic MT', Helvetica";
function Page::print_theme_stylesheet() {
"""
@@ -1084,16 +1084,16 @@
## Fonts
##===============================
-set font_base = "News Gothic MT, Helvetica";
-set font_comment_title = "Britannic Bold, Calibri";
+set font_base = "'News Gothic MT', Helvetica";
+set font_comment_title = "'Britannic Bold', Calibri";
set font_comment_title_size = "1.28";
-set font_entry_title = "Britannic Bold, Calibri";
+set font_entry_title = "'Britannic Bold', Calibri";
set font_entry_title_size = "1.28";
-set font_journal_subtitle = "News Gothic MT, Helvetica";
-set font_journal_title = "Britannic Bold, Calibri";
-set font_module_heading = "Britannic Bold, Calibri";
+set font_journal_subtitle = "'News Gothic MT', Helvetica";
+set font_journal_title = "'Britannic Bold', Calibri";
+set font_module_heading = "'Britannic Bold', Calibri";
set font_module_heading_size = "1.28";
-set font_module_text = "News Gothic MT, Helvetica";
+set font_module_text = "'News Gothic MT', Helvetica";
function Page::print_theme_stylesheet() {
"""
@@ -1192,16 +1192,16 @@
## Fonts
##===============================
-set font_base = "News Gothic MT, Helvetica";
-set font_comment_title = "Britannic Bold, Calibri";
+set font_base = "'News Gothic MT', Helvetica";
+set font_comment_title = "'Britannic Bold', Calibri";
set font_comment_title_size = "1.28";
-set font_entry_title = "Britannic Bold, Calibri";
+set font_entry_title = "'Britannic Bold', Calibri";
set font_entry_title_size = "1.28";
-set font_journal_subtitle = "News Gothic MT, Helvetica";
-set font_journal_title = "Britannic Bold, Calibri";
-set font_module_heading = "Britannic Bold, Calibri";
+set font_journal_subtitle = "'News Gothic MT', Helvetica";
+set font_journal_title = "'Britannic Bold', Calibri";
+set font_module_heading = "'Britannic Bold', Calibri";
set font_module_heading_size = "1.28";
-set font_module_text = "News Gothic MT, Helvetica";
+set font_module_text = "'News Gothic MT', Helvetica";
function Page::print_theme_stylesheet() {
"""
@@ -1304,16 +1304,16 @@
## Fonts
##===============================
-set font_base = "News Gothic MT, Helvetica";
-set font_comment_title = "Britannic Bold, Calibri";
+set font_base = "'News Gothic MT', Helvetica";
+set font_comment_title = "'Britannic Bold', Calibri";
set font_comment_title_size = "1.28";
-set font_entry_title = "Britannic Bold, Calibri";
+set font_entry_title = "'Britannic Bold', Calibri";
set font_entry_title_size = "1.28";
-set font_journal_subtitle = "News Gothic MT, Helvetica";
-set font_journal_title = "Britannic Bold, Calibri";
-set font_module_heading = "Britannic Bold, Calibri";
+set font_journal_subtitle = "'News Gothic MT', Helvetica";
+set font_journal_title = "'Britannic Bold', Calibri";
+set font_module_heading = "'Britannic Bold', Calibri";
set font_module_heading_size = "1.28";
-set font_module_text = "News Gothic MT, Helvetica";
+set font_module_text = "'News Gothic MT', Helvetica";
function Page::print_theme_stylesheet() {
"""
@@ -1555,7 +1555,7 @@
## Fonts
##===============================
-set font_base = "News Gothic MT, Helvetica";
+set font_base = "'News Gothic MT', Helvetica";
set font_comment_title = "Impact, Calibri";
set font_comment_title_size = "1.28";
set font_entry_title = "Impact, Calibri";
@@ -1564,7 +1564,7 @@
set font_journal_title = "Impact, Calibri";
set font_module_heading = "Impact, Calibri";
set font_module_heading_size = "1.28";
-set font_module_text = "News Gothic MT, Helvetica";
+set font_module_text = "'News Gothic MT', Helvetica";
function Page::print_theme_stylesheet() {
"""
@@ -1673,16 +1673,16 @@
## Fonts
##===============================
-set font_base = "News Gothic MT, Helvetica";
-set font_comment_title = "Britannic Bold, Calibri";
+set font_base = "'News Gothic MT', Helvetica";
+set font_comment_title = "'Britannic Bold', Calibri";
set font_comment_title_size = "1.28";
-set font_entry_title = "Britannic Bold, Calibri";
+set font_entry_title = "'Britannic Bold', Calibri";
set font_entry_title_size = "1.28";
-set font_journal_subtitle = "News Gothic MT, Helvetica";
-set font_journal_title = "Britannic Bold, Calibri";
-set font_module_heading = "Britannic Bold, Calibri";
+set font_journal_subtitle = "'News Gothic MT', Helvetica";
+set font_journal_title = "'Britannic Bold', Calibri";
+set font_module_heading = "'Britannic Bold', Calibri";
set font_module_heading_size = "1.28";
-set font_module_text = "News Gothic MT, Helvetica";
+set font_module_text = "'News Gothic MT', Helvetica";
function Page::print_theme_stylesheet() {
"""
@@ -1919,7 +1919,7 @@
## Fonts
##===============================
-set font_base = "News Gothic MT, Helvetica";
+set font_base = "'News Gothic MT', Helvetica";
set font_comment_title = "Impact, Calibri";
set font_comment_title_size = "1.28";
set font_entry_title = "Impact, Calibri";
@@ -1928,7 +1928,7 @@
set font_journal_title = "Impact, Calibri";
set font_module_heading = "Impact, Calibri";
set font_module_heading_size = "1.28";
-set font_module_text = "News Gothic MT, Helvetica";
+set font_module_text = "'News Gothic MT', Helvetica";
function Page::print_theme_stylesheet() {
"""
@@ -2037,16 +2037,16 @@
## Fonts
##===============================
-set font_base = "News Gothic MT, Helvetica";
-set font_comment_title = "Britannic Bold, Calibri";
+set font_base = "'News Gothic MT', Helvetica";
+set font_comment_title = "'Britannic Bold', Calibri";
set font_comment_title_size = "1.28";
-set font_entry_title = "Britannic Bold, Calibri";
+set font_entry_title = "'Britannic Bold', Calibri";
set font_entry_title_size = "1.28";
-set font_journal_subtitle = "News Gothic MT, Helvetica";
-set font_journal_title = "Britannic Bold, Calibri";
-set font_module_heading = "Britannic Bold, Calibri";
+set font_journal_subtitle = "'News Gothic MT', Helvetica";
+set font_journal_title = "'Britannic Bold', Calibri";
+set font_module_heading = "'Britannic Bold', Calibri";
set font_module_heading_size = "1.28";
-set font_module_text = "News Gothic MT, Helvetica";
+set font_module_text = "'News Gothic MT', Helvetica";
function Page::print_theme_stylesheet() {
"""
diff -r 8b3b20063226 -r eca28858bfd6 bin/upgrading/s2layers/fluidmeasure/themes.s2
--- a/bin/upgrading/s2layers/fluidmeasure/themes.s2 Mon Dec 05 18:09:53 2011 +0800
+++ b/bin/upgrading/s2layers/fluidmeasure/themes.s2 Mon Dec 05 18:41:11 2011 +0800
@@ -60,13 +60,13 @@
## Fonts
##===============================
-set font_base = "News Gothic MT";
+set font_base = "'News Gothic MT'";
set font_comment_title = "Impact";
set font_entry_title = "Impact";
set font_journal_subtitle = "Impact";
set font_journal_title = "Impact";
set font_module_heading = "Impact";
-set font_module_text = "News Gothic MT";
+set font_module_text = "'News Gothic MT'";
#NEWLAYER: fluidmeasure/aqualicious
@@ -132,13 +132,13 @@
## Fonts
##===============================
-set font_base = "News Gothic MT";
+set font_base = "'News Gothic MT'";
set font_comment_title = "Impact";
set font_entry_title = "Impact";
set font_journal_subtitle = "Impact";
set font_journal_title = "Impact";
set font_module_heading = "Impact";
-set font_module_text = "News Gothic MT";
+set font_module_text = "'News Gothic MT'";
#NEWLAYER: fluidmeasure/autumnclouds
@@ -323,13 +323,13 @@
## Fonts
##===============================
-set font_base = "News Gothic MT";
+set font_base = "'News Gothic MT'";
set font_comment_title = "Impact";
set font_entry_title = "Impact";
set font_journal_subtitle = "Impact";
set font_journal_title = "Impact";
set font_module_heading = "Impact";
-set font_module_text = "News Gothic MT";
+set font_module_text = "'News Gothic MT'";
#NEWLAYER: fluidmeasure/citrusy
@@ -394,13 +394,13 @@
## Fonts
##===============================
-set font_base = "News Gothic MT";
+set font_base = "'News Gothic MT'";
set font_comment_title = "Impact";
set font_entry_title = "Impact";
set font_journal_subtitle = "Impact";
set font_journal_title = "Impact";
set font_module_heading = "Impact";
-set font_module_text = "News Gothic MT";
+set font_module_text = "'News Gothic MT'";
#NEWLAYER: fluidmeasure/dependable
@@ -465,13 +465,13 @@
## Fonts
##===============================
-set font_base = "News Gothic MT";
+set font_base = "'News Gothic MT'";
set font_comment_title = "Impact";
set font_entry_title = "Impact";
set font_journal_subtitle = "Impact";
set font_journal_title = "Impact";
set font_module_heading = "Impact";
-set font_module_text = "News Gothic MT";
+set font_module_text = "'News Gothic MT'";
#NEWLAYER: fluidmeasure/driedflowers
@@ -777,13 +777,13 @@
## Fonts
##===============================
-set font_base = "News Gothic MT";
+set font_base = "'News Gothic MT'";
set font_comment_title = "Impact";
set font_entry_title = "Impact";
set font_journal_subtitle = "Impact";
set font_journal_title = "Impact";
set font_module_heading = "Impact";
-set font_module_text = "News Gothic MT";
+set font_module_text = "'News Gothic MT'";
#NEWLAYER: fluidmeasure/hollowsilence
@@ -848,13 +848,13 @@
## Fonts
##===============================
-set font_base = "News Gothic MT";
+set font_base = "'News Gothic MT'";
set font_comment_title = "Impact";
set font_entry_title = "Impact";
set font_journal_subtitle = "Impact";
set font_journal_title = "Impact";
set font_module_heading = "Impact";
-set font_module_text = "News Gothic MT";
+set font_module_text = "'News Gothic MT'";
#NEWLAYER: fluidmeasure/kiwi
@@ -980,13 +980,13 @@
## Fonts
##===============================
-set font_base = "News Gothic MT";
+set font_base = "'News Gothic MT'";
set font_comment_title = "Impact";
set font_entry_title = "Impact";
set font_journal_subtitle = "Impact";
set font_journal_title = "Impact";
set font_module_heading = "Impact";
-set font_module_text = "News Gothic MT";
+set font_module_text = "'News Gothic MT'";
#NEWLAYER: fluidmeasure/lemonade
@@ -1052,13 +1052,13 @@
## Fonts
##===============================
-set font_base = "News Gothic MT";
+set font_base = "'News Gothic MT'";
set font_comment_title = "Impact";
set font_entry_title = "Impact";
set font_journal_subtitle = "Impact";
set font_journal_title = "Impact";
set font_module_heading = "Impact";
-set font_module_text = "News Gothic MT";
+set font_module_text = "'News Gothic MT'";
#NEWLAYER: fluidmeasure/marblei
@@ -1608,13 +1608,13 @@
## Fonts
##===============================
-set font_base = "News Gothic MT";
+set font_base = "'News Gothic MT'";
set font_comment_title = "Impact";
set font_entry_title = "Impact";
set font_journal_subtitle = "Impact";
set font_journal_title = "Impact";
set font_module_heading = "Impact";
-set font_module_text = "News Gothic MT";
+set font_module_text = "'News Gothic MT'";
#NEWLAYER: fluidmeasure/peacefuldreams
@@ -1919,13 +1919,13 @@
## Fonts
##===============================
-set font_base = "News Gothic MT";
+set font_base = "'News Gothic MT'";
set font_comment_title = "Impact";
set font_entry_title = "Impact";
set font_journal_subtitle = "Impact";
set font_journal_title = "Impact";
set font_module_heading = "Impact";
-set font_module_text = "News Gothic MT";
+set font_module_text = "'News Gothic MT'";
#NEWLAYER: fluidmeasure/rosegardeni
@@ -2738,13 +2738,13 @@
## Fonts
##===============================
-set font_base = "News Gothic MT";
+set font_base = "'News Gothic MT'";
set font_comment_title = "Impact";
set font_entry_title = "Impact";
set font_journal_subtitle = "Impact";
set font_journal_title = "Impact";
set font_module_heading = "Impact";
-set font_module_text = "News Gothic MT";
+set font_module_text = "'News Gothic MT'";
#NEWLAYER: fluidmeasure/wooded
diff -r 8b3b20063226 -r eca28858bfd6 bin/upgrading/s2layers/funkycircles/layout.s2
--- a/bin/upgrading/s2layers/funkycircles/layout.s2 Mon Dec 05 18:09:53 2011 +0800
+++ b/bin/upgrading/s2layers/funkycircles/layout.s2 Mon Dec 05 18:41:11 2011 +0800
@@ -64,11 +64,11 @@
## Fonts
##===============================
-set font_base = "Trebuchet MS, DejaVu Sans";
+set font_base = "'Trebuchet MS', 'DejaVu San's";
set font_fallback = "sans-serif";
set font_base_size = "1";
set font_base_units = "em";
-set font_journal_title = "Impact, MgOpen Moderna";
+set font_journal_title = "Impact, 'MgOpen Moderna'";
set font_journal_title_size = "2";
set font_journal_title_units ="em";
set font_journal_subtitle_size = "1.5";
diff -r 8b3b20063226 -r eca28858bfd6 bin/upgrading/s2layers/modular/layout.s2
--- a/bin/upgrading/s2layers/modular/layout.s2 Mon Dec 05 18:09:53 2011 +0800
+++ b/bin/upgrading/s2layers/modular/layout.s2 Mon Dec 05 18:41:11 2011 +0800
@@ -27,11 +27,11 @@
set font_base = "Verdana, Helvetica";
set font_fallback = "sans-serif";
-set font_journal_title = "Century Gothic, Verdana, sans-serif";
-set font_journal_subtitle = "Century Gothic, Verdana, sans-serif";
-set font_entry_title = "Century Gothic, Verdana, sans-serif";
-set font_comment_title = "Century Gothic, Verdana, sans-serif";
-set font_module_heading = "Century Gothic, Verdana, sans-serif";
+set font_journal_title = "'Century Gothic', Verdana, sans-serif";
+set font_journal_subtitle = "'Century Gothic', Verdana, sans-serif";
+set font_entry_title = "'Century Gothic', Verdana, sans-serif";
+set font_comment_title = "'Century Gothic', Verdana, sans-serif";
+set font_module_heading = "'Century Gothic', Verdana, sans-serif";
# Give a title to the navlinks module
function print_module_navlinks() {
diff -r 8b3b20063226 -r eca28858bfd6 bin/upgrading/s2layers/modular/themes.s2
--- a/bin/upgrading/s2layers/modular/themes.s2 Mon Dec 05 18:09:53 2011 +0800
+++ b/bin/upgrading/s2layers/modular/themes.s2 Mon Dec 05 18:41:11 2011 +0800
@@ -173,11 +173,11 @@
## Fonts
##===============================
-set font_base = "Trebuchet MS, Verdana";
-set font_comment_title = "Trebuchet MS, Verdana";
-set font_entry_title = "Trebuchet MS, Verdana";
-set font_journal_title = "Trebuchet MS, Verdana";
-set font_module_heading = "Trebuchet MS, Verdana";
+set font_base = "'Trebuchet MS', Verdana";
+set font_comment_title = "'Trebuchet MS', Verdana";
+set font_entry_title = "'Trebuchet MS', Verdana";
+set font_journal_title = "'Trebuchet MS', Verdana";
+set font_module_heading = "'Trebuchet MS', Verdana";
#NEWLAYER: modular/coffeeandcream
@@ -425,11 +425,11 @@
## Fonts
##===============================
-set font_base = "Trebuchet MS, Verdana";
-set font_comment_title = "Trebuchet MS, Verdana";
-set font_entry_title = "Trebuchet MS, Verdana";
-set font_journal_title = "Trebuchet MS, Verdana";
-set font_module_heading = "Trebuchet MS, Verdana";
+set font_base = "'Trebuchet MS', Verdana";
+set font_comment_title = "'Trebuchet MS', Verdana";
+set font_entry_title = "'Trebuchet MS', Verdana";
+set font_journal_title = "'Trebuchet MS', Verdana";
+set font_module_heading = "'Trebuchet MS', Verdana";
#NEWLAYER: modular/freshprose
@@ -676,11 +676,11 @@
## Fonts
##===============================
-set font_base = "Trebuchet MS, Verdana";
-set font_comment_title = "Trebuchet MS, Verdana";
-set font_entry_title = "Trebuchet MS, Verdana";
-set font_journal_title = "Trebuchet MS, Verdana";
-set font_module_heading = "Trebuchet MS, Verdana";
+set font_base = "'Trebuchet MS', Verdana";
+set font_comment_title = "'Trebuchet MS', Verdana";
+set font_entry_title = "'Trebuchet MS', Verdana";
+set font_journal_title = "'Trebuchet MS', Verdana";
+set font_module_heading = "'Trebuchet MS', Verdana";
#NEWLAYER: modular/mediterraneanpeach
@@ -914,11 +914,11 @@
## Fonts
##===============================
-set font_base = "Trebuchet MS, Verdana";
-set font_comment_title = "Trebuchet MS, Verdana";
-set font_entry_title = "Trebuchet MS, Verdana";
-set font_journal_title = "Trebuchet MS, Verdana";
-set font_module_heading = "Trebuchet MS, Verdana";
+set font_base = "'Trebuchet MS', Verdana";
+set font_comment_title = "'Trebuchet MS', Verdana";
+set font_entry_title = "'Trebuchet MS', Verdana";
+set font_journal_title = "'Trebuchet MS', Verdana";
+set font_module_heading = "'Trebuchet MS', Verdana";
#NEWLAYER: modular/starrynight
@@ -1065,11 +1065,11 @@
## Fonts
##===============================
-set font_base = "Trebuchet MS, Verdana";
-set font_comment_title = "Trebuchet MS, Verdana";
-set font_entry_title = "Trebuchet MS, Verdana";
-set font_journal_title = "Trebuchet MS, Verdana";
-set font_module_heading = "Trebuchet MS, Verdana";
+set font_base = "'Trebuchet MS', Verdana";
+set font_comment_title = "'Trebuchet MS', Verdana";
+set font_entry_title = "'Trebuchet MS', Verdana";
+set font_journal_title = "'Trebuchet MS', Verdana";
+set font_module_heading = "'Trebuchet MS', Verdana";
#NEWLAYER: modular/subtlemisses
diff -r 8b3b20063226 -r eca28858bfd6 bin/upgrading/s2layers/negatives/themes.s2
--- a/bin/upgrading/s2layers/negatives/themes.s2 Mon Dec 05 18:09:53 2011 +0800
+++ b/bin/upgrading/s2layers/negatives/themes.s2 Mon Dec 05 18:41:11 2011 +0800
@@ -714,7 +714,7 @@
## Fonts
##===============================
-set font_base = "News Gothic MT";
+set font_base = "'News Gothic MT'";
set font_comment_title = "Georgia";
set font_comment_title_size = "1.1";
set font_comment_title_units = "em";
@@ -1038,7 +1038,7 @@
## Fonts
##===============================
-set font_base = "News Gothic MT";
+set font_base = "'News Gothic MT'";
set font_comment_title = "Georgia";
set font_comment_title_size = "1.1";
set font_comment_title_units = "em";
@@ -1209,7 +1209,7 @@
## Fonts
##===============================
-set font_base = "News Gothic MT";
+set font_base = "'News Gothic MT'";
set font_comment_title = "Georgia";
set font_comment_title_size = "1.1";
set font_comment_title_units = "em";
@@ -1367,7 +1367,7 @@
## Fonts
##===============================
-set font_base = "News Gothic MT";
+set font_base = "'News Gothic MT'";
set font_comment_title = "Georgia";
set font_comment_title_size = "1.1";
set font_comment_title_units = "em";
diff -r 8b3b20063226 -r eca28858bfd6 bin/upgrading/s2layers/practicality/layout.s2
--- a/bin/upgrading/s2layers/practicality/layout.s2 Mon Dec 05 18:09:53 2011 +0800
+++ b/bin/upgrading/s2layers/practicality/layout.s2 Mon Dec 05 18:41:11 2011 +0800
@@ -17,27 +17,27 @@
## Fonts
##===============================
-set font_base = "Trebuchet MS, Arial";
+set font_base = "'Trebuchet MS', Arial";
set font_fallback = "sans-serif";
set font_base_size = "1";
set font_base_units = "em";
-set font_journal_title = "Lucida Sans";
+set font_journal_title = "'Lucida Sans'";
set font_journal_title_size = "1.8";
set font_journal_title_units = "em";
-set font_journal_subtitle = "Lucida Sans";
+set font_journal_subtitle = "'Lucida Sans'";
set font_journal_subtitle_size = "1.3";
set font_journal_subtitle_units = "em";
-set font_entry_title = "Lucida Sans";
+set font_entry_title = "'Lucida Sans'";
set font_entry_title_size = "1.37";
set font_entry_title_units = "em";
set font_comment_title_size = "1.2";
set font_comment_title_units = "em";
-set font_module_heading = "Lucida Sans";
+set font_module_heading = "'Lucida Sans'";
set font_module_heading_size = "1.37";
set font_module_heading_units = "em";
diff -r 8b3b20063226 -r eca28858bfd6 bin/upgrading/s2layers/practicality/themes.s2
--- a/bin/upgrading/s2layers/practicality/themes.s2 Mon Dec 05 18:09:53 2011 +0800
+++ b/bin/upgrading/s2layers/practicality/themes.s2 Mon Dec 05 18:41:11 2011 +0800
@@ -978,17 +978,17 @@
## Fonts
##===============================
-set font_base = "News Gothic MT";
-set font_comment_title = "Bernard MT Condensed";
-set font_entry_title = "Bernard MT Condensed";
+set font_base = "'News Gothic MT'";
+set font_comment_title = "'Bernard MT Condensed'";
+set font_entry_title = "'Bernard MT Condensed'";
set font_entry_title_size = "1.42";
-set font_journal_subtitle = "News Gothic MT";
+set font_journal_subtitle = "'News Gothic MT'";
set font_journal_subtitle_size = "1.37";
-set font_journal_title = "Bernard MT Condensed";
+set font_journal_title = "'Bernard MT Condensed'";
set font_journal_title_size = "1.92";
-set font_module_heading = "Bernard MT Condensed";
+set font_module_heading = "'Bernard MT Condensed'";
set font_module_heading_size = "1.42";
-set font_module_text = "News Gothic MT";
+set font_module_text = "'News Gothic MT'";
#NEWLAYER: practicality/danceinthedark
@@ -3026,17 +3026,17 @@
## Fonts
##===============================
-set font_base = "News Gothic MT";
-set font_comment_title = "Bernard MT Condensed";
-set font_entry_title = "Bernard MT Condensed";
+set font_base = "'News Gothic MT'";
+set font_comment_title = "'Bernard MT Condensed'";
+set font_entry_title = "'Bernard MT Condensed'";
set font_entry_title_size = "1.42";
-set font_journal_subtitle = "News Gothic MT";
+set font_journal_subtitle = "'News Gothic MT'";
set font_journal_subtitle_size = "1.37";
-set font_journal_title = "Bernard MT Condensed";
+set font_journal_title = "'Bernard MT Condensed'";
set font_journal_title_size = "1.92";
-set font_module_heading = "Bernard MT Condensed";
+set font_module_heading = "'Bernard MT Condensed'";
set font_module_heading_size = "1.42";
-set font_module_text = "News Gothic MT";
+set font_module_text = "'News Gothic MT'";
#NEWLAYER: practicality/printemps
@@ -4378,14 +4378,14 @@
## Fonts
##===============================
-set font_base = "News Gothic MT";
-set font_comment_title = "Bernard MT Condensed";
-set font_entry_title = "Bernard MT Condensed";
+set font_base = "'News Gothic MT'";
+set font_comment_title = "'Bernard MT Condensed'";
+set font_entry_title = "'Bernard MT Condensed'";
set font_entry_title_size = "1.42";
-set font_journal_subtitle = "News Gothic MT";
+set font_journal_subtitle = "'News Gothic MT'";
set font_journal_subtitle_size = "1.37";
-set font_journal_title = "Bernard MT Condensed";
+set font_journal_title = "'Bernard MT Condensed'";
set font_journal_title_size = "1.92";
-set font_module_heading = "Bernard MT Condensed";
+set font_module_heading = "'Bernard MT Condensed'";
set font_module_heading_size = "1.42";
-set font_module_text = "News Gothic MT";
+set font_module_text = "'News Gothic MT'";
diff -r 8b3b20063226 -r eca28858bfd6 bin/upgrading/s2layers/skittlishdreams/layout.s2
--- a/bin/upgrading/s2layers/skittlishdreams/layout.s2 Mon Dec 05 18:09:53 2011 +0800
+++ b/bin/upgrading/s2layers/skittlishdreams/layout.s2 Mon Dec 05 18:41:11 2011 +0800
@@ -193,7 +193,7 @@
property use font_module_text_units;
}
-set font_base = "tahoma, verdana, arial";
+set font_base = "Tahoma, Verdana, Arial";
set font_fallback = "sans-serif";
set font_base_size = "1";
set font_base_units = "em";
diff -r 8b3b20063226 -r eca28858bfd6 bin/upgrading/s2layers/tranquilityiii/themes.s2
--- a/bin/upgrading/s2layers/tranquilityiii/themes.s2 Mon Dec 05 18:09:53 2011 +0800
+++ b/bin/upgrading/s2layers/tranquilityiii/themes.s2 Mon Dec 05 18:41:11 2011 +0800
@@ -855,12 +855,12 @@
## Fonts
##===============================
-set font_base = "Trebuchet MS, Arial";
-set font_entry_title = "Trebuchet MS, Arial";
-set font_journal_title = "Trebuchet MS";
+set font_base = "'Trebuchet MS', Arial";
+set font_entry_title = "'Trebuchet MS', Arial";
+set font_journal_title = "'Trebuchet MS'";
set font_journal_title_size = "2.5";
set font_journal_title_units = "em";
-set font_module_heading = "Trebuchet MS, Arial";
+set font_module_heading = "'Trebuchet MS', Arial";
function Page::print_theme_stylesheet() {
"""
diff -r 8b3b20063226 -r eca28858bfd6 cgi-bin/DW/Controller/Entry.pm
--- a/cgi-bin/DW/Controller/Entry.pm Mon Dec 05 18:09:53 2011 +0800
+++ b/cgi-bin/DW/Controller/Entry.pm Mon Dec 05 18:41:11 2011 +0800
@@ -52,7 +52,7 @@
# redirect to app-space
sub _user_to_app_role {
my ( $path ) = @_;
- return DW::Request->get->redirect( "$LJ::SITEROOT$path" );
+ return DW::Request->get->redirect( LJ::create_url( $path, host => $LJ::SITEROOT ) );
}
sub _new_handler_userspace { return _user_to_app_role( "/entry/$_[0]->{username}/new" ) }
--------------------------------------------------------------------------------

no subject
You have a bit at the end which seems to be from another bug. Maybe http://changelog.dreamwidth.org/1079582.html?
no subject
And errr oops, thanks. I thought I'd taken care of that, but obviously not!