(process_acknowledged_grobs): catch

[lilypond.git] / scm / new-markup.scm

diff --git a/scm/new-markup.scm b/scm/new-markup.scm
index 7c455a5f4d2bff4f3c86a7b79517448648abbca4..44067bae691b54d631a47d045312bbcbe6fed507 100644 (file)
--- a/scm/new-markup.scm
+++ b/scm/new-markup.scm
@@ -130,7 +130,7 @@ Use `markup*' in a \\notes block."
   
   
 (define (compile-all-markup-expressions expr)
-  "Return a list of canonical markups expressions, eg:
+  "Return a list of canonical markups expressions, e.g.:
   (#:COMMAND1 arg11 arg12 #:COMMAND2 arg21 arg22 arg23)
   ===>
   ((make-COMMAND1-markup arg11 arg12)
@@ -143,12 +143,12 @@ Use `markup*' in a \\notes block."
              (set! rest r))))
 
 (define (keyword->make-markup key)
-  "Transform a keyword, eg. #:COMMAND, in a make-COMMAND-markup symbol."
+  "Transform a keyword, e.g. #:COMMAND, in a make-COMMAND-markup symbol."
   (string->symbol (string-append "make-" (symbol->string (keyword->symbol key)) "-markup")))
 
 (define (compile-markup-expression expr)
   "Return two values: the first complete canonical markup expression found in `expr',
-eg (make-COMMAND-markup arg1 arg2 ...), and the rest expression."
+e.g. (make-COMMAND-markup arg1 arg2 ...), and the rest expression."
   (cond ((and (pair? expr)
               (keyword? (car expr)))
          ;; expr === (#:COMMAND arg1 ...)
@@ -175,8 +175,11 @@ eg (make-COMMAND-markup arg1 arg2 ...), and the rest expression."
          ;; expr === ((#:COMMAND arg1 ...) ...)
          (receive (m r) (compile-markup-expression (car expr))
                   (values m (cdr expr))))
+        ((and (pair? expr)
+              (string? (car expr))) ;; expr === ("string" ...)
+         (values `(make-simple-markup ,(car expr)) (cdr expr)))
         (else
-         ;; expr === (symbol ...) or ("string" ...) or ((funcall ...) ...)
+         ;; expr === (symbol ...) or ((funcall ...) ...)
          (values (car expr)
                  (cdr expr)))))
 
@@ -412,6 +415,7 @@ Also set markup-signature and markup-keyword object properties."
 
 
 (define-public (stack-stencil-line space stencils)
+  "DOCME"
   (if (and (pair? stencils)
           (ly:stencil? (car stencils)))