Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index 89e8a40ce06f42b9daa3da9d48a5510f81d2a4ad..46a24d2db5688012fa13d745768c01746fa2b63c 100644 (file)
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -97,7 +97,7 @@ and other text spanners.
   \override Glissando #'bound-details #'right #'Y = #-4
   \override Glissando #'bound-details #'right #'padding = #0.0
   \override Glissando #'bound-details #'left #'arrow = ##t
-  \override Glissando #'bound-details #'left #'padding = #5.0
+  \override Glissando #'bound-details #'left #'padding = #3.0
   \override Glissando #'style = #'trill
   
   c1 \glissando c'

diff --git a/Documentation/user/running.itely b/Documentation/user/running.itely
index a081721d113a2307b5e4fa63883a868db3000a4a..981e71867a5d2fcd8e5c7a418361215b82bf3a57 100644 (file)
--- a/Documentation/user/running.itely
+++ b/Documentation/user/running.itely
@@ -252,7 +252,7 @@ Generate PostScript.
 
 @item --dvi
 Generate DVI files.  In this case, the @TeX{} backend should be
-specified, i.e., @code{-b tex}.
+specified, i.e., @code{-dbackend=tex}.
 
 @item --png
 Generate pictures of each page, in PNG format.  This implies

diff --git a/Documentation/user/spacing.itely b/Documentation/user/spacing.itely
index 377a74ea1392fb6d13a8cf68799b679ed76f08d5..2fca4954d3f72bfdb54a60a08b5c4c1f7e8efd8f 100644 (file)
--- a/Documentation/user/spacing.itely
+++ b/Documentation/user/spacing.itely
@@ -640,7 +640,7 @@ For the first pass, the @code{dump-tweaks} option should be set to
 generate the page layout file.
 
 @example
-lilypond -b null -d dump-tweaks <file>.ly
+lilypond -dbackend=null -d dump-tweaks <file>.ly
 lilypond <file>.ly
 @end example
 

diff --git a/lily/align-interface.cc b/lily/align-interface.cc
index efb7986a217ac0bcce84ccf071909af5157990ca..7294335bd9845d961cc1457b3880f936e8632f79 100644 (file)
--- a/lily/align-interface.cc
+++ b/lily/align-interface.cc
@@ -129,7 +129,9 @@ get_skylines (Grob *me,
          /* this is perhaps an abuse of minimum-?-extent: maybe we should create
             another property? But it seems that the only (current) use of
             minimum-Y-extent is to separate vertically-aligned elements */
-         SCM min_extent = g->get_property (a == X_AXIS ? "minimum-X-extent" : "minimum-Y-extent");
+         SCM min_extent = g->get_property (a == X_AXIS
+                                           ? ly_symbol2scm ("minimum-X-extent")
+                                           : ly_symbol2scm ("minimum-Y-extent"));
 
          if (is_number_pair (min_extent))
            {

diff --git a/make/generic-rules.make b/make/generic-rules.make
index b41e4846f0c37755aa969dbe0c2d17b8e2b22664..e02ba286c2e89d1554a16117c36e6e15d36e6962 100644 (file)
--- a/make/generic-rules.make
+++ b/make/generic-rules.make
@@ -7,7 +7,7 @@ $(outdir)/%.ly: %.lym4
 
 $(outdir)/%: %.in
        rm -f $@
-       cat $< | sed $(sed-atfiles) $(sed-atvariables) > $@
+       cat $< | sed $(sed-atfiles) | sed $(sed-atvariables) > $@
 
 
 

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 98d09dc9bfbc5c0790c0ad26e589657b45c17d49..49b9a32bac4494f9ca6adfbb59b7cacdd91717d0 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -2083,6 +2083,7 @@
        (direction . ,UP)
        (padding . 1)
        (font-encoding . fetaNumber)
+       (minimum-Y-extent . (0 . 2))
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (side-axis . ,Y)
        (thickness . 1.6)  ;;  line-thickness

diff --git a/stepmake/stepmake/python-module-rules.make b/stepmake/stepmake/python-module-rules.make
index cb3ef487d8984f4ca7df3c90c0394828d5b865db..f32732f5847cb9e9bc052036269d05177bebc14c 100644 (file)
--- a/stepmake/stepmake/python-module-rules.make
+++ b/stepmake/stepmake/python-module-rules.make
@@ -9,6 +9,6 @@ $(outdir)/%.pyo: $(outdir)/%.py
        $(PYTHON) -O -c 'import py_compile; py_compile.compile ("$<")'
 
 $(outdir)/%.py: %.py $(config_make)
-       cat $< | sed $(sed-atfiles) $(sed-atvariables) > $@
+       cat $< | sed $(sed-atfiles) | sed $(sed-atvariables) > $@
        chmod 755 $@
 

diff --git a/stepmake/stepmake/script-rules.make b/stepmake/stepmake/script-rules.make
index bf6589e15c3c1796d85f4141b858ee6867f7e0a6..0862d6b8d641b5b48f5e47eb3dbee89c69b9dc00 100644 (file)
--- a/stepmake/stepmake/script-rules.make
+++ b/stepmake/stepmake/script-rules.make
@@ -1,25 +1,25 @@
 
 $(outdir)/%: %.pl $(config_make)  $(depth)/VERSION
-       cat $< | sed $(sed-atfiles) $(sed-atvariables) > $@
+       cat $< | sed $(sed-atfiles) | sed $(sed-atvariables) > $@
        chmod 755 $@
 
 $(outdir)/%: %.bash $(config_make) $(depth)/VERSION
-       cat $< | sed $(sed-atfiles) $(sed-atvariables) > $@
+       cat $< | sed $(sed-atfiles) | sed $(sed-atvariables) > $@
        chmod 755 $@
 
 $(outdir)/%: %.scm $(config_make) $(depth)/VERSION
-       cat $< | sed $(sed-atfiles) $(sed-atvariables) > $@
+       cat $< | sed $(sed-atfiles) | sed $(sed-atvariables) > $@
        chmod 755 $@
 
 $(outdir)/%: %.expect $(config_make) $(depth)/VERSION
-       cat $< | sed $(sed-atfiles) $(sed-atvariables) > $@
+       cat $< | sed $(sed-atfiles) | sed $(sed-atvariables) > $@
        chmod 755 $@
 
 $(outdir)/%: %.sh $(config_make) $(depth)/VERSION
-       cat $< | sed $(sed-atfiles)$(sed-atvariables) > $@
+       cat $< | sed $(sed-atfiles) | sed $(sed-atvariables) > $@
        chmod 755 $@
 
 $(outdir)/%: %.py $(config_make) $(depth)/VERSION
-       cat $< | sed $(sed-atfiles) $(sed-atvariables) > $@
+       cat $< | sed $(sed-atfiles) | sed $(sed-atvariables) > $@
        chmod 755 $@
 

diff --git a/stepmake/stepmake/substitute-rules.make b/stepmake/stepmake/substitute-rules.make
index fc330548f654bef8bc67263615d83ce242ad28e7..879aec1f3b90af4c0645f00fe51d34f785fdb540 100644 (file)
--- a/stepmake/stepmake/substitute-rules.make
+++ b/stepmake/stepmake/substitute-rules.make
@@ -2,6 +2,6 @@
 # config_make dep isn't working. Why?
 $(outdir)/%: %.in $(config_make) $(depth)/VERSION
        rm -f $@
-       cat $< | sed $(sed-atfiles) $(sed-atvariables) > $@
+       cat $< | sed $(sed-atfiles) | sed $(sed-atvariables) > $@