From 35f8b87b566e5220c60a784911094d0826372b1b Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 19:58:41 +0000
Subject: [PATCH] lilypond-0.1.17

---
 init/table16.ly      | 19 ++++++++-----------
 init/table20.ly      | 15 ++++++---------
 lily/symtable.cc     |  8 +++++++-
 tex/lilyponddefs.tex | 16 +++++++++-------
 4 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/init/table16.ly b/init/table16.ly
index 5097530ac8..99a3a295a2 100644
--- a/init/table16.ly
+++ b/init/table16.ly
@@ -75,18 +75,14 @@ table_sixteen=
 	"tenor_change"	"\caltoclef" 	0.0\pt	11.2\pt	0.0\pt	16.0\pt
      }
 
-     "balls" = \table {
-	"-2"	"\longaball"	0.0\pt	6.0\pt	-2.0\pt	2.0\pt
-	"-1"	"\breveball"	0.0\pt	6.0\pt	-2.0\pt	2.0\pt
-	"0"	"\wholeball"	0.0\pt	8.0\pt	0.0\pt	4.4\pt
-	"1"	"\halfball"	0.0\pt	5.4\pt	0.0\pt	4.4\pt
-	"2"	"\quartball"	0.0\pt	5.5\pt	0.0\pt	4.4\pt
-     }
+     % ugh what's our outdir called?
+     \include "font-en-tja16.ly"
 
      "slur" = \table {
 	"whole"	"\slurchar%{%}"
 	"half"	"\hslurchar%{%}"
      }
+
      "accidentals" = \table {
 	"-2"	"\flatflat"	0.0\pt 	8.16\pt	-2.5\pt 7.5\pt
 	"-1"	"\flat"		0.0\pt	4.8\pt	-2.5\pt 7.5\pt
@@ -96,8 +92,8 @@ table_sixteen=
      }
 
      "streepjes" = \table {
-	"toplines"	"\toplines{%}"	-1.0\pt	7.0\pt	0.0\pt	0.0\pt
-	"botlines"	"\botlines{%}"	-1.0\pt	7.0\pt	0.0\pt	0.0\pt
+	"toplines"	"\toplines{%}{%}"	-1.0\pt	7.0\pt	0.0\pt	0.0\pt
+	"botlines"	"\botlines{%}{%}"	-1.0\pt	7.0\pt	0.0\pt	0.0\pt
      }
 
      "bars" = \table {
@@ -170,8 +166,9 @@ table_sixteen=
      }
 
      "beamslopes" = \table {
-	"slope"	"\beamslope{%}{%}"
-	"horizontal"	"\rulesym{%}{%}"
+	"uslope"	"\beamuslope{%}{%}"  2.0\pt 64.0\pt 0.0\pt 0.0\pt
+	"dslope"	"\beamdslope{%}{%}"  2.0\pt 64.0\pt 0.0\pt 0.0\pt
+	"horizontal"	"\rulesym{%}{%}"	
      }
 
 }
diff --git a/init/table20.ly b/init/table20.ly
index dc32462e8b..c2a8f02bca 100644
--- a/init/table20.ly
+++ b/init/table20.ly
@@ -78,12 +78,8 @@ table_twenty =
 	"tenor_change"	"\caltoclef" 	0.0\pt	16.0\pt	0.0\pt	20.0\pt
     }
 
