lilypond-0.0.2

diff --git a/Sources.make b/Sources.make
index 8c6744f8e97fa1db703cf05fb87f42fa4b1f0bc0..4e7949f081afcc7a5579ed331828562f93fdcfd9 100644 (file)
--- a/Sources.make
+++ b/Sources.make
@@ -6,7 +6,7 @@ hdr=matrix.hh    qlp.hh       smat.hh      vsmat.hh\
         tstream.hh dstream.hh mtime.hh rhythmstaf.hh\
        parseconstruct.hh real.hh debug.hh globvars.hh keyword.hh\
        misc.hh score.hh notename.hh lexer.hh symtable.hh\
-       choleski.hh
+       choleski.hh symbol.hh
 
 mycc=smat.cc matrix.cc choleski.cc  qlp.cc qlpsolve.cc \
         break.cc linespace.cc molecule.cc line.cc\

diff --git a/depend b/depend
index fdb5acec60ae98a288fbe2fb6976abbb08dfe297..1bc847e241932d2174edfb85a94422ba7b466975 100644 (file)
--- a/depend
+++ b/depend
@@ -1,79 +1,80 @@
 smat.o: smat.cc smat.hh ../flower/vray.hh vsmat.hh real.hh
 matrix.o: matrix.cc matrix.hh vsmat.hh ../flower/vray.hh real.hh \
  vector.hh glob.hh proto.hh const.hh ../flower/string.hh \
- ../flower/stringutil.hh debug.hh dstream.hh
+ ../flower/stringutil.hh debug.hh dstream.hh ../flower/assoc.hh
 choleski.o: choleski.cc choleski.hh matrix.hh vsmat.hh \
  ../flower/vray.hh real.hh vector.hh glob.hh proto.hh const.hh
 qlp.o: qlp.cc debug.hh dstream.hh ../flower/string.hh \
- ../flower/stringutil.hh qlp.hh matrix.hh vsmat.hh ../flower/vray.hh \
- real.hh vector.hh glob.hh proto.hh const.hh choleski.hh
+ ../flower/stringutil.hh ../flower/assoc.hh ../flower/vray.hh qlp.hh \
+ matrix.hh vsmat.hh real.hh vector.hh glob.hh proto.hh const.hh \
+ choleski.hh
 qlpsolve.o: qlpsolve.cc qlpsolve.hh qlp.hh matrix.hh vsmat.hh \
  ../flower/vray.hh real.hh vector.hh glob.hh proto.hh const.hh \
  debug.hh dstream.hh ../flower/string.hh ../flower/stringutil.hh \
- choleski.hh
+ ../flower/assoc.hh choleski.hh
 break.o: break.cc linespace.hh glob.hh real.hh proto.hh const.hh \
  ../flower/list.hh ../flower/list.inl ../flower/cursor.hh \
  ../flower/link.hh ../flower/link.inl ../flower/cursor.inl \
  ../flower/vray.hh cols.hh boxes.hh ../flower/textdb.hh \
  ../flower/textstr.hh ../flower/string.hh ../flower/stringutil.hh \
  item.hh tex.hh ../flower/compare.hh matrix.hh vsmat.hh vector.hh \
- debug.hh dstream.hh line.hh pstaff.hh pscore.hh
+ debug.hh dstream.hh ../flower/assoc.hh line.hh pstaff.hh pscore.hh
 linespace.o: linespace.cc linespace.hh glob.hh real.hh proto.hh \
  const.hh ../flower/list.hh ../flower/list.inl ../flower/cursor.hh \
  ../flower/link.hh ../flower/link.inl ../flower/cursor.inl \
  ../flower/vray.hh cols.hh boxes.hh ../flower/textdb.hh \
  ../flower/textstr.hh ../flower/string.hh ../flower/stringutil.hh \
  item.hh tex.hh ../flower/compare.hh matrix.hh vsmat.hh vector.hh \
