From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 29 Dec 2002 13:33:37 +0000 (+0000)
Subject: Remove fixme's. Jazz chords still broken.
X-Git-Tag: release/1.7.11~26
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=cf391d7c636581812add329f0f0389ec77bef437;p=lilypond.git
Remove fixme's. Jazz chords still broken.
---
diff --git a/ChangeLog b/ChangeLog
index 6f47262803..879dd771e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
+2002-12-29 Jan Nieuwenhuizen <janneke@gnu.org>
+
+ * scm/chord-name.scm: Remove fixme's. Jazz chords still broken.
+
2002-12-28 Jan Nieuwenhuizen <janneke@gnu.org>
+ * cygwin/lilypond.hint (requires): Add cygwin.
+
* .cvsignore: Remove stepmake (huh!?!), add lib.
* GNUmakefile.in: Add libdir links for builddir runs.
diff --git a/cygwin/lilypond.hint b/cygwin/lilypond.hint
index fbd263c6f8..7d83518fd8 100644
--- a/cygwin/lilypond.hint
+++ b/cygwin/lilypond.hint
@@ -1,6 +1,6 @@
sdesc: "A program for printing sheet music"
category: Publishing
-requires: bash ghostscript libguile12 libiconv2 libintl2 libkpathsea3 python tetex-bin tetex-tiny
+requires: bash cygwin fileutils findutils ghostscript libguile12 libiconv2 libintl2 libkpathsea3 python tetex-bin tetex-tiny
#requires: tetex-bin, tetex-tiny | tetex-base
#suggests: emacs gsview lilypond-doc rxvt tetex-x11 XFree86-serv
ldesc: "A program for printing sheet music.
diff --git a/scm/chord-name.scm b/scm/chord-name.scm
index 6cc1c3ea84..85fc30382d 100644
--- a/scm/chord-name.scm
+++ b/scm/chord-name.scm
@@ -16,7 +16,8 @@
;; debugging.
-(define (mydisplay x) (display x) x)
+;;(define (write-me x) (write x) (newline) x)
+(define (write-me x) x)
"
@@ -92,9 +93,10 @@ dump reinterpret the markup as a molecule. " ; "
(define (accidental-markup acc)
"ACC is an int, return a markup making an accidental."
(if (= acc 0)
- empty-markup
- `(,smaller-markup (,musicglyph-markup ,(string-append "accidentals-" (number->string acc))))
- ))
+ `(,line-markup (,empty-markup))
+ `(,smaller-markup (,musicglyph-markup
+ ,(string-append "accidentals-"
+ (number->string acc))))))
(define (pitch->markup pitch)
`(,line-markup
@@ -309,17 +311,17 @@ dump reinterpret the markup as a molecule. " ; "
(let* ((tonic-markup (pitch->chord-name-markup-banter tonic steps))
(except-markup
- ;; see below.
- (if exception-part exception-part `(,simple-markup "fixme")))
+ (if exception-part exception-part empty-markup)) ;;`(,simple-markup "")))
(sep-markup (list simple-markup
- (if (and (string-match "super" (format "~s" except-markup))
+ (if (and (string-match "super"
+ (format "~s" except-markup))
(or (pair? additions)
(pair? subtractions)))
- "/" "")
- ))
+ "/" "")))
(adds-markup (chord::additions->markup-banter additions subtractions))
(subs-markup (chord::subtractions->markup-banter subtractions))
- (b+i-markup (chord::bass-and-inversion->markup-banter bass-and-inversion)))
+ (b+i-markup (chord::bass-and-inversion->markup-banter
+ bass-and-inversion)))
`(,line-markup
(,tonic-markup
@@ -424,8 +426,10 @@ dump reinterpret the markup as a molecule. " ; "
(define (chord::name->markup style tonic steps bass-and-inversion)
- (let* ((lookup (chord::exceptions-lookup style steps))
- (exception-part (car lookup))
+ (write-me tonic)
+ (write-me steps)
+ (let* ((lookup (write-me (chord::exceptions-lookup style steps)))
+ (exception-part (write-me (car lookup)))
(unmatched-steps (cadr lookup))
(func (chord::restyle 'chord::name- style))
)
@@ -703,7 +707,8 @@ dump reinterpret the markup as a molecule. " ; "
(define (step->markup-alternate-jazz pitch)
`(,line-markup
(,(accidental-markup (caddr pitch))
- (,simple-markup (number->string (+ (cadr pitch) (if (= (car pitch) 0) 1 8)))))))
+ (,simple-markup ,(number->string (+ (cadr pitch)
+ (if (= (car pitch) 0) 1 8)))))))
(define (step->markup-jazz pitch)
(if (= (cadr pitch) 6)
@@ -715,7 +720,8 @@ dump reinterpret the markup as a molecule. " ; "
(,simple-markup "7"))
)))
((-1) `(,simple-markup "7"))
- ((0) `(,simple-markup "maj7"))
+ ;;;((0) `(,simple-markup "maj7"))
+ ((0) `(,line-markup (,simple-markup "maj7")))
((1) `(,line-markup
(,(accidental-markup 1)
(,simple-markup "7"))))
@@ -785,22 +791,15 @@ Compose markup of all additions
(,(if (not (null? subtractions))
`(,simple-markup "add")
empty-markup)
- ,(if #t
- ;; FIXME
- `(,simple-markup "fixme")
- ;; this is totally incomprehensible. Fix me, and docme.
- (let
- ((radds (reverse additions)))
-
- (reverse (chord::additions>5->markup-jazz-helper
- radds
- subtractions
- (if (or (null? subtractions) (null? radds))
- #f (car radds)))))
-
- )
-
- )))
+ ;; this is totally incomprehensible. Fix me, and docme.
+ ,(let* ((radds (reverse additions))
+ (rmarkups (chord::additions>5->markup-jazz-helper
+ radds
+ subtractions
+ (if (or (null? subtractions) (null? radds))
+ #f (car radds)))))
+ (if (null? rmarkups) empty-markup
+ (car (reverse rmarkups)))))))
(define (chord::additions>5->markup-jazz-helper additions subtractions list-step)
"