From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 9 Sep 2003 11:41:34 +0000 (+0000)
Subject: release commit
X-Git-Tag: release/1.8.2~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7adedf1ecef6d0b76f7dd062839f2978b3a3d6cb;p=lilypond.git

release commit
---

diff --git a/ChangeLog b/ChangeLog
index 130b328594..13c03b106d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2003-09-09  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+	* scm/chord-ignatzek-names.scm: backport 1.9 fix for base notes. 
+
 	* lily/glissando-engraver.cc (stop_translation_timestep): backport
 	of glissando bugfix.
 
diff --git a/VERSION b/VERSION
index 062568f034..d91a929acd 100644
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=8
-PATCH_LEVEL=1
+PATCH_LEVEL=2
 MY_PATCH_LEVEL=
 
 # Use the above to send patches: MY_PATCH_LEVEL is always empty for a
diff --git a/scm/chord-ignatzek-names.scm b/scm/chord-ignatzek-names.scm
index 3e19987611..3a23a4a05f 100644
--- a/scm/chord-ignatzek-names.scm
+++ b/scm/chord-ignatzek-names.scm
@@ -1,11 +1,12 @@
 ;;;
-;;; chord-name.scm --  chord name utility functions
+;;; chord-ignatzek-names.scm --  chord name utility functions
 ;;;
 ;;; source file of the GNU LilyPond music typesetter
 ;;; 
 ;;; (c)  2000--2003  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
@@ -202,7 +203,7 @@ work than classifying the pitches."
 			       alterations
 			       suffixes
 			       add-markups) sep))
-	 (base-stuff (if bass-pitch
+	 (base-stuff (if (ly:pitch? bass-pitch)
 			 (list sep (name-note bass-pitch))
 			 '()))
 	 )
@@ -213,10 +214,25 @@ work than classifying the pitches."
 		   (markup-join prefixes sep)
 		   (make-super-markup to-be-raised-stuff))
 	     base-stuff))
-      (make-line-markup       base-stuff)
+      (make-line-markup base-stuff)
 
        ))
 
+  (define (ignatzek-format-exception
+	   root
+	   exception-markup
+	   bass-pitch)
+
+      (make-line-markup
+       `(
+	,(name-root root)
+	,exception-markup
+	. 
+	,(if (ly:pitch? bass-pitch)
+	    (list (ly:get-context-property context 'chordNameSeparator)
+		  (name-note bass-pitch))
+	   '()))))
+
   (let*
       (
        (root (car in-pitches))
@@ -227,14 +243,15 @@ work than classifying the pitches."
        (suffixes '())
        (add-steps '())
        (main-name #f)
-       (bass-note #f)
+       (bass-note
+	(if (ly:pitch? inversion)
+	    inversion
+	    bass))
        (alterations '())
        )
-
-    (if
-     exception
-     (make-line-markup
-      (list (name-root root) exception))
+   
+    (if exception
+     (ignatzek-format-exception  root exception bass-note)
      
      (begin				; no exception.
        
@@ -280,13 +297,6 @@ work than classifying the pitches."
 	 (set! alterations (delq main-name alterations))
 	 (set! add-steps (delq main-name add-steps))
 
-	 (if (ly:pitch? inversion)
-	     (set! bass-note inversion)
-	     )
-	 
-	 (if (ly:pitch? bass)
-	     (set! bass-note bass)
-	     )
 
 	 ;; chords with natural (5 7 9 11 13) or leading subsequence.
 	 ;; etc. are named by the top pitch, without any further
@@ -302,8 +312,9 @@ work than classifying the pitches."
 	       (set! main-name (last alterations))
 	       (set! alterations '())
 	       ))
-	 
+
 	 (ignatzek-format-chord-name root prefixes main-name alterations add-steps suffixes bass-note)
-	 )
-       ))))
+	 )))
+       ))
+