lilypond-1.0.1

diff --git a/lily/rest.cc b/lily/rest.cc
index e46f3f8673f80cd13896edeaab7d7840df63920d..dc13cb911f14c724dc40f6a15b5fd01f7994740d 100644 (file)
--- a/lily/rest.cc
+++ b/lily/rest.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "molecule.hh"
@@ -17,7 +17,7 @@
 void
 Rest::do_add_processing ()
 {
-  if (balltype_i_ != 0 && balltype_i_ != 1)
+  if (balltype_i_ > 1)
     position_i_ -= 4;
   else if (balltype_i_ == 0)
     position_i_ += 2;
@@ -41,7 +41,7 @@ Rest::brew_molecule_p () const
   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));
+  Atom s(lookup_l ()->rest (balltype_i_, streepjes_b));
   Molecule * m = new Molecule ( Atom (s));
   m->translate_axis (position_i_ *  paper ()->internote_f (), Y_AXIS);
   return m;

diff --git a/mf/feta-eindelijk.mf b/mf/feta-eindelijk.mf
index 7649ea0e8ee9129d2e96a73dcc8bfbf313feaaa9..0670ea351bf72b2f89866aa45a08e56f1443666e 100644 (file)
--- a/mf/feta-eindelijk.mf
+++ b/mf/feta-eindelijk.mf
@@ -1,8 +1,6 @@
 % eindelijk.mf
 % LilyPond's own rest(s)
 
-% todo breve/longa rests
-
 
 fet_begingroup("rests");
 
@@ -85,6 +83,25 @@ fet_beginchar("half rest (outside staff)", "1o", "outsidehalfrest");
        draw z5 .. z6;
 fet_endchar;
 
+
+save breve_rest_y, breve_rest_x;
+
+breve_rest_y# =  interline#;
+breve_rest_x# = 3/5 interline#;
+
+define_pixels(breve_rest_y, breve_rest_x);
+
+fet_beginchar("breve rest", "-1", "breverest");
+       set_char_box(0, breve_rest_x#, 0, breve_rest_y#);
+       draw_block ((0,0), (breve_rest_x, breve_rest_y));
+fet_endchar;
+
+fet_beginchar("longa rest", "-2", "longarest");
+       set_char_box(0, breve_rest_x#, breve_rest_y#, breve_rest_y#);
+       draw_block ((0,-breve_rest_y), (breve_rest_x, breve_rest_y));
+fet_endchar;
+
+
 fet_beginchar("Quarter rest","2","quartrest");
        save alpha;
        alpha:=-50;