lilypond-0.0.14

diff --git a/src/clef.cc b/src/clef.cc
index d12225e8d6fe3f61d65eb73a09c3f7ea745e6ee3..49671dd4267f5d87109b5405a4873fe7b08f2c13 100644 (file)
--- a/src/clef.cc
+++ b/src/clef.cc
@@ -7,7 +7,7 @@ Clef::Clef()
 }
 
 void
-Clef::read(svec<String> args)
+Clef::read(svec<Scalar>args)
 {
     clef_type = args[0];
     if (clef_type == "violin") {

diff --git a/src/simpleprint.cc b/src/simpleprint.cc
index 3a0ac3dde35da394a7fbb55cf734e039d08bb442..833afe2108a609a25b4e9a042051d149b0cf2726 100644 (file)
--- a/src/simpleprint.cc
+++ b/src/simpleprint.cc
@@ -13,7 +13,7 @@ Item *
 Simple_staff::get_TYPESET_item(Command *com)
 {
     Item *s=0;
-    svec<String> arg( com->args);
+    svec<Scalar> arg( com->args);
     String type =arg[0];
     arg.del(0);
     if (type ==  "BAR" ) {

diff --git a/src/simplewalker.cc b/src/simplewalker.cc
index 7705e045a922ec577189bcf90414736d03aa6021..8d056e59ce8e1bec0a9509cb25f364d4a6c1784c 100644 (file)
--- a/src/simplewalker.cc
+++ b/src/simplewalker.cc
@@ -22,7 +22,7 @@ Simple_walker::do_INTERPRET_command(Command*com)
     if (com->args[0] == "BAR") {
        local_key_.reset(key_);
     } else if (com->args[0] == "KEY") {
-       svec<String> s(com->args);
+       svec<Scalar>s(com->args);
        s.del(0);
        if (com->when) {
            assert(!oldkey_undo);
@@ -32,7 +32,7 @@ Simple_walker::do_INTERPRET_command(Command*com)
        typesetkey = key_.read(s);
        local_key_.reset(key_); 
     } else if (com->args[0] == "CLEF") {
-       svec<String> s(com->args);
+       svec<Scalar>s(com->args);
        s.del(0);
        clef_.read(s);
     } else {