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

diff --git a/scm/translation-functions.scm b/scm/translation-functions.scm
index eec3029702..571e6c964c 100644
--- a/scm/translation-functions.scm
+++ b/scm/translation-functions.scm
@@ -1,60 +1,54 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; tuplets.
+;;;; translation-functions.scm --
+;;;;
+;;;;  source file of the GNU LilyPond music typesetter
+;;;; 
+;;;; (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;;		     Jan Nieuwenhuizen <janneke@gnu.org>
 
 (define-public (denominator-tuplet-formatter mus)
-  (number->string (ly:get-mus-property mus 'denominator)))
+  (number->string (ly:music-property mus 'denominator)))
 
 (define-public (fraction-tuplet-formatter mus)
-  (string-append (number->string (ly:get-mus-property mus 'numerator))
-		 ":"
-		 (number->string (ly:get-mus-property mus 'denominator))
-		 ))
-
+  (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: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) ) ) 
+  (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))))  
     (make-line-markup
      (list
-      note-mark
+      (make-general-align-markup Y DOWN note-mark)
       (make-simple-markup  "=")
-      (make-simple-markup (number->string count))
-      
-  ))))
-
-
-
-(define number->mark-letter-vector (make-vector 25 #\A))
+      (make-simple-markup (number->string count))))))
 
-(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-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)))))
 
 (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-box-numbers mark context)
+  (make-bold-markup (make-box-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)))))