release: 0.1.48

[lilypond.git] / lily / clef-grav.cc

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;
 }