- debug.hh dstream.hh qlp.hh ../flower/unionfind.hh
+ debug.hh dstream.hh ../flower/assoc.hh qlp.hh ../flower/unionfind.hh
 molecule.o: molecule.cc glob.hh real.hh proto.hh const.hh \
  ../flower/string.hh ../flower/stringutil.hh molecule.hh \
  ../flower/list.hh ../flower/list.inl ../flower/cursor.hh \
  ../flower/link.hh ../flower/link.inl ../flower/cursor.inl boxes.hh \
  ../flower/textdb.hh ../flower/textstr.hh ../flower/vray.hh item.hh \
- tex.hh
+ tex.hh symbol.hh
 line.o: line.cc line.hh real.hh ../flower/list.hh ../flower/list.inl \
  ../flower/cursor.hh ../flower/link.hh ../flower/link.inl \
  ../flower/cursor.inl ../flower/vray.hh glob.hh proto.hh const.hh \
  pstaff.hh item.hh boxes.hh ../flower/textdb.hh ../flower/textstr.hh \
- ../flower/string.hh ../flower/stringutil.hh tex.hh cols.hh \
+ ../flower/string.hh ../flower/stringutil.hh tex.hh symbol.hh cols.hh \
  ../flower/compare.hh pscore.hh
 pscore.o: pscore.cc debug.hh dstream.hh ../flower/string.hh \
- ../flower/stringutil.hh line.hh real.hh ../flower/list.hh \
- ../flower/list.inl ../flower/cursor.hh ../flower/link.hh \
- ../flower/link.inl ../flower/cursor.inl ../flower/vray.hh glob.hh \
+ ../flower/stringutil.hh ../flower/assoc.hh ../flower/vray.hh line.hh \
+ real.hh ../flower/list.hh ../flower/list.inl ../flower/cursor.hh \
+ ../flower/link.hh ../flower/link.inl ../flower/cursor.inl glob.hh \
  proto.hh const.hh pstaff.hh item.hh boxes.hh ../flower/textdb.hh \
  ../flower/textstr.hh tex.hh pscore.hh cols.hh ../flower/compare.hh \
  tstream.hh
 tex.o: tex.cc tex.hh ../flower/string.hh ../flower/stringutil.hh \
  boxes.hh ../flower/textdb.hh ../flower/textstr.hh ../flower/vray.hh \
- real.hh const.hh
+ real.hh symbol.hh const.hh
 item.o: item.cc line.hh real.hh ../flower/list.hh ../flower/list.inl \
  ../flower/cursor.hh ../flower/link.hh ../flower/link.inl \
  ../flower/cursor.inl ../flower/vray.hh glob.hh proto.hh const.hh \
  pstaff.hh item.hh boxes.hh ../flower/textdb.hh ../flower/textstr.hh \
- ../flower/string.hh ../flower/stringutil.hh tex.hh cols.hh \
+ ../flower/string.hh ../flower/stringutil.hh tex.hh symbol.hh cols.hh \
  ../flower/compare.hh
 cols.o: cols.cc cols.hh glob.hh real.hh proto.hh const.hh boxes.hh \
  ../flower/textdb.hh ../flower/textstr.hh ../flower/string.hh \
  ../flower/stringutil.hh ../flower/vray.hh ../flower/list.hh \
  ../flower/list.inl ../flower/cursor.hh ../flower/link.hh \
  ../flower/link.inl ../flower/cursor.inl item.hh tex.hh \
- ../flower/compare.hh
+ ../flower/compare.hh pstaff.hh
 staff.o: staff.cc staff.hh score.hh ../flower/vray.hh cols.hh glob.hh \
  real.hh proto.hh const.hh boxes.hh ../flower/textdb.hh \
  ../flower/textstr.hh ../flower/string.hh ../flower/stringutil.hh \
  ../flower/list.hh ../flower/list.inl ../flower/cursor.hh \
  ../flower/link.hh ../flower/link.inl ../flower/cursor.inl item.hh \
  tex.hh ../flower/compare.hh mtime.hh command.hh voice.hh request.hh \
