From 8233bc8ac54edb73af3754426adfaddf1105c772 Mon Sep 17 00:00:00 2001
From: Graham Percival <graham@percival-music.ca>
Date: Tue, 16 May 2006 02:04:30 +0000
Subject: [PATCH] Small fixes.

---
 Documentation/user/advanced-notation.itely | 26 ++--------------------
 Documentation/user/lilypond.tely           | 17 ++++++++++++++
 Documentation/user/tweaks.itely            | 22 +++++++++---------
 3 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/Documentation/user/advanced-notation.itely b/Documentation/user/advanced-notation.itely
index bfadf74aa2..959cfd1811 100644
--- a/Documentation/user/advanced-notation.itely
+++ b/Documentation/user/advanced-notation.itely
@@ -862,12 +862,6 @@ Bar numbers are printed by default at the start of the line.  The
 number itself is stored in the @code{currentBarNumber} property, which
 is normally updated automatically for every measure.
 
-To manually set a bar number, use
-
-@example
-\set Score.currentBarNumber = #57
-@end example
-
 Bar numbers can be typeset at regular intervals instead of at the
 beginning of each line.  This is illustrated in the following example,
 whose source is available as
@@ -875,22 +869,6 @@ whose source is available as
 
 @lilypondfile[ragged-right,quote]{bar-number-regular-interval.ly}
 
-Bar numbers can be typeset manually by tweaking the
-@code{markFormatter} property
-
-@lilypond[verbatim,ragged-right,quote]
-\relative c' {
-  \set Score.markFormatter
-    = #(lambda (mark context)
-      (make-bold-markup
-        (make-box-markup
-          (number->string (ly:context-property context
-                                               'currentBarNumber)))))
-
-  c1 \bar "||" \mark \default c1 c1 \mark \default c1 \bar "|."
-}
-@end lilypond
-
 Bar numbers can be manually changed by setting the
 @code{Staff.currentBarNumber} property
 
@@ -905,14 +883,14 @@ Bar numbers can be manually changed by setting the
 Bar numbers can be removed entirely by removing the Bar number
 engraver from the score.
 
-@lilypond[verbatim,ragged-right,quote,relative=2]
+@lilypond[verbatim,ragged-right,quote]
 \layout {
   \context {
     \Score
     \remove "Bar_number_engraver"
   }
 }
-{
+\relative c''{
 c4 c c c \break
 c4 c c c
 }
diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index 3ac190b9b0..9665fda854 100644
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -5,6 +5,23 @@
 @afourpaper
 @end iftex
 
+@c  Keep this here, since it pertains to the direntry below.
+@ignore
+Distributions will want to install lilypond.info in postinstall, doing:
+
+    install-info --info-dir=/usr/share/info out/lilypond.info
+
+  * Prepend GNU for dir, must be unique.
+  
+  * Do not list the `lilypond' node at toplevel, so that `info lilypond'
+    goes to Top.
+
+  * List all commands in direntry.
+  
+@c  * lilypond: (lilypond/lilypond)Running LilyPond.      Invoking the
+@c    LilyPond  program.
+@end ignore
+
 @dircategory GNU music project
 @direntry
 * LilyPond: (lilypond/lilypond).           The GNU music typesetter.
diff --git a/Documentation/user/tweaks.itely b/Documentation/user/tweaks.itely
index 11835602ff..53421c0962 100644
--- a/Documentation/user/tweaks.itely
+++ b/Documentation/user/tweaks.itely
@@ -163,14 +163,14 @@ We cannot list every object, but here is a list of the most
 common objects.
 
 @multitable @columnfractions .33 .66
-@headitem Object type  @tab Object name
-@item Text             @tab @code{TextScript}
-@item Dynamics         @tab @code{DynamicLineSpanner}
-@item Ties             @tab @code{Tie}
-@item Slurs            @tab @code{Slur}
-@item Articulation     @tab @code{Script}
-@item Fingering        @tab @code{Fingering}
-@item Rehearsal marks  @tab @code{RehearsalMark}
+@headitem Object type           @tab Object name
+@item Dynamics                  @tab @code{DynamicLineSpanner}
+@item Ties                      @tab @code{Tie}
+@item Slurs                     @tab @code{Slur}
+@item Articulations             @tab @code{Script}
+@item Fingerings                @tab @code{Fingering}
+@item Text e.g. @code{^"text"}  @tab @code{TextScript}
+@item Rehearsal / Text marks    @tab @code{RehearsalMark}
 @end multitable
 
 
@@ -349,8 +349,8 @@ padText = #(define-music-function (parser location padding) (number?)
 We can use it to create new commands,
 
 @lilypond[quote,verbatim,ragged-right]
-tempoMark = #(define-music-function
-  (parser location marktext padding) (string? number?)
+tempoMark = #(define-music-function (parser location padding marktext)
+                                    (number? string?)
 #{
   \once \override Score . RehearsalMark #'padding = $padding
   \once \override Score . RehearsalMark #'no-spacing-rods = ##t
@@ -359,7 +359,7 @@ tempoMark = #(define-music-function
 
 \relative c'' {
 c2 e
-\tempoMark #"Allegro" #3.0
+\tempoMark #3.0 #"Allegro"
 g c
 }
 @end lilypond
-- 
2.39.2