From ee7981dcc59de73dc259805880a68e5211ded946 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 26 Apr 2005 14:04:15 +0000 Subject: [PATCH] (out_filename): fix thinko with \version. --- ChangeLog | 4 ++++ lily/all-font-metrics.cc | 10 +++++----- lily/font-config.cc | 4 +++- scripts/abc2ly.py | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 70d601fc68..2c06cc170a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-04-26 Han-Wen Nienhuys + + * scripts/abc2ly.py (out_filename): fix thinko with \version. + 2005-04-26 Graham Percival * Documentation/user/basic-notation.itely, diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index 2b3db1bc09..9ccc1f78ed 100644 --- a/lily/all-font-metrics.cc +++ b/lily/all-font-metrics.cc @@ -68,14 +68,14 @@ All_font_metrics::find_pango_font (PangoFontDescription *description, 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 @@ All_font_metrics::find_pango_font (PangoFontDescription *description, pf->description_ = scm_cons (SCM_BOOL_F, scm_make_real (1.0)); } - g_free (fn); + g_free (pango_fn); return dynamic_cast (unsmob_metrics (val)); } diff --git a/lily/font-config.cc b/lily/font-config.cc index b9ba8b41a3..bed5bfdc10 100644 --- a/lily/font-config.cc +++ b/lily/font-config.cc @@ -44,7 +44,7 @@ init_fontconfig () { 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 @@ init_fontconfig () void init_fontconfig () { + } + #endif diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py index 7f7a241169..09dc7b27ce 100644 --- a/scripts/abc2ly.py +++ b/scripts/abc2ly.py @@ -1393,7 +1393,7 @@ for f in files: # don't substitute @VERSION@. 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) -- 2.39.2