*** empty log message ***

[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 e8c1060ad16703a31d681bf666f4f26d00e652c0..5065cd604a80d1cbd3bb4482c157cfd2ccbde125 100644 (file)
--- a/input/test/chord-names-jazz.ly
+++ b/input/test/chord-names-jazz.ly
@@ -1,4 +1,4 @@
-\version "1.9.2"
+\version "2.1.22"
 
 
 \header {
@@ -15,50 +15,50 @@ and an alternative Jazz  chord notation.
 
 chs = \notes \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'>
 }
 
 
@@ -67,29 +67,29 @@ chs = \notes \transpose c' c'
 
 efullmusicJazzAlt = \notes
 {
-    <<c e gis>>1-\markup { "+" }
-    <<c e g b>>-\markup { \normal-size-super
+    <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" }
+   <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 = \notes{
-    <<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" }
+    <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 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)
@@ -97,28 +97,28 @@ epartialJazzAlt = #(sequential-music-to-chord-exceptions epartialmusicJazzAlt #f
 jazzAltProperties =
 
 \sequential { 
-           \property ChordNames.majorSevenSymbol = #whiteTriangleMarkup
-           \property ChordNames.chordNameSeparator = #(make-simple-markup  "/")
-           \property ChordNames.chordNameExceptionsFull = #efullJazzAlt
-           \property ChordNames.chordNameExceptionsPartial = #epartialJazzAlt
-           \property ChordNames.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 { 
-           \property ChordNames.chordNameFunction = #banter-chord-names
+           \set chordNameFunction =  #banter-chord-names
 }
 
 \score{
-    <
-       \context ChordNames {
-           \property ChordNames.instrument = #"Ignatzek (default)"
-           \property ChordNames.instr = #"Def"
+    <<
+       \new ChordNames {
+           \set instrument =  #"Ignatzek (default)"
+           \set instr =  #"Def"
            \chs }
-       \newcontext ChordNames {
-           \property ChordNames.instrument = #"Alternative"
-           \property ChordNames.instr = #"Alt"
+       \new ChordNames {
+           \set instrument =  #"Alternative"
+           \set instr =  #"Alt"
            \jazzAltProperties
            \chs }
 
@@ -127,18 +127,17 @@ banterProperties = \sequential {
        % making this file take up to 4 pages.
        
 %{
-               \newcontext ChordNames  {
+               \new ChordNames  {
            \banterProperties
            \chs
            }
 %}
-       \context Staff \notes \transpose c c' { \chs }
-    >
+       \new Staff \notes \transpose c c' { \chs }
+    >>
     \paper{
        indent = 3.\cm
        \translator { 
            \ChordNamesContext
-           ChordName \override #'word-space = #1
            \consists Instrument_name_engraver
        }
     }