Undo habits of a Serif font lover

diff --git a/gtk2_ardour/bundle_env_cocoa.cc b/gtk2_ardour/bundle_env_cocoa.cc
index f8b84091ed40e678c61c9efe553edae788cc0a05..eea289fce616f180726e9d8adf8180d822df8891 100644 (file)
--- a/gtk2_ardour/bundle_env_cocoa.cc
+++ b/gtk2_ardour/bundle_env_cocoa.cc
@@ -187,7 +187,7 @@ void load_custom_fonts()
                                kCFStringEncodingUTF8, FALSE);
                fontURL = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, ttf, kCFURLPOSIXPathStyle, TRUE);
                if (CTFontManagerRegisterFontsForURL(fontURL, kCTFontManagerScopeProcess, &error) != true) {
-                       cerr << _("Cannot load ArdourSerif TrueType font.") << endl;
+                       cerr << _("Cannot load ArdourSans TrueType font.") << endl;
                }
        }
 #endif

diff --git a/gtk2_ardour/bundle_env_mingw.cc b/gtk2_ardour/bundle_env_mingw.cc
index e979b8ac821d6db8bdba62a4e5a83d8cb36a0c2b..926e4cdcae02d18ba8487d0d2391c5016815ef0e 100644 (file)
--- a/gtk2_ardour/bundle_env_mingw.cc
+++ b/gtk2_ardour/bundle_env_mingw.cc
@@ -98,7 +98,7 @@ unload_custom_fonts()
        if (find_file (ardour_data_search_path(), "ArdourMono.ttf", font_file)) {
                RemoveFontResource(font_file.c_str());
        }
-       if (find_file (ardour_data_search_path(), "ArdourSerif.ttf", font_file)) {
+       if (find_file (ardour_data_search_path(), "ArdourSans.ttf", font_file)) {
                RemoveFontResource(font_file.c_str());
        }
 }

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index a2d75c3c68b741d44e62ef8f84470284a1fc0c86..e49ea3ec3e9294ddac45dd7dc0e6596119406814 100644 (file)
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -919,7 +919,7 @@ def build(bld):
     # Icons/Images
     bld.install_files(os.path.join (bld.env['DATADIR'], 'icons'), bld.path.ant_glob('icons/*.png'))
     bld.install_files(bld.env['DATADIR'], 'ArdourMono.ttf')
-    bld.install_files(bld.env['DATADIR'], 'ArdourSerif.ttf')
+    bld.install_files(bld.env['DATADIR'], 'ArdourSans.ttf')
 
     # Application/Product specific resources (icon, splash)
     pgmname = bld.env['PROGRAM_NAME']

diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index afc2fe12b8bab67d1a4278780f12dc21232cd8b5..83e2e3b7eca59233694c52f4a4e4287366c7a36a 100755 (executable)
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -647,7 +647,7 @@ cp ../../system_config $Etc/system_config
 cp ../../gtk2_ardour/icons/*.png ${Shared}/icons
 cp -r ../../gtk2_ardour/icons/cursor_* ${Shared}/icons/
 cp ../../gtk2_ardour/ArdourMono.ttf $Shared
-cp ../../gtk2_ardour/ArdourSerif.ttf $Shared
+cp ../../gtk2_ardour/ArdourSans.ttf $Shared
 cp ../../gtk2_ardour/resources/${APPNAME}-* ${Shared}/resources/
 
 # Themes: only install those named for this app

diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index 117aec56d505f544d547007b83f4269717a11a0d..f890cfe97136290242ee7da8a39f65ad4cc5fc46 100755 (executable)
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -509,7 +509,7 @@ cp ../../system_config $Resources/system_config
 cp ../../gtk2_ardour/icons/*.png ${Resources}/icons/
 cp -r ../../gtk2_ardour/icons/cursor_* ${Resources}/icons/
 cp ../../gtk2_ardour/ArdourMono.ttf $Shared
-cp ../../gtk2_ardour/ArdourSerif.ttf $Shared
+cp ../../gtk2_ardour/ArdourSans.ttf $Shared
 cp ../../gtk2_ardour/resources/${PRODUCT_PKG_DIR}-* ${Resources}/resources/