* configure.in (gui_b): make bison optional.

* lily/GNUmakefile (OUT_DIST_FILES): dist parser and lexer.

diff --git a/ChangeLog b/ChangeLog
index 5f7c57979e8999ae3d2b036257d5e0ad3c66b0b1..6ab22c25243e8242f02d22bd95a8124a1f3f4b75 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2005-04-16  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * configure.in (gui_b): make bison optional.
+
+       * lily/GNUmakefile (OUT_DIST_FILES): dist parser and lexer.
+
+2005-04-16  Bernard Hurley  <bernard@fong-hurley.org.uk>
+
+       * framework-eps.scm: code added so that a macro \betweenLilyPondSystem
+       with one parameter can be defined in a LaTeX file when processed
+       by lilypond-book this will be evaluated between the systems of
+       a muti-system score. The parameter is the number of systems processed.
+
 2005-04-16  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * python/lilylib.py (make_ps_images): Escape newline.

diff --git a/configure.in b/configure.in
index 71107fdde7131d2dc9cb40d2a79f08928e99acd1..2ca40bae7dcbe34a858719b170aae3b7af19cafe 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -41,7 +41,7 @@ STEPMAKE_LIB(REQUIRED)
 STEPMAKE_DLOPEN
 # Do not use bison 1.50 and 1.75.
 # 1.29 is required fr %locations, but I'm not sure it's enough --ns
-STEPMAKE_BISON(REQUIRED, 1.29)
+STEPMAKE_BISON(OPTIONAL, 1.29)
 STEPMAKE_FLEX(REQUIRED)
 STEPMAKE_FLEXLEXER(REQUIRED)
 AC_LANG_C

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 55eb9704bf90d1673e02d5490e159a421cc6ddf4..8dfb77025e4592e30e2827208bdf95d768052bba 100644 (file)
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -11,6 +11,8 @@ MODULE_CXXFLAGS=
 HELP2MAN_EXECS = lilypond
 STEPMAKE_TEMPLATES= c++ executable po help2man
 
+OUT_DIST_FILES=$(addprefix $(outdir)/,parser.cc lexer.cc parser.hh)
+
 include $(depth)/make/stepmake.make 
 
 ifeq ($(HAVE_LIBKPATHSEA_SO),no)
@@ -33,6 +35,7 @@ $(outdir)/lily-parser.o: $(outdir)/parser.hh
 $(outdir)/lily-lexer.o: $(outdir)/parser.hh
 $(outdir)/lexer.o: $(outdir)/parser.hh $(outdir)/version.hh
 
+
 $(outdir)/general-scheme.o: $(outdir)/version.hh
 $(outdir)/kpath.o: $(outdir)/version.hh
 $(outdir)/lily-guile.o: $(outdir)/version.hh

diff --git a/scm/framework-eps.scm b/scm/framework-eps.scm
index 348929c1c49f7cd82a2820e86082bef19c16cea0..976a41d077025e6d18135e54270778c3ae3c4f49 100644 (file)
--- a/scm/framework-eps.scm
+++ b/scm/framework-eps.scm
@@ -46,12 +46,19 @@
     (ly:message (_ "Writing ~a...") texi-system-name)
     (dump-stencils-as-separate-EPS stencils 1)
     (for-each (lambda (c)
+               (if (< 0 c)
+                   (begin 
+                     (display "\\ifx\\betweenLilyPondSystem \\undefined\n" tex-system-port)
+                     (display "  \\relax\n" tex-system-port)
+                     (display "\\else\n" tex-system-port)
+                     (display (format 
+                               "  \\betweenLilyPondSystem{~a}\n" c) tex-system-port)
+                     (display "\\fi\n" tex-system-port)))
                (display (format "\\includegraphics{~a-~a.eps}\n"
                                 basename (1+ c)) tex-system-port)
                (display (format "@image{~a-~a}\n"
                                 basename (1+ c)) texi-system-port))
              (iota (length stencils)))
-
     (display "@c eof - 'eof' is a Makefile marker; don not remove. " texi-system-port)
     (display "% eof - 'eof' is Makefile marker; do not remove. " tex-system-port)