lilypond-0.0.17

diff --git a/Sources.make b/Sources.make
index 25bd89dfb16a6a760e09d0d7a0917f55b7a5d604..4545a011b2d723bd0f6a935af0e5b6b1b18ed29d 100644 (file)
--- a/Sources.make
+++ b/Sources.make
@@ -20,7 +20,7 @@ hdr=    qlp.hh linespace.hh qlpsolve.hh\
        inputcommand.hh grouping.hh
 
 mycc=   qlp.cc qlpsolve.cc leastsquares.cc\
-       inputcommands.cc inputmusic.cc  inputcursor.cc\
+       inputcommands.cc inputmusic.cc  \
        inputscore.cc inputstaff.cc\
        break.cc linespace.cc molecule.cc staffline.cc\
        pscore.cc tex.cc item.cc pcol.cc staff.cc \
@@ -40,6 +40,7 @@ mycc=   qlp.cc qlpsolve.cc leastsquares.cc\
        simplewalker.cc\
        texbeam.cc texslur.cc clef.cc key.cc slur.cc beam.cc\
        idealspacing.cc inputcommand.cc grouping.cc identifier.cc\
+       lexerinit.cc mylexer.cc\
        template1.cc template2.cc template3.cc template4.cc\
        version.cc
 

diff --git a/hdr/keyword.hh b/hdr/keyword.hh
index df4547ad7698dd82ae3b8a9ec4a66a1dc3f7a0fe..b081df3a6294e759c5f29d7764dd1a98499800fa 100644 (file)
--- a/hdr/keyword.hh
+++ b/hdr/keyword.hh
@@ -1,3 +1,12 @@
+/*
+  keyword.hh -- part of LilyPond
+
+  (c) 1996 Han-Wen Nienhuys
+*/
+
+#ifndef KEYWORD_HH
+#define KEYWORD_HH
+
 /* for the keyword table */
 struct Keyword_ent
 {
@@ -12,3 +21,7 @@ struct Keyword_table
     Keyword_table(Keyword_ent *);
     int     lookup(const char *s) const;
 };
+
+
+#endif // KEYWORD_HH
+

diff --git a/src/beam.cc b/src/beam.cc
index c897ebfc6650eb35cc56a591c368f5a50d508772..3d43b4ed1dc6a1d42c09e9907d6174263914ee86 100644 (file)
--- a/src/beam.cc
+++ b/src/beam.cc
@@ -22,6 +22,7 @@ struct Stem_info {
     Stem_info(){}
     Stem_info(const Stem*);
 };
+
 Stem_info::Stem_info(const Stem*s)
 {
     x = s->hpos();

diff --git a/src/table.cc b/src/table.cc
index 5e199beb9eee7ca6412b9f735007293c928a7b8b..119475cc54d167cb5b7804ab5b1c2594f5fa1017 100644 (file)
--- a/src/table.cc
+++ b/src/table.cc
@@ -2,80 +2,7 @@
 #include "debug.hh"
 #include "string.hh"
 #include "inputstaff.hh"
-#include "identparent.hh"
-#include "keyword.hh"
-#include "associter.hh"
-#include "parser.hh"
 
-static Keyword_ent the_key_tab[]={
-    "bar", BAR,
-    "bass", BASS,
-    "clef", CLEF,
-    "cm", CM,
-    "commands", COMMANDS,
-    "duration", DURATIONCOMMAND,
-    "geometric", GEOMETRIC,
-    "in", IN,
-    "key", KEY, 
-    "melodic", MELODIC,
-    "meter", METER,
-    "mm", MM,
-    "octave", OCTAVECOMMAND,
-    "output", OUTPUT,
-    "partial", PARTIAL,
-    "paper", PAPER,
-    "pt", PT,
-    "rhythmic", RHYTHMIC,
-    "score", SCORE,
-    "skip", SKIP,
-    "staff", STAFF,
-    "start", START_T,
-    "table", TABLE,
-    "symboltables", SYMBOLTABLES,
-    "notenames", NOTENAMES,
-    "texid", TEXID,
-    "chord", CHORD,
-    "multi", MULTI,
-    "unitspace", UNITSPACE,
-    "violin", VIOLIN,
-    "voice", VOICE,
-    "voices", VOICES,
-    "width", WIDTH,
-    "music", MUSIC,
-    "grouping", GROUPING,
-    0,0
-};
 
 
-int
-lookup_keyword(String s)
-{
-    static Keyword_table table(the_key_tab);
-    return table.lookup(s);
-}
 
-Assoc<String, Identifier*> the_id_tab;
-
-Identifier*
-lookup_identifier(String s)
-{
-    if (!the_id_tab.elt_query(s))
-       return 0;
-    
-    return the_id_tab[s];
-}
-
-void
-add_identifier(Identifier*i)
-{    
-    the_id_tab[i->name] = i;
-}
-
-void
-delete_identifiers()
-{    
-    for (Assoc_iter<String,Identifier*> ai(the_id_tab); ai.ok(); ai++) {
-       mtor << "deleting: " << ai.key()<<'\n';
-       delete ai.val();
-    }
-}