From 62428eca69900104a0dcd97820595b5957313d79 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 19:42:08 +0000
Subject: [PATCH] lilypond-0.0.59

---
 NEWS                   | 12 ++++++++++--
 init/table_sixteen.ini |  4 ++--
 lily/include/bow.hh    | 29 +++++++++++++++++++++++++++++
 lily/parser.y          |  7 +++++--
 tex/dimen.tex          |  2 +-
 5 files changed, 47 insertions(+), 7 deletions(-)
 create mode 100644 lily/include/bow.hh

diff --git a/NEWS b/NEWS
index 9bbb2e1f44..f01134bef9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+pl 59
+	- Slur now into voicegroups, and take stems into account.
+	- bf: rest size in table.
+	- split Slur in baseclass Bow
+	- Tie, Tie_req, Tie_register
+
+******
+may 2
 pl 58
 	- lexer cleanup
 	- national chars in lyrics
@@ -20,7 +28,7 @@ pl 57.jcn2
 	- small toccata-fuga-E.ly fixes
 	- \bar "||"; is now doublebar, "|." is finishbar
 	- collision hshift fix, with on-line assistance
-
+******
 pl 57
 	- lots of TODO doco
 	- text alignment bugfix
@@ -62,7 +70,7 @@ pl 55
 	- script-on-rest bug
 	- doc update
 	- transpose syntax
-
+******
 pl 54
 	- bugfix Colhpos.cc::OK assert fail.
 	- Inclusion of MusixTeX MF files, 
diff --git a/init/table_sixteen.ini b/init/table_sixteen.ini
index b93ddb7b31..a205cddaff 100644
--- a/init/table_sixteen.ini
+++ b/init/table_sixteen.ini
@@ -108,8 +108,8 @@ table_sixteen=
      }
 
      "rests" = \table {
-	     "1"	"\wholerest"		-5\pt	1\pt	-1\pt	1\pt
-	     "2"	"\halfrest"		-5\pt	1\pt	-1\pt	1\pt
+	     "1"	"\wholerest"		0\pt	6\pt	0\pt	2\pt
+	     "2"	"\halfrest"		0\pt	6\pt	-2\pt	0\pt
 	     "4"	"\quartrest"		-5\pt	2\pt	-5\pt	5\pt
 	     "8"	"\eighthrest"		0\pt	5\pt	0\pt	8\pt
 	     "16"	"\sixteenthrest"		0\pt	6\pt	0\pt	12\pt
diff --git a/lily/include/bow.hh b/lily/include/bow.hh
new file mode 100644
index 0000000000..ab3908a769
--- /dev/null
+++ b/lily/include/bow.hh
@@ -0,0 +1,29 @@
+/*
+  bow.hh -- declare Bow
+
+  source file of the LilyPond music typesetter
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
+
+#ifndef BOW_HH
+#define BOW_HH
+#include "directional-spanner.hh"
+
+/**
+  base class for anything that looks like a slur.
+  */
+class Bow : public Directional_spanner {
+protected:
+    int left_pos_i_;
+    int right_pos_i_;
+    Real left_dx_f_;
+    Real right_dx_f_;
+    Molecule*brew_molecule_p()const;
+public:
+    Bow();
+    NAME_MEMBERS(Bow);
+    Offset center() const;  
+};
+#endif // BOW_HH
diff --git a/lily/parser.y b/lily/parser.y
index b384729562..6ece45d55e 100644
--- a/lily/parser.y
+++ b/lily/parser.y
@@ -1,7 +1,7 @@
 %{ // -*-Fundamental-*-
 #include <iostream.h>
 
-#define MUDELA_VERSION "0.0.56"
+#define MUDELA_VERSION "0.0.57"
 
 #include "script-def.hh"
 #include "symtable.hh"
@@ -807,7 +807,10 @@ close_plet_parens:
 	;
 
 close_request_parens:
-	'('	{ 
+	'~'	{
+		$$ = '~';
+	}
+	| '('	{ 
 		$$='(';
 	}
 	| ']'	{ 
diff --git a/tex/dimen.tex b/tex/dimen.tex
index 9d36059462..4ae5e1376c 100644
--- a/tex/dimen.tex
+++ b/tex/dimen.tex
@@ -1,4 +1,4 @@
-\font\musicfont=cmsy10
+\font\musicfont=musix16
 \font\slurfont=xslu16
 \def\thefont{\musicfont}
 
-- 
2.39.5