From 0589e317d6b54cc7383e8e43bfb11a57aad2715e Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Tue, 19 Jun 2007 18:24:05 -0700 Subject: [PATCH] Update docs to point to LSR-snippet instead of input/test/ and regression/ --- Documentation/user/advanced-notation.itely | 11 +-- Documentation/user/basic-notation.itely | 13 ++- Documentation/user/instrument-notation.itely | 23 +++--- Documentation/user/macros.itexi | 2 +- Documentation/user/non-music.itely | 2 +- input/new/non-music/clip-systems.ly | 85 ++++++++++++++++++++ 6 files changed, 106 insertions(+), 30 deletions(-) create mode 100644 input/new/non-music/clip-systems.ly diff --git a/Documentation/user/advanced-notation.itely b/Documentation/user/advanced-notation.itely index bd3f1d8535..e7cd36b3a2 100644 --- a/Documentation/user/advanced-notation.itely +++ b/Documentation/user/advanced-notation.itely @@ -1125,7 +1125,7 @@ be added 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 -@inputfileref{input/@/test,bar@/-number@/-regular@/-interval@/.ly} +@lsr{staff,making-bar-numbers-appear-at-regular-intervals.ly}. @lilypondfile[ragged-right,quote]{bar-number-regular-interval.ly} @@ -1150,9 +1150,7 @@ c4 c c c Program reference: @internalsref{BarNumber}. -Examples: -@inputfileref{input/@/test,bar@/-number@/-every@/-five@/-reset@/.ly}, -and @inputfileref{input/@/test,bar@/-number@/-regular@/-interval@/.ly}. +Examples: @lsrdir{staff} @refbugs @@ -1889,7 +1887,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 -@inputfileref{input/@/test,compound@/-time@/.ly}). +@lsr{contemporary,compound-time-signature}. @lilypond[verbatim,ragged-right] % create 2/4 + 5/8 @@ -2650,7 +2648,6 @@ the notes. >> @end lilypond -Examples: @inputfileref{input/@/regression,grid@/-lines@/.ly}. - +Examples: @lsrdir{education} diff --git a/Documentation/user/basic-notation.itely b/Documentation/user/basic-notation.itely index dd94b0a331..e33db9b3a0 100644 --- a/Documentation/user/basic-notation.itely +++ b/Documentation/user/basic-notation.itely @@ -486,7 +486,7 @@ existing music with another @code{transpose} Program reference: @internalsref{TransposedMusic}. -Example: @inputfileref{input/@/test,smart@/-transpose@/.ly}. +Example: @lsr{scheme,transpose-pitches-with-minimum-accidentals.ly}. @refbugs @@ -1612,7 +1612,7 @@ measure is subdivided in 2, 2, 2 and 3. This is passed to Program reference: @internalsref{TimeSignature}, and @internalsref{Timing_translator}. -Examples: @inputfileref{input/@/test,compound@/-time@/.ly}. +Examples: @lsr{contemporary,compound-time-signature.ly}. @refbugs @@ -1898,8 +1898,8 @@ LilyPond, these lines are drawn using a separate layout object called The staff symbol may be tuned in the number, thickness and distance of lines, using properties. This is demonstrated in the example files -@inputfileref{input/@/test,staff@/-lines@/.ly}, -@inputfileref{input/@/test,staff@/-size@/.ly}. +@lsr{staff,changing-the-number-of-lines-in-a-staff.ly} and +@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}. @@ -1930,10 +1930,7 @@ sections. An example is shown here Program reference: @internalsref{StaffSymbol}. -Examples: @inputfileref{input/@/test,staff@/-lines@/.ly}, -@inputfileref{input/@/test@/,ossia.ly}, -@inputfileref{input/@/test,staff@/-size@/.ly}, -@lsr{staff,staff-line-positions.ly} +Examples: @lsrdir{staff} @node Writing music in parallel diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely index 9c814cdb1b..28fa837d75 100644 --- a/Documentation/user/instrument-notation.itely +++ b/Documentation/user/instrument-notation.itely @@ -556,7 +556,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} +@lsr{chords,chord@/-name@/-exceptions@/.ly} @cindex exceptions, chord names. @@ -614,8 +614,8 @@ demonstrated here, 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 described in the input file -@inputfileref{input/@/test,chord@/-names@/-jazz@/.ly}. +chart}. Turning on these styles is demonstrated in +@lsr{chords,chord-names-jazz.ly}. @cindex Banter @cindex jazz chords @@ -639,10 +639,7 @@ chart}. Turning on these styles is described in the input file @seealso Examples: -@lsr{chords/,chord@/-name@/-exceptions@/.ly}, -@lsr{chords,chord@/-name@/-major7@/.ly}, and -@inputfileref{input/@/test,chord@/-names@/-jazz@/.ly}. - +@lsrdir{chords} Init files: @file{scm/@/chords@/-ignatzek@/.scm}, and @file{scm/@/chord@/-entry@/.scm}. @@ -2237,7 +2234,7 @@ Details about the property interface to fret diagrams are found at @seealso -Examples: @inputfileref{input/@/test,fret@/-diagram@/.ly} +Examples: @lsrdir{guitar} @node Right hand fingerings @@ -2610,7 +2607,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 -@inputfileref{input/@/test,ancient@/-accidentals@/.ly}. +@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 @@ -2625,7 +2622,7 @@ the use of key signatures. Program reference: @internalsref{KeySignature}. -Examples: @inputfileref{input/@/test,ancient@/-accidentals@/.ly}. +Examples: @lsrdir{ancient} @node Ancient rests @subsection Ancient rests @@ -2652,8 +2649,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 @inputfileref{input/@/test,rests@/.ly} for a chart of all -rests. +taken. See @lsr{pitches,rests} for a chart of all rests. There are no rests in Gregorian Chant notation; instead, it uses @ref{Divisiones}. @@ -3216,7 +3212,8 @@ In this manual: @ref{Breath marks}. Program reference: @internalsref{BreathingSign}. -Examples: @inputfileref{input/@/test,divisiones@/.ly}. +Examples: @lsr{expressive,breathing-sign.ly}. + @node Ligatures @subsection Ligatures diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi index 32536c3cd5..ddef52ebc3 100644 --- a/Documentation/user/macros.itexi +++ b/Documentation/user/macros.itexi @@ -62,7 +62,7 @@ @macro lsrdir{DIR} @ifhtml - @uref{source/input/lsr/\DIR\/collated-files.html,@file{\DIR\}} + @uref{source/input/lsr/\DIR\/collated-files.html,@file{\DIR\}/} @end ifhtml @ifnothtml @file{\DIR\} diff --git a/Documentation/user/non-music.itely b/Documentation/user/non-music.itely index 536780c36f..9f21e649e4 100644 --- a/Documentation/user/non-music.itely +++ b/Documentation/user/non-music.itely @@ -368,7 +368,7 @@ For more information on output formats, see @ref{Invoking lilypond}. @seealso -Examples: @inputfileref{input/regression/,clip-systems.ly} +Examples: @lsr{non-notation,clip-systems.ly} @node Including LilyPond files diff --git a/input/new/non-music/clip-systems.ly b/input/new/non-music/clip-systems.ly new file mode 100644 index 0000000000..06247e76b5 --- /dev/null +++ b/input/new/non-music/clip-systems.ly @@ -0,0 +1,85 @@ +\header { + texidoc = "Clipping snippets from a finished score + +Notes: + +@itemize @bullet +@item If system starts and ends are included, they include extents of the System grob, eg. instrument names. +@item Grace notes at the end point of the region are not included +@item Regions can span multiple systems. In this case, multiple EPS files are generated. +@end itemize + +This file needs to be run separately with @code{-dclip-systems}; the +collated-files.html of the regression test does not adequately show +the results. + +The result will be files named +@file{@var{base}-from-@var{start}-to-@var{end}[-@var{count}].eps}. +" + +} + +\version "2.10.0" + +#(ly:set-option 'clip-systems) + +#(set! output-count 1) + +origScore = \score{ + \relative { + \set Staff.instrumentName = #"bla" + c1 + d + \grace c16 + e1 + \key d\major + + f + \break \clef bass + g, + fis + } +} + +\book { + \score { + \origScore + \layout { + + %% each clip-region is a (START . END) pair + %% where both are rhythmic-locations. + + %% (make-rhythmic-locations BAR-NUMBER NUM DEN) + %% means NUM/DEN whole-notes into bar numbered BAR-NUMBER + + clip-regions + = #(list + (cons + (make-rhythmic-location 2 0 1) + (make-rhythmic-location 4 0 1)) + + (cons + (make-rhythmic-location 0 0 1) + (make-rhythmic-location 4 0 1)) + + (cons + (make-rhythmic-location 0 0 1) + (make-rhythmic-location 6 0 1)) + ) + } + } +} + +#(set! output-count 0) +#(ly:set-option 'clip-systems #f) + +\book { + \score { \origScore } + \markup { \bold \fontsize #6 clips } + \score { + \lyrics { + \markup { from-2.0.1-to-4.0.1-clip.eps } + \markup { \epsfile #X #30.0 #(format #f "~a-1-from-2.0.1-to-4.0.1-clip.eps" (ly:parser-output-name parser)) } + } + } +} -- 2.39.2