* scm/lily.scm (ly:all-stencil-expressions):

[lilypond.git] / input / test / chord-names-jazz.ly

diff --git a/input/test/chord-names-jazz.ly b/input/test/chord-names-jazz.ly
index 0cd30317ca901b745e877b5b70e85dca6fb4cd54..5d282eaa47be0b92d0fd27563a82f9787e547378 100644 (file)
--- a/input/test/chord-names-jazz.ly
+++ b/input/test/chord-names-jazz.ly
@@ -1,19 +1,21 @@
-\version "2.1.26"
+\version "2.3.4"
 
 
 \header {
 
 texidoc = " Chord names are generated from a list pitches.  The
-functions constructing the names are customisable. This file shows
-Jazz chords, following Ignatzek (1995), page 17 and 18, Banter chords,
-and an alternative Jazz  chord notation.
+functions which construct these names can be customised. Here are shown
+Jazz chords, following Ignatzek (pp. 17-18, 1995) and 
+an alternative Jazz  chord notation.
 
+Chords following Banter (1987) can also be printed from this file, but
+are turned off for brevity.
 
 "
 
 }
 
-chs = \notes \transpose c' c' 
+chs =  \transpose c' c' 
 {
        <c e g>1
        <c es g>% m = minor triad
@@ -65,7 +67,7 @@ chs = \notes \transpose c' c'
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % alternate Jazz notation
 
-efullmusicJazzAlt = \notes
+efullmusicJazzAlt = 
 {
     <c e gis>1-\markup { "+" }
     <c e g b>-\markup { \normal-size-super
@@ -81,7 +83,7 @@ efullmusicJazzAlt = \notes
 
 efullJazzAlt = #(sequential-music-to-chord-exceptions efullmusicJazzAlt #f)
 
-epartialmusicJazzAlt = \notes{
+epartialmusicJazzAlt = {
     <c d>1-\markup { \normal-size-super "2" }
     <c es>-\markup { "m" }
     <c f>-\markup { \normal-size-super "sus4" }
@@ -94,18 +96,14 @@ epartialmusicJazzAlt = \notes{
 
 epartialJazzAlt = #(sequential-music-to-chord-exceptions epartialmusicJazzAlt #f)
 
-jazzAltProperties =
-
-\sequential { 
-           \set majorSevenSymbol = #whiteTriangleMarkup
-           \set chordNameSeparator = #(make-simple-markup  "/")
-           \set chordNameExceptionsFull = #efullJazzAlt
-           \set chordNameExceptionsPartial = #epartialJazzAlt
-           \set chordNameFunction = #jazz-chord-names
+jazzAltProperties = \sequential { 
+    \set majorSevenSymbol = #whiteTriangleMarkup
+    \set chordNameSeparator = #(make-simple-markup  "/")
+    \set chordNameExceptionsFull = #efullJazzAlt
+    \set chordNameExceptionsPartial = #epartialJazzAlt
+    \set chordNameFunction = #jazz-chord-names
 }
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 banterProperties = \sequential { 
            \set chordNameFunction = #banter-chord-names
 }
@@ -115,29 +113,40 @@ banterProperties = \sequential {
        \new ChordNames {
            \set instrument = #"Ignatzek (default)"
            \set instr = #"Def"
-           \chs }
+           \chs
+       }
+       
        \new ChordNames {
+           \jazzAltProperties
            \set instrument = #"Alternative"
            \set instr = #"Alt"
-           \jazzAltProperties
-           \chs }
+           \chs
+       }
 
-       % This is the banter style.
-       % it gives exceedingly verbose (wide) names
-       % making this file take up to 4 pages.
-       
 %{
-               \new ChordNames  {
+
+       %% This is the Banter (1987) style.  It gives exceedingly
+       %% verbose (wide) names, making the output file take up to 4 pages.
+       %% (FIXME: how big is is now?)
+       %% Turned off by default.
+
+       %% FIXME: use smaller font for Banter (or remove some esoteric
+       %% chords).
+       
+       \new ChordNames {
            \banterProperties
+           \set instrument = #"Banter"
+           \set instr = #"Ban"
            \chs
-           }
+       }
 %}
-       \new Staff \notes \transpose c c' { \chs }
+       
+       \new Staff  \transpose c c' { \chs }
     >>
-    \paper{
+    \paper {
        indent = 3.\cm
-       \translator { 
-           \ChordNamesContext
+       \context { 
+           \ChordNames
            \consists Instrument_name_engraver
        }
     }