lilypond-0.1.25

diff --git a/lily/rest.cc b/lily/rest.cc
index d186608b2628766e76bf5d8cc88734cf792f3d96..4cf872f613f0b470edc86ef929f6b5520b77df8f 100644 (file)
--- a/lily/rest.cc
+++ b/lily/rest.cc
@@ -19,6 +19,8 @@ Rest::do_add_processing ()
 {
   if (balltype_i_ != 0 && balltype_i_ != 1)
     position_i_ -= 4;
+  else if (balltype_i_ == 0)
+    position_i_ += 2;
 
   Rhythmic_head::do_add_processing ();
   if (dots_l_)
@@ -34,7 +36,8 @@ Molecule *
 Rest::brew_molecule_p () const
 {
   int staff_size_i_ = 8;
-  bool streepjes_b = abs(position_i_) > staff_size_i_ /2 &&  (balltype_i_ == 0 || balltype_i_ == 1);
+  bool streepjes_b = abs(position_i_) > staff_size_i_ /2 &&  
+    (balltype_i_ == 0 || balltype_i_ == 1);
   
   Atom s(paper ()->lookup_l()->rest (balltype_i_, streepjes_b));
   Molecule * m = new Molecule ( Atom (s));

diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf
index 798782d5d418469188d7ee6344934add0397a117..4b99ef06d74de566b068d2c9d75ec2a0202a029b 100644 (file)
--- a/mf/feta-generic.mf
+++ b/mf/feta-generic.mf
@@ -24,6 +24,6 @@ if test = 0:
        input feta-schrift;
        input feta-banier;
 else:
-       input feta-bolletjes;
-       input feta-banier;
+%      input feta-bolletjes;   input feta-banier;
+       input feta-eindelijk;
 fi