From a75890d466b161695315791db1ae3102fbb130dc Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 11 Dec 2004 13:08:26 +0000 Subject: [PATCH] (special_time_signature): --- ChangeLog | 8 ++++++++ lily/clef.cc | 28 +++++++++------------------- lily/font-metric.cc | 4 +++- lily/time-signature.cc | 12 ++++-------- lily/virtual-font-metric.cc | 4 +--- scm/clef.scm | 6 +++--- 6 files changed, 28 insertions(+), 34 deletions(-) diff --git a/ChangeLog b/ChangeLog index 53fe7fa7b8..1b6adf3f27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-12-11 Jan Nieuwenhuizen + + * ly/engraver-init.ly: Fix clef glyp names. + + * lily/time-signature.cc (special_time_signature): + 2004-12-11 Han-Wen Nienhuys * mf/merge.pe: new file. @@ -14,6 +20,8 @@ 2004-12-11 Jan Nieuwenhuizen + * lily/time-signature.cc (special_time_signature): Fix. + * configure.in (PKG_CONFIG_PATH): Remove stray `i'. Check for GTK2 before checking for pango. Fixes -fgnome. diff --git a/lily/clef.cc b/lily/clef.cc index c07944289e..589fe29ef4 100644 --- a/lily/clef.cc +++ b/lily/clef.cc @@ -16,15 +16,16 @@ /* FIXME: should use symbol for #'style. */ -MAKE_SCHEME_CALLBACK (Clef,before_line_breaking,1); +MAKE_SCHEME_CALLBACK (Clef, before_line_breaking, 1); SCM Clef::before_line_breaking (SCM smob) { Item *s = unsmob_item (smob); - SCM glyph = s->get_property ("glyph-name"); - - if (scm_is_string (glyph)) + + if (!scm_is_string (glyph)) + s->suicide (); + else { String str = ly_scm2string (glyph); @@ -33,24 +34,16 @@ Clef::before_line_breaking (SCM smob) && !to_boolean (s->get_property ("full-size-change"))) { str += "_change"; - s->set_property ("glyph-name", scm_makfrom0str (str.to_str0 ())); + s->set_property ("glyph-name", scm_makfrom0str (str.to_str0 ())); } } - else - { - s->suicide (); - return SCM_UNSPECIFIED; - } return SCM_UNSPECIFIED; } - - - -MAKE_SCHEME_CALLBACK (Clef,print,1) +MAKE_SCHEME_CALLBACK (Clef, print, 1) SCM -Clef::print (SCM smob) +Clef::print (SCM smob) { Grob *me = unsmob_grob (smob); SCM glyph_scm = me->get_property ("glyph-name"); @@ -61,13 +54,10 @@ Clef::print (SCM smob) Font_metric *fm = Font_interface::get_default_font (me); Stencil out = fm->find_by_name (glyph); if (out.is_empty ()) - { - me->warning (_f ("clef `%s' not found", glyph.to_str0 ())); - } + me->warning (_f ("clef `%s' not found", glyph.to_str0 ())); return out.smobbed_copy (); } - ADD_INTERFACE (Clef, "clef-interface", "A clef sign", "non-default full-size-change glyph-name"); diff --git a/lily/font-metric.cc b/lily/font-metric.cc index 63f45abe96..cbaa78603c 100644 --- a/lily/font-metric.cc +++ b/lily/font-metric.cc @@ -35,7 +35,9 @@ Font_metric::coding_scheme () const Stencil Font_metric::find_by_name (String s) const { - s = s.substituted ('-', "M"); + // FIXME: past tense in func name? + // $23 = 0x865ba10 "clefsMG_change" + s = s.substituted ('-', "M"); int idx = name_to_index (s); Box b; diff --git a/lily/time-signature.cc b/lily/time-signature.cc index ba2a32cf33..049ed3184e 100644 --- a/lily/time-signature.cc +++ b/lily/time-signature.cc @@ -27,7 +27,7 @@ MAKE_SCHEME_CALLBACK (Time_signature, print, 1); SCM Time_signature::print (SCM smob) { - Grob * me = unsmob_grob (smob); + Grob *me = unsmob_grob (smob); SCM st = me->get_property ("style"); SCM frac = me->get_property ("fraction"); int n = 4; @@ -40,18 +40,14 @@ Time_signature::print (SCM smob) Stencil m; if (st == ly_symbol2scm ("single-digit")) - { - m = numbered_time_signature (me, n, 0); - } + m = numbered_time_signature (me, n, 0); else if (scm_is_symbol (st)) - { - m = special_time_signature (me, st, n, d); - } + m = special_time_signature (me, st, n, d); else m = numbered_time_signature (me, n,d); if (Staff_symbol_referencer::line_count (me) % 2 == 0) - m.translate_axis (Staff_symbol_referencer::staff_space (me)/2 , Y_AXIS); + m.translate_axis (Staff_symbol_referencer::staff_space (me) / 2 , Y_AXIS); return m.smobbed_copy (); } diff --git a/lily/virtual-font-metric.cc b/lily/virtual-font-metric.cc index 71de7f33ba..a2fd658558 100644 --- a/lily/virtual-font-metric.cc +++ b/lily/virtual-font-metric.cc @@ -71,9 +71,7 @@ Virtual_font_metric::find_by_name (String glyph) const { Stencil m; for (SCM s = font_list_; m.is_empty () && scm_is_pair (s); s = scm_cdr (s)) - { - m = unsmob_metrics (scm_car (s))->find_by_name (glyph); - } + m = unsmob_metrics (scm_car (s))->find_by_name (glyph); return m; } diff --git a/scm/clef.scm b/scm/clef.scm index 2bbc081ec5..69f2bc79c3 100644 --- a/scm/clef.scm +++ b/scm/clef.scm @@ -91,7 +91,7 @@ ("clefs.petrucci-g" . -4))) (define-public (make-clef-set clef-name) - "Generate the clef setting commands for a clef with name CL." + "Generate the clef setting commands for a clef with name CLEF-NAME." (define (make-prop-set props) (let ((m (make-music 'PropertySet))) (map (lambda (x) (set! (ly:music-property m (car x)) (cdr x))) props) @@ -121,7 +121,7 @@ (csp (make-music 'ContextSpeccedMusic))) (context-spec-music seq 'Staff)) (begin - (ly:warn "Unknown clef type `~a' -See scm/lily.scm for supported clefs" clef-name) + (ly:warn (_ "Unknown clef type `~a' clef-name")) + (ly:warn (_ "See scm/lily.scm for supported clefs")) (make-music 'Music))))) -- 2.39.2