* 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/ChangeLog b/ChangeLog
index e03d4d4743ed93bfb837091a0d11456fa9f01b90..abd751de121e8cc6a7192760cb4e7e36f2c4bf8d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-07-16  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * 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 385f171e626ba2e5960e1b68c513242a92d63ae2..c04dfb9b8776dfc3fd73946e8a0afaa21adb2854 100644 (file)
--- 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 cc91f9c5bd2deecf774a3c70cb32d9c3ccdf0f9f..8c6e9501ebe50b7aeb0a605714e1599605e8a07c 100644 (file)
--- 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 1cd7453db95afd09e918e57eeade43ce3e123335..a90a48eb3043bf427895f747bed9c5dae47b00cb 100644 (file)
--- 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*