use springs instead of fixed/distance pairs

[lilypond.git] / lily / font-config-scheme.cc

diff --git a/lily/font-config-scheme.cc b/lily/font-config-scheme.cc
index 5d734899b2b8a3cf95ba7a91d4a7ec19dc0c0bd2..6ccc616793addc2e73ed3e30c7be7655393e6ad6 100644 (file)
--- a/lily/font-config-scheme.cc
+++ b/lily/font-config-scheme.cc
@@ -55,9 +55,9 @@ string
 display_config (FcConfig *fcc)
 {
   string retval;
-  retval += display_strlist ("Config files", FcConfigGetConfigFiles(fcc));
-  retval +=  display_strlist ("Config dir", FcConfigGetConfigDirs(fcc));
-  retval +=  display_strlist ("Font dir", FcConfigGetFontDirs(fcc));
+  retval += display_strlist ("Config files", FcConfigGetConfigFiles (fcc));
+  retval +=  display_strlist ("Config dir", FcConfigGetConfigDirs (fcc));
+  retval +=  display_strlist ("Font dir", FcConfigGetFontDirs (fcc));
   return retval;
 }
 
@@ -89,16 +89,14 @@ LY_DEFINE (ly_font_config_get_font_file, "ly:font-config-get-font-file", 1, 0, 0
           (SCM name),
           "Get the file for font @var{name}")
 {
-  SCM_ASSERT_TYPE (scm_is_string (name), name,
-                  SCM_ARG1, __FUNCTION__, "string");
-
+  LY_ASSERT_TYPE (scm_is_string, name, 1);
   
   FcPattern*pat = FcPatternCreate ();
   FcValue val;
   
   val.type = FcTypeString;
   val.u.s = (const FcChar8*)ly_scm2string (name).c_str (); // FC_SLANT_ITALIC;
-  FcPatternAdd(pat, FC_FAMILY, val, FcFalse);
+  FcPatternAdd (pat, FC_FAMILY, val, FcFalse);
 
   FcResult result;
   SCM scm_result = SCM_BOOL_F;
@@ -106,7 +104,7 @@ LY_DEFINE (ly_font_config_get_font_file, "ly:font-config-get-font-file", 1, 0, 0
   FcConfigSubstitute (NULL, pat, FcMatchFont);
   FcDefaultSubstitute (pat);
   
-  pat = FcFontMatch(NULL, pat, &result);
+  pat = FcFontMatch (NULL, pat, &result);
   FcChar8 *str = 0;
   if (FcPatternGetString (pat, FC_FILE, 0, &str) == FcResultMatch)
     scm_result = scm_from_locale_string ((char const*) str);