lilypond-1.3.152

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 89789e350bf6c0ea80b9edd54a35803df195920d..de3e14502549f22a766d2d27cf8edb5d0faabe6d 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -53,7 +53,7 @@ info: $(INFO_FILES)
 # The new pretest version of makeinfo, 4.0a splits html files into their own
 # directory.  Available from
 # ftp://texinfo.org/texinfo/pretests/texinfo-4.0a.tar.gz
-SPLITTING_MAKEINFO = $(shell makeinfo --version | egrep '4.0((.jcn[2,3])|a)')
+SPLITTING_MAKEINFO = $(shell makeinfo --version | egrep '4.0((.jcn[2,3])|a|b)')
 
 
 # Generic rule using % twice not possible?

diff --git a/lily/include/span-bar.hh b/lily/include/span-bar.hh
index 1e7ea7eadd05d61ba30d097f8456d05e550467d5..f59f075a607f877b351bdd6a6ddfccaaf3134954 100644 (file)
--- a/lily/include/span-bar.hh
+++ b/lily/include/span-bar.hh
@@ -29,6 +29,7 @@ public:
   static void evaluate_empty (Grob*);
   DECLARE_SCHEME_CALLBACK (width_callback, (SCM smob, SCM axis));
   DECLARE_SCHEME_CALLBACK (get_bar_size, (SCM ));
+  DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM ));
   DECLARE_SCHEME_CALLBACK (before_line_breaking, (SCM ));
   DECLARE_SCHEME_CALLBACK (center_on_spanned_callback, (SCM element, SCM axis));
 };