(create_clef): bugfix for octavate clef

(thanks Rune!)

diff --git a/ChangeLog b/ChangeLog
index baf592de094c3b0060066365f22fb514c0291353..ebf06d76708fea460de12a4b97bb349b4e008167 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2002-09-14  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * debian/: debian patches by Anthony Fok.
+       
+       * lily/clef-engraver.cc (create_clef): bugfix for octavate clef
+       (thanks Rune!)
+
        * Documentation/user/tutorial.itely: replace grob by
        object. Explain \once.
 

diff --git a/debian/changelog b/debian/changelog
index eaa2a170a04626b64cd78d79b0d46d7c40efb00a..1057e905e07a0bdc31a74969d9f4219440848700 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-lilypond (1.6.1-1) unstable; urgency=low
+lilypond (1.6.2-1) unstable; urgency=low
 
   * New upstream release.
+  * Check g++ version and run lexer-gcc-3.1.sh if necessary.
 
- -- Anthony Fok <foka@debian.org>  Sat, 31 Aug 2002 18:15:53 +0800
+ -- Anthony Fok <foka@debian.org>  Tue, 10 Sep 2002 23:37:27 +0800
 
 lilypond (1.6.0-1) unstable; urgency=medium
 

diff --git a/debian/control b/debian/control
index 3bc46450f9d95a61c50644c85c7ab3f4be5140fa..5f3571eca34b5a102ab0491cad88f4fef5477067 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Build-Depends-Indep: bibtex2html, gs | gs-aladdin, netpbm (>= 2:9.10-1)
 Section: tex
 Priority: optional
 Maintainer: Anthony Fok <foka@debian.org>
-Standards-Version: 3.5.6
+Standards-Version: 3.5.7
 
 Package: lilypond
 Architecture: any
@@ -28,14 +28,14 @@ Description: A program for printing sheet music.
 Package: lilypond-doc
 Section: doc
 Architecture: all
-Suggests: lilypond (>= 1.6.1-1), postscript-viewer, www-browser
+Suggests: lilypond (>= 1.6.2-1), postscript-viewer, www-browser
 Description: LilyPond Documentation in HTML, PS and DVI formats
  This package contains the HTML, PostScript and DVI documentation for the
  LilyPond music typesetting software.
 
 Package: lilypond1.3
 Architecture: arm i386 m68k powerpc sparc
-Depends: lilypond (>= 1.6.1-1)
+Depends: lilypond (>= 1.6.2-1)
 Description: Dummy package for transition to new stable lilypond.
  This dummy package provides a transition from the previous lilypond1.3
  package back to a newer lilypond because the stable 1.4 and now 1.6 series

diff --git a/debian/control.foka b/debian/control.foka
index 3bc46450f9d95a61c50644c85c7ab3f4be5140fa..5f3571eca34b5a102ab0491cad88f4fef5477067 100644 (file)
--- a/debian/control.foka
+++ b/debian/control.foka
@@ -4,7 +4,7 @@ Build-Depends-Indep: bibtex2html, gs | gs-aladdin, netpbm (>= 2:9.10-1)
 Section: tex
 Priority: optional
 Maintainer: Anthony Fok <foka@debian.org>
-Standards-Version: 3.5.6
+Standards-Version: 3.5.7
 
 Package: lilypond
 Architecture: any
@@ -28,14 +28,14 @@ Description: A program for printing sheet music.
 Package: lilypond-doc
 Section: doc
 Architecture: all
-Suggests: lilypond (>= 1.6.1-1), postscript-viewer, www-browser
+Suggests: lilypond (>= 1.6.2-1), postscript-viewer, www-browser
 Description: LilyPond Documentation in HTML, PS and DVI formats
  This package contains the HTML, PostScript and DVI documentation for the
  LilyPond music typesetting software.
 
 Package: lilypond1.3
 Architecture: arm i386 m68k powerpc sparc
-Depends: lilypond (>= 1.6.1-1)
+Depends: lilypond (>= 1.6.2-1)
 Description: Dummy package for transition to new stable lilypond.
  This dummy package provides a transition from the previous lilypond1.3
  package back to a newer lilypond because the stable 1.4 and now 1.6 series

diff --git a/debian/rules b/debian/rules
index e618d46f2f8f3ba29a20b8bb00287f5c5c06ac0b..2c715919c7b9e80766859c7e0ebfa06dcccdf248 100644 (file)
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,11 @@ d = usr/share/doc/$(package)
 include VERSION
 VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_LEVEL)
 
+gcc_version = $(shell g++ --version 2>&1 \
+               | grep '[0-9]\.[0-9]' | head -1 \
+               | sed -e 's/.*[^-.0-9]\([0-9][0-9]*\.[0-9][.0-9]*\).*/\1/' \
+                     -e 's/^\([0-9]\+\).*/\1/')
+
 # "main_memory = 263000" in /etc/texmf/texmf.cnf isn't large enough
 # for latex to process standchen.dvi.latex, so adding extra_mem_* ...
 # export extra_mem_top = 100000
@@ -44,10 +49,13 @@ build: build-stamp
 build-stamp:
        dh_testdir
 
-       ./configure --enable-checking --disable-debugging \
+       if [ "$(gcc_version)" = "3" ]; then ./lexer-gcc-3.1.sh; fi
+       CPPFLAGS=-I`pwd`/lily/out \
+       ./configure --enable-checking --enable-debugging \
                --prefix=/usr --enable-optimise \
                --infodir='$${prefix}/share/info' \
                --mandir='$${prefix}/share/man'
