Circle-mark patch from Erlend Aasland.

diff --git a/ChangeLog b/ChangeLog
index 5da6dce99fd270002e90d6a4fce87731d507949a..c5ac748e002b435779b5294f05b6e88a60b37980 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-15  Graham Percival  <gpermus@gmail.com>
+
+       * scm/translation-functions.scm: circle patch from Erlend, thanks!
+
+       * THANKS: moved Erlend Aasland to contributors.
+
 2006-02-15  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * config.hh.in: remove HAVE_PANGO_16

diff --git a/THANKS b/THANKS
index 1c8563a4c9fb02ff7a97c1f7424e84f545400574..a6ea1c437961eaf1223c6843b0e13fcd31fcbdc2 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -14,6 +14,7 @@ CONTRIBUTORS
 
 Bruce Fairchild
 Cameron Horsburgh
+Erlend Aasland
 Heikki Junes
 Joe Neeman
 Johannes Schindelin
@@ -60,7 +61,6 @@ Donald Axel
 Don Blaheta
 Edward Neeman
 Eduardo Vieira
-Erlend Aasland
 Ernesto Gancedo
 Frédéric Bron
 Hans Forbrich

diff --git a/scm/translation-functions.scm b/scm/translation-functions.scm
index c3cd17ecdf3f3c02038a07b9d2a1ae013de50b16..27bbd5200b909f552d2817c8174fbecc8be57f15 100644 (file)
--- a/scm/translation-functions.scm
+++ b/scm/translation-functions.scm
@@ -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.