-    "balls" = \table {
-	"-1"	"\breveball" 	0.0\pt	7.5\pt	-2.5\pt	2.5\pt
-	"0"	"\wholeball"	0.0\pt	10.2\pt	0.0\pt	5.4\pt
-	"1"	"\halfball"	0.0\pt	6.8\pt	0.0\pt	5.4\pt
-	"2"	"\quartball"	0.0\pt	6.6\pt	0.0\pt	5.4\pt
-    }
+    % ugh what's our outdir called?
+    \include "font-en-tja20.ly"
 
     "slur" = \table {
 	"whole"	"\slurchar%{%}"	0.0\pt	0.0\pt	0.0\pt	0.0\pt
@@ -99,8 +95,8 @@ table_twenty =
     }
 
     "streepjes" = \table {
-	"toplines"	"\toplines{%}"	-3.0\pt	9.0\pt	0.0\pt	0.0\pt
-	"botlines"	"\botlines{%}"	-3.0\pt	9.0\pt	0.0\pt	0.0\pt
+	"toplines"	"\toplines{%}{%}"	-3.0\pt	9.0\pt	0.0\pt	0.0\pt
+	"botlines"	"\botlines{%}{%}"	-3.0\pt	9.0\pt	0.0\pt	0.0\pt
     }
 
     "bars" = \table {
@@ -170,7 +166,8 @@ table_twenty =
      }
 
     "beamslopes" = \table {
-	"slope"	"\beamslope{%}{%}"
+	"uslope"	"\beamuslope{%}{%}"  2.0\pt 64.0\pt 0.0\pt 0.0\pt
+	"dslope"	"\beamdslope{%}{%}"  2.0\pt 64.0\pt 0.0\pt 0.0\pt
 	"horizontal"	"\rulesym{%}{%}"	
     }
 }
diff --git a/lily/symtable.cc b/lily/symtable.cc
index 9098e18ad4..f04ac53df5 100644
--- a/lily/symtable.cc
+++ b/lily/symtable.cc
@@ -51,7 +51,13 @@ Symtable::lookup (String s) const
 Symtable* 
 Symtables::operator()(String s) 
 {
-  return Dictionary<Symtable*>::operator[](s);
+  if (!elt_b (s))
+    {
+      warning ("Symtables `" + s + "\' unknown");
+      return 0;
+    }
+  else
+    return Dictionary<Symtable*>::operator[](s);
 } 
 void
 Symtables::print() const
diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index 1094443b96..20986c443f 100644
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -57,12 +57,14 @@
 \newdimen\noteheight
 \newdimen\staffrulethickness
 \newdimen\interstaffrule
+\newdimen\dist
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % set fonts and primary dimensions
+% ugh
 \def\musixtwentydefs{
         \balkheight=20pt
-        \notewidth=6.7pt
+        \notewidth=7.15pt
         \noteheight=5pt
         \staffrulethickness=0.4pt
         \musixtwentyfonts
@@ -73,7 +75,7 @@
 \def\musixsixteendefs{
         \balkheight=16pt
         \staffrulethickness=0.4pt
-        \notewidth=5.45pt
+        \notewidth=5.93pt
         \noteheight=4pt
         \musixsixteenfonts
         \font\textmusic=cmmi10
@@ -101,6 +103,7 @@
 \input dyndefs
 
 \input taupindefs
+%\input eglerdefs
 
 \musicmathdef\cup{91} % \cup
 \musicmathdef\wedge{94} % \wedge
@@ -180,11 +183,11 @@
 %%
 % Ugh. Need to redo this. Wish we had PS.
 %
-\def\toplines#1{ % why space needed here?
-        \topalign{\hbox{\kern-\notewidth\lines{#1}{1.6\notewidth}{1.6\staffrulethickness}}}}
+\def\toplines#1#2{\dist#1
+        \topalign{\hbox{\kern-.25\dist\lines{#2}{1.5\dist}{2\staffrulethickness}}}}
 
-\def\botlines#1{ % idem ditto
-        \botalign{\hbox{\kern-\notewidth\lines{#1}{1.6\notewidth}{1.6\staffrulethickness}}}}
+\def\botlines#1#2{\dist#1
+        \botalign{\hbox{\kern-.25\dist\lines{#2}{1.5\dist}{2\staffrulethickness}}}}
 
 %
 % a staffsymbol with #1 lines, width #2
@@ -198,7 +201,6 @@
 }
 
 
-\def\beamslope#1#2{{\count0=#2\advance\count0 by#1\musicfnt\char\count0}}
 \def\brace#1{\count0=148\advance\count0 by #1\musicdraw\char\count0}
 \def\crescendosym#1{\count0=84\advance\count0 by #1\musicdraw\char\count0}
 \def\decrescendosym#1{\count0=116\advance\count0 by #1\musicdraw\char\count0}
-- 
2.39.5