Merge branch 'master' of git://git.sv.gnu.org/lilypond

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 52e4a1b3142aabca6d69b4aba281bb337f56e685..9f50bd0707704b93b9e02278c2ffbc64aae85d15 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -209,7 +209,7 @@ test:
        $(MAKE) -C input/regression/musicxml out=test local-test
 
 test-baseline: 
-       @if  test -d .git ; then \
+       @if test -d .git ; then \
                $(if $(shell git diff), echo "commit before base lining" && false,true) ; \
        fi
        $(MAKE) 

diff --git a/input/regression/lyric-hyphen-break.ly b/input/regression/lyric-hyphen-break.ly
index 41cff57e68939f0bbaa84e4bae5b8a2744cd8fe5..e9d3542568bc9ba292ec7fdc6f6356b471988b09 100644 (file)
--- a/input/regression/lyric-hyphen-break.ly
+++ b/input/regression/lyric-hyphen-break.ly
@@ -20,15 +20,13 @@ they go past the first note. "
 
 
 <<
-  \new Staff \relative c'' {
+  \new Voice \relative c'' {
     \time 1/4 c16[ c c  c]
     \time 1/4
     c16[ c c c]
     \time 1/4
     r c16[ c c]
-
-  }
-  \new Lyrics \lyricmode {
+  } \addlyrics {
     bla16 -- bla -- bla -- bla --
     bla -- bla -- bla -- bla8 --
     bla16 -- bla -- bla 

diff --git a/input/regression/lyric-hyphen.ly b/input/regression/lyric-hyphen.ly
index 7e1f52f7f67c07f5ab436ba91905885d1dcce16f..bb53f10e8b665a6320cdd9dd5e739be047a4eb9f 100644 (file)
--- a/input/regression/lyric-hyphen.ly
+++ b/input/regression/lyric-hyphen.ly
@@ -7,13 +7,11 @@
     ragged-right= ##t
 }
 
-<<
-    \context Staff  { c' (c') c'( c') }
-    \context Lyrics \lyricmode {
-      \override Lyrics . LyricSpace #'minimum-distance = #5.0
-      a -- b x -- y
-    }
->>
+\new Voice { c' (c') c'( c') }
+\addlyrics {
+  \override Lyrics . LyricSpace #'minimum-distance = #5.0
+  a -- b x -- y
+}
 
 
 

diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc
index a3c4ca08a75a4594bb71c1f64200adac9cc56f72..bffcf98426f727b79f1613a10b9b67a4b7a62ee4 100644 (file)
--- a/lily/side-position-interface.cc
+++ b/lily/side-position-interface.cc
@@ -10,6 +10,7 @@
 
 #include <cmath>               // ceil.
 #include <algorithm>
+
 using namespace std;
 
 #include "directional-element-interface.hh"
@@ -251,7 +252,7 @@ Side_position_interface::aligned_side (Grob *me, Axis a, bool pure, int start, i
              /* In case of a ledger lines, quantize even if we're outside the staff. */
              || (Note_head::has_interface (head)
                  
-                 && abs (Staff_symbol_referencer::get_position (head)) > position))
+                 && abs (Staff_symbol_referencer::get_position (head)) > abs (position)))
            {
              o += (rounded - position) * 0.5 * ss;
              if (Staff_symbol_referencer::on_line (me, int (rounded)))

diff --git a/make/lysdoc-targets.make b/make/lysdoc-targets.make
index 28b84beee2c6616260584b6fe3fbd222f2bc4f75..b216c11bdeff8e5835b347822a24f1c776bb94d9 100644 (file)
--- a/make/lysdoc-targets.make
+++ b/make/lysdoc-targets.make
@@ -12,9 +12,9 @@ local-test:
        rm -f $(outdir)/collated-files.html
        if test -d $(top-src-dir)/.git  ; then \
                echo -e 'HEAD is:\n\n\t' ; \
-               git log --max-count=1 --pretty=oneline ;\
+               (cd $(top-src-dir) && git log --max-count=1 --pretty=oneline ) ;\
                echo -e '\n\n\n' ; \
-               git diff ; \
+               (cd $(top-src-dir) && git diff ) ; \
        fi > $(outdir)/tree.gittxt
        $(MAKE) LILYPOND_BOOK_LILYPOND_FLAGS="-dbackend=eps --formats=ps $(LILYPOND_JOBS) -dseparate-log-files -dinclude-eps-fonts -dgs-load-lily-fonts --header=texidoc -I $(top-src-dir)/input/manual -ddump-profile -dcheck-internal-types -ddump-signatures -danti-alias-factor=1" LILYPOND_BOOK_VERBOSE= $(outdir)/collated-files.html
        rsync -L -a --exclude 'out-*' --exclude 'out' --exclude mf --exclude source --exclude mf $(top-build-dir)/out/share $(outdir)