X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Ftranslation-functions.scm;h=fc7552fc355d4ed4e87520e6848cbd7afb3c1214;hb=37ca1f80bf5401accd17056938f4f7b2c147ddb2;hp=eec30297023cda0c774a062f2a1c213cb1e154e3;hpb=5249785633e818fc67096ddda5d72de525933f2f;p=lilypond.git

diff --git a/scm/translation-functions.scm b/scm/translation-functions.scm
index eec3029702..fc7552fc35 100644
--- a/scm/translation-functions.scm
+++ b/scm/translation-functions.scm
@@ -1,60 +1,305 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; tuplets.
+;;;; translation-functions.scm --
+;;;;
+;;;;  source file of the GNU LilyPond music typesetter
+;;;; 
+;;;; (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;;		     Jan Nieuwenhuizen <janneke@gnu.org>
 
-(define-public (denominator-tuplet-formatter mus)
-  (number->string (ly:get-mus-property mus 'denominator)))
+;; metronome marks
+(define-public (format-metronome-markup text dur count context)
+  (let* ((hide_note (eq? #t (ly:context-property context 'tempoHideNote)))
+	 (note-mark (if (and (not hide_note) (ly:duration? dur))
+                      (make-smaller-markup
+		       (make-note-by-number-markup (ly:duration-log dur)
+						   (ly:duration-dot-count dur)
+						   1))
+		      #f))
+         (note-markup (if (and note-mark (number? count) (> count 0) )
+                        (make-concat-markup (list
+                          (make-general-align-markup Y DOWN note-mark)
+                          (make-simple-markup " ")
+                          (make-simple-markup  "=")
+                          (make-simple-markup " ")
+                          (make-simple-markup (number->string count))))
+                        #f))
+         (text-markup (if (not (null? text))
+                        (make-bold-markup text)
+                        #f)))
+    (if text-markup
+      (if note-markup
+        (make-line-markup (list text-markup
+          (make-concat-markup (list (make-simple-markup "(")
+                                    note-markup
+                                    (make-simple-markup ")")))))
+        (make-line-markup (list text-markup))
+      )
+      (if note-markup
+        (make-line-markup (list note-markup))
+        #f
+      )
+    )
+  )
+)
 
-(define-public (fraction-tuplet-formatter mus)
-  (string-append (number->string (ly:get-mus-property mus 'numerator))
-		 ":"
-		 (number->string (ly:get-mus-property mus 'denominator))
-		 ))
+(define-public (format-mark-alphabet mark context)
+  (make-bold-markup (make-markalphabet-markup (1- mark))))
 
+(define-public (format-mark-box-alphabet mark context)
+  (make-bold-markup (make-box-markup (make-markalphabet-markup (1- mark)))))
 
-;; metronome marks
-(define-public (format-metronome-markup event context)
-  (let*
-      ((dur  (ly:get-mus-property event 'tempo-unit))
-       (count (ly:get-mus-property event 'metronome-count))
-       (note-mark (make-note-by-number-markup (ly:duration-log dur)
-					      (ly:duration-dot-count dur)
-					      1) ) ) 
-    (make-line-markup
-     (list
-      note-mark
-      (make-simple-markup  "=")
-      (make-simple-markup (number->string count))
-      
-  ))))
-
-
-
-(define number->mark-letter-vector (make-vector 25 #\A))
-
-(do ((i 0 (1+ i))
-     (j 0 (1+ j)) )
-    ((>= i 26))
-  (if (= i (- (char->integer #\I) (char->integer #\A)))
-      (set! i (1+ i)))
-  (vector-set! number->mark-letter-vector j
-	       (integer->char (+ i (char->integer #\A))))  )
-
-(define-public (number->mark-string n)
-  "Double letters for big marks."
-  (let*
-      ((l (vector-length number->mark-letter-vector)))
-    (display n) (newline)
-    (display l) (newline)
-    
-  (if (>= n l)
-      (string-append (number->mark-string (1- (quotient n l)))
-		     (number->mark-string (remainder n l)))
-      (make-string 1 (vector-ref number->mark-letter-vector n)))))
-
+(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 (number->mark-string (1- mark))))
+  (make-bold-markup (make-markletter-markup (1- mark))))
 
 (define-public (format-mark-numbers mark context)
   (make-bold-markup (number->string mark)))
 
+(define-public (format-mark-barnumbers mark context)
+  (make-bold-markup (number->string (ly:context-property context 'currentBarNumber))))
+
+(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:event-property event 'figure))
+	 (fig-markup (if (number? figure)
+
+			 ;; 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)
+
+			  (cond
+				((eq? #t (ly:event-property event 'diminished))
+				         (markup #:slashed-digit figure))
+				((eq? #t (ly:event-property event 'augmented-slash))
+				         (markup #:backslashed-digit figure))
+				(else (markup #:number (number->string figure 10)))))
+			 #f
+			 ))
+	 (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))
+	      
+	      #f))
+	 (plus-markup (if (eq? #t (ly:event-property event 'augmented))
+			  (markup #:number "+")
+			  #f))
+
+	 (alt-dir (ly:context-property context 'figuredBassAlterationDirection))
+	 (plus-dir (ly:context-property context 'figuredBassPlusDirection))
+	 )
+
+    (if (and (not fig-markup) alt-markup)
+	(begin
+	  (set! fig-markup (markup #:left-align #:pad-around 0.3 alt-markup))
+	  (set! alt-markup #f)))
+
+
+    ;; hmm, how to get figures centered between note, and
+    ;; lone accidentals too?
+    
+    ;;    (if (markup? fig-markup)
+    ;;	(set!
+    ;;	 fig-markup (markup #:translate (cons 1.0 0)
+    ;;			    #:hcenter fig-markup)))
+
+    (if alt-markup
+	(set! fig-markup
+	      (markup #:put-adjacent
+		      fig-markup X
+		      (if (number? alt-dir)
+			  alt-dir
+			  LEFT)
+		      #:pad-x 0.2 alt-markup
+		      )))
+
+    
+    (if plus-markup
+	(set! fig-markup
+	      (if fig-markup
+		  (markup #:put-adjacent
+			  fig-markup
+			  X (if (number? plus-dir)
+				plus-dir
+				LEFT)
+			  #:pad-x 0.2 plus-markup)
+		  plus-markup)))
+    
+    (if (markup? fig-markup)
+	(markup #:fontsize -2 fig-markup)
+	empty-markup)
+
+    ))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 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)