From 40106e3ada3d1ead4bbad19c92ed333586950a48 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 3 Mar 2004 00:42:29 +0000 Subject: [PATCH] * 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. --- ChangeLog | 2 ++ Documentation/user/introduction.itely | 7 ++++--- Documentation/user/music-glossary.tely | 2 +- input/regression/new-markup-syntax.ly | 3 +++ scm/define-markup-commands.scm | 7 +++---- scm/new-markup.scm | 7 +++++-- 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 19c63b4adb..216bea666d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2004-03-03 Han-Wen Nienhuys + * 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 6ec0a2d928..0d87a1334e 100644 --- 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 b2c18a08eb..c52bf5b2e5 100644 --- 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 7d046f298c..a9f263f184 100644 --- 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 29964efd0a..96086be60c 100644 --- 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 4b8758b32b..ea9c880e85 100644 --- 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))))) -- 2.39.5