release commit

diff --git a/input/regression/lily-in-scheme.ly b/input/regression/lily-in-scheme.ly
index b3fc634da215b39e38cb809c713a2d81ea598871..344fc69e79649ef8f3e119619873bc47a3978f77 100644 (file)
--- 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 a5e4985ad3ba9abda3326522c97e064bc4e0fd56..167fd88c13d858d07761625be826b0dc1b6836af 100644 (file)
--- 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.