From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 18 Apr 2005 11:27:22 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.5.20~18
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b3768e70f4497923ad4c1400c4da88e1808c1b22;p=lilypond.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index 8f3bc2eb1c..ca0f5716a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-18  Mathieu Giraud  <magiraud@free.fr>
+
+	* input/test/chord-names-german.ly: update for italian/french chords
+	
+	* Documentation/user/instrument-notation.itely (Printing chord names): update
+
 2005-04-18  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 	* lily/include/paper-score.hh (class Paper_score): remove unused prototypes.
diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely
index 4185e1a1d4..7bb12094a3 100644
--- a/Documentation/user/instrument-notation.itely
+++ b/Documentation/user/instrument-notation.itely
@@ -585,10 +585,18 @@ The default is to print single pitch, e.g., the bass note, using the
 to a specialized function to change this behavior.  For example, the
 base can be printed in lower case.
 
+@cindex @code{chordPrefixSpacer}
+@item chordPrefixSpacer
+The ``m'' for minor chords is usually printed right after the root of 
+the chord. By setting @code{chordPrefixSpacer}, you can fix a spacer 
+between the root and ``m''. The spacer is not used when the root
+is altered.
+
 @end table
 
 The predefined variables @code{\germanChords},
-@code{\semiGermanChords} set these variables.  The effect is
+@code{\semiGermanChords}, @code{\italianChords} and @code{\frenchChords} 
+set these variables.  The effect is
 demonstrated here,
 
 @lilypondfile[raggedright]{chord-names-german.ly}
@@ -610,6 +618,10 @@ chart}.  Turning on these styles is described in the input file
 @code{\germanChords},
 @cindex @code{\semiGermanChords}
 @code{\semiGermanChords}.
+@cindex @code{\italianChords}
+@code{\italianChords}.
+@cindex @code{\frenchChords}
+@code{\frenchChords}.
 
 
 
diff --git a/input/test/chord-names-german.ly b/input/test/chord-names-german.ly
index df70113482..88e3d2e8cb 100644
--- a/input/test/chord-names-german.ly
+++ b/input/test/chord-names-german.ly
@@ -2,13 +2,16 @@
 \header  {
     texidoc = "@cindex Chord Names German
 The english naming of chords (default) can be changed to german 
-(@code{\germanChords} replaces B and Bes to H and B) or semi-german 
-(@code{\semiGermanChords} replaces B and Bes to H and Bb).
+(@code{\germanChords} replaces B and Bes to H and B), semi-german 
+(@code{\semiGermanChords} replaces B and Bes to H and Bb), italian
+(@code{\italianChords} uses Do Re Mi Fa Sol La Si), or french
+(@code{\frenchChords} replaces Re to Ré).
 
 " }
 
 scm = \chordmode {
-    c1/c cis/cis
+    e1/d c:m
+    % c/c cis/cis
     % yeah, we get the idea. -hwn
     
     % cisis/cisis ces/ces ceses/ceses
@@ -33,5 +36,12 @@ scm = \chordmode {
     \new ChordNames {
 	\set instrument = #"semi-german"
 	\semiGermanChords \scm }
+    \new ChordNames {
+	\set instrument = #"italian"
+	\italianChords \scm }
+    \new ChordNames {
+	\set instrument = #"french"
+	\frenchChords \scm }
+
     \context Voice { \scm }
 >>