X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fambitus.ly;h=b5c579b01da6765702fdfc17781ce77ae0392469;hb=26a079ca2393d053315ef8dbef626c897dc9645a;hp=eb653a386e87159d299a133f07103158fc31e8e5;hpb=7e8d660df15820c540b74a4ab74d175284cd9008;p=lilypond.git

diff --git a/input/regression/ambitus.ly b/input/regression/ambitus.ly
index eb653a386e..b5c579b01d 100644
--- a/input/regression/ambitus.ly
+++ b/input/regression/ambitus.ly
@@ -1,100 +1,34 @@
+\version "2.16.0"
 
 \header {
-    texidoc = "Ambituses indicate pitch ranges for voices.
-
-By default, the ambitus grob is put before the clef.  You can control
-this behaviour through the @code{breakAlignOrder} property of the score
-context by redefining the order.
-
-
-The shape of the note heads to use can be changed via the
-@code{note-head-style} property, which holds the glyph name of the
-note head.  The vertical line between the upper and lower head can be
-switched on or off via the @code{join-heads} property.
+  texidoc = "Ambitus indicate pitch ranges for voices.
 
+Accidentals only show up if they're not part of key
+signature.  @code{AmbitusNoteHead} grobs also have ledger lines.
+The noteheads are printed in overstrike, so there's only one
+visible; the accidentals are prevented from colliding. 
 "
 }
 
-%{
-
- tex chokes on #
-
-, e.g. with the following addition to the
-paper block:
-
-@example
-\context @{
-  \ScoreContext
-  breakAlignOrder = #'(
-    instrument-name
-    left-edge
-    span-bar
-    breathing-sign
-    clef
-    ambitus
-    key-signature
-    staff-bar
-    time-signature
-    custos
-  )
-@}
-@end example
-
- 
-@example
-\context @{
-  \VoiceContext
-  \consists Ambitus_engraver
-  Ambitus \set #'note-head-style = #'noteheads-2mensural
-  Ambitus \set #'join-heads = ##f
-@}
-@end example
-
-
- %}
-\version "2.1.30"
-
-upper = \notes \relative c {
-	\clef "treble"
-	\key c \minor
-	as'' c e bes f cis d e f g f e d f d e
-	f d e e d f d e e d f d e e d f d e
-	f d e e d f d e e d f d e e d f d e
-}
-
-lower = \notes \relative c {
-	\clef "treble"
-	\key e \major
-	e'2 b4 g a c es fis a cis b a g f e d
-	f e d e f g f e d e f g f e d e f g
-	f e d e f g f e d e f g f e d e f g
-}
-
-\score { \context ChoirStaff {
-	<<
-		\new Staff { \upper }
-		\new Staff { \lower }
-	>> }
-	\paper {
-	       \context {
-			\ScoreContext
-			breakAlignOrder = #'(
-				instrument-name
-				left-edge
-				ambitus
-				span-bar
-				breathing-sign
-				clef
-				key-signature
-				staff-bar
-				time-signature
-				custos
-			)
-		}
-		\context {
-			\VoiceContext
-			\consists Ambitus_engraver
-		}
-	}
+\layout {
+  \context {
+    \Voice
+    \consists "Ambitus_engraver"
+  }
 }
 
+<<
+  \new Staff \relative c'{
+    \time 2/4
+    c4 f'
+  }
+  \new Staff \relative c' {
+    \time  2/4
+    \key d \major
+    cis as'
+  }
+  \new Staff \relative c' {
+    \time 2/4
+    c4 cis
+  }
+>>