Begin using 3-value @lsr macros.

diff --git a/Documentation/user/ancient.itely b/Documentation/user/ancient.itely
index aff177a54f59c9667b385e57805b101b551b4a00..6917436ca7439fb90906b1b63621106f54fae8ec 100644 (file)
--- a/Documentation/user/ancient.itely
+++ b/Documentation/user/ancient.itely
@@ -200,7 +200,7 @@ ancient accidentals.
 As shown, not all accidentals are supported by each style.  When
 trying to access an unsupported accidental, LilyPond will switch to a
 different style, as demonstrated in
-@lsr{ancient,ancient-accidentals.ly}.
+@c @lsr{ancient,ancient-accidentals.ly}.
 
 Similarly to local accidentals, the style of the key signature can be
 controlled by the @code{glyph-name-alist} property of the
@@ -242,7 +242,7 @@ r\longa r\breve r1 r2 r4 r8 r16
 
 There are no 32th and 64th rests specifically for the mensural or
 neo-mensural style.  Instead, the rests from the default style will be
-taken.  See @lsr{pitches,rests} for a chart of all rests.
+taken.  See @c @lsr{pitches,rests} for a chart of all rests.
 
 There are no rests in Gregorian Chant notation; instead, it uses
 @ref{Divisiones}.
@@ -768,7 +768,7 @@ supported are @code{vaticana}, @code{medicaea}, @code{hufnagel}, and
 Internals Reference: @internalsref{Custos}.
 
 Examples:
-@lsr{ancient,custodes@/.ly}.
+@c @lsr{ancient,custodes@/.ly}.
 
 
 @node Divisiones
@@ -819,7 +819,7 @@ Notation Reference: @ref{Breath marks}.
 
 Internals Reference: @internalsref{BreathingSign}.
 
-Examples: @lsr{expressive,breathing-sign.ly}.
+Examples: @c @lsr{expressive,breathing-sign.ly}.
 
 
 @node Ligatures

diff --git a/Documentation/user/chords.itely b/Documentation/user/chords.itely
index 4a868c09427944640b0ed384ff4d9850e3a9d149..d4b5223f8a7cdfe95b6f98ec5b6c90db1cfc355f 100644 (file)
--- a/Documentation/user/chords.itely
+++ b/Documentation/user/chords.itely
@@ -345,7 +345,7 @@ adds the new exceptions to the default ones, which are defined in
 @file{ly/@/chord@/-modifier@/-init@/.ly}.
 
 For an example of tuning this property, see also
-@lsr{chords,chord@/-name@/-exceptions@/.ly}
+@c @lsr{chords,chord@/-name@/-exceptions@/.ly}
 @cindex exceptions, chord names.
 
 
@@ -354,7 +354,7 @@ For an example of tuning this property, see also
 This property contains the markup object used for the 7th step, when
 it is major.  Predefined options are @code{whiteTriangleMarkup} and
 @code{blackTriangleMarkup}.  See
-@lsr{chords,chord@/-name@/-major7@/.ly} for an example.
+@c @lsr{chords,chord@/-name@/-major7@/.ly} for an example.
 
 @funindex chordNameSeparator
 @item chordNameSeparator
@@ -404,7 +404,7 @@ There are also two other chord name schemes implemented: an alternate
 Jazz chord notation, and a systematic scheme called Banter chords.  The
 alternate Jazz notation is also shown on the chart in @ref{Chord name
 chart}.  Turning on these styles is demonstrated in
-@lsr{chords,chord-names-jazz.ly}.
+@c @lsr{chords,chord-names-jazz.ly}.
 
 @cindex Banter
 @cindex jazz chords

diff --git a/Documentation/user/editorial.itely b/Documentation/user/editorial.itely
index ecfbb82e1fe5bcb035b95230d91c57d0096952ff..0dfa0c725a7c7c5aab6e61ba2d472dc62a43f57e 100644 (file)
--- a/Documentation/user/editorial.itely
+++ b/Documentation/user/editorial.itely
@@ -170,7 +170,7 @@ Snippets: @lsrdir{editorial}.
 
 Internals Reference: @internalsref{Fingering}.
 
-Examples: @lsr{expressive,fingering-chords.ly}
+Examples: @c @lsr{expressive,fingering-chords.ly}
 
 
 

diff --git a/Documentation/user/expressive.itely b/Documentation/user/expressive.itely
index 333c573fc7942ab4f3fa7fcd15f8027ffa81bd25..2625e054f899ea959aadcbef8aac84a5c72ffd29 100644 (file)
--- a/Documentation/user/expressive.itely
+++ b/Documentation/user/expressive.itely
@@ -483,7 +483,7 @@ d4
 
 @seealso
 
-Snippets: @lsrdir{expressive}, @lsr{expressive,breathing-sign.ly}.
+Snippets: @lsrdir{expressive}, @c @lsr{expressive,breathing-sign.ly}.
 
 Internals Reference: @internalsref{BreathingSign}.
 

