* scm/new-markup.scm (stack-stencil-line): robustness.

* scm/define-markup-commands.scm (simple): robustification of
simple-markup.

* Documentation/user/music-glossary.tely (Top): change central C
to middle C.

diff --git a/ChangeLog b/ChangeLog
index 19c63b4adbd9e84d4b281010f1e289dc77df3705..216bea666d52fd870740945a64e7938c24b15a25 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-03-03  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * scm/new-markup.scm (stack-stencil-line): robustness.
+
        * scm/define-markup-commands.scm (simple): robustification of
        simple-markup.
 

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index 6ec0a2d9280710f414fd8a31246d84f9d6168ab9..0d87a1334e8e1be582b0b492a7dd0b36dd02164a 100644 (file)
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -251,10 +251,11 @@ frag= \notes {
         \override Beam #'thickness = #0.3
         \override Stem #'thickness = #0.5
         \override Bar #'thickness = #3.6
-        \override Tie  #'thickness = #2.2
-        \override StaffSymbol #'thickness = 3.0
+        \override Tie #'thickness = #2.2
+        \override StaffSymbol #'thickness = #3.0
         \override Tie #'extra-offset = #'(0 . 0.3)
-   }>>
+   } \frag
+   >>
 }
 @end lilypond
 

diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely
index b2c18a08eb474ce851a377d60b0aba4b146e79d2..c52bf5b2e521f543663cae05c2186b7b70db8334 100644 (file)
--- a/Documentation/user/music-glossary.tely
+++ b/Documentation/user/music-glossary.tely
@@ -750,7 +750,7 @@ Logarithmic unit of measurement.  1 cent is 1/1200 of an octave (1/100 of an
 equally tempered @aref{semitone}).
 @aref{equal temperament}.
 
-@aitem{middle C}
+@aitem{central C}
 @aref{middle C}.
 
 @aitem{chord}

diff --git a/input/regression/new-markup-syntax.ly b/input/regression/new-markup-syntax.ly
index 7d046f298c3d23cfdfb7c96954f0cf45383b493a..a9f263f184d78d7a018bce7fa09971e11bbcefbd 100644 (file)
--- a/input/regression/new-markup-syntax.ly
+++ b/input/regression/new-markup-syntax.ly
@@ -20,6 +20,9 @@ texidoc = "With the new markup syntax, text may be written in various manners."
                        \char #53
                }
                \semiflat
+
+               { }
+               
                \combine "X" "+"   
                \combine "o" "/"
 %              \char-number #"abc1234abc"

diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 29964efd0a1b32e943c9f630f3c2548e2998e476..96086be60c2ff20c5057ebc38a3893291b20c8bc 100644 (file)
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -19,12 +19,11 @@
   "A simple text-string; @code{\\markup @{ foo @}} is equivalent with
 @code{\\markup @{ \\simple #\"foo\" @}}."
   (let ((toks (string-tokenize str)))
-    (if (< 1 (length  toks))
-       (interpret-markup paper props
+    (interpret-markup paper props
                          (make-line-markup
                           (map make-word-markup toks)))
-       (interpret-markup paper props str))))
-    
+    ))
+
 (define (font-markup qualifier value)
   (lambda (paper props arg)
     (interpret-markup paper

diff --git a/scm/new-markup.scm b/scm/new-markup.scm
index 4b8758b32b137d06dc2b02c0003b1519beab2e99..ea9c880e8567d447bcd3d112dcc3579a359216f2 100644 (file)
--- a/scm/new-markup.scm
+++ b/scm/new-markup.scm
@@ -375,8 +375,11 @@ Also set markup-signature and markup-keyword object properties."
 
 
 (define-public (stack-stencil-line space stencils)
-  (if (pair? stencils)
-      (if (pair? (cdr stencils))
+  (if (and (pair? stencils)
+          (ly:stencil? (car stencils)))
+      
+      (if (and (pair? (cdr stencils))
+              (ly:stencil? (cadr stencils)))
           (let* ((tail (stack-stencil-line  space (cdr stencils)))
                  (head (car stencils))
                  (xoff (+ space (cdr (ly:stencil-get-extent head X)))))