Merge branch 'master' of git://git.sv.gnu.org/lilypond

diff --git a/.gitignore b/.gitignore
index 20420023d0abe0573950e78d120bba713b0d8c0c..346f815f15ae53653e341ae799c5374f731183d2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,20 +5,23 @@
 *.600pk
 *.afm
 *.aux
+*.checksum
 *.eps
 *.gcda
 *.gcno
 *.gcov
+*.graph
 *.log
 *.midi
+*.new
 *.orig
 *.patch
 *.pats
-*.pdf
-*.ps
+*.profile
 *.pyc
 *.rej
 *.signature
+*.stacks
 *.svg
 *.tfm
 *~
@@ -27,9 +30,14 @@
 .dotest
 .gdbinit
 .htaccess
+/*.abc
 /*.html
 /*.ly
+/*.pdf
 /*.png
+/*.po
+/*.ppm
+/*.ps
 /.sconf_temp
 /.sconsign.dblite
 /GNUmakefile
@@ -45,6 +53,8 @@ TAGS
 a.out
 aclocal.m4
 autom4te.cache
+config-*.hh
+config-*.make
 config.hh
 config.log
 config.make
@@ -53,13 +63,10 @@ config.status.lineno
 configure
 gcstat*.scm
 lily-[0-9a-f][0-9a-f][0-9a-f]*
-out-scons
+nohup.out
 out-cov
+out-scons
 out-test
+pats
 tags
 test-output-distance
-config-*.hh
-config-*.make
-*.graph
-*.stacks
-*.profile

diff --git a/lily/font-config.cc b/lily/font-config.cc
index 742887f6846efdb84ec21a2f3d6aa1abc133350f..39ae3c2a76c7c64d69d7ceebc7d2e08319ad4416 100644 (file)
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -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++)
     {