From: Joe Neeman <joeneeman@gmail.com>
Date: Sun, 26 Nov 2006 17:11:30 +0000 (+0200)
Subject: Merge with git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond.git
X-Git-Tag: release/2.11.16-1^2~16^2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6f664e0e318a1651f6fe9317a842bf9c7f476f08;hp=-c;p=lilypond.git

Merge with git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond.git
---

6f664e0e318a1651f6fe9317a842bf9c7f476f08
diff --combined scm/define-grobs.scm
index 08937eb37f,bd5dee7706..5e2dd4d86c
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@@ -422,6 -422,7 +422,7 @@@
  	(stencil . ,ly:clef::print)
  	(glyph-name . ,ly:clef::calc-glyph-name)
  	(non-musical . #t)
+ 	(avoid-slur . inside)
  	(font-family . music)
  	(break-align-symbol . clef)
  	(break-visibility . ,begin-of-line-visible)
@@@ -793,6 -794,7 +794,7 @@@
      (KeySignature
       . (
  	(stencil . ,ly:key-signature-interface::print)
+ 	(avoid-slur . inside)
  	(space-alist . (
  			(time-signature . (extra-space . 1.15))
  			(staff-bar . (extra-space . 1.1))
@@@ -1641,7 -1643,6 +1643,7 @@@
  	(axes . (0 1))
  	(X-extent . ,ly:axis-group-interface::width)
  	(Y-extent . ,ly:axis-group-interface::height)
 +	(skyline-spacing . #t)
  	(meta . ((class . System)
  		 (interfaces . (system-interface
  				axis-group-interface))))))
@@@ -1809,6 -1810,7 +1811,7 @@@
  	(stencil . ,ly:time-signature::print)
  	(break-align-symbol . time-signature)
  	(break-visibility . ,all-visible)
+ 	(avoid-slur . inside)
  	(space-alist . (
  			(first-note . (fixed-space . 2.0))
  			(right-edge . (extra-space . 0.5))
@@@ -1965,7 -1967,6 +1968,7 @@@
  	(Y-offset . ,ly:hara-kiri-group-spanner::force-hara-kiri-callback)
  	(Y-extent . ,ly:hara-kiri-group-spanner::y-extent)
  	(X-extent . ,ly:axis-group-interface::width)
 +	(skyline-spacing . #t)
  	(meta . ((class . Spanner)
  		 (interfaces . (axis-group-interface
  				hara-kiri-group-interface
diff --combined scm/lily.scm
index a0788091a0,2241c85047..f3767ca9f5
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@@ -26,7 -26,6 +26,7 @@@
  	      (debug-lexer #f "debug the flex lexer")
  	      (debug-midi #f "generate human readable MIDI")
  	      (debug-parser #f "debug the bison parser")
 +	      (debug-skylines #f "debug skylines")
  	      (delete-intermediate-files #f
  					 "delete unusable PostScript files")
  	      (dump-signatures #f "dump output signatures of each system")
@@@ -52,7 -51,7 +52,7 @@@ scheme are caught in the parser. If off
  on errors, and print a stack trace.")
  	      (profile-property-accesses #f "keep statistics of get_property() calls.")
  	      
- 	      (resolution 101 "resolution for generating bitmaps")
+ 	      (resolution 101 "resolution for generating PNG bitmaps")
  	      (read-file-list #f "Read files to be processed from command line arguments")
  
  	      (safe #f "Run safely")
@@@ -422,7 -421,6 +422,7 @@@ The syntax is the same as `define*-publ
  	  (ly:error (_ "failed files: ~S") (string-join failed))
  	  (exit 1))
  	(begin
 +	  (ly:do-atexit)
  	  ;; HACK: be sure to exit with single newline
  	  (ly:message "")
  	  (exit 0)))))