lilypond-0.0.14

diff --git a/Sources.make b/Sources.make
index 1dcc72a3c730a79fef45329f45ad359f3e1caf44..7aa12eb13bd61b77f88557ff54a184f7806008c3 100644 (file)
--- a/Sources.make
+++ b/Sources.make
@@ -6,7 +6,7 @@ hdr=    qlp.hh linespace.hh qlpsolve.hh\
        const.hh glob.hh molecule.hh  boxes.hh pscore.hh item.hh tex.hh\
        request.hh voice.hh command.hh staff.hh  linestaff.hh \
        tstream.hh rhythmstaff.hh\
-       parseconstruct.hh  debug.hh globvars.hh keyword.hh\
+       parseconstruct.hh debug.hh globvars.hh keyword.hh\
        misc.hh score.hh notename.hh lexer.hh symtable.hh\
        symbol.hh main.hh dimen.hh paper.hh lookup.hh\
        sccol.hh stcol.hh staffcommands.hh melodicstaff.hh\
@@ -15,9 +15,13 @@ hdr=    qlp.hh linespace.hh qlpsolve.hh\
        swalker.hh bar.hh meter.hh accidental.hh\
        key.hh keyitem.hh localkeyitem.hh simplewalker.hh\
        clef.hh clefitem.hh slur.hh inputcommands.hh\
-       getcommand.hh inputmusic.hh
+       getcommand.hh inputmusic.hh \
+       inputscore.hh inputstaff.hh identparent.hh\
+       inputcommand.hh
 
-mycc=   qlp.cc qlpsolve.cc \
+mycc=   qlp.cc qlpsolve.cc leastsquares.cc\
+       inputcommands.cc inputmusic.cc  inputcursor.cc\
+       inputscore.cc inputstaff.cc\
        break.cc linespace.cc molecule.cc staffline.cc\
        pscore.cc tex.cc item.cc pcol.cc staff.cc \
        rhythmstaff.cc  score.cc note.cc  main.cc misc.cc\
@@ -25,17 +29,16 @@ mycc=   qlp.cc qlpsolve.cc \
        keyword.cc linestaff.cc table.cc command.cc\
        warn.cc debug.cc symtable.cc boxes.cc\
        pstaff.cc  tstream.cc\
-       calcideal.cc scores.cc identifier.cc \
+       calcideal.cc scores.cc  \
        dimen.cc paper.cc lookup.cc staffcommands.cc\
        sccol.cc stcol.cc getcommands.cc simplestaff.cc\
        melodicstaff.cc simpleprint.cc stem.cc\
-       spanner.cc notehead.cc leastsquares.cc beam.cc\
-       texbeam.cc rest.cc swalker.cc scoreline.cc\
+       spanner.cc notehead.cc  \
+       rest.cc swalker.cc scoreline.cc\
        simplewalker.cc bar.cc meter.cc accidental.cc\
-       key.cc keyitem.cc localkeyitem.cc\
-       clef.cc clefitem.cc texslur.cc slur.cc\
-       inputcommands.cc inputmusic.cc\
-       inputcursor.cc\
+       keyitem.cc localkeyitem.cc\
+       clefitem.cc texbeam.cc  texslur.cc clef.cc key.cc slur.cc beam.cc\
+        idealspacing.cc inputcommand.cc\
        template1.cc template2.cc template3.cc template4.cc\
        version.cc
 

diff --git a/hdr/clef.hh b/hdr/clef.hh
index 52206960ed6c8299b1948f9c7a75103f4610c730..243ea6ebdd8f9e1a8a9fe37b1ac53115a71f717c 100644 (file)
--- a/hdr/clef.hh
+++ b/hdr/clef.hh
@@ -6,7 +6,7 @@
 
 #ifndef CLEF_HH
 #define CLEF_HH
-#include "string.hh"
+#include "scalar.hh"
 #include "vray.hh"
 
 struct Clef {
@@ -14,7 +14,7 @@ struct Clef {
     String clef_type;
 
     Clef();
-    void read(svec<String> args);    
+    void read(svec<Scalar> args);    
 };
 #endif // CLEF_HH
 

diff --git a/src/key.cc b/src/key.cc
index 542549ddf9287c567a40d51f40aef68e7a1ddb8e..55c79c0e1f68519455ff53c4a7307eaef36abc59 100644 (file)
--- a/src/key.cc
+++ b/src/key.cc
@@ -38,11 +38,11 @@ Local_key::reset(Key k)
 }
 
 svec<int>
-Key::read(svec<String> s)
+Key::read(svec<Scalar> s)
 {
     svec<int> newkey;
     for (int j = 0; j < 7; j++)
-     accidentals[j] = 0;
+       accidentals[j] = 0;
    
     for (int i=0; i < s.sz(); i++) {
        int large, small;
@@ -56,7 +56,7 @@ Key::read(svec<String> s)
 }
 
 svec<int>
-Key::oldkey_undo(svec<String> s)
+Key::oldkey_undo(svec<Scalar>s)
 {
     svec<int> oldkey;
     svec<int> newkey;

diff --git a/src/meter.cc b/src/meter.cc
index 29375b8abac158070a839b7c9bc8a4f3f4f5c8fe..14b242e5c60d344d3209bb86c96385b996d0b6b3 100644 (file)
--- a/src/meter.cc
+++ b/src/meter.cc
@@ -1,11 +1,10 @@
-#include "string.hh"
+#include "scalar.hh"
 #include "molecule.hh"
 #include "meter.hh"
 #include "paper.hh"
 #include "lookup.hh"
 
-
-Meter::Meter(svec<String> a)
+Meter::Meter(svec<Scalar>a)
     :args(a)
 {
 }