- error (_f ("can't find `%s'", "feta20.afm")
- + "\n" +_ ("Music font has not been installed properly. Aborting"));
-
- SCM pfa_path = ly_kpathsea_expand_path (scm_makfrom0str ("ecrm10.pfa"));
- if (!scm_is_string (pfa_path))
- error (_f ("can't find `%s'", "ecrm10.pfa")
- + "\n" +_f ("Install the ec-mftraced package from %s. Aborting",
- "http://lilypond.org/download/fonts/"));
-
-
+ {
+ error (_f ("cannot find `%s'", MUSIC_FONT ".otf")
+ + "\n"
+ + _ ("Music font has not been installed properly.")
+ + "\n"
+ + _f ("Search path `%s'", global_path.to_string ().to_str0())
+ + "\n"
+ + _ ("Aborting"));
+ }
+
+ if (!scm_is_string (ly_kpathsea_find_file (scm_makfrom0str ("ecrm10.pfa")))
+ && (!scm_is_string (ly_kpathsea_find_file (scm_makfrom0str ("lmr10.pfb")))))
+ error (_f ("cannot find `%s'", "ecrm10.pfa")
+ + "\n"
+ + _f ("cannot find `%s'", "lmr10.pfb")
+ + "\n"
+ + _f ("Install the ec-fonts-mftraced package from: %s.",
+ "http://lilypond.org/download/fonts/")
+ + "\n"
+ + _ ("Aborting."));
+