(filter_engravers): derefence pointer.

diff --git a/ChangeLog b/ChangeLog
index 891cd3de294b2e3e938e7fd4cf47725de7df2b46..04e9213e3555d70435481db2724725ba1d42c4ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-03-25  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * 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 c4feda16199d513220a08e0aa939e5be9a29e71c..12fbaaf18faa706ff19744326c6a8220c850eb83 100644 (file)
--- 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 eded15dd5f11a1db9032a69ccf07fac2335c7929..afa8ccfac6e87309901c737cd6b0e948d0001105 100644 (file)
--- 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<Performer*> (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<Engraver*> (unsmob_translator (gh_car (*tail))))
        {

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 745df7d3c9f59fd54959c7d270f7c30705ac5929..0e086b6a692e8b04362d97d50c4fd3c647ffc46c 100644 (file)
--- 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 ))))