From: Han-Wen Nienhuys Date: Fri, 25 Jun 2004 13:57:05 +0000 (+0000) Subject: release commit X-Git-Tag: release/2.3.5 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e2f56541bb35cfc1c401a9561363d77a5a4bc8b1;p=lilypond.git release commit --- diff --git a/input/regression/lily-in-scheme.ly b/input/regression/lily-in-scheme.ly index b3fc634da2..344fc69e79 100644 --- a/input/regression/lily-in-scheme.ly +++ b/input/regression/lily-in-scheme.ly @@ -1,10 +1,22 @@ -\header { - texidoc = "LilyPond syntax can be used inside scheme to -build music expressions, with the @code{#@{ ... #@}} syntax. -Scheme forms can be introduced inside these blocks by escaping -them with a @code{$}, both in a LilyPond context (see the @code{music} variable) or in a Scheme -context (see the @code{$padding} and @code{$(* padding 2)} forms.)" +\header { texidoc = "LilyPond syntax can be used inside scheme to + build music expressions, with the @code{#@{ ... #@}} syntax. + Scheme forms can be introduced inside these blocks by escaping + them with a @code{$}, both in a LilyPond context or in a Scheme + context. + +In this example, the @code{\withpaddingA}, @code{\withpaddingB} and +@code{\withpaddingC} music functions set different kinds of padding on +the @code{TextScript} grob. + +FIXME: this is broken. +" + } + + +\score{ c'4^"FIXME" } +%{ + \version "2.3.4" \paper { raggedright = ##t } @@ -37,3 +49,4 @@ withPaddingC = #(def-music-function (location padding music) (number? ly:music?) c'^"10" } } +%} diff --git a/scm/fret-diagrams.scm b/scm/fret-diagrams.scm index a5e4985ad3..167fd88c13 100644 --- a/scm/fret-diagrams.scm +++ b/scm/fret-diagrams.scm @@ -310,9 +310,9 @@ For example, - @verbatim +@example \\markup \\fret-diagram #'((mute 6) (mute 5) (open 4) (place-fret 3 2) (place-fret 2 3) (place-fret 1 2)) - @end verbatim +@end example will produce a standard D chord diagram without fingering indications.