;;;; This file is part of LilyPond, the GNU music typesetter.
;;;;
-;;;; Copyright (C) 2002--2012 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; Copyright (C) 2002--2015 Jan Nieuwenhuizen <janneke@gnu.org>
;;;; Patrick McCarty <pnorcks@gmail.com>
;;;;
;;;; LilyPond is free software: you can redistribute it and/or modify
(string-append "<!-- " s " -->\n"))
(define-public (entity entity string . attributes-alist)
- (if (equal? string "")
+ (if (string-null? string)
(apply eoc entity attributes-alist)
(string-append
- (apply eo (cons entity attributes-alist)) string (ec entity))))
+ (apply eo entity attributes-alist) string (ec entity))))
(define (offset->point o)
(ly:format "~4f ~4f" (car o) (- (cdr o))))
(define (helper lst)
(if (null? lst)
'()
- (cons (format #f "~S ~S" (car lst) (- (cadr lst)))
+ (cons (ly:format "~4f ~4f" (car lst) (- (cadr lst)))
(helper (cddr lst)))))
(string-join (helper lst) " "))
(else (any (lambda (t)
(ly:in-event-class? cause t))
point-and-click)))
- (let* ((location (ly:input-file-line-char-column music-origin))
- (raw-file (car location))
- (file (if (is-absolute? raw-file)
- raw-file
- (string-append (ly-getcwd) "/" raw-file))))
-
+ (let* ((location (ly:input-file-line-char-column music-origin)))
+
(ly:format "<a style=\"color:inherit;\" xlink:href=\"textedit://~a:~a:~a:~a\">\n"
;; Backslashes are not valid
;; file URI path separators.
(ly:string-percent-encode
- (ly:string-substitute "\\" "/" file))
-
+ (ly:string-substitute "\\" "/" (car location)))
+
(cadr location)
(caddr location)
(1+ (cadddr location))))))))
'(fill . "currentColor")))
(define (setcolor r g b)
- (format #f "<g color=\"rgb(~a%, ~a%, ~a%)\">\n"
+ (ly:format "<g color=\"rgb(~4f%, ~4f%, ~4f%)\">\n"
(* 100 r) (* 100 g) (* 100 b)))
;; rotate around given point