- debug.hh dstream.hh pscore.hh pstaff.hh
+ debug.hh dstream.hh ../flower/assoc.hh pscore.hh pstaff.hh
 rhythmstaf.o: rhythmstaf.cc request.hh glob.hh real.hh proto.hh \
  const.hh ../flower/string.hh ../flower/stringutil.hh mtime.hh \
- debug.hh dstream.hh linestaff.hh pstaff.hh ../flower/list.hh \
- ../flower/list.inl ../flower/cursor.hh ../flower/link.hh \
- ../flower/link.inl ../flower/cursor.inl item.hh boxes.hh \
- ../flower/textdb.hh ../flower/textstr.hh ../flower/vray.hh tex.hh \
- staff.hh score.hh cols.hh ../flower/compare.hh command.hh voice.hh \
- pscore.hh molecule.hh rhythmstaf.hh
+ debug.hh dstream.hh ../flower/assoc.hh ../flower/vray.hh linestaff.hh \
+ pstaff.hh ../flower/list.hh ../flower/list.inl ../flower/cursor.hh \
+ ../flower/link.hh ../flower/link.inl ../flower/cursor.inl item.hh \
+ boxes.hh ../flower/textdb.hh ../flower/textstr.hh tex.hh staff.hh \
+ score.hh cols.hh ../flower/compare.hh command.hh voice.hh pscore.hh \
+ molecule.hh rhythmstaf.hh symbol.hh
 score.o: score.cc tstream.hh ../flower/string.hh \
  ../flower/stringutil.hh score.hh ../flower/vray.hh cols.hh glob.hh \
  real.hh proto.hh const.hh boxes.hh ../flower/textdb.hh \
@@ -81,52 +82,55 @@ score.o: score.cc tstream.hh ../flower/string.hh \
  ../flower/cursor.hh ../flower/link.hh ../flower/link.inl \
  ../flower/cursor.inl item.hh tex.hh ../flower/compare.hh mtime.hh \
  command.hh pscore.hh pstaff.hh staff.hh voice.hh request.hh misc.hh \
- debug.hh dstream.hh
+ debug.hh dstream.hh ../flower/assoc.hh
 note.o: note.cc ../flower/string.hh ../flower/stringutil.hh real.hh \
- debug.hh dstream.hh request.hh glob.hh proto.hh const.hh mtime.hh \
- voice.hh ../flower/list.hh ../flower/list.inl ../flower/cursor.hh \
- ../flower/link.hh ../flower/link.inl ../flower/cursor.inl notename.hh
+ debug.hh dstream.hh ../flower/assoc.hh ../flower/vray.hh request.hh \
+ glob.hh proto.hh const.hh mtime.hh voice.hh ../flower/list.hh \
+ ../flower/list.inl ../flower/cursor.hh ../flower/link.hh \
+ ../flower/link.inl ../flower/cursor.inl notename.hh
 dstream.o: dstream.cc dstream.hh ../flower/string.hh \
- ../flower/stringutil.hh
+ ../flower/stringutil.hh ../flower/assoc.hh ../flower/vray.hh \
+ ../flower/textdb.hh ../flower/textstr.hh
 main.o: main.cc ../flower/lgetopt.hh misc.hh mtime.hh real.hh debug.hh \
- dstream.hh ../flower/string.hh ../flower/stringutil.hh score.hh \
- ../flower/vray.hh cols.hh glob.hh proto.hh const.hh boxes.hh \
- ../flower/textdb.hh ../flower/textstr.hh ../flower/list.hh \
- ../flower/list.inl ../flower/cursor.hh ../flower/link.hh \
- ../flower/link.inl ../flower/cursor.inl item.hh tex.hh \
- ../flower/compare.hh command.hh globvars.hh
+ dstream.hh ../flower/string.hh ../flower/stringutil.hh \
+ ../flower/assoc.hh ../flower/vray.hh score.hh cols.hh glob.hh \
+ proto.hh const.hh boxes.hh ../flower/textdb.hh ../flower/textstr.hh \
+ ../flower/list.hh ../flower/list.inl ../flower/cursor.hh \
+ ../flower/link.hh ../flower/link.inl ../flower/cursor.inl item.hh \
+ tex.hh ../flower/compare.hh command.hh globvars.hh
 misc.o: misc.cc misc.hh mtime.hh real.hh glob.hh proto.hh const.hh
