attempted further rationalization of clock font issues (especially fr OS X

git-svn-id: svn://localhost/ardour2/branches/3.0@14199 d708f5d6-7413-0410-9779-e7cbd77b26cf

4 files changed, 12 insertions, 9 deletions

diff --git a/gtk2_ardour/ardour3_fonts.rc.in b/gtk2_ardour/ardour3_fonts.rc.in
index 7e07b5a2f0..7d017df4b3 100644
--- a/gtk2_ardour/ardour3_fonts.rc.in
+++ b/gtk2_ardour/ardour3_fonts.rc.in
@@ -50,7 +50,7 @@ style "large_bold_text"
  	font_name = "bold @FONT_LARGE@"
 }
 
-style "bigger_bold_mono_text"
+style "bigger_mono_text"
 {
 	font_name = "@MONOSPACE@ @FONT_BIGGER@"
 }
diff --git a/gtk2_ardour/ardour3_widget_list.rc b/gtk2_ardour/ardour3_widget_list.rc
index 43c18b8aaf..343075c1ea 100644
--- a/gtk2_ardour/ardour3_widget_list.rc
+++ b/gtk2_ardour/ardour3_widget_list.rc
@@ -122,10 +122,10 @@ widget "*WarningMessage" style:highest "warning_message"
 widget "*big clock" style:highest "monospace massive_text"
 widget "*selection clock" style:highest "small_mono_text"
 widget "*punch clock" style:highest "small_mono_text"
-widget "*transport clock" style:highest "bigger_bold_mono_text"
-widget "*secondary clock" style:highest "bigger_bold_mono_text"
-widget "*transport delta clock" style:highest "bigger_bold_mono_text"
-widget "*secondary delta clock" style:highest "bigger_bold_mono_text"
+widget "*transport clock" style:highest "bigger_mono_text"
+widget "*secondary clock" style:highest "bigger_mono_text"
+widget "*transport delta clock" style:highest "bigger_mono_text"
+widget "*secondary delta clock" style:highest "bigger_mono_text"
 widget "*silence duration clock" style:highest "medium_text"
 widget "*edit point clock" style:highest "medium_text"
 widget "*nudge clock" style:highest "small_mono_text"
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index f386f2a0e5..60f0367764 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -223,10 +223,10 @@ fixup_bundle_environment (int, char* [])
 
 static void load_custom_fonts() {
 /* this code will only compile on OS X 10.6 and above, and we currently do not
- * need it anyway since we have no custom fonts on OS X. Leave it here in case
- * we ever need to comeback to it.
+ * need it for earlier versions since we fall back on a non-monospace,
+ * non-custom font.
  */
-#if 0
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
 	std::string ardour_mono_file;
 
 	if (!find_file_in_search_path (ardour_data_search_path(), "ArdourMono.ttf", ardour_mono_file)) {
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 39bc67be43..1b5a72daa4 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -513,8 +513,11 @@ def build(bld):
                 'MASSIVE' : '60',
         }
         if bld.env['build_target'] == 'tiger' or bld.env['build_target'] == 'leopard' :
+            # There is no acceptable monospace font available on older versions of OS X
+            # and no API to load TTF files that will work with GTK/fontconfig/pango.
+            # Fall back on a font that works, even though it is not monospace
             font_names = {
-                'MONOSPACE' : 'Lucida Sans Typewriter',
+                'MONOSPACE' : 'Lucida Grande',
             }
         else:
             font_names = {