From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 7 Feb 2007 19:32:07 +0000 (+0100)
Subject: Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond
X-Git-Tag: release/2.11.17-1~7
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c74523f061cba5fb50d307ff04e3507c8b36f5c8;hp=c4a377d30d0f18ca7722cb64225215b47e50dc61;p=lilypond.git

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 89e8a40ce0..46a24d2db5 100644
--- 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 a081721d11..981e71867a 100644
--- 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 377a74ea13..2fca4954d3 100644
--- 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 efb7986a21..7294335bd9 100644
--- 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 b41e4846f0..e02ba286c2 100644
--- 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 98d09dc9bf..49b9a32bac 100644
--- 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 cb3ef487d8..f32732f584 100644
--- 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 bf6589e15c..0862d6b8d6 100644
--- 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 fc330548f6..879aec1f3b 100644
--- 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) > $@