lilypond-0.1.36

diff --git a/input/font.ly b/input/font.ly
index ac54e3e36aa9c5c28e65aa02f1568c442991c575..c2f1d25ef43a5ba7618631e5d42a4dc2e7443292 100644 (file)
--- a/input/font.ly
+++ b/input/font.ly
@@ -75,6 +75,8 @@ TestedFeatures =       "This file tests the Feta music-font"
                \meter 7/8; a2.. |
                \meter 9/8; a1... |
                \meter 12/8; a1. |
+               \meter 12/4;
+               r1. r2. r4. r8. r16. r32. r64. r64. |
                }
        \paper{ 
            % don't change this.

diff --git a/lily/rest.cc b/lily/rest.cc
index 4cf872f613f0b470edc86ef929f6b5520b77df8f..0028373cf5dfdd9ce5331ccc0d439ae9e78adff6 100644 (file)
--- a/lily/rest.cc
+++ b/lily/rest.cc
@@ -23,8 +23,10 @@ Rest::do_add_processing ()
     position_i_ += 2;
 
   Rhythmic_head::do_add_processing ();
-  if (dots_l_)
-      dots_l_->position_i_ = position_i_;
+  if (dots_l_ && balltype_i_ > 1)
+    {
+      dots_l_->position_i_ = position_i_ + 4;
+    }
 }
 
 Rest::Rest ()