Merge branch 'master' into dev/texi2html

[lilypond.git] / input / regression / ambitus.ly

diff --git a/input/regression/ambitus.ly b/input/regression/ambitus.ly
index b725220887120543edb813f05585a7470a56f03f..d0099af68ab49109af078fb1dd4a71ce0a03135a 100644 (file)
--- a/input/regression/ambitus.ly
+++ b/input/regression/ambitus.ly
@@ -1,100 +1,27 @@
-
 \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.
+Accidentals only show up if they're not part of key
+signature. @code{AmbitusNoteHead} grobs also have ledger lines.
 
 "
 }
-
-%{
-
- tex chokes on #
-
-, e.g. with the following addition to the
-paper block:
-
-@example
-\translator @{
-  \ScoreContext
-  breakAlignOrder = #'(
-    instrument-name
-    left-edge
-    span-bar
-    breathing-sign
-    clef
-    ambitus
-    key-signature
-    staff-bar
-    time-signature
-    custos
-  )
-@}
-@end example
-
- 
-@example
-\translator @{
-  \VoiceContext
-  \consists Ambitus_engraver
-  Ambitus \set #'note-head-style = #'noteheads-2mensural
-  Ambitus \set #'join-heads = ##f
-@}
-@end example
-
-
- %}
-\version "1.9.8"
-
-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 {
-              \translator {
-                       \ScoreContext
-                       breakAlignOrder = #'(
-                               instrument-name
-                               left-edge
-                               ambitus
-                               span-bar
-                               breathing-sign
-                               clef
-                               key-signature
-                               staff-bar
-                               time-signature
-                               custos
-                       )
-               }
-               \translator {
-                       \VoiceContext
-                       \consists Ambitus_engraver
-               }
-       }
+\version "2.11.51"
+
+\layout {
+    ragged-right = ##t
+    \context {
+       \Voice
+       \consists Ambitus_engraver
+    }
 }
 
+\relative
+<<
+    \new Staff {  \time  2/4 c4 f' }
+    \new Staff \relative {
+       \time  2/4
+       \key d \major
+       cis as'
+    }
+>>