-symbol.o: symbol.cc tex.hh ../flower/string.hh ../flower/stringutil.hh \
- boxes.hh ../flower/textdb.hh ../flower/textstr.hh ../flower/vray.hh \
- real.hh
+symbol.o: symbol.cc symbol.hh ../flower/string.hh \
+ ../flower/stringutil.hh boxes.hh ../flower/textdb.hh \
+ ../flower/textstr.hh ../flower/vray.hh real.hh
 request.o: request.cc request.hh glob.hh real.hh proto.hh const.hh \
  ../flower/string.hh ../flower/stringutil.hh mtime.hh
 notename.o: notename.cc glob.hh real.hh proto.hh const.hh \
  ../flower/string.hh ../flower/stringutil.hh
 voice.o: voice.cc debug.hh dstream.hh ../flower/string.hh \
- ../flower/stringutil.hh voice.hh mtime.hh real.hh ../flower/list.hh \
- ../flower/list.inl ../flower/cursor.hh ../flower/link.hh \
- ../flower/link.inl ../flower/cursor.inl request.hh glob.hh proto.hh \
- const.hh
+ ../flower/stringutil.hh ../flower/assoc.hh ../flower/vray.hh voice.hh \
+ mtime.hh real.hh ../flower/list.hh ../flower/list.inl \
+ ../flower/cursor.hh ../flower/link.hh ../flower/link.inl \
+ ../flower/cursor.inl request.hh glob.hh proto.hh const.hh
 keyword.o: keyword.cc glob.hh real.hh proto.hh const.hh lexer.hh
 linestaff.o: linestaff.cc linestaff.hh pstaff.hh ../flower/list.hh \
  ../flower/list.inl ../flower/cursor.hh ../flower/link.hh \
  ../flower/link.inl ../flower/cursor.inl item.hh glob.hh real.hh \
  proto.hh const.hh boxes.hh ../flower/textdb.hh ../flower/textstr.hh \
- ../flower/string.hh ../flower/stringutil.hh ../flower/vray.hh tex.hh
+ ../flower/string.hh ../flower/stringutil.hh ../flower/vray.hh tex.hh \
+ symbol.hh
 table.o: table.cc glob.hh real.hh proto.hh const.hh \
  ../flower/string.hh ../flower/stringutil.hh keyword.hh parser.hh
 command.o: command.cc ../flower/string.hh ../flower/stringutil.hh \
  command.hh glob.hh real.hh proto.hh const.hh mtime.hh \
  ../flower/vray.hh
 warn.o: warn.cc debug.hh dstream.hh ../flower/string.hh \
- ../flower/stringutil.hh
+ ../flower/stringutil.hh ../flower/assoc.hh ../flower/vray.hh
 debug.o: debug.cc debug.hh dstream.hh ../flower/string.hh \
- ../flower/stringutil.hh
+ ../flower/stringutil.hh ../flower/assoc.hh ../flower/vray.hh
 symtable.o: symtable.cc misc.hh mtime.hh real.hh debug.hh dstream.hh \
- ../flower/string.hh ../flower/stringutil.hh tex.hh boxes.hh \
- ../flower/textdb.hh ../flower/textstr.hh ../flower/vray.hh \
- ../flower/assoc.hh symtable.hh const.hh
+ ../flower/string.hh ../flower/stringutil.hh ../flower/assoc.hh \
+ ../flower/vray.hh symbol.hh boxes.hh ../flower/textdb.hh \
+ ../flower/textstr.hh symtable.hh const.hh
 boxes.o: boxes.cc boxes.hh ../flower/textdb.hh ../flower/textstr.hh \
  ../flower/string.hh ../flower/stringutil.hh ../flower/vray.hh real.hh \
  const.hh
