release: 1.0.19

diff --git a/NEWS b/NEWS
index 69d5f27cc8c95c5a5bae8bafa02f180c0782e14b..aadb5066fd0b75f8d4111ae47989100736829b84 100644 (file)
--- 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 769196e8e34b25c23e70f39be49cec372b4844bb..3744a3b3127cd6e3f4d914047d5c6711b987fe3f 100644 (file)
--- 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 e81242c64f53d9f72e61825f03809c901a313ea0..597cb466989c787c4ec48935a28378b19defe187 100644 (file)
--- 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<V>*)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<V>*)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 f8e3747b58cba51b4ae719f56dd7751e6980a426..ae0cca2cdcbaf3264bd69e4d201b1def16f3f502 100644 (file)
--- 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 cc3cecff23140339de16c96438dcf0fd18466a37..af9b037fdfe14fb821d80477093e598213bcc269 100644 (file)
--- 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 244a80801f44ad24d36de04121a273d77ec7079e..3c0213304a27b8828cb8d2f9c75c0b331d967aad 100644 (file)
--- 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 <hanwen@cs.uu.nl>
-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 09bfbe8ac777d8d84601c788c7951fe3f0597501..a8364ec135c9936531a524ce655cd84dc1d12c74 100644 (file)
--- 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 49776279aacb3143dd4de43d72438716dc2dac42..59b457ac61c092c403d3d715d14d24181c208866 100644 (file)
--- 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 fadbc4b4f0b6b8fbe94a54acaacd0f131ad2e2cb..9e947861d07a8fe656ffbbe649e3b4b589791c25 100644 (file)
--- 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 <hanwen@cs.uu.nl>
-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