* ly/property-init.ly (germanChords): Added.

	(semiGermanChords): Added.

	* input/test/chord-names-german.ly: Use new macros

diff --git a/ChangeLog b/ChangeLog
index 84647942427dfc4e7a97c9c05c00056017dbae5b..e4bf7d9a7dd5a3274ebfb34190b3bb7ca4f97e34 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-06-10  Rune Zedeler  <rune@zedeler.dk>
+
+       * ly/property-init.ly (germanChords): Added.
+       (semiGermanChords): Added.
+       
+       * input/test/chord-names-german.ly: Use new macros
+       
 2003-06-09  Heikki Junes  <hjunes@cc.hut.fi>
 
        * lilypond-indent.el: Use similar parenthesis highlighting for 

diff --git a/input/test/chord-names-german.ly b/input/test/chord-names-german.ly
index d14fa524932bbb7d0ffa99fa54d8b9ca58e6291e..76e44f018c37484be3d55c068b0f4b7e2a9c873f 100644 (file)
--- a/input/test/chord-names-german.ly
+++ b/input/test/chord-names-german.ly
@@ -1,18 +1,16 @@
-\version "1.7.18"
+\version "1.7.20"
 \header  {
     texidoc = "@cindex Chord Names German
 By setting @code{ChordNames.chordRootNamer}, the root
 of the chord may be named with a different function.
 " }
 
-scm = \chords { c4/c cis/cis cisis/cisis ces/ces ceses/ceses b/b bis/bis bes/bes beses/beses } 
+scm = \chords { c1/c cis/cis cisis/cisis ces/ces ceses/ceses b/b bis/bis bes/bes beses/beses \bar "||" } 
 \score {
-<    \context ChordNames \chords <
-    % #t gives true german chord-names
-    % #f gives semi-german chord-names -
+\notes <
+    % \germanChords gives true german chord-names
+    % \semiGermanChords gives semi-german chord-names -
     % - with Bb and below keeping the english names
-    \property ChordNames. chordRootNamer = #(chord-name->german-markup #f)
-    \property ChordNames. chordNoteNamer = #note-name->german-markup
-    \scm >
-    \context Voice \scm >
+    \context ChordNames { \scm \germanChords \scm \semiGermanChords \scm }
+    \context Voice { \scm s1*0^"germanChords" \scm s1*0^"semiGermanChords" \scm } >
 }

diff --git a/ly/property-init.ly b/ly/property-init.ly
index ca1caf0e816898be26ce1d922ed4e934b7d9e9dd..ae13649de6516ca0dafcf7769678950df8a81e85 100644 (file)
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -265,3 +265,12 @@ unHideNotes =  \sequential {
 \property Voice.Beam \revert #'transparent
 \property Staff.Accidental \revert #'transparent
 }
+
+germanChords = {
+    \property ChordNames. chordRootNamer = #(chord-name->german-markup #t)
+    \property ChordNames. chordNoteNamer = #note-name->german-markup
+}
+semiGermanChords = {
+    \property ChordNames. chordRootNamer = #(chord-name->german-markup #f)
+    \property ChordNames. chordNoteNamer = #note-name->german-markup
+}