X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fincluded%2Fchord-names-jazz.ly;h=eba2fa282e21b3ec721c6b8faa706c496819c91d;hb=98ac53591234404cd70c5eebd370a598ec74095b;hp=aff509ea921ffc6411dfacf886625166a3170871;hpb=26a079ca2393d053315ef8dbef626c897dc9645a;p=lilypond.git

diff --git a/Documentation/included/chord-names-jazz.ly b/Documentation/included/chord-names-jazz.ly
index aff509ea92..eba2fa282e 100644
--- a/Documentation/included/chord-names-jazz.ly
+++ b/Documentation/included/chord-names-jazz.ly
@@ -3,8 +3,8 @@
 
 texidoc = " Chord names are generated from a list pitches.  The
 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.
+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.
@@ -13,143 +13,141 @@ 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 b fis'>  % Lydian
-    <c e g bes des' ees' fis' aes'>  % altered chord
+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 b fis'>  % Lydian
+  <c e g bes des' ees' fis' aes'>  % altered chord
 }
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % alternate Jazz notation
 
-efullmusicJazzAlt =
-{
-    <c e gis>1-\markup { "+" }
-    <c e g b>-\markup {
-      \normal-size-super
+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:3.5.7 = \markup { \override #'(font-family . math) "M" }
-    %%c:3.5.7 = \markup { \normal-size-super "maj7" }
-
-   <c es ges>-\markup { \super "o" } % should be $\circ$ ?
-   <c es ges bes>-\markup { \super \combine "o" "/" }
-   <c es ges beses>-\markup { \super  "o7" }
+    \override #'(font-family . math) "M"
+  }
+  %%c:3.5.7 = \markup { \override #'(font-family . math) "M" }
+  %%c:3.5.7 = \markup { \normal-size-super "maj7" }
+
+  <c es ges>-\markup { \super "o" }  % should be $\circ$ ?
+  <c es ges bes>-\markup { \super \combine "o" "/" }
+  <c es ges beses>-\markup { \super  "o7" }
 }
 
 efullJazzAlt = #(sequential-music-to-chord-exceptions efullmusicJazzAlt #f)
 
 epartialmusicJazzAlt = {
-    <c d>1-\markup { \normal-size-super "2" }
-    <c es>-\markup { "m" }
-    <c f>-\markup { \normal-size-super "sus4" }
-    <c g>-\markup { \normal-size-super "5" }
-
-    %% TODO, partial exceptions
-    <c es f>-\markup { "m" }-\markup { \normal-size-super "sus4" }
-    <c d es>-\markup { "m" }-\markup { \normal-size-super "sus2" }
+  <c d>1-\markup { \normal-size-super "2" }
+  <c es>-\markup { "m" }
+  <c f>-\markup { \normal-size-super "sus4" }
+  <c g>-\markup { \normal-size-super "5" }
+  %% TODO, partial exceptions
+  <c es f>-\markup { "m" }-\markup { \normal-size-super "sus4" }
+  <c d es>-\markup { "m" }-\markup { \normal-size-super "sus2" }
 }
 
 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
+  \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
+  \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
-        }
-
-%{
-
-        %% 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).
-
-        \new ChordNames {
-            \banterProperties
-            \set instrumentName = #"Banter"
-            \set shortInstrumentName = #"Ban"
-            \chs
-        }
-%}
-
-        \new Staff  \transpose c c' { \chs }
-    >>
-    \layout {
-        \context {
-            \ChordNames
-            \consists Instrument_name_engraver
-        }
+  <<
+    \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.
 
+  %% TODO: use smaller font for Banter (or remove some esoteric
+  %% chords).
+
+    \new ChordNames {
+      \banterProperties
+      \set instrumentName = #"Banter"
+      \set shortInstrumentName = #"Ban"
+      \chs
+    }
+  %}
+
+  \new Staff  \transpose c c' { \chs }
+  >>
+  \layout {
+    \context {
+      \ChordNames
+      \consists "Instrument_name_engraver"
+    }
+    \context {
+      \Score
+      \remove "Bar_number_engraver"
+    }
+  }
+}