+       if [ "$(gcc_version)" = "3" ]; then ./lexer-gcc-3.1.sh; fi
        $(MAKE) MAKE_PFA_FILES=1
 
        touch build-stamp

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index e7b4dfa94ed9bbf51a0cc9efe3de4ef8c19e2577..091ee979a0bb8a0fd93b235b18530ce8c7a26f9c 100644 (file)
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -95,28 +95,27 @@ Clef_engraver::create_clef ()
       announce_grob(c, SCM_EOL);
 
       clef_ = c;
-    }
-  SCM cpos = get_property ("clefPosition");
+      SCM cpos = get_property ("clefPosition");
 
-  if (gh_number_p (cpos))
-    Staff_symbol_referencer::set_position (clef_, gh_scm2int (cpos));
+      if (gh_number_p (cpos))
+       Staff_symbol_referencer::set_position (clef_, gh_scm2int (cpos));
 
-  SCM oct =  get_property ("clefOctavation");
-  if (gh_number_p (oct) && gh_scm2int (oct))
-    {
-      Item * g = new Item (get_property ("OctavateEight"));
+      SCM oct =  get_property ("clefOctavation");
+      if (gh_number_p (oct) && gh_scm2int (oct))
+       {
+         Item * g = new Item (get_property ("OctavateEight"));
 
-      Side_position_interface::add_support (g,clef_);      
+         Side_position_interface::add_support (g,clef_);      
 
-      g->set_parent (clef_, Y_AXIS);
-      g->set_parent (clef_, X_AXIS);
+         g->set_parent (clef_, Y_AXIS);
+         g->set_parent (clef_, X_AXIS);
 
-      g->set_grob_property ("direction", scm_int2num (sign (gh_scm2int (oct))));
-      octavate_ = g;
-      announce_grob(octavate_, SCM_EOL);
+         g->set_grob_property ("direction", scm_int2num (sign (gh_scm2int (oct))));
+         octavate_ = g;
+         announce_grob(octavate_, SCM_EOL);
+       }
     }
 }
-
 void
 Clef_engraver::process_music ()
 {

diff --git a/lily/source-file.cc b/lily/source-file.cc
index a6ec31298d7e38bb2184f24ec138496a155d01e5..23cf17cf7c0e6f514912fbae7d33f2a6b9a322d4 100644 (file)
--- a/lily/source-file.cc
+++ b/lily/source-file.cc
@@ -7,6 +7,8 @@
   & Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <assert.h>
 #if HAVE_SSTREAM

diff --git a/make/lilypond.mandrake.spec.in b/make/lilypond.mandrake.spec.in
index 39e3ca4824707cc24d1621bafdb6010ea030077d..43edd6971d3d430599635317af4906a8547f8071 100644 (file)
--- a/make/lilypond.mandrake.spec.in
+++ b/make/lilypond.mandrake.spec.in
@@ -59,9 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 # DO NOT use % { configure } , it hardcodes all paths, runs libtool,
 # so we can't do make prefix=/tmp/ install.
 # -- not sure what this comment means; it's a relic from the PPC spec file -- mbrown@fensystems.co.uk
-##./configure --disable-checking --disable-debugging --enable-printing --prefix=%{_prefix} --disable-optimise --enable-shared
+##./configure --disable-checking --disable-debugging --enable-printing --prefix=%{_prefix} --disable-optimising --enable-shared
 ## Add options if needed
-./configure --disable-checking --prefix=%{_prefix} --enable-optimise
+./configure --disable-checking --prefix=%{_prefix} --enable-optimising
 make MAKE_PFA_FILES=1 all
 
 # make info

diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in
index ad858229bb714d9a7589e9fdf0523a63ef9a43e9..c7f0a50fcccc70b7e44002d3b2ca440ccceaed9f 100644 (file)
--- a/make/lilypond.redhat.spec.in
+++ b/make/lilypond.redhat.spec.in
@@ -39,7 +39,7 @@ The documentation and example files of LilyPond.
 # In fact, do not take out the spaces between % and { in the above comment,
 # because RPM will gladly do a substitution anyway.
 
-./configure --disable-checking --prefix=%{_prefix} --enable-optimise
+./configure --disable-checking --prefix=%{_prefix} --enable-optimising
 
 make MAKE_PFA_FILES=1 all
 

diff --git a/make/lilypond.suse.spec.in b/make/lilypond.suse.spec.in
index c5e68f391e2594e853dbe3921c55a3f2e41a2a6f..b5c4cb4017e0cb903aceb95fa367de169786fba2 100644 (file)
--- a/make/lilypond.suse.spec.in
+++ b/make/lilypond.suse.spec.in
@@ -92,7 +92,7 @@ The documentation of LilyPond, both in HTML and PostScript.
 # In fact, do not take out the spaces between % and { , because RPM will gladly
 # do a substitution anyway.
 
-CFLAGS="$RPM_OPT_FLAGS" ./configure --disable-checking --disable-debugging --enable-printing --prefix=%{_prefix} --enable-optimise --enable-shared
+CFLAGS="$RPM_OPT_FLAGS" ./configure --disable-checking --disable-debugging --enable-printing --prefix=%{_prefix} --enable-optimising --enable-shared
 
 make LDFLAGS=-s "CFLAGS=$RPM_OPT_FLAGS" all