From 96ace6a412590f123ec7dc63df9b666ac86aa2fa Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 16 Jul 2003 14:02:46 +0000 Subject: [PATCH] * lily/text-item.cc (interpret_new_markup): do only if new-markup detected. * Documentation/user/refman.itely (Grace notes): note on explicit contexts --- ChangeLog | 3 +++ Documentation/user/refman.itely | 8 +++++++- lily/text-item.cc | 7 +++++-- scm/new-markup.scm | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e03d4d4743..abd751de12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2003-07-16 Han-Wen Nienhuys + * lily/text-item.cc (interpret_new_markup): do only if new-markup + detected. + * Documentation/user/refman.itely (Grace notes): note on explicit contexts diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 385f171e62..c04dfb9b87 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -7291,6 +7291,12 @@ See @ref{The Feta font} for a complete listing of the possible glyphs. This produces a single character, e.g. @code{\char #65} produces the letter 'A'. +@item \note +@cindex \note @var{log} @var{dots} @var{dir} + +This produces a note with a stem pointing in @var{dir} direction, with +duration log @var{log} and @var{dots} augmentation dots. + @item \hspace #@var{amount} @cindex \hspace This produces a invisible object taking horizontal space. @@ -7331,7 +7337,7 @@ A \magnify #1.1 @{ A @} A This overrides a formatting property for its argument. The argument should be a key/value pair, e.g. @example -m \override #'(font-family . math) m m + m \override #'(font-family . math) m m @end example @end table diff --git a/lily/text-item.cc b/lily/text-item.cc index cc91f9c5bd..8c6e9501eb 100644 --- a/lily/text-item.cc +++ b/lily/text-item.cc @@ -284,6 +284,9 @@ Text_item::interpret_new_markup (SCM grob, SCM achain, static SCM proc; if (!proc) proc = scm_c_eval_string ("interpret-markup"); - - return *unsmob_molecule (scm_call_3 (proc, grob, achain, markup)); + + if (new_markup_p (markup)) + return *unsmob_molecule (scm_call_3 (proc, grob, achain, markup)); + else + return Molecule(); } diff --git a/scm/new-markup.scm b/scm/new-markup.scm index 1cd7453db9..a90a48eb30 100644 --- a/scm/new-markup.scm +++ b/scm/new-markup.scm @@ -671,7 +671,7 @@ against SIGNATURE, reporting MAKE-NAME as the user-invoked function. (define-public empty-markup (make-simple-markup "")) -(define-public (interpret-markup grob props markup) +(define-public (interpret-markup grob props markup) (if (string? markup) (simple-markup grob props markup) (let* -- 2.39.5