diff --git a/Documentation/user/guitar.itely b/Documentation/user/guitar.itely
index 0083509ebec0de5894da8ae5b01636cc425a2f8b..ea7bae8cfbc14a5656b6081f8756a10665c1073f 100644 (file)
--- a/Documentation/user/guitar.itely
+++ b/Documentation/user/guitar.itely
@@ -45,7 +45,7 @@ with @code{\}@var{number},
 @seealso
 
 Internals Reference: @internalsref{StringNumber},
-@lsr{guitar/,string-number.ly}.
+@c @lsr{guitar/,string-number.ly}.
 
 
 @node Tablatures basic

diff --git a/Documentation/user/input.itely b/Documentation/user/input.itely
index 5527175a52bbccea311caecdca5099b881a159d3..dcfd9176c0d79d5ea8860842c07c378e3b931772 100644 (file)
--- a/Documentation/user/input.itely
+++ b/Documentation/user/input.itely
@@ -329,7 +329,7 @@ For more information on output formats, see @rprogram{Invoking lilypond}.
 
 @seealso
 
-Examples: @lsr{non-notation,clip-systems.ly}
+Examples: @c @lsr{non-notation,clip-systems.ly}
 
 
 @node Including LilyPond files
@@ -429,7 +429,7 @@ To use a Unicode escape sequence, use
 
 @seealso
 
-@lsr{text,utf-8.ly}
+@c @lsr{text,utf-8.ly}
 
 
 @node Different editions from one source
@@ -498,7 +498,7 @@ a piece of music with multiple @code{\tag} entries,
 
 @seealso
 
-Examples: @lsr{parts,tag@/-filter@/.ly}
+Examples: @c @lsr{parts,tag@/-filter@/.ly}
 
 
 @refbugs

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index bbeddc24332d878d04dd7a0b3157e55c527bfcd8..df8844a4287e9109bdd5531fff67504446dcacd1 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -82,10 +82,10 @@
 
 @c   **** Links and references ****
 
-@c usage: @lsr{ancient,custodes.ly}
-@macro lsr{DIR,TEXT}
+@c usage: @lsr{ancient,Ancient-notation,custodes.ly}
+@macro lsr{SECTION,DIR,TEXT}
 @ifhtml
