lilypond-0.0.1

diff --git a/Sources.make b/Sources.make
new file mode 100644 (file)
index 0000000..8c6744f
--- /dev/null
+++ b/Sources.make
@@ -0,0 +1,20 @@
+hdr=matrix.hh    qlp.hh       smat.hh      vsmat.hh\
+       linespace.hh   qlpsolve.hh  vector.hh\
+       cols.hh   proto.hh pstaff.hh  line.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 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
+
+mycc=smat.cc matrix.cc choleski.cc  qlp.cc qlpsolve.cc \
+        break.cc linespace.cc molecule.cc line.cc\
+       pscore.cc tex.cc item.cc cols.cc staff.cc rhythmstaf.cc\
+       score.cc note.cc dstream.cc main.cc misc.cc \
+       symbol.cc request.cc notename.cc  voice.cc\
+       keyword.cc linestaff.cc table.cc command.cc\
+       warn.cc debug.cc symtable.cc boxes.cc\
+       pstaff.cc vector.cc tstream.cc version.cc\
+       calcideal.cc\
+       template.cc template2.cc 

diff --git a/calcideal.cc b/calcideal.cc
new file mode 100644 (file)
index 0000000..b1410ae
--- /dev/null
+++ b/calcideal.cc
@@ -0,0 +1,64 @@
+#include "tstream.hh"
+#include "score.hh"
+#include "pscore.hh"
+#include "staff.hh"
+#include "misc.hh"
+#include "debug.hh"
+
+
+void
+Score::do_connect(PCol *c1, PCol *c2, Real d)
+{
+    Idealspacing*sp=pscore_->get_spacing(c1,c2);
+       
+    if (!sp->hooke){
+       sp->hooke = 1.0;
+       sp->space =d;
+    }
+}
+
+void
+Score::connect_nonmus(PCol* c1, PCol *c2, Real d)
+{
+    if (c2->used && c1->used) {
+       do_connect(c1,c2,d);
+
+       // alert! this is broken!
+       if (c1->breakable) {
+           do_connect(c1->postbreak, c2,d);
+       }
+       if (c2->breakable) {
+           do_connect(c1, c2->prebreak,d);
+       }
+       if (c1->breakable &&c2->breakable) {
+           do_connect(c1->postbreak, c2->prebreak,d);      
+       }       
+    }
+}
+/* this needs A LOT of rethinking.
+
+    generate springs between columns.
+    */
+void
+Score::calc_idealspacing()
+{
+    PCursor<Score_column*> sc(cols_);
+
+    for (; sc.ok(); sc++) {
+       if (sc->musical)
+           for (int i=0; i < sc->durations.sz(); i++) {
+               Mtime d = sc->durations[i];
+               Real dist = duration_to_idealspace(d);
+               PCol * c2 = find_col(sc->when + d,true)->pcol;
+               connect_nonmus(sc->pcol, c2, dist);
+               c2 = find_col(sc->when + d,false)->pcol;
+               connect_nonmus(sc->pcol, c2,  dist);
+           }
+       else if (sc->used()) {  // ignore empty columns
+           PCol * c2 = find_col(sc->when,true)->pcol;
+           connect_nonmus(sc->pcol,c2,0.0);
+       }
+    }          
+}
+
+

diff --git a/depend b/depend
new file mode 100644 (file)
index 0000000..fdb5ace
--- /dev/null
+++ b/depend
@@ -0,0 +1,179 @@
+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
+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
+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
+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
+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
+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
+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/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 \
+ 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
+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/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
+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
+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
+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 \
+ ../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 mtime.hh \
+ command.hh pscore.hh pstaff.hh staff.hh voice.hh request.hh misc.hh \
+ debug.hh dstream.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
+dstream.o: dstream.cc dstream.hh ../flower/string.hh \
+ ../flower/stringutil.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
+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
+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
+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
+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
+debug.o: debug.cc debug.hh dstream.hh ../flower/string.hh \
+ ../flower/stringutil.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
+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
+pstaff.o: pstaff.cc 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
+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
+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
+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 \
+ ../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 mtime.hh \
+ command.hh pscore.hh pstaff.hh staff.hh voice.hh request.hh misc.hh \
+ debug.hh dstream.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 \
+ 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/compare.hh request.hh mtime.hh score.hh \
+ command.hh staff.hh voice.hh ../flower/list.cc ../flower/cursor.cc
+template2.o: template2.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 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 \
+ ../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 keyword.hh globvars.hh debug.hh \
+ dstream.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