@@ -136,13 +140,13 @@ pstaff.o: pstaff.cc pstaff.hh ../flower/list.hh ../flower/list.inl \
  boxes.hh ../flower/textdb.hh ../flower/textstr.hh ../flower/string.hh \
  ../flower/stringutil.hh ../flower/vray.hh tex.hh
 vector.o: vector.cc debug.hh dstream.hh ../flower/string.hh \
- ../flower/stringutil.hh vector.hh glob.hh real.hh proto.hh const.hh \
- ../flower/vray.hh
+ ../flower/stringutil.hh ../flower/assoc.hh ../flower/vray.hh \
+ vector.hh glob.hh real.hh proto.hh const.hh
 tstream.o: tstream.cc tex.hh ../flower/string.hh \
  ../flower/stringutil.hh boxes.hh ../flower/textdb.hh \
  ../flower/textstr.hh ../flower/vray.hh real.hh tstream.hh debug.hh \
- dstream.hh
-version.o: version.cc ../flower/string.hh ../flower/stringutil.hh
+ dstream.hh ../flower/assoc.hh
+version.o: version.cc version.hh
 calcideal.o: calcideal.cc tstream.hh ../flower/string.hh \
  ../flower/stringutil.hh score.hh ../flower/vray.hh cols.hh glob.hh \
  real.hh proto.hh const.hh boxes.hh ../flower/textdb.hh \
@@ -150,7 +154,7 @@ calcideal.o: calcideal.cc tstream.hh ../flower/string.hh \
  ../flower/cursor.hh ../flower/link.hh ../flower/link.inl \
  ../flower/cursor.inl item.hh tex.hh ../flower/compare.hh mtime.hh \
  command.hh pscore.hh pstaff.hh staff.hh voice.hh request.hh misc.hh \
- debug.hh dstream.hh
+ debug.hh dstream.hh ../flower/assoc.hh
 template.o: template.cc line.hh real.hh ../flower/list.hh \
  ../flower/list.inl ../flower/cursor.hh ../flower/link.hh \
  ../flower/link.inl ../flower/cursor.inl ../flower/vray.hh glob.hh \
@@ -163,8 +167,8 @@ template2.o: template2.cc line.hh real.hh ../flower/list.hh \
  ../flower/link.inl ../flower/cursor.inl ../flower/vray.hh glob.hh \
  proto.hh const.hh pstaff.hh item.hh boxes.hh ../flower/textdb.hh \
  ../flower/textstr.hh ../flower/string.hh ../flower/stringutil.hh \
- tex.hh voice.hh mtime.hh request.hh molecule.hh staff.hh score.hh \
- cols.hh ../flower/compare.hh command.hh ../flower/list.cc \
+ tex.hh symbol.hh voice.hh mtime.hh request.hh molecule.hh staff.hh \
+ score.hh cols.hh ../flower/compare.hh command.hh ../flower/list.cc \
  ../flower/cursor.cc
 parser.o: parser.cc lexer.hh proto.hh real.hh staff.hh score.hh \
  ../flower/vray.hh cols.hh glob.hh const.hh boxes.hh \
@@ -173,7 +177,7 @@ parser.o: parser.cc lexer.hh proto.hh real.hh staff.hh score.hh \
  ../flower/cursor.hh ../flower/link.hh ../flower/link.inl \
  ../flower/cursor.inl item.hh tex.hh ../flower/compare.hh mtime.hh \
  command.hh voice.hh request.hh keyword.hh globvars.hh debug.hh \
- dstream.hh parseconstruct.hh
+ dstream.hh ../flower/assoc.hh parseconstruct.hh
 lexer.o: lexer.cc glob.hh real.hh proto.hh const.hh \
  ../flower/string.hh ../flower/stringutil.hh lexer.hh keyword.hh \
- ../flower/vray.hh parser.hh debug.hh dstream.hh
+ ../flower/vray.hh parser.hh debug.hh dstream.hh ../flower/assoc.hh

