From 9154f136a5d373ead56529e516bd72cd184a467c Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Tue, 10 Jun 2003 18:45:50 +0000
Subject: [PATCH] *** empty log message ***

---
 ChangeLog                                             | 5 +++++
 input/regression/chords-funky-ignatzek.ly             | 2 +-
 ly/engraver-init.ly                                   | 1 +
 scm/{chords-ignatzek.scm => chord-ignatzek-names.scm} | 0
 scm/lily.scm                                          | 2 +-
 5 files changed, 8 insertions(+), 2 deletions(-)
 rename scm/{chords-ignatzek.scm => chord-ignatzek-names.scm} (100%)

diff --git a/ChangeLog b/ChangeLog
index 6d14006546..b660cf6cd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-04  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+	* scm/chord-ignatzek-names.scm (remove-step): rename file.
+
 2003-06-10  Heikki Junes  <hjunes@cc.hut.fi>
 
 	* lilypond-indent.el: Match better slurs in scheme expressions.
@@ -98,6 +102,7 @@
 	* scm/chord-name.scm (sequential-music-to-chord-exceptions): Add
 	comment about octave change.
 
+>>>>>>> 1.959
 2003-06-04  Graham Percival  <gperlist@shaw.ca>
 
 	* input/test/[d,e]: added texinfo index tags.
diff --git a/input/regression/chords-funky-ignatzek.ly b/input/regression/chords-funky-ignatzek.ly
index 1e77c4fd3a..5bdf811cc9 100644
--- a/input/regression/chords-funky-ignatzek.ly
+++ b/input/regression/chords-funky-ignatzek.ly
@@ -19,7 +19,7 @@ chs = \notes
 \score{
     <
 	\context ChordNames {
-	#(set-chord-name-style 'ignatzek)
+%	#(set-chord-name-style 'ignatzek)
 	\chs
     }
 	\context Staff \notes \transpose c c' { \chs }
diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index bf82304533..c63c97c783 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -139,6 +139,7 @@ RhythmicStaffContext=\translator{
 VoiceContext = \translator {
 	\type "Engraver_group_engraver"
 	\name Voice
+
 \description "
     Corresponds to a voice on a staff.  This context handles the
     conversion of dynamic signs, stems, beams, super- and subscripts,
diff --git a/scm/chords-ignatzek.scm b/scm/chord-ignatzek-names.scm
similarity index 100%
rename from scm/chords-ignatzek.scm
rename to scm/chord-ignatzek-names.scm
diff --git a/scm/lily.scm b/scm/lily.scm
index 2764151bab..64f5eaecf9 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -381,7 +381,7 @@ is the  first to satisfy CRIT
      '("define-music-types.scm"
        "output-lib.scm"
        "c++.scm"
-       "chords-ignatzek.scm"
+       "chord-ignatzek-names.scm"
        "chord-entry.scm"
        "double-plus-new-chord-name.scm"
        "molecule.scm"
-- 
2.39.5