CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/10/20 23:08:14
Modified files:
. : ChangeLog
lily : font-config.cc grob.cc slur.cc
Log message:
(init_fontconfig): resurrect mf/out/ check.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4199&tr2=1.4200&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/font-config.cc.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/grob.cc.diff?tr1=1.150&tr2=1.151&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/slur.cc.diff?tr1=1.228&tr2=1.229&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4199 lilypond/ChangeLog:1.4200
--- lilypond/ChangeLog:1.4199 Thu Oct 20 18:32:44 2005
+++ lilypond/ChangeLog Thu Oct 20 23:08:12 2005
@@ -1,3 +1,7 @@
+2005-10-21 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * lily/font-config.cc (init_fontconfig): resurrect mf/out/ check.
+
2005-10-20 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
* stepmake/stepmake/script-vars.make (PYTHON_SCRIPTS_IN): Oops. Add.
Index: lilypond/lily/font-config.cc
diff -u lilypond/lily/font-config.cc:1.25 lilypond/lily/font-config.cc:1.26
--- lilypond/lily/font-config.cc:1.25 Wed Oct 19 13:54:23 2005
+++ lilypond/lily/font-config.cc Thu Oct 20 23:08:14 2005
@@ -29,15 +29,20 @@
font_config_global = FcConfigGetCurrent ();
Array<String> dirs;
+ String builddir = prefix_directory + "/mf/out/";
- /*
- ugh. C&P main.cc
- */
- dirs.push (prefix_directory + "/fonts/otf/");
- dirs.push (prefix_directory + "/fonts/type1/");
- dirs.push (prefix_directory + "/fonts/cff/");
- dirs.push (prefix_directory + "/fonts/svg/");
-
+ if (stat (builddir.to_str0 (), &statbuf) == 0)
+ dirs.push (builddir.to_str0 ());
+ else
+ {
+ /*
+ ugh. C&P main.cc
+ */
+ dirs.push (prefix_directory + "/fonts/otf/");
+ dirs.push (prefix_directory + "/fonts/type1/");
+ dirs.push (prefix_directory + "/fonts/cff/");
+ dirs.push (prefix_directory + "/fonts/svg/");
+ }
for (int i = 0; i < dirs.size (); i++)
{
String dir = dirs[i];
Index: lilypond/lily/grob.cc
diff -u lilypond/lily/grob.cc:1.150 lilypond/lily/grob.cc:1.151
--- lilypond/lily/grob.cc:1.150 Sun Oct 16 14:09:30 2005
+++ lilypond/lily/grob.cc Thu Oct 20 23:08:14 2005
@@ -232,7 +232,8 @@
{
SCM expr = m->expr ();
if (point_and_click_global)
- expr = scm_list_3 (ly_symbol2scm ("grob-cause"), self_scm (), expr);
+ expr = scm_list_3 (ly_symbol2scm ("grob-cause"),
+ self_scm (), expr);
retval = Stencil (m->extent_box (), expr);
}
Index: lilypond/lily/slur.cc
diff -u lilypond/lily/slur.cc:1.228 lilypond/lily/slur.cc:1.229
--- lilypond/lily/slur.cc:1.228 Sun Oct 16 11:36:37 2005
+++ lilypond/lily/slur.cc Thu Oct 20 23:08:14 2005
@@ -230,6 +230,7 @@
"A slur",
+ /* properties */
"control-points "
"dash-fraction "
"dash-period "
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
