Circle-mark patch from Erlend Aasland.

[lilypond.git] / scm / translation-functions.scm

diff --git a/scm/translation-functions.scm b/scm/translation-functions.scm
index 312acb5949eb7daf409e6110bf5d3f3dc8e9efcb..27bbd5200b909f552d2817c8174fbecc8be57f15 100644 (file)
--- a/scm/translation-functions.scm
+++ b/scm/translation-functions.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  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@cs.uu.nl>
 ;;;;                Jan Nieuwenhuizen <janneke@gnu.org>
 
 (define-public (denominator-tuplet-formatter mus)
@@ -34,6 +34,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,13 +49,23 @@
 (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.
@@ -70,7 +83,9 @@
         (alt-markup
          (if (number? alt)
              (markup
-                     #:general-align Y DOWN #:smaller #:smaller
+                     #:general-align Y DOWN #:fontsize
+                     (if (not (= alt DOUBLE-SHARP))
+                         -2 2)
                      (alteration->text-accidental-markup alt))
              
              #f))