patch::: 1.0.7.jcn1: Hoi

[lilypond.git] / lily / note.cc

diff --git a/lily/note.cc b/lily/note.cc
index 2b1a8c447b3b69faedc4b86086054a4cd38c8277..a32cabab79ce880fc0885d28cee951e35963818b 100644 (file)
--- a/lily/note.cc
+++ b/lily/note.cc
@@ -11,7 +11,7 @@
 #include "command-request.hh"
 #include "music-list.hh"
 #include "identifier.hh"
-#include "varray.hh"
+#include "array.hh"
 #include "text-def.hh"
 #include "parseconstruct.hh"
 
@@ -20,66 +20,52 @@
 String *
 get_scriptdef (char c)
 {
-    String s;
-    switch (c) {
+  String s;
+  switch (c) 
+    {
     case '^' : s = "marcato";
-       break;
+      break;
     case  '+' : s = "stopped";
-       break;
+      break;
     case '-' : s = "tenuto";
-       break;
+      break;
     case  '|':  s = "staccatissimo";
-       break;
+      break;
     case  'o' : s = "";
-       break;
+      break;
     case '>' : s = "accent";
-       break;
+      break;
     case  'v' : s = ""; 
-       break;
+      break;
     case  '.' : s = "staccato";
-       break;
+      break;
     default:
-       assert (false);
+      assert (false);
     }
-    return new String (s);
+  return new String (s);
 }
 
 Request*
 get_script_req (int d , General_script_def*def)
 {
-    Musical_script_req* script_req_p = new Musical_script_req;
-    script_req_p->dir_i_ =d;
-    script_req_p->scriptdef_p_=def;
-    return script_req_p;
+  Musical_script_req* script_req_p = new Musical_script_req;
+  script_req_p->dir_ =(Direction)d;
+  script_req_p->scriptdef_p_=def;
+  return script_req_p;
 }
 
 
 
-Request*
-get_stemdir_req (int d)
-{
-    d = sign (long (d));
-    Group_feature_req * gfreq_p = new Group_feature_req;
-    gfreq_p->type_str_ = "vdir";
-    gfreq_p->value_str_ = String (d);
-    return gfreq_p;
-}
-Request*
-get_hshift_req (int i)
-{
-   Group_feature_req * gfreq_p = new Group_feature_req;
-    gfreq_p->type_str_ = "hshift";
-    gfreq_p->value_str_ = String (i);
-    return gfreq_p;
-}
-    
+
+  
 Request*
 get_grouping_req (Array<int> i_arr)
 {
-    Measure_grouping_req * mr_p = new Measure_grouping_req;
-    for (int i=0; i <i_arr.size();) {
-       mr_p->elt_length_arr_.push (Moment (1, i_arr[i++]));
-       mr_p->beat_i_arr_.push (i_arr[i++]);
+  Measure_grouping_req * mr_p = new Measure_grouping_req;
+  for (int i=0; i <i_arr.size();) 
+    {
+      mr_p->elt_length_arr_.push (Moment (1, i_arr[i++]));
+      mr_p->beat_i_arr_.push (i_arr[i++]);
     }
-    return mr_p;
+  return mr_p;
 }