Merge branch 'master' of git://git.sv.gnu.org/lilypond.git

diff --cc ly/predefined-guitar-ninth-fretboards.ly
index eb11a4a1ce7ccdf70a78645241beb4ea9bbf9e69,4858df0a27058dfa1d4697ed2d3ee771d11aed35..519323e0dd1b245ee462900acc9eb696db223f6a
--- 1/ly/predefined-guitar-ninth-fretboards.ly
--- 2/ly/predefined-guitar-ninth-fretboards.ly
+++ b/ly/predefined-guitar-ninth-fretboards.ly
@@@ -1,64 -1,64 +1,64 @@@
 -\version "2.11.61"\r
 -%\r
 -%  Add ninth chords to to predefined fret diagrams for standard guitar tunings\r
 -%\r
 -%  This is part of the Lilypond distribution files\r
 -%\r
 -%  Copyright 2008 by Jonathan Kulp\r
 -%\r
 - \r
 -\r
 -\addChordShape #'c:9 #"x;3-2;2-1;3-3-(;3-3;3-3-);"\r
 -\addChordShape #'f:9 #"1-1-(;3-3;1-1;2-2;1-1-);3-4;"\r
 -\r
 -\storePredefinedDiagram \chordmode {c:9} \r
 -                        #guitar-tuning \r
 -                      #(chord-shape 'c:9)\r
 -\storePredefinedDiagram \chordmode {cis:9} \r
 -                        #guitar-tuning \r
 -                      #(offset-fret 1 (chord-shape 'c:9))\r
 -\storePredefinedDiagram \chordmode {des:9} \r
 -                        #guitar-tuning \r
 -                      #(offset-fret 1 (chord-shape 'c:9))\r
 -\storePredefinedDiagram \chordmode {d:9} \r
 -                        #guitar-tuning \r
 -                      #(offset-fret 2 (chord-shape 'c:9))\r
 -\storePredefinedDiagram \chordmode {dis:9} \r
 -                        #guitar-tuning \r
 -                      #(offset-fret 3 (chord-shape 'c:9))\r
 -\storePredefinedDiagram \chordmode {ees:9} \r
 -                        #guitar-tuning \r
 -                      #(offset-fret 3 (chord-shape 'c:9))\r
 -\storePredefinedDiagram \chordmode {e:9} \r
 -                        #guitar-tuning \r
 -                      #"o;2-2;o;1-1;o;2-3;"\r
 -\storePredefinedDiagram \chordmode {f:9} \r
 -                        #guitar-tuning \r
 -                      #(chord-shape 'f:9)\r
 -\storePredefinedDiagram \chordmode {fis:9} \r
 -                        #guitar-tuning \r
 -                      #(offset-fret 1 (chord-shape 'f:9))\r
 -\storePredefinedDiagram \chordmode {ges:9} \r
 -                        #guitar-tuning \r
 -                      #(offset-fret 1 (chord-shape 'f:9))\r
 -\storePredefinedDiagram \chordmode {g:9} \r
 -                        #guitar-tuning \r
 -                      #(offset-fret 2 (chord-shape 'f:9))\r
 -\storePredefinedDiagram \chordmode {gis:9} \r
 -                        #guitar-tuning \r
 -                      #(offset-fret 3 (chord-shape 'f:9))\r
 -\storePredefinedDiagram \chordmode {aes:9} \r
 -                        #guitar-tuning \r
 -                      #(offset-fret 3 (chord-shape 'f:9))\r
 -\storePredefinedDiagram \chordmode {a:9} \r
 -                        #guitar-tuning \r
 -                      #(offset-fret 4 (chord-shape 'f:9))\r
 -\storePredefinedDiagram \chordmode {ais:9} \r
 -                        #guitar-tuning \r
 -                      #(offset-fret 5 (chord-shape 'f:9))\r
 -\storePredefinedDiagram \chordmode {bes:9} \r
 -                        #guitar-tuning \r
 -                      #(offset-fret 5 (chord-shape 'f:9))\r
 -\storePredefinedDiagram \chordmode {b:9} \r
 -                        #guitar-tuning \r
 -                      #(offset-fret -1 (chord-shape 'c:9))\r
 +\version "2.11.61"
 +%
 +%  Add ninth chords to to predefined fret diagrams for standard guitar tunings
 +%
 +%  This is part of the Lilypond distribution files
 +%
 +%  Copyright 2008 by Jonathan Kulp
 +%
