From 30137ea3e3a871ed5cbfe00cf214d8efda1bf7d5 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 20:06:47 +0000
Subject: [PATCH] lilypond-0.1.48

---
 NEWS              | 25 ++++++++++++++++++++++++-
 input/rhythm.ly   | 17 ++++++++++++++++-
 lily/clef-grav.cc | 37 ++++++++++++++++++++-----------------
 3 files changed, 60 insertions(+), 19 deletions(-)

diff --git a/NEWS b/NEWS
index 60d9a467b5..4ead68b8d3 100644
--- 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 5b5289306a..b670410342 100644
--- 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 589dbf3282..5f9a9376e7 100644
--- 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;
 }
 
-- 
2.39.5