diff --git a/linestaff.cc b/linestaff.cc
index 38fa40e872b53908198acf5064d07e295261596c..f2dd43b2b5a167e00e04dda434febf1b2143e3b4 100644 (file)
--- a/linestaff.cc
+++ b/linestaff.cc
@@ -1,5 +1,7 @@
 #include "linestaff.hh"
-#include "tex.hh"
+#include "symbol.hh"
+
+
 
 Linestaff::Linestaff(int l)
 {

diff --git a/molecule.cc b/molecule.cc
index 96a21b9025dc590292eee53ef7a85b9f010025e5..3e107ae7fb301e6c4afa7191d10ceafa4f42cf6e 100644 (file)
--- a/molecule.cc
+++ b/molecule.cc
@@ -1,6 +1,15 @@
 #include "glob.hh"
 #include "string.hh"
 #include "molecule.hh"
+#include "symbol.hh"
+
+Box
+Atom::extent() const
+{
+    Box b( sym->dim);
+    b.translate(off);
+    return b;
+}
 
 String
 Atom::TeXstring() const

diff --git a/molecule.hh b/molecule.hh
index c98cfe5f49421b26c11e01193f4b6ae5bb71eb95..6f63be3ba9cef03c0d9cb94436b460ae65ca4bcc 100644 (file)
--- a/molecule.hh
+++ b/molecule.hh
@@ -15,11 +15,7 @@ struct Atom {
     }
     
     /// how big is #this#?
-    Box extent() const {
-       Box b( sym->dim);
-       b.translate(off);
-       return b;
-    }
+    Box extent() const;
     Atom(const Symbol*s) {
        sym=s;
     }

diff --git a/symbol.cc b/symbol.cc
index 9a3e8cdf62e496df4d6caaca65c2c36354a5ff66..66771dc90aaf4c43ffe751d9ad54c7bda6110566 100644 (file)
--- a/symbol.cc
+++ b/symbol.cc
@@ -1,5 +1,9 @@
-#include "tex.hh"
-
+#include "symbol.hh"
+Symbol::Symbol()
+    :    dim(Interval(0,0),Interval(0,0))
+{
+    tex = "\\unknown";        
+}
 Symbol::Symbol(String s, Box b)
     : tex(s), dim(b)
 {

diff --git a/template.cc b/template.cc
index 6d45473c1fa8d2ddd0c445b0d9cabf06b385ffd5..f0260b5edcbc61d67aaeda46932d833a722b4f94 100644 (file)
--- a/template.cc
+++ b/template.cc
@@ -12,15 +12,15 @@
 #include "cursor.cc"
 
 
+PL_instantiate(Line_of_score);
 PL_instantiate(Line_of_staff);
 PL_instantiate(Item);
-PL_instantiate(Line_of_score);
-PL_instantiate(Request);
 PL_instantiate(Spanner);
 PL_instantiate(PStaff);
 PL_instantiate(Idealspacing);
 PL_instantiate(PCol);
 PL_instantiate(Command);
+PL_instantiate(Request);
 PL_instantiate(Score_column);
 
 

diff --git a/template2.cc b/template2.cc
index 21e24f06c75eec5e0a9d2b8419494712e8f9ecf0..bd9a0dcade2c8fb6333e56dd3f1b57c81495eebc 100644 (file)
--- a/template2.cc
+++ b/template2.cc
@@ -1,4 +1,5 @@
 #include "line.hh"
+#include "symbol.hh"
 #include "voice.hh"
 #include "molecule.hh"
 #include "staff.hh"

diff --git a/tex.cc b/tex.cc
index db789e47b3ca953f3bc407dce79aab5fd840eb4d..e11ebb90b826ed0b5a287461a6010bf57b7ab942 100644 (file)
--- a/tex.cc
+++ b/tex.cc
@@ -1,4 +1,6 @@
+
 #include "tex.hh"
+#include "symbol.hh"
 #include "const.hh"
 /*
     #TeXstring# should generate a TeX string to typeset the object in