Imported Upstream version 2.16.0

[lilypond.git] / Documentation / included / chord-names-jazz.ly

diff --git a/Documentation/included/chord-names-jazz.ly b/Documentation/included/chord-names-jazz.ly
index 5be2e57a56026ad91b332089df793cc4d0b37c65..aff509ea921ffc6411dfacf886625166a3170871 100644 (file)
--- a/Documentation/included/chord-names-jazz.ly
+++ b/Documentation/included/chord-names-jazz.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.16.0"
 \header {
 
 texidoc = " Chord names are generated from a list pitches.  The
@@ -15,50 +15,52 @@ are turned off for brevity.
 
 chs =  \transpose c' c'
 {
-       <c e g>1
-       <c es g>% m = minor triad
-       <c e gis>
-       <c es ges> \break
-       <c e g bes>
-       <c es g bes>
-       <c e g b>               % triangle = maj
-       <c es ges beses>
-       <c es ges b> \break
-       <c e gis bes>
-       <c es g b>
-       <c e gis b>
-       <c es ges bes>\break
-       <c e g a>   % 6 = major triad with added sixth
-       <c es g a>  % m6 = minor triad with added sixth
-       <c e g bes d'>
-       <c es g bes d'> \break
-       <c es g bes d' f' a' >
-       <c es g bes d' f' >
-       <c es ges bes d' >
-       <c e g bes des' > \break
-       <c e g bes dis'>
-       <c e g bes d' f'>
-       <c e g bes d' fis'>
-       <c e g bes d' f' a'>\break
-       <c e g bes d' fis' as'>
-       <c e gis bes dis'>
-       <c e g bes dis' fis'>
-       <c e g bes d' f' as'>\break
-       <c e g bes des' f' as'>
-       <c e g bes d' fis'>
-       <c e g b d'>
-       <c e g bes d' f' as'>\break
-       <c e g bes des' f' as'>
-       <c e g bes des' f' a'>
-       <c e g b d'>
-       <c e g b d' f' a'>\break
-       <c e g b d' fis'>
-       <c e g bes des' f ' a'>
-       <c f g>
-       <c f g bes>\break
-       <c f g bes d'>
-       <c e g d'>      % add9
-       <c es g f'>
+    <c e g>1
+    <c es g>% m = minor triad
+    <c e gis>
+    <c es ges> \break
+    <c e g bes>
+    <c es g bes>
+    <c e g b>           % triangle = maj
+    <c es ges beses>
+    <c es ges b> \break
+    <c e gis bes>
+    <c es g b>
+    <c e gis b>
+    <c es ges bes>\break
+    <c e g a>   % 6 = major triad with added sixth
+    <c es g a>  % m6 = minor triad with added sixth
+    <c e g bes d'>
+    <c es g bes d'> \break
+    <c es g bes d' f' a' >
+    <c es g bes d' f' >
+    <c es ges bes d' >
+    <c e g bes des' > \break
+    <c e g bes dis'>
+    <c e g bes d' f'>
+    <c e g bes d' fis'>
+    <c e g bes d' f' a'>\break
+    <c e g bes d' fis' as'>
+    <c e gis bes dis'>
+    <c e g bes dis' fis'>
+    <c e g bes d' f' as'>\break
+    <c e g bes des' f' as'>
+    <c e g bes d' fis'>
+    <c e g b d'>
+    <c e g bes d' f' as'>\break
+    <c e g bes des' f' as'>
+    <c e g bes des' f' a'>
+    <c e g b d'>
+    <c e g b d' f' a'>\break
+    <c e g b d' fis'>
+    <c e g bes des' f ' a'>
+    <c f g>
+    <c f g bes>\break
+    <c f g bes d'>
+    <c e g d'>  % add9
+    <c es g f'>
+    <c e g b fis'>  % Lydian
+    <c e g bes des' ees' fis' aes'>  % altered chord
 }
 
 
@@ -68,9 +70,11 @@ chs =  \transpose c' c'
 efullmusicJazzAlt =
 {
     <c e gis>1-\markup { "+" }
-    <c e g b>-\markup { \normal-size-super
-    %                    \override #'(font-family . math) "N" }
-                         \override #'(font-family . math) "M" }
+    <c e g b>-\markup {
+      \normal-size-super
+    % \override #'(font-family . math) "N"
+      \override #'(font-family . math) "M"
+    }
     %%c:3.5.7 = \markup { \override #'(font-family . math) "M" }
     %%c:3.5.7 = \markup { \normal-size-super "maj7" }
 
@@ -103,50 +107,49 @@ jazzAltProperties = \sequential {
 }
 
 banterProperties = \sequential {
-           \set chordNameFunction = #banter-chord-names
+    \set chordNameFunction = #banter-chord-names
 }
 
 \score{
     <<
-       \new ChordNames {
-           \set instrumentName = #"Ignatzek (default)"
-           \set shortInstrumentName = #"Def"
-           \chs
-       }
-
-       \new ChordNames {
-           \jazzAltProperties
-           \set instrumentName = #"Alternative"
-           \set shortInstrumentName = #"Alt"
-           \chs
-       }
+        \new ChordNames {
+            \set instrumentName = #"Ignatzek (default)"
+            \set shortInstrumentName = #"Def"
+            \chs
+        }
+
+        \new ChordNames {
+            \jazzAltProperties
+            \set instrumentName = #"Alternative"
+            \set shortInstrumentName = #"Alt"
+            \chs
+        }
 
 %{
 
-       %% This is the Banter (1987) style.  It gives exceedingly
-       %% verbose (wide) names, making the output file take up to 4 pages.
-       %% (TODO: how big is is now?)
-       %% Turned off by default.
+        %% This is the Banter (1987) style.  It gives exceedingly
+        %% verbose (wide) names, making the output file take up to 4 pages.
+        %% (TODO: how big is is now?)
+        %% Turned off by default.
 
-       %% TODO: use smaller font for Banter (or remove some esoteric
-       %% chords).
+        %% TODO: use smaller font for Banter (or remove some esoteric
+        %% chords).
 
-       \new ChordNames {
-           \banterProperties
-           \set instrumentName = #"Banter"
-           \set shortInstrumentName = #"Ban"
-           \chs
-       }
+        \new ChordNames {
+            \banterProperties
+            \set instrumentName = #"Banter"
+            \set shortInstrumentName = #"Ban"
+            \chs
+        }
 %}
 
-       \new Staff  \transpose c c' { \chs }
+        \new Staff  \transpose c c' { \chs }
     >>
     \layout {
-       indent = 3.\cm
-       \context {
-           \ChordNames
-           \consists Instrument_name_engraver
-       }
+        \context {
+            \ChordNames
+            \consists Instrument_name_engraver
+        }
     }
 }