-  
++
 +
 +\addChordShape #'c:9 #"x;3-2;2-1;3-3-(;3-3;3-3-);"
 +\addChordShape #'f:9 #"1-1-(;3-3;1-1;2-2;1-1-);3-4;"
 +
- \storePredefinedDiagram \chordmode {c:9} 
-                         #guitar-tuning 
++\storePredefinedDiagram \chordmode {c:9}
++                        #guitar-tuning
 +                      #(chord-shape 'c:9)
- \storePredefinedDiagram \chordmode {cis:9} 
-                         #guitar-tuning 
++\storePredefinedDiagram \chordmode {cis:9}
++                        #guitar-tuning
 +                      #(offset-fret 1 (chord-shape 'c:9))
- \storePredefinedDiagram \chordmode {des:9} 
-                         #guitar-tuning 
++\storePredefinedDiagram \chordmode {des:9}
++                        #guitar-tuning
 +                      #(offset-fret 1 (chord-shape 'c:9))
- \storePredefinedDiagram \chordmode {d:9} 
-                         #guitar-tuning 
++\storePredefinedDiagram \chordmode {d:9}
++                        #guitar-tuning
 +                      #(offset-fret 2 (chord-shape 'c:9))
- \storePredefinedDiagram \chordmode {dis:9} 
-                         #guitar-tuning 
++\storePredefinedDiagram \chordmode {dis:9}
++                        #guitar-tuning
 +                      #(offset-fret 3 (chord-shape 'c:9))
- \storePredefinedDiagram \chordmode {ees:9} 
-                         #guitar-tuning 
++\storePredefinedDiagram \chordmode {ees:9}
++                        #guitar-tuning
 +                      #(offset-fret 3 (chord-shape 'c:9))
- \storePredefinedDiagram \chordmode {e:9} 
-                         #guitar-tuning 
++\storePredefinedDiagram \chordmode {e:9}
++                        #guitar-tuning
 +                      #"o;2-2;o;1-1;o;2-3;"
- \storePredefinedDiagram \chordmode {f:9} 
-                         #guitar-tuning 
++\storePredefinedDiagram \chordmode {f:9}
++                        #guitar-tuning
 +                      #(chord-shape 'f:9)
- \storePredefinedDiagram \chordmode {fis:9} 
-                         #guitar-tuning 
++\storePredefinedDiagram \chordmode {fis:9}
++                        #guitar-tuning
 +                      #(offset-fret 1 (chord-shape 'f:9))
- \storePredefinedDiagram \chordmode {ges:9} 
-                         #guitar-tuning 
++\storePredefinedDiagram \chordmode {ges:9}
++                        #guitar-tuning
 +                      #(offset-fret 1 (chord-shape 'f:9))
- \storePredefinedDiagram \chordmode {g:9} 
-                         #guitar-tuning 
++\storePredefinedDiagram \chordmode {g:9}
++                        #guitar-tuning
 +                      #(offset-fret 2 (chord-shape 'f:9))
- \storePredefinedDiagram \chordmode {gis:9} 
-                         #guitar-tuning 
++\storePredefinedDiagram \chordmode {gis:9}
++                        #guitar-tuning
 +                      #(offset-fret 3 (chord-shape 'f:9))
- \storePredefinedDiagram \chordmode {aes:9} 
-                         #guitar-tuning 
++\storePredefinedDiagram \chordmode {aes:9}
++                        #guitar-tuning
 +                      #(offset-fret 3 (chord-shape 'f:9))
- \storePredefinedDiagram \chordmode {a:9} 
-                         #guitar-tuning 
++\storePredefinedDiagram \chordmode {a:9}
++                        #guitar-tuning
 +                      #(offset-fret 4 (chord-shape 'f:9))
- \storePredefinedDiagram \chordmode {ais:9} 
-                         #guitar-tuning 
++\storePredefinedDiagram \chordmode {ais:9}
++                        #guitar-tuning
 +                      #(offset-fret 5 (chord-shape 'f:9))
- \storePredefinedDiagram \chordmode {bes:9} 
-                         #guitar-tuning 
++\storePredefinedDiagram \chordmode {bes:9}
++                        #guitar-tuning
 +                      #(offset-fret 5 (chord-shape 'f:9))
- \storePredefinedDiagram \chordmode {b:9} 
-                         #guitar-tuning 
++\storePredefinedDiagram \chordmode {b:9}
++                        #guitar-tuning
 +                      #(offset-fret -1 (chord-shape 'c:9))