release: 0.1.48

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

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index a63d8b72bd5d910910b6a56c1c34f0519d3d6f83..b3b468047f9761507ab4b28ab4a00cbff159881c 100644 (file)
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -38,23 +38,53 @@ void
 Clef_item::read (String t)
 {
   symbol_= t;
-  if (t == "violin") {
-    y_position_i_ = -2;
-  }
-  else if (t == "soprano") {
-    symbol_="alto";
-    y_position_i_ = -4;
-  }
-  else if (t == "alto") {
-    y_position_i_ = 0;
-  }
-  else if (t == "tenor") {
-    symbol_="alto";
-    y_position_i_ = 2;
-  }
-  else if (t == "bass") {
-    y_position_i_ = 2;
-  }
+  if (t == "violin") 
+    {
+      y_position_i_ = -2;
+    }
+  else if (t == "french") 
+    {
+      symbol_="violin";
+      y_position_i_ = -4;
+    }
+  else if (t == "soprano") 
+    {
+      symbol_="alto";
+      y_position_i_ = -4;
+    }
+  else if (t == "mezzosoprano")
+    {
+      symbol_ = "alto";
+      y_position_i_ = -2;
+    }
+  else if (t == "alto") 
+    {
+      y_position_i_ = 0;
+    }
+  else if (t == "tenor") 
+    {
+      symbol_="alto";
+      y_position_i_ = 2;
+    }
+  else if (t == "baritone")
+    {
+      symbol_ = "alto";
+      y_position_i_ = 4;
+    }
+  else if (t == "varbaritone")
+    {
+      symbol_ = "bass";
+      y_position_i_ = 0;
+    }
+  else if (t == "bass") 
+    {
+      y_position_i_ = 2;
+    }
+  else if (t == "subbass")
+    {
+      symbol_ = "bass";
+      y_position_i_ = 4;
+    }
 }
 
 void