From ff2eb2fecfda84b33cb5ce2d59cc299c48db11b8 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 4 Mar 2003 23:52:52 +0000 Subject: [PATCH] (brew-new-markup-molecule): robustness: don't crash when processing '() markup --- ChangeLog | 7 ++++++- Documentation/user/refman.itely | 1 + scm/new-markup.scm | 15 ++++++++++----- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 330b1a5151..8448e2ecc3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,13 @@ 2003-03-05 Han-Wen Nienhuys + * scm/new-markup.scm (brew-new-markup-molecule): robustness: don't + crash when processing '() markup + + * input/regression/breathing-sign.ly (texidoc): add caesura example. + * lily/breathing-sign.cc (railtracks): another caesura. - * mf/feta-schrift.mf: caesura symbol + * mf/feta-schrift.mf: caesura symbol. 2003-03-04 Han-Wen Nienhuys diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index e4533d4999..905b2d2436 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -5389,6 +5389,7 @@ longer than one line, can be produced by setting @code{raggedright} to true in the @code{\paper} block. @cindex page layout +@cindex vertical spacing The page layout process happens outside lilypond. Ly2dvi sets page layout instructions. Ly2dvi responds to the following variables in the diff --git a/scm/new-markup.scm b/scm/new-markup.scm index b11ab35123..ad4a34a745 100644 --- a/scm/new-markup.scm +++ b/scm/new-markup.scm @@ -530,11 +530,16 @@ against SIGNATURE, reporting MAKE-NAME as the user-invoked function. (define-public (brew-new-markup-molecule grob) - (interpret-markup grob - (Font_interface::get_property_alist_chain grob) - (ly:get-grob-property grob 'text) - ) - ) + (let* + ((t (ly:get-grob-property grob 'text)) + ) + (if (null? t) + '() + (interpret-markup grob + (Font_interface::get_property_alist_chain grob) + t + )) + )) (define-public empty-markup `(,simple-markup "")) -- 2.39.5