Merge branch 'master' of git://git.savannah.gnu.org/lilypond.git

[lilypond.git] / scm / output-lib.scm

diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index 01953a941215f60b06c9a30797c5d2c5e8d551f0..025590e5bae0e001db8f089a96b811485faa1198 100644 (file)
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -333,7 +333,7 @@ and duration-log @var{log}."
 (define-public (tuplet-number::calc-fraction-text grob)
   (let ((ev (event-cause grob)))
 
-    (format "~a:~a"
+    (format #f "~a:~a"
            (ly:event-property ev 'denominator)
            (ly:event-property ev 'numerator))))
 
@@ -363,7 +363,7 @@ and duration-log @var{log}."
          (den (if denominator denominator (ly:event-property ev 'denominator)))
          (num (if numerator numerator (ly:event-property ev 'numerator))))
 
-    (format "~a:~a" den num)))
+    (format #f "~a:~a" den num)))
 
 ;; Print a tuplet fraction with note durations appended to the numerator and the
 ;; denominator
@@ -385,10 +385,10 @@ and duration-log @var{log}."
          (num (if numerator numerator (ly:event-property ev 'numerator))))
 
     (make-concat-markup (list
-                        (make-simple-markup (format "~a" den))
+                        (make-simple-markup (format #f "~a" den))
                         (markup #:fontsize -5 #:note denominatornote UP)
                         (make-simple-markup " : ")
-                        (make-simple-markup (format "~a" num))
+                        (make-simple-markup (format #f "~a" num))
                         (markup #:fontsize -5 #:note numeratornote UP)))))
 
 
@@ -467,6 +467,25 @@ and duration-log @var{log}."
        (+ c0 p))))
 
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; annotations
+
+(define-public (numbered-footnotes int)
+  (markup #:tiny (number->string (+ 1 int))))
+
+(define-public (symbol-footnotes int)
+  (define (helper symbols out idx n)
+    (if (< n 1)
+        out
+        (helper symbols
+                (string-append out (list-ref symbols idx))
+                idx
+                (- n 1))))
+  (markup #:tiny (helper '("*" "†" "‡" "§" "¶")
+                          ""
+                          (remainder int 5)
+                          (+ 1 (quotient int 5)))))
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; accidentals
 
@@ -792,40 +811,6 @@ between the two text elements."
     (ly:grob-property grob 'dot-placement-list))))
 
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; glissando
-
-(define-public (glissando::make-simple-y grob)
- "Establishes the Y terminus points of the glissando based on the
-pre-broken positions of its left and right bounds."
- (let* ((siblings (ly:spanner-broken-into (ly:grob-original grob)))
-        (bound-details (ly:grob-property grob 'bound-details))
-        (extra-dy (ly:grob-property grob 'extra-dy 0.0)))
-
-   (and (pair? siblings)
-        (for-each (lambda (dir-sym)
-                    (let* ((details (assoc-get dir-sym bound-details))
-                           (dir (if (eq? dir-sym 'left) LEFT RIGHT))
-                           (good-grob (if (eq? dir-sym 'left)
-                                          (first siblings)
-                                          (last siblings)))
-                           (bound (ly:spanner-bound good-grob dir))
-                           (common-y (ly:grob-common-refpoint good-grob
-                                                              bound
-                                                              Y))
-                           (y (+ (interval-center (ly:grob-extent bound
-                                                                 common-y
-                                                                 Y))
-                                 (/ (* dir extra-dy)
-                                    2))))
-                      (if (not (assoc-get 'Y details))
-                          (set! bound-details (assoc-set! bound-details dir-sym
-                                                          (acons 'Y y details))))))
-                  '(left right))
-
-        (set! (ly:grob-property grob 'bound-details) bound-details))))
-
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; scripts