CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/04/26 14:04:15
Modified files:
. : ChangeLog
lily : all-font-metrics.cc font-config.cc
scripts : abc2ly.py
Log message:
(out_filename): fix thinko with \version.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3507&tr2=1.3508&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/all-font-metrics.cc.diff?tr1=1.86&tr2=1.87&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/font-config.cc.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scripts/abc2ly.py.diff?tr1=1.50&tr2=1.51&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3507 lilypond/ChangeLog:1.3508
--- lilypond/ChangeLog:1.3507 Tue Apr 26 08:50:09 2005
+++ lilypond/ChangeLog Tue Apr 26 14:04:15 2005
@@ -1,3 +1,7 @@
+2005-04-26 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * scripts/abc2ly.py (out_filename): fix thinko with \version.
+
2005-04-26 Graham Percival <[EMAIL PROTECTED]>
* Documentation/user/basic-notation.itely,
Index: lilypond/lily/all-font-metrics.cc
diff -u lilypond/lily/all-font-metrics.cc:1.86
lilypond/lily/all-font-metrics.cc:1.87
--- lilypond/lily/all-font-metrics.cc:1.86 Tue Apr 12 22:49:29 2005
+++ lilypond/lily/all-font-metrics.cc Tue Apr 26 14:04:15 2005
@@ -68,14 +68,14 @@
gint (magnification *
pango_font_description_get_size
(description)));
- gchar *fn = pango_font_description_to_filename (description);
- SCM key = ly_symbol2scm (fn);
+ gchar *pango_fn = pango_font_description_to_filename (description);
+ SCM key = ly_symbol2scm (pango_fn);
SCM val;
if (!pango_dict_->try_retrieve (key, &val))
{
- if (be_verbose_global)
- progress_indication ("[" + String (fn));
+ progress_indication ("[" + String (pango_fn));
+
Pango_font *pf = new Pango_font (pango_ft2_fontmap_,
RIGHT,
description,
@@ -90,7 +90,7 @@
pf->description_ = scm_cons (SCM_BOOL_F,
scm_make_real (1.0));
}
- g_free (fn);
+ g_free (pango_fn);
return dynamic_cast<Pango_font *> (unsmob_metrics (val));
}
Index: lilypond/lily/font-config.cc
diff -u lilypond/lily/font-config.cc:1.17 lilypond/lily/font-config.cc:1.18
--- lilypond/lily/font-config.cc:1.17 Sun Apr 17 09:38:04 2005
+++ lilypond/lily/font-config.cc Tue Apr 26 14:04:15 2005
@@ -44,7 +44,7 @@
{
String dir = dirs[i];
if (!FcConfigAppFontAddDir (fcc, (FcChar8 *)dir.to_str0 ()))
- error (_f ("adding lilypond directory: %s", dir.to_str0 ()));
+ error (_f ("adding font directory: %s", dir.to_str0 ()));
else if (be_verbose_global)
message (_f ("adding font directory: %s", dir.to_str0 ()));
}
@@ -58,5 +58,7 @@
void
init_fontconfig ()
{
+
}
+
#endif
Index: lilypond/scripts/abc2ly.py
diff -u lilypond/scripts/abc2ly.py:1.50 lilypond/scripts/abc2ly.py:1.51
--- lilypond/scripts/abc2ly.py:1.50 Sun Apr 24 22:02:34 2005
+++ lilypond/scripts/abc2ly.py Tue Apr 26 14:04:15 2005
@@ -1393,7 +1393,7 @@
# don't substitute @[EMAIL PROTECTED] We want this to reflect
# the last version that was verified to work.
- outf.write ('\\version "2.5.20"\n' % version)
+ outf.write ('\\version "2.5.20"\n')
# dump_global (outf)
dump_header (outf, header)
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
