]> git.donarmstrong.com Git - lilypond.git/commitdiff
Remove trailing slashes from fontconfig dirs.
authorJan Nieuwenhuizen <janneke@gnu.org>
Thu, 20 Dec 2007 10:41:52 +0000 (11:41 +0100)
committerJan Nieuwenhuizen <janneke@gnu.org>
Thu, 20 Dec 2007 10:41:52 +0000 (11:41 +0100)
Should fix Lily on Windows with current GUB/fontconfig.

lily/font-config.cc

index 742887f6846efdb84ec21a2f3d6aa1abc133350f..39ae3c2a76c7c64d69d7ceebc7d2e08319ad4416 100644 (file)
@@ -45,8 +45,10 @@ init_fontconfig ()
                        
   vector<string> dirs;
 
-  dirs.push_back (lilypond_datadir + "/fonts/otf/");
-  dirs.push_back (lilypond_datadir + "/fonts/type1/");
+  /* Extra trailing slash suddenly breaks fontconfig (fc-cache 2.5.0)
+     on windows.  */
+  dirs.push_back (lilypond_datadir + "/fonts/otf");
+  dirs.push_back (lilypond_datadir + "/fonts/type1");
   
   for (vsize i = 0; i < dirs.size (); i++)
     {