X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Ftranslation-functions.scm;h=eab413f5ce8a1cd7ba220b5025dcb073889b58c6;hb=d284b4f1b522bd48cb92ee8d13e8831950024159;hp=9c4866a9ac6999eec1dd5eae1f147d8e0d095bfc;hpb=bbd89dfe7865636f9fb1eccf9326db4831f632e8;p=lilypond.git

diff --git a/scm/translation-functions.scm b/scm/translation-functions.scm
index 9c4866a9ac..eab413f5ce 100644
--- a/scm/translation-functions.scm
+++ b/scm/translation-functions.scm
@@ -2,26 +2,15 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;		     Jan Nieuwenhuizen <janneke@gnu.org>
 
-(define-public (denominator-tuplet-formatter mus)
-  (number->string (ly:music-property mus 'denominator)))
-
-(define-public (fraction-tuplet-formatter mus)
-  (string-append
-   (number->string (ly:music-property mus 'denominator))
-   ":"
-   (number->string (ly:music-property mus 'numerator))))
-
 ;; metronome marks
-(define-public (format-metronome-markup event context)
-  (let* ((dur (ly:music-property event 'tempo-unit))
-       (count (ly:music-property event 'metronome-count))
-       (note-mark (make-smaller-markup
-		   (make-note-by-number-markup (ly:duration-log dur)
-					       (ly:duration-dot-count dur)
-					       1))))  
+(define-public (format-metronome-markup dur count context)
+  (let* ((note-mark (make-smaller-markup
+		     (make-note-by-number-markup (ly:duration-log dur)
+						 (ly:duration-dot-count dur)
+						 1))))  
     (make-line-markup
      (list
       (make-general-align-markup Y DOWN note-mark)
@@ -34,6 +23,9 @@
 (define-public (format-mark-box-alphabet mark context)
   (make-bold-markup (make-box-markup (make-markalphabet-markup (1- mark)))))
 
+(define-public (format-mark-circle-alphabet mark context)
+  (make-bold-markup (make-circle-markup (make-markalphabet-markup (1- mark)))))
+
 (define-public (format-mark-letters mark context)
   (make-bold-markup (make-markletter-markup (1- mark))))
 
@@ -46,37 +38,56 @@
 (define-public (format-mark-box-letters mark context)
   (make-bold-markup (make-box-markup (make-markletter-markup (1- mark)))))
 
+(define-public (format-mark-circle-letters mark context)
+  (make-bold-markup (make-circle-markup (make-markletter-markup (1- mark)))))
+
 (define-public (format-mark-box-numbers mark context)
   (make-bold-markup (make-box-markup (number->string mark))))
 
+(define-public (format-mark-circle-numbers mark context)
+  (make-bold-markup (make-circle-markup (number->string mark))))
+
 (define-public (format-mark-box-barnumbers mark context)
   (make-bold-markup (make-box-markup
     (number->string (ly:context-property context 'currentBarNumber)))))
 
+(define-public (format-mark-circle-barnumbers mark context)
+  (make-bold-markup (make-circle-markup
+    (number->string (ly:context-property context 'currentBarNumber)))))
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Bass figures.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-public (format-bass-figure figure event context)
-  (let* ((fig (ly:music-property event 'figure))
+  (let* ((fig (ly:event-property event 'figure))
 	 (fig-markup (if (number? figure)
-			 (if (eq? #t (ly:music-property event 'diminished))
-			     (markup #:slashed-digit figure)
-			     (markup #:number (number->string figure 10)))
+
+			 ;; this is not very elegant, but center-aligning all digits
+			 ;; is problematic with other markups, and shows problems
+			 ;; in the (lack of) overshoot of feta alphabet glyphs.
+			 
+			 ((if (<= 10 figure)
+			      (lambda (y) (make-translate-scaled-markup (cons -0.7 0) y))
+			      identity)
+
+			  (if (eq? #t (ly:event-property event 'diminished))
+			      (markup #:slashed-digit figure)
+			      (markup #:number (number->string figure 10))))
 			 #f
 			 ))
-	 (alt (ly:music-property event 'alteration))
+	 (alt (ly:event-property event 'alteration))
 	 (alt-markup
 	  (if (number? alt)
 	      (markup
-		      #:general-align Y DOWN #:fontsize
-		      (if (not (= alt DOUBLE-SHARP))
-			  -2 2)
-		      (alteration->text-accidental-markup alt))
+	       #:general-align Y DOWN #:fontsize
+	       (if (not (= alt DOUBLE-SHARP))
+		   -2 2)
+	       (alteration->text-accidental-markup alt))
 	      
 	      #f))
-	 (plus-markup (if (eq? #t (ly:music-property event 'augmented))
+	 (plus-markup (if (eq? #t (ly:event-property event 'augmented))
 			  (markup #:number "+")
 			  #f))
 
@@ -126,3 +137,142 @@
 
     ))
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; fret diagrams
+
+(define-public (determine-frets context grob notes string-numbers)
+  (define (ensure-number a b)
+    (if (number? a)
+	a
+	b))
+(let*
+      ((tunings (ly:context-property context 'stringTunings))
+       (minimum-fret (ensure-number
+		      (ly:context-property context 'minimumFret) 0))
+       (max-stretch (ensure-number
+		      (ly:context-property context 'maximumFretStretch) 4))
+       (string-frets (determine-frets-mf notes string-numbers
+					 minimum-fret max-stretch
+					 tunings)))
+
+       	      
+  (set! (ly:grob-property grob 'string-count) (length tunings))
+  (set! (ly:grob-property grob 'string-fret-finger-combinations) string-frets)
+
+  ))
+
+(define-public (determine-frets-mf notes string-numbers
+				   minimum-fret max-stretch
+				   tunings)
+
+  (define (calc-fret pitch string tuning)
+    (- (ly:pitch-semitones pitch) (list-ref tuning (1- string))))
+
+  (define (note-pitch a)
+    (ly:event-property a 'pitch))
+
+  (define (note-pitch<? a b)
+    (ly:pitch<? (note-pitch a)
+		(note-pitch b)))
+
+  (define (note-finger ev)
+    (let* ((articulations (ly:event-property ev 'articulations))
+	   (finger-found #f))
+
+      (map (lambda (art)
+	     (let*
+		 ((num (ly:event-property art 'digit)))
+
+	       (if (and (eq? 'fingering-event (ly:event-property art 'class))
+			(number? num))
+		   (set! finger-found num))))
+	   articulations)
+
+      finger-found))
+  
+  (define (note-string ev)
+    (let* ((articulations (ly:event-property ev 'articulations))
+	   (string-found #f))
+
+      (map (lambda (art)
+	     (let*
+		 ((num (ly:event-property art 'string-number)))
+
+	       (if (number? num)
+		   (set! string-found num))))
+	   articulations)
+
+      string-found))
+
+  (define (del-string string)
+		      (if (number? string)
+			  (set! free-strings
+				(delete string free-strings))))
+  (define specified-frets '())
+  (define free-strings '())
+  
+  (define (close-enough fret)
+		       (reduce
+			(lambda (x y)
+			  (and x y))
+			#t
+			(map (lambda (specced-fret)
+			       (> max-stretch (abs (- fret specced-fret))))
+			     specified-frets)
+			))
+  
+  (define (string-qualifies string pitch)
+    (let*
+	((fret (calc-fret pitch string tunings)))
+	 
+	 (and (>= fret minimum-fret)
+	      (close-enough fret))
+	 
+	 ))
+			   
+  (define string-fret-fingering-tuples '())
+  (define (set-fret note string)
+		    (set! string-fret-fingering-tuples
+			  (cons (list string
+				      (calc-fret (ly:event-property note 'pitch)
+						 string tunings)
+				      (note-finger note))
+				string-fret-fingering-tuples))
+		    (del-string string))
+       
+
+  ;;; body.
+  (set! specified-frets
+	(filter identity (map
+		      (lambda (note)
+			(if (note-string note)
+			    (calc-fret (note-pitch note)
+				       (note-string note) tunings)
+			    #f))
+		      notes)))
+
+
+  (set! free-strings (map 1+ (iota (length tunings))))
+    
+  (for-each (lambda (note)
+	      (del-string (note-string note)))
+	    notes)
+  
+  
+  (for-each
+   (lambda (note)
+     (if (note-string note)
+	 (set-fret note (note-string note))
+	 (let*
+	     ((string (find (lambda (string) (string-qualifies string
+							       (note-pitch note)))
+			      (reverse free-strings))))
+	   (if string
+	       (set-fret note string)
+	       (ly:warning "No string for pitch ~a (given frets ~a)" (note-pitch note)
+			   specified-frets))
+			   
+	       )))
+   (sort notes note-pitch<?))
+
+  string-fret-fingering-tuples)