* scm/music-property-description.scm (label): Typecheck markup?

(was string?).

* Documentation/user/refman.itely (Tablatures basic): Change
TabStaff @lilypond snippets to @example until TabStaff is
anal-proof.

diff --git a/ChangeLog b/ChangeLog
index 303f220d298ac5f73ccd87641eb273268a7da7ac..5e884ae1d25b03dd2499ae1e7d5db1f4f49a702a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
 2002-08-18  Jan Nieuwenhuizen  <janneke@gnu.org>
 
-       * Documentation/user/refman.itely (Tablatures basic): Comment out
-       TabStaff example until TabStaff gets fixed.
+       * scm/music-property-description.scm (label): Typecheck markup?
+       (was string?).
+
+       * Documentation/user/refman.itely (Tablatures basic): Change
+       TabStaff @lilypond snippets to @example until TabStaff is
+       anal-proof.
 
 2002-08-18  Rune Zedeler <rune@zedeler.dk>
 

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 577beaf0d464c7d85d252ad2add8deee5dca7e49..0adafdee7a6bf067b5f609bf58235a1d0e44c4da 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -2942,8 +2942,8 @@ quarter on the third string. The string 1 is the lowest one, and the
 tuning defaults to the standard guitar tuning (with 6 strings).
 
 @c FIXME  TabStaff is broken
-@ignore
 @lily pond[fragment,verbatim]
+@example
   \context TabStaff <
     \notes {
       \property Staff.Stem \override #'direction = #1
@@ -2952,8 +2952,8 @@ tuning defaults to the standard guitar tuning (with 6 strings).
       e-3 c'-5 a-4 e'-6
     }
   >  
-@end lilypond
-@end ignore
+@end example
+@c @end lilypond
 
 @node Non-guitar tablatures
 @subsection Non-guitar tablatures
@@ -2986,8 +2986,8 @@ the fingering information (which correspond to the string number) for
 the standard staff.
 
 @c FIXME
-@ignore
-@lily pond[verbatim]
+@c @lily pond[verbatim]
+@example
   part = \notes {
     a,4-2 c'-5 a-4 e'-6
     e-3 c'-5 a-4 e'-6
@@ -3007,8 +3007,8 @@ the standard staff.
       >
     >
   }
-@end lilypond
-@end ignore
+@end example
+@c @end lilypond
 
 @c . {Chords}
 @node Chords

diff --git a/scm/music-property-description.scm b/scm/music-property-description.scm
index 8b91f1d45f863918e9251f54aa53f447a7010f25..ffa83e31ef311ce7a8090185d1b556c189fdee71 100644 (file)
--- a/scm/music-property-description.scm
+++ b/scm/music-property-description.scm
@@ -45,7 +45,7 @@ TODO: consider making type into symbol ")
 (music-property-description 'grob-property symbol? "The symbol of the grob property to set. ")
 (music-property-description 'grob-value scheme? "The value of the grob property to set")
 (music-property-description 'inversion boolean? "If set, this chord note is inverted.")
-(music-property-description 'label string? "label of a mark.")
+(music-property-description 'label markup? "label of a mark.")
 (music-property-description 'last-pitch pitch? "The last pitch after relativization.")
 (music-property-description 'length procedure? "How to compute the duration of this music")
 (music-property-description 'numerator integer? "numerator of a time signature")