Add changes entry for Mike's work on skylines (28f3294954eff1).

[lilypond.git] / scm / display-lily.scm

diff --git a/scm/display-lily.scm b/scm/display-lily.scm
index 9536c3dd42b25b626dd0300b8f7f9a9cf31f80a6..788f89e3596f35f48a81279e4a7e47aa37194919 100644 (file)
--- a/scm/display-lily.scm
+++ b/scm/display-lily.scm
@@ -82,10 +82,21 @@ display method will be called."
 (define* (tweaks->lily-string expr #:optional (post-event? #f))
   (format #f "~{~a ~}"
           (map (lambda (tweak)
-                 (format #f "~a\\tweak #'~a #~a"
-                         (if post-event? "-" "")
-                         (car tweak)
-                         (scheme-expr->lily-string (cdr tweak))))
+                 (let ((addr (car tweak))
+                       (val (cdr tweak)))
+                   (format #f "~a\\tweak ~a #~a"
+                           (if post-event? "-" "")
+                           (cond
+                            ((symbol? addr)
+                             (format #f "~a" addr))
+                            ((symbol? (cdr addr))
+                             (format #f "~a.~a" (car addr) (cdr addr)))
+                            (else
+                             (format #f "~{~a~^.~}"
+                                     (if (symbol? (car addr))
+                                         addr
+                                         (cdr addr)))))
+                           (scheme-expr->lily-string val))))
                (ly:music-property expr 'tweaks))))
 
 (define-public (music->lily-string expr parser)
@@ -282,8 +293,7 @@ inside body."
 (define *max-element-number-before-break* (make-parameter 6))
 
 ;; \times factor (used in durations)
-(define *time-factor-denominator* (make-parameter #f))
-(define *time-factor-numerator* (make-parameter #f))
+(define *time-scale* (make-parameter 1))
 
 (define *current-context* (make-parameter 'Bottom))