lilypond-0.1.48

diff --git a/NEWS b/NEWS
index 60d9a467b54ab82ff7124d8a7d770e9fdbfa519e..4ead68b8d3db77a9164f815aea9be3194ff46bbc 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,24 @@
+pl 48
+       - Pitch_squash_engraver makes Rhythmic_staff possible.
+       - some fixes to buildscripts for sgi irix
+       - misc. patches (WL)
+       - move away from libg++: rolled own Rational class..
+       - don't make gif files Documentation/ by default 
+       - ly2dvi manpage (JAF)
+       - ly2dvi 0.7 (JAF)
+       - more clefs. (MB)
+
+pl 47.jcn2
+       - bf: interbeams and beam-stemlengths for size != 16
+       - bf's: preludes
+       - more introduction
+
+pl 47.jcn1
+       - voice{one,two,three} defines
+       - preludes-*: fixes, junked multi, broke-down score-block
+       - mudela-book: added center option
+
+******
 pl 47
        - Abbreviation now a separate item.
        - bf'd some gcc 2.8 warnings.
@@ -6,7 +27,9 @@ pl 47
 
 pl 46.jcn1
        - start mudela introduction
-       - plet-fraction abbrev by guessing; /3 -> 2/3 etc.
+
+
+pl 46.jcn2
        - bf's: preludes-*
 
 *******

diff --git a/input/rhythm.ly b/input/rhythm.ly
index 5b5289306ac1a32a5dd0dec0a431dfb26d9e6436..b67041034210cd7c1d1e398a2e03c0996f3a2f16 100644 (file)
--- a/input/rhythm.ly
+++ b/input/rhythm.ly
@@ -52,7 +52,9 @@ yanother =
        \type Staff_group <
                \ritme
                \another
-               \yanother
+               \type Rhythmic_staff {
+                       \yanother
+               }
        >
        
        \paper{
@@ -77,6 +79,19 @@ yanother =
        \accepts "Grandstaff";
 }
 
+Rhythmic_staff = \translator
+{
+         \type "Engraver_group_engraver";
+       nolines  = "1";
+         \consists "Pitch_squash_engraver";
+
+         \consists "Bar_engraver";
+         \consists "Meter_engraver";
+         \consists "Staff_sym_engraver";
+         \consists "Line_group_engraver";
+         \consists "Timing_engraver";
+         \accepts "Voice";
+}
        %% add Timing_engraver to the staff
        Staff = \translator {
          \type "Engraver_group_engraver";

diff --git a/lily/clef-grav.cc b/lily/clef-grav.cc
index 589dbf328273522401f73ff49b27339f1cbd3acf..5f9a9376e743c1ceb92e2f2a4e35219b8362ce00 100644 (file)
--- a/lily/clef-grav.cc
+++ b/lily/clef-grav.cc
@@ -22,33 +22,36 @@ Clef_engraver::Clef_engraver()
   c0_position_i_ =0;
 }
 
+/*
+  Ugh.  Should have support for Dictionaries in mudela.
+ */
 bool
 Clef_engraver::set_type (String s)
 {
-  clef_type_str_  = s;
+  clef_type_str_ = s;
   if (clef_type_str_ == "violin")
-    {
-      c0_position_i_= -6;
-    }
+    c0_position_i_= -6;
+  else if (clef_type_str_ == "french")
+    c0_position_i_= -8;
   else if (clef_type_str_ == "soprano")
-    {
-      c0_position_i_= -4;
-    }
+    c0_position_i_= -4;
+  else if (clef_type_str_ == "mezzosoprano")
+    c0_position_i_ = -2;
   else if (clef_type_str_ == "alto")
-    {
-      c0_position_i_= 0;
-    }
+    c0_position_i_= 0;
   else if (clef_type_str_ == "tenor")
-    {
-      c0_position_i_= 2;
-    }
+    c0_position_i_= 2;
+  else if (clef_type_str_ == "baritone")
+    c0_position_i_ = 4;
+  else if (clef_type_str_ == "varbaritone")
+    c0_position_i_ = 4;
   else if (clef_type_str_ == "bass")
-    {
-      c0_position_i_= 6;
-    }
+    c0_position_i_= 6;
+  else if (clef_type_str_ == "subbass")
+    c0_position_i_ = 8;
   else
     return false;
-
+  
   return true;
 }