From 5b83265e53c2095a7fdbda95a536b5a98b464ab8 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 25 Mar 2004 14:28:18 +0000 Subject: [PATCH] (filter_engravers): derefence pointer. --- ChangeLog | 2 ++ lily/clef-engraver.cc | 9 ++++++--- lily/context-def.cc | 4 ++-- scm/define-grobs.scm | 5 ++++- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 891cd3de29..04e9213e35 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2004-03-25 Han-Wen Nienhuys + * lily/context-def.cc (filter_engravers): derefence pointer. + * lily/lily-guile.cc (type_check_assignment): use ly_scheme_function iso. scm_primitive_eval where possible. diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index c4feda1619..12fbaaf18f 100644 --- a/lily/clef-engraver.cc +++ b/lily/clef-engraver.cc @@ -103,10 +103,13 @@ Clef_engraver::create_clef () int abs_oct = gh_scm2int (oct) ; int dir = sign (abs_oct); abs_oct = abs (abs_oct) + 1; - + + SCM txt = scm_number_to_string (gh_int2scm (abs_oct), + SCM_MAKINUM (10)); + g->set_property ("text", - scm_number_to_string (gh_int2scm (abs_oct), - SCM_MAKINUM (10))); + scm_list_n (ly_scheme_function ("vcenter-markup"), + txt, SCM_UNDEFINED)); Side_position_interface::add_support (g,clef_); g->set_parent (clef_, Y_AXIS); diff --git a/lily/context-def.cc b/lily/context-def.cc index eded15dd5f..afa8ccfac6 100644 --- a/lily/context-def.cc +++ b/lily/context-def.cc @@ -265,7 +265,7 @@ Context_def::get_translator_names (SCM user_mod) const SCM filter_performers (SCM l) { - for (SCM *tail = &l; gh_pair_p (*tail); tail = SCM_CDRLOC (tail)) + for (SCM *tail = &l; gh_pair_p (*tail); tail = SCM_CDRLOC (*tail)) { if (dynamic_cast (unsmob_translator (gh_car (*tail)))) { @@ -279,7 +279,7 @@ filter_performers (SCM l) SCM filter_engravers (SCM l) { - for (SCM *tail = &l; gh_pair_p (*tail) ; tail = SCM_CDRLOC (tail)) + for (SCM *tail = &l; gh_pair_p (*tail) ; tail = SCM_CDRLOC (*tail)) { if (dynamic_cast (unsmob_translator (gh_car (*tail)))) { diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 745df7d3c9..0e086b6a69 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -684,8 +684,11 @@ (X-offset-callbacks . (,Self_alignment_interface::centered_on_parent ,Self_alignment_interface::aligned_on_self)) (Y-offset-callbacks . (,Side_position_interface::aligned_side)) (print-function . ,Text_item::print) + + ;; no Y dimensions, because of lyrics under tenor clef. + (Y-extent-callback . #f) (font-shape . italic) - (padding . 0.4) + (padding . 0.6) (staff-padding . 0.2) (font-size . -4) (meta . ((interfaces . (text-interface self-alignment-interface side-position-interface font-interface item-interface )))) -- 2.39.5