+2003-08-02 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+
+ * scm/new-markup.scm (strut-markup): new markup function.
+
+ * scm/bass-figure.scm (make-bass-figure-markup): insert vertical
+ space also when no accidental is there.
+
2003-08-02 Jan Nieuwenhuizen <janneke@gnu.org>
* input/les-nereides.ly: Updates.
(fig-markup
(if (string? fig)
(make-simple-markup fig)
- (make-simple-markup (if align-accs " " ""))
+ (if align-accs (make-simple-markup " ")
+ (if (not (eq? acc '()))
+ (make-simple-markup "")
+ (make-strut-markup)))
)))
(if (number? acc)
" ; "
+
+;;;;;;;;;;;;;;;;;
+;; TODO:
+;; each markup function should have a doc string with
+;; syntax, description and example.
+;;
+
(define-public (simple-markup grob props . rest)
(Text_item::text_to_molecule grob props (car rest))
)
(box-molecule m th pad)
))
+
+(define-public (strut-markup grob props . rest)
+ "Syntax: \strut
+
+ A box of the same height as the space.
+"
+
+ (let*
+ ((m (Text_item::text_to_molecule grob props " ")))
+
+ (ly:molecule-set-extent! m 0 '(1000 . -1000))
+ m))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
(define (markup-signature-to-keyword sig)
" (A B C) -> a0-b1-c2 "
(cons fontsize-markup (list number? markup?))
(cons box-markup (list markup?))
- )
- )
+ (cons strut-markup '())
+ ))
(define markup-module (current-module))
"
(let*
- (
- (arglen (length args))
+ ((arglen (length args))
(siglen (length signature))
(error-msg
(if (and (> siglen 0) (> arglen 0))
- (markup-argument-list-error signature args 1)))
- )
+ (markup-argument-list-error signature args 1)
+ #f)))
(if (or (not (= arglen siglen)) (< siglen 0) (< arglen 0))