-@uref{source/input/lsr/snippets/\DIR\.html#\TEXT\,@file{\DIR\/\TEXT\}}
+@uref{source/input/lsr/snippets/\SECTION\.html#\TEXT\,@file{\DIR\/\TEXT\}}
 @end ifhtml
 @ifnothtml
 @file{\DIR\/\TEXT\}

diff --git a/Documentation/user/repeats.itely b/Documentation/user/repeats.itely
index 1a7abed3796b169f9a391d71ae03d5098bcfb95d..2ba8590683861b8eb0d3e94598e37560ba6cbf11 100644 (file)
--- a/Documentation/user/repeats.itely
+++ b/Documentation/user/repeats.itely
@@ -161,7 +161,7 @@ and brackets for the repeat are thus normally only printed over
 the topmost staff.  This can be adjusted by adding
 @code{Volta_engraver} to the Staff context where you want the
 brackets to appear; see @ref{Modifying context plug-ins} and
-@lsr{repeats,volta@/-multi@/-staff@/.ly}.
+@c @lsr{repeats,volta@/-multi@/-staff@/.ly}.
 
 @lilypond[verbatim,ragged-right,quote]
 \score { <<

diff --git a/Documentation/user/rhythms.itely b/Documentation/user/rhythms.itely
index 2552746b8adca4c622862e5e8d48d8dcb134c035..bf9a89fe8fe9fa0c0a1ececd4ef7d93a52637da5 100644 (file)
--- a/Documentation/user/rhythms.itely
+++ b/Documentation/user/rhythms.itely
@@ -446,7 +446,7 @@ Internals Reference:
 @internalsref{LaissezVibrerTieColumn}
 
 Example files:
-@lsr{connecting,laissez-vibrer-ties.ly}
+@c @lsr{connecting,laissez-vibrer-ties.ly}
 
 
 @commonprop
@@ -931,7 +931,7 @@ Snippets: @lsrdir{rhythms}
 Internals Reference: @internalsref{TimeSignature}, and
 @internalsref{Timing_translator}.
 
-Examples: @lsr{contemporary,compound-time-signature.ly}.
+Examples: @c @lsr{contemporary,compound-time-signature.ly}.
 
 
 @refbugs
@@ -1067,7 +1067,7 @@ Double time signatures are not supported explicitly, but they can
 be faked.  In the next example, the markup for the time signature
 is created with a markup text.  This markup text is inserted in
 the @internalsref{TimeSignature} grob.  See also
-@lsr{contemporary,compound-time-signature}.
+@c @lsr{contemporary,compound-time-signature}.
 
 @lilypond[verbatim,ragged-right]
 % create 2/4 + 5/8
@@ -1183,7 +1183,7 @@ aligned vertically, but bar lines distort the regular spacing.
 
 @seealso
 
-Snippets: @lsrdir{rhythms}, @lsr{contemporary,compound-time-signature}.
+Snippets: @lsrdir{rhythms}, @c @lsr{contemporary,compound-time-signature}.
 
 Internals Reference: @internalsref{TimeSignature}, @internalsref{Timing-translator}, @internalsref{Staff}.
 
@@ -2182,7 +2182,7 @@ the definition of @code{format-mark-numbers} and
 @code{format-mark-letters}.  They can be used as inspiration for
 other formatting functions.
 
-Examples: @lsr{parts,rehearsal-mark-numbers.ly}
+Examples: @c @lsr{parts,rehearsal-mark-numbers.ly}
 
 
 @node Special rhythmic concerns

diff --git a/Documentation/user/simultaneous.itely b/Documentation/user/simultaneous.itely
index eafcc36d243f2d7e4b7439b9807dc6df4be4282a..e3e23f2a5378921c728319022cc8d53ba9d09885 100644 (file)
--- a/Documentation/user/simultaneous.itely
+++ b/Documentation/user/simultaneous.itely
@@ -88,7 +88,7 @@ Internals Reference: @internalsref{ClusterSpanner},
 @internalsref{ClusterSpannerBeacon},
 @internalsref{Cluster_spanner_engraver}.
 
-Examples: @lsr{contemporary,cluster@/.ly}.
+Examples: @c @lsr{contemporary,cluster@/.ly}.
 
 
 

diff --git a/Documentation/user/spacing.itely b/Documentation/user/spacing.itely
index ede0209436060daafe645245c9b1f3a8a7cb8a33..536e0cbf0986578d5b6fac9c860d512904749df4 100644 (file)
--- a/Documentation/user/spacing.itely
+++ b/Documentation/user/spacing.itely
@@ -1039,8 +1039,8 @@ Internals: Vertical alignment of staves is handled by the
 specifying the vertical extent are described in connection with
 the @internalsref{Axis_group_engraver}.
 
-Example files: @lsr{spacing,page-spacing.ly},
-@lsr{spacing,alignment-vertical-spacing.ly}.
+Example files: @c @lsr{spacing,page-spacing.ly},
+@c @lsr{spacing,alignment-vertical-spacing.ly}.
 
 
 @node Vertical spacing between systems

diff --git a/Documentation/user/staff.itely b/Documentation/user/staff.itely
index 315a38d5c681def120bf0f9d636f681a0eed0e24..fa067f8e9510afc794779685bab74631659d49fe 100644 (file)
--- a/Documentation/user/staff.itely
+++ b/Documentation/user/staff.itely
@@ -116,7 +116,7 @@ the command @code{\override Staff.BarLine #'transparent = ##t}
 
 Staff groups can be nested, using the context
 @code{InnerStaffGroup} or @code{InnerChoirStaff}; see
-@lsr{staff,staff-brackets.ly}
+@c @lsr{staff,staff-brackets.ly}
 @c snippet 137
 
 @commonprop
@@ -148,8 +148,7 @@ instantiated manually
 @c FIXME: Graham will deal with this.  -gp
 @c snippet 201
 To display a bracket even if there is only one staff, see
-@lsr{staff,display-bracket-with-only-one-staff-in-a
-system.ly}
+@c @lsr{staff,display-bracket-with-only-one-staff-in-a system.ly}
 
 @seealso
 
@@ -174,8 +173,8 @@ The layout object which draws the lines of a staff is called
 @code{staff symbol}.  The staff symbol may be tuned in the number,
 thickness and distance of lines, using properties.  This is
 demonstrated in the example files
-@lsr{staff,changing-the-number-of-lines-in-a-staff.ly} and
-@lsr{staff,changing-the-staff-size.ly}.
+@c @lsr{staff,changing-the-number-of-lines-in-a-staff.ly} and
+@c @lsr{staff,changing-the-staff-size.ly}.
 
 In addition, staves may be started and stopped at will.  This is
 done with @code{\startStaff} and @code{\stopStaff}.

diff --git a/Documentation/user/vocal.itely b/Documentation/user/vocal.itely
index 6ddaf4f9a8f5ca8fa792edbfcaf1805dc6898bc4..fe831ced4bd25fa94efce3eb43ff1e6891940b02 100644 (file)
--- a/Documentation/user/vocal.itely
+++ b/Documentation/user/vocal.itely
@@ -483,7 +483,7 @@ A complete example of a SATB score setup is in section
 
 Internals Reference: @internalsref{Melisma_translator}.
 
-@lsr{vocal,lyric@/-combine.ly}.
+@c @lsr{vocal,lyric@/-combine.ly}.
 
 @refbugs