From e9c683d7eedcbc52d71682694a2ceb83bad07d75 Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Wed, 30 Jan 2008 02:14:43 -0800 Subject: [PATCH] Begin using 3-value @lsr macros. --- Documentation/user/ancient.itely | 8 ++++---- Documentation/user/chords.itely | 6 +++--- Documentation/user/editorial.itely | 2 +- Documentation/user/expressive.itely | 2 +- Documentation/user/guitar.itely | 2 +- Documentation/user/input.itely | 6 +++--- Documentation/user/macros.itexi | 6 +++--- Documentation/user/repeats.itely | 2 +- Documentation/user/rhythms.itely | 10 +++++----- Documentation/user/simultaneous.itely | 2 +- Documentation/user/spacing.itely | 4 ++-- Documentation/user/staff.itely | 9 ++++----- Documentation/user/vocal.itely | 2 +- 13 files changed, 30 insertions(+), 31 deletions(-) diff --git a/Documentation/user/ancient.itely b/Documentation/user/ancient.itely index aff177a54f..6917436ca7 100644 --- 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 4a868c0942..d4b5223f8a 100644 --- 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 ecfbb82e1f..0dfa0c725a 100644 --- 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 333c573fc7..2625e054f8 100644 --- 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 0083509ebe..ea7bae8cfb 100644 --- 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 5527175a52..dcfd9176c0 100644 --- 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 bbeddc2433..df8844a428 100644 --- 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 1a7abed379..2ba8590683 100644 --- 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 2552746b8a..bf9a89fe8f 100644 --- 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 eafcc36d24..e3e23f2a53 100644 --- 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 ede0209436..536e0cbf09 100644 --- 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 315a38d5c6..fa067f8e95 100644 --- 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 6ddaf4f9a8..fe831ced4b 100644 --- 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 -- 2.39.2