From: fred <fred>
Date: Tue, 10 Dec 1996 14:42:26 +0000 (+0000)
Subject: lilypond-0.0.15
X-Git-Tag: release/1.5.59~6628
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3ed30bda2f6ef2cd47a365c81c93e70937859a37;p=lilypond.git

lilypond-0.0.15
---

diff --git a/src/lexer.l b/src/lexer.l
index aaacf06df5..f83cf144df 100644
--- a/src/lexer.l
+++ b/src/lexer.l
@@ -39,7 +39,7 @@ DURNAME		1|2|4|8|16|32
 DURATION	{DURNAME}\.*
 FULLNOTE	{PITCH}{DURATION}?
 WORD		[a-zA-Z][a-zA-Z0-9_]+
-REAL		[0-9]+(\.[0-9]*)?
+REAL		-?[0-9]+(\.[0-9]*)?
 
 %%
 
@@ -86,7 +86,7 @@ REAL		[0-9]+(\.[0-9]*)?
 }
 <notes>[ \t\n]+		{
 }
-<notes>%.*$		{
+<notes>[%#].*$		{ 
 
 }
 <notes>\$	{
diff --git a/src/lookup.cc b/src/lookup.cc
index c22e3aaf55..7376f3c1d4 100644
--- a/src/lookup.cc
+++ b/src/lookup.cc
@@ -5,26 +5,35 @@
 #include "tex.hh"
 #include "scalar.hh"
 
-Real
-Lookup::internote()
+
+Lookup::Lookup()
 {
-    return ball(4).dim.y.length()/2;
+    texsetting = "\\unknowntexsetting";
+    symtables_ = new Symtables;
 }
 
-void
-Lookup::parse(Text_db&t)
+Lookup::Lookup(Lookup const &s)
+{
+    texsetting = s.texsetting;
+    symtables_ = new Symtables(*s.symtables_);
+}
+Lookup::~Lookup()
 {
-    symtables_->read(t) ;
+    delete symtables_;
 }
 
-Lookup::Lookup()
+void
+Lookup::add(String s, Symtable*p)
 {
-    symtables_ = new Symtables;
+    symtables_->add(s, p);
 }
 
-Lookup::~Lookup()
+/****************/
+
+Real
+Lookup::internote()
 {
-    delete symtables_;
+    return ball(4).dim.y.length()/2;
 }
 
 Symbol
@@ -100,8 +109,6 @@ Lookup::streepjes(int i)
     return ret;
 }
 
-/****************************************************************/
-// bare bones.
 
 
 Symbol
@@ -122,9 +129,6 @@ Lookup::linestaff(int lines, Real wid)
     return s;
 }
 
-/****************************************************************/
-
-
 
 Symbol
 Lookup::meter(svec<Scalar> a)
@@ -156,5 +160,3 @@ Lookup::stem(Real y1,Real y2)
     s.tex = substitute_args(src,a);
     return s;
 }
-
-
diff --git a/src/pscore.cc b/src/pscore.cc
index 378ad37f0a..fcd03ca55a 100644
--- a/src/pscore.cc
+++ b/src/pscore.cc
@@ -1,5 +1,6 @@
 // utility functions for PScore
 #include "debug.hh"
+#include "lookup.hh"
 #include "spanner.hh"
 #include "paper.hh"
 #include "molecule.hh"
@@ -147,6 +148,7 @@ PScore::output(Tex_stream &ts)
 {
     int l=1;
 
+    ts << "\n "<<  paper_->lookup_->texsetting << "%(Tex id)\n";
     for (PCursor<Line_of_score*> lic(lines); lic.ok(); lic++) {
 	ts << "% line of score no. " << l++ <<"\n";
 	ts << lic->TeXstring();