From c50fc8529872cd6a9bb90671dfb0cf3967b50ed7 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 12 Nov 1998 14:27:00 +0100 Subject: [PATCH] release: 1.0.19 --- NEWS | 3 +++ VERSION | 2 +- flower/include/dictionary.hh | 20 +++++++++++++------- lily/include/key-item.hh | 1 + lily/symtable.cc | 3 +-- make/lilypond.spec.in | 10 ++++++---- make/out/lelievijver.lsm | 8 ++++---- make/out/lilypond.lsm | 8 ++++---- make/out/lilypond.spec | 14 ++++++++------ 9 files changed, 41 insertions(+), 28 deletions(-) diff --git a/NEWS b/NEWS index 69d5f27cc8..aadb5066fd 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +pl 18.uu1 + - gcc 2.7 fixes + pl 18 - dictionary.hh fix diff --git a/VERSION b/VERSION index 769196e8e3..3744a3b312 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=0 -PATCH_LEVEL=18 +PATCH_LEVEL=19 MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a diff --git a/flower/include/dictionary.hh b/flower/include/dictionary.hh index e81242c64f..597cb46698 100644 --- a/flower/include/dictionary.hh +++ b/flower/include/dictionary.hh @@ -99,9 +99,6 @@ public: i = nexti; nexti = (nexti + j*j)%sz; } - - finish: - return retval; } }; @@ -174,6 +171,17 @@ public: fixed_p_->dict_arr_[l].name_ = s; return fixed_p_->dict_arr_[l].value_; } + V elem (String s) const + { + return const_elem (s); + } + V const_elem (String k) const + { + V retval; + if (elem_b (k)) + retval = ((Dictionary*)this)->elem (k); + return retval; + } V& operator [] (String k) { return elem (k); @@ -181,11 +189,9 @@ public: V operator [] (String k) const { - V retval; - if (elem_b (k)) - retval = ((Dictionary*)this)->elem (k); - return retval; + return const_elem (k); } + V remove (String s) { diff --git a/lily/include/key-item.hh b/lily/include/key-item.hh index f8e3747b58..ae0cca2cdc 100644 --- a/lily/include/key-item.hh +++ b/lily/include/key-item.hh @@ -8,6 +8,7 @@ #define KEYITEM_HH #include "item.hh" +#include "musical-pitch.hh" #include "array.hh" diff --git a/lily/symtable.cc b/lily/symtable.cc index cc3cecff23..af9b037fdf 100644 --- a/lily/symtable.cc +++ b/lily/symtable.cc @@ -42,8 +42,7 @@ Symtable::lookup (String s) const { if (elem_b (s)) { - Atom a (elem(s)); - return a; + return ((Symtable*)this)->elem(s); } else { diff --git a/make/lilypond.spec.in b/make/lilypond.spec.in index 244a80801f..3c0213304a 100644 --- a/make/lilypond.spec.in +++ b/make/lilypond.spec.in @@ -7,7 +7,7 @@ Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-@TOPLEVEL_VERSION@. Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond Packager: Han-Wen Nienhuys -Icon: @package@-icon.gif +# Icon: @package@-icon.gif BuildRoot: /tmp/lilypond-install Prereq: tetex @@ -20,12 +20,14 @@ Prereq: tetex ./configure --disable-checking --disable-debugging --enable-printing --prefix=/usr --disable-optimise --enable-shared make all make -C Documentation info || true -make htmldoc +make htmldoc || true %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc -tar -C $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc -xzf out/htmldoc.tar.gz +mkdir htmldocs +tar -C htmldocs -xzf out/htmldoc.tar.gz +#tar -C $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc -xzf out/htmldoc.tar.gz strip lily/out/lilypond mi2mu/out/mi2mu make prefix="$RPM_BUILD_ROOT/usr" install @@ -36,7 +38,7 @@ cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT/etc/profile.d/lilypond.csh %files -%doc /tmp/lilypond-rpm-doc +%doc htmldocs/ # hairy to hook it in (possibly non-existing) emacs %doc mudela-mode.el diff --git a/make/out/lelievijver.lsm b/make/out/lelievijver.lsm index 09bfbe8ac7..a8364ec135 100644 --- a/make/out/lelievijver.lsm +++ b/make/out/lelievijver.lsm @@ -1,15 +1,15 @@ Begin3 Titel: LilyPond -Versie: 1.0.18 -Inschrijf datum: 03NOV98 +Versie: 1.0.19 +Inschrijf datum: 26NOV98 Beschrijving: @FLAPTEKST@ Trefwoorden: muziek typezetten midi notatie Auteur: hanwen@stack.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Onderhouden door: hanwen@cs.ruu.nl (Han-Wen Nienhuys) Voornaamste plek: sunsite.unc.edu /pub/Linux/apps - 770k lilypond-1.0.18.tar.gz + 770k lilypond-1.0.19.tar.gz Oorspronkelijke plek: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.0.18.tar.gz + 770k lilypond-1.0.19.tar.gz Copi-eer voorwaarden: GPL End diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index 49776279aa..59b457ac61 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond -Version: 1.0.18 -Entered-date: 03NOV98 +Version: 1.0.19 +Entered-date: 26NOV98 Description: LilyPond is the GNU Project music typesetter. This program can print beautiful sheet music from a music definition file. It can also play @@ -14,8 +14,8 @@ Author: hanwen@cs.ruu.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys) Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert - 770k lilypond-1.0.18.tar.gz + 770k lilypond-1.0.19.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.0.18.tar.gz + 770k lilypond-1.0.19.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index fadbc4b4f0..9e947861d0 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,13 +1,13 @@ Name: lilypond -Version: 1.0.18 +Version: 1.0.19 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.0.18.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.0.19.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond Packager: Han-Wen Nienhuys -Icon: lilypond-icon.gif +# Icon: lilypond-icon.gif BuildRoot: /tmp/lilypond-install Prereq: tetex @@ -26,12 +26,14 @@ a nice font of musical symbols. ./configure --disable-checking --disable-debugging --enable-printing --prefix=/usr --disable-optimise --enable-shared make all make -C Documentation info || true -make htmldoc +make htmldoc || true %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc -tar -C $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc -xzf out/htmldoc.tar.gz +mkdir htmldocs +tar -C htmldocs -xzf out/htmldoc.tar.gz +#tar -C $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc -xzf out/htmldoc.tar.gz strip lily/out/lilypond mi2mu/out/mi2mu make prefix="$RPM_BUILD_ROOT/usr" install @@ -42,7 +44,7 @@ cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT/etc/profile.d/lilypond.csh %files -%doc /tmp/lilypond-rpm-doc +%doc htmldocs/ # hairy to hook it in (possibly non-existing) emacs %doc mudela-mode.el -- 2.39.5