lilypond-1.5.24

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index e54217156990ed97cfac0856f4076e161749de4a..61cf08e3b9fcc8520169295b827655373f5d1a33 100644 (file)
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -531,7 +531,7 @@ interfere with your build, you may want to do this before the build too:
 @end example
 
 
-
+@c Why isn't this in BUGS (where it belongs?)
 @section Problems
 
 For help and questions use @email{lilypond-user@@gnu.org}.  Please
@@ -554,6 +554,21 @@ LilyPond with gcc-3.0 you may do:
 
 Note that this is fixed in Debian/unstable for flex >= 2.5.4a-13.
 
+ 
+ 
+@unnumberedsubsec Linux-2.4.0, Guile-1.4 --with-threads
+
+There's a bug in certain kernels around version 2.4.0, that is
+triggered when using Guile 1.4 compiled with pthreads.  You'll see
+random segmentation fault crashes of LilyPond.  Upgrade to a newer
+version of Linux.  If you can't do that, you may try to recompiling
+Guile without threads (YMMV):
+
+@example
+         guile-1.4$ ./configure --without-threads; make all install
+@end example
+
+
 @unnumberedsubsec NetBSD
 
 @itemize @bullet

diff --git a/input/test/beam-pos.ly b/input/test/beam-pos.ly
index 14b92742d8ef05abb28cdf705f8ece07b073ecca..2917db77dd1a492c568baa96c5035ea5545e93ed 100644 (file)
--- a/input/test/beam-pos.ly
+++ b/input/test/beam-pos.ly
@@ -5,6 +5,7 @@ filename =       "beam-pos.ly"
 composer =      "jcn"
 enteredby =     "jcn"
 copyright =     "PD"
+title = "Beam quantization"
 
 TestedFeatures =        "beam quant positions"
 }

diff --git a/scm/basic-properties.scm b/scm/basic-properties.scm
index 7f02a51e5dcdffaf73e07cca64f037f1e9746ba0..e3c781c1bcea9ef685be3d978b8045e4cc4da64f 100644 (file)
--- a/scm/basic-properties.scm
+++ b/scm/basic-properties.scm
@@ -27,6 +27,7 @@
                        '((":|:" . (":|" . "|:"))
                          ("||:" . ("||" . "|:"))
                          ("|" . ("|" . ""))
+                         ("||:" . ("||" . "|:"))
                          ("|s" . (nil . "|"))
                          ("|:" . ("|" . "|:"))
                          ("|." . ("|." . nil))

diff --git a/scm/beam.scm b/scm/beam.scm
index f7afad28fcbb0b561f081445099f87547c195268..b0feb6008fbec2b73ff54486fa0aea6f73f05ed5 100644 (file)
--- a/scm/beam.scm
+++ b/scm/beam.scm
@@ -95,6 +95,8 @@
 (define (beam-dir-majority count total)
   (dir-compare (car count) (cdr count)))
 
+(beam-dir-majority '(0 . 0) '(0 . 0))
+
 (define (beam-dir-mean count total)
   (dir-compare (car total) (cdr total)))
 

diff --git a/stepmake/bin/add-html-footer.py b/stepmake/bin/add-html-footer.py
index 744c6ac5093a240b901bf4d962559f43d3b63243..fe15316b4150bff52bfe763e5c94612f733c7b7f 100644 (file)
--- a/stepmake/bin/add-html-footer.py
+++ b/stepmake/bin/add-html-footer.py
@@ -40,7 +40,7 @@ of @PACKAGE_NAME@
 
 built = r"""<hr>
 <p><font size="-1">
-This page was built from @PACKAGE_NAME@-@PACKAGE_VERSION@ by<br>
+This page was built from @PACKAGE_NAME@-@PACKAGE_VERSION@ (@BRANCH@) by<br>
 </font>
 <address><font size="-1">@GCOS@ &lt;<a href="mailto:@MAILADDRESS@">@MAILADDRESS@</a>&gt;,
 @LOCALTIME@.</font></address>"""
@@ -218,6 +218,7 @@ def do_file (f):
                else:
                        s = s + footer
 
+
        #URUGRGOUSNGUOUNRIU
        index = index_url
        top = top_url
@@ -231,6 +232,12 @@ def do_file (f):
                #       index = "./index.html"
                #       top = "./"
 
+
+       versiontup = string.split(package_version, '.')
+       branch_str = 'stable-branch' 
+       if string.atoi ( versiontup[1]) %  2:
+               branch_str = 'development-branch'
+               
        s = re.sub ('@INDEX@', index, s)
        s = re.sub ('@TOP@', top, s)
        s = re.sub ('@PACKAGE_NAME@', package_name, s)
@@ -239,7 +246,8 @@ def do_file (f):
        s = re.sub ('@GCOS@', gcos, s)
        s = re.sub ('@LOCALTIME@', localtime, s)
        s = re.sub ('@MAILADDRESS@', mail_address, s)
-
+       s = re.sub ('@BRANCH@', branch_str, s)  
+  
        m = re.match ('.*?<!-- (@[a-zA-Z0-9_-]*@)=(.*?) -->', s, re.DOTALL)
        while m:
                at_var = m.group (1)