* scm/define-grobs.scm (all-grob-descriptions): use staff-padding

for Fingering.

* lily/side-position-interface.cc (out_of_staff): don't do
anything if staff-padding not defined.

* scm/define-grobs.scm (all-grob-descriptions): remove
enclose-bounds in OttavaBracket and PianoPedalBracket

diff --git a/ChangeLog b/ChangeLog
index 977b2993342dcbce54cf633b5bce654d30a00118..e5a6c846f59f82ff54f69fadcfe972157b78cd40 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2004-01-25  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * scm/define-grobs.scm (all-grob-descriptions): use staff-padding
+       for Fingering.
+
+       * lily/side-position-interface.cc (out_of_staff): don't do
+       anything if staff-padding not defined. 
+
        * mf/feta-params.mf (stafflines): introduce linethickness as
        general blackness of the font.
 

diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi
index 2cf0e66670684a0c4ab7e5325ba76b0bb1783a8b..7df7feb2e2c8d7210d6f2fab0bbbcd9904d456cf 100644 (file)
--- a/Documentation/topdocs/NEWS.texi
+++ b/Documentation/topdocs/NEWS.texi
@@ -18,6 +18,9 @@ Version 2.1.13
 
 @itemize @bullet
 
+@item There is now a Scheme macro for defining markup
+commands. Special mark-up commands can be defined in  user-files too.
+
 @item Many fixes for dimension scaling have been made,
 resulting in correct results for scores that mix staves in different
 sizes.

diff --git a/Documentation/user/invoking.itexi b/Documentation/user/invoking.itexi
index 7ced331abf022a3128bfb922f8624e3753fe796c..c376c546bed3a9055632469feda984873deb30fa 100644 (file)
--- a/Documentation/user/invoking.itexi
+++ b/Documentation/user/invoking.itexi
@@ -485,8 +485,8 @@ manuals using Info.  If lilypond-mode is not installed on your
 platform, then refer to the installation instructions for more
 information.
 
-For VIM, a vimrc is supplied, along with syntax coloring tools. For
-more information, refer to the
+For @uref{http://www.vim.org,VIM}, a vimrc is supplied, along with
+syntax coloring tools. For more information, refer to the
 @ifhtml
 @uref{../../../topdocs/out-www/INSTALL.html,installation instructions}.
 @end ifhtml
@@ -499,8 +499,9 @@ For both editors, there is also a facility to jump in the input file
 to the source of errors in the graphical output. See @ref{Point and
 click}.
 
-There exists a plugin jEdit. Refer to the
-@uref{website,lily4jedit.sourceforget.net} for more information.
+There exists a plugin for @uref{http://www.jedit.org/,jEdit}. Refer to
+the @uref{http://lily4jedit.sourceforget.net,plugin website} for more
+information.
 
 
 @node Point and click

diff --git a/input/regression/finger-chords.ly b/input/regression/finger-chords.ly
index 37ba338f6a963c3d785b27eeea7479f086ec473d..641b06463aac19345a4c2722d3271d056c341e43 100644 (file)
--- a/input/regression/finger-chords.ly
+++ b/input/regression/finger-chords.ly
@@ -25,6 +25,9 @@ easier to process."
        \property Voice.fingeringOrientations = #'(down left up)
        < c-1  e-2 g-3 b-5 > 4
 
+       \once \property Voice.Fingering \set #'staff-padding = #'()
+       < c-1  e-2 g-3 b-5 > 4
+
        \property Voice.fingeringOrientations = #'(up left)
        < c-1  e-2 g-3 b-5 > 4
 

diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc
index 433fd96b21abec8059b2312524f50824b180b721..509be0064779b58b4c14103c0d093c285a71adf0 100644 (file)
--- a/lily/new-fingering-engraver.cc
+++ b/lily/new-fingering-engraver.cc
@@ -253,12 +253,12 @@ New_fingering_engraver::position_scripts ()
       f->set_grob_property ("script-priority",
                            gh_int2scm (finger_prio + i));
       f->add_offset_callback (Side_position_interface::aligned_side_proc, Y_AXIS);
+      f->add_offset_callback (Side_position_interface::out_of_staff_proc, Y_AXIS);
       f->add_offset_callback (Self_alignment_interface::centered_on_parent_proc, X_AXIS);
       f->add_offset_callback (Self_alignment_interface::aligned_on_self_proc, X_AXIS);
       
       f->set_grob_property ("direction", gh_int2scm (UP));
 
-      Side_position_interface::add_staff_support (f);
       typeset_grob (f);
     }
   
@@ -273,8 +273,8 @@ New_fingering_engraver::position_scripts ()
       f->add_offset_callback (Self_alignment_interface::centered_on_parent_proc, X_AXIS);
       f->add_offset_callback (Self_alignment_interface::aligned_on_self_proc, X_AXIS);
       f->add_offset_callback (Side_position_interface::aligned_side_proc, Y_AXIS);
+      f->add_offset_callback (Side_position_interface::out_of_staff_proc, Y_AXIS);
       f->set_grob_property ("direction", gh_int2scm (DOWN));
-      Side_position_interface::add_staff_support (f);
       typeset_grob (f);
     }
 }

diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc
index c476b32b7d84c89fe6f6379ccd2b82acf7c43e3a..081d84d9934c60c4f7aced662db9608c3a439984 100644 (file)
--- a/lily/side-position-interface.cc
+++ b/lily/side-position-interface.cc
@@ -213,9 +213,13 @@ Side_position_interface::out_of_staff (SCM element_smob, SCM axis)
   if (!st)
     return gh_int2scm (0);
 
+  SCM scm_padding = me->get_grob_property ("staff-padding");
+  if (!gh_number_p (scm_padding))
+    return gh_int2scm (0);
+  
   Real padding=
     Staff_symbol_referencer::staff_space (me)
-    * robust_scm2double (me->get_grob_property ("staff-padding"), 0);
+    * gh_scm2double (scm_padding);
   
   Grob *common = me->common_refpoint (st, Y_AXIS);
   Direction d = Side_position_interface::get_direction (me);
@@ -285,8 +289,11 @@ Side_position_interface::supported_b (Grob*me)
 
 
 ADD_INTERFACE (Side_position_interface,"side-position-interface",
-  "Position a victim object (this one) next to other objects (the "
-"support).  In this case, the property @code{direction} signifies where to put the  "
-"victim object relative to the support (left or right, up or down?) "
-,
-  "staff-padding side-support-elements direction-source direction side-relative-direction minimum-space padding");
+              "Position a victim object (this one) next to other objects (the "
+              "support).  In this case, the property @code{direction} signifies where to put the  "
+              "victim object relative to the support (left or right, up or down?)\n\n "
+              "The @code{out_of_staff} routine puts objects at a distance of the staff. If the property "
+              "@code{staff-padding} is not defined, the routine doesn't do anything." 
+              ,
+              "staff-padding side-support-elements direction-source "
+              "direction side-relative-direction minimum-space padding");

diff --git a/mf/feta-din.mf b/mf/feta-din.mf
index b9c7052ebe6ffa9810fd968d412976bbefcd3e7c..ca5029d2867407d5166e1f63b32fc00a799f48ed 100644 (file)
--- a/mf/feta-din.mf
+++ b/mf/feta-din.mf
@@ -23,7 +23,7 @@ horizontal_space# :=  .66 ex#;
 font_x_height ex#;
 font_normal_space horizontal_space#;
 
-define_pixels (staffspace, stafflinethickness, ex, descender, ascender);
+define_pixels (staffspace, linethickness, stafflinethickness, ex, descender, ascender);
 
 fet_beginfont("feta-din", design_size);
 

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 17a8ee0cefd9dc65639f911f2293678f8b79b822..bb73bcef853ad4902fd55372f86cdc4a54fde2ed 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -370,6 +370,7 @@
      . (
        (molecule-callback . ,Text_item::brew_molecule)
        (padding . 0.6)
+       (staff-padding . 0.5)
        (self-alignment-X . 0)
        (self-alignment-Y . 0)
        (script-priority . 100)