From 7dcd363b91092f12471d7966e83b572625d71f0b Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Thu, 12 May 2005 08:15:42 +0000 Subject: [PATCH] Misc changes. --- ChangeLog | 10 +++++ Documentation/user/instrument-notation.itely | 15 ++++++- Documentation/user/introduction.itely | 45 +------------------- Documentation/user/lilypond.tely | 1 + Documentation/user/tutorial.itely | 10 ++--- 5 files changed, 29 insertions(+), 52 deletions(-) diff --git a/ChangeLog b/ChangeLog index c2882aaaf9..eb70211222 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2005-05-12 Graham Percival + + * Documentation/user/instrument-notation.itely: add guitar + position. + + * Documentation/user/introduction.itely, + Documentation/user/lilypond.tely, + Documentation/user/tutorial.itely: begin pruning + unused (duplicated) cindex entries and misc cleanup. + 2005-05-12 Mats Bengtsson * input/test/volta-chord-names.ly: Bring the explanation up to diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely index bf83cd5b41..03abdf1030 100644 --- a/Documentation/user/instrument-notation.itely +++ b/Documentation/user/instrument-notation.itely @@ -1845,7 +1845,18 @@ Examples: @inputfileref{input/@/test,fret@/-diagram@/.ly} @node Other guitar issues @subsection Other guitar issues -FIXME: insert guitar fret number example here. +This example demonstrates how to include guitar position and +barring indications. + +@lilypond[quote,raggedright,fragment,verbatim,relative=0] +\clef "G_8" +b16 d16 g16 b16 e16 +\textSpannerDown +\override TextSpanner #'edge-text = #'("XII " . "") + g16\startTextSpan + b16 e16 g16 e16 b16 g16\stopTextSpan +e16 b16 g16 d16 +@end lilypond @node Ancient notation @@ -2061,7 +2072,7 @@ Examples: @inputfileref{input/@/test,ancient@/-accidentals@/.ly}. @node Ancient rests @subsection Ancient rests -@cindex rests +@cindex rests, ancient Use the @code{style} property of grob @internalsref{Rest} to select diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely index 7d70a7108b..c226d05e63 100644 --- a/Documentation/user/introduction.itely +++ b/Documentation/user/introduction.itely @@ -641,9 +641,6 @@ gives a gentle introduction to typesetting music. First time users should start here. @item -@ifhtml -The -@end ifhtml @emph{@ref{Example templates}} provides templates of LilyPond pieces. Just cut and paste a template into a file, add notes, and you're done! @@ -653,76 +650,41 @@ template into a file, add notes, and you're done! demonstrates practical uses of LilyPond. @item -@ifhtml -The chapter -@end ifhtml -@emph{@ref{Running LilyPond}} shows how to run LilyPond and its helper +@emph{@ref{Running LilyPond}} +shows how to run LilyPond and its helper programs. In addition, this section explains how to upgrade input files from previous versions of LilyPond. @item -@ifhtml -The -@end ifhtml @emph{@ref{Basic notation}} -@ifhtml -chapter -@end ifhtml discusses topics grouped by notation construct. This section gives details about basic notation that will be useful in almost any notation project. @item -@ifhtml -The -@end ifhtml @emph{@ref{Instrument-specific notation}} -@ifhtml -chapter -@end ifhtml discusses topics grouped by notation construct. This section gives details about special notation that will only be useful for particular instrument (or vocal) groups. @item -@ifhtml -The -@end ifhtml @emph{@ref{Advanced notation}} -@ifhtml -chapter -@end ifhtml discusses topics grouped by notation construct. This section gives details about complicated or unusual notation. @item -@ifhtml -The -@end ifhtml @emph{@ref{Global issues}} -@ifhtml -chapter -@end ifhtml discusses issues which affect the whole lilypond file. @item -@ifhtml -The -@end ifhtml @emph{@ref{Changing defaults}} explains how to fine tune layout. @item -@ifhtml -The chapter -@end ifhtml @emph{@ref{LilyPond-book}} explains the details behind creating documents with in-line music examples, like this manual. @item -@ifhtml -The chapter -@end ifhtml @emph{@ref{Converting from other formats}} explains how to run the conversion programs. These programs are supplied with the LilyPond package, and convert a variety of music @@ -857,12 +819,9 @@ Initialization files, for example @file{scm/@/lily@/.scm}, or @cindex internal documentation @cindex Scheme @cindex extending lilypond -@cindex bug report @cindex index Finally, this and all other manuals, are available online both as PDF files and HTML from the web site, which can be found at @uref{http://@/www@/.lilypond@/.org/}. -@cindex website -@cindex URL diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely index 365ab06169..d40b0a8be1 100644 --- a/Documentation/user/lilypond.tely +++ b/Documentation/user/lilypond.tely @@ -241,6 +241,7 @@ This is the user manual for GNU LilyPond 2.6.x series. @end ifhtml @cindex web site +@cindex URL A further source of information is the website, which can be found at @uref{http://@/www@/.lilypond@/.org/}. The website contains on-line copies diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index 08714455a6..c1d331b774 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -6,6 +6,9 @@ @c compiling/viewing (emacs?) @c * where to go from First steps+More basics? +@c wherever possible, do not include index entries here; the +@c index should point to stuff in the reference manual. -gp + @c Your first LilyPond score in 10 minutes? @node Tutorial @@ -86,9 +89,7 @@ name. @samp{1} for a @rglos{whole note}, @samp{2} for a @rglos{half note}, a1 a2 a4 a16 a32 @end example -@c FIXME: have NOTIME also remove Score.timing? @lilypond[fragment,quote,notime,relative=2] -\set Score.timing = ##f \set Staff.autoBeaming = ##f { a1 a2 a4 a16 a32 s16_" " } @end lilypond @@ -102,20 +103,17 @@ a a8 a a2 a @end example @lilypond[fragment,quote,notime,relative=2] -\set Score.timing = ##f { a a8 a a2 a s16_" " } @end lilypond A @rglos{rest} is entered just like a note, but with the name @samp{r} -@cindex rests @example r2 r4 r8 r16 @end example @lilypond[fragment,quote,notime] -\set Score.timing = ##f r2 r4 r8 r16 s16_" " @end lilypond @@ -126,7 +124,6 @@ a2. a4 a8. a16 @end example @lilypond[fragment,quote,notime,relative=1] -\set Score.timing = ##f { a2. a4 a8. a16 s16_" " } @end lilypond @@ -160,7 +157,6 @@ The @rglos{clef} can be set using the @code{\clef} command @end example @lilypond[fragment,quote,notime] -\set Score.timing = ##f \clef treble s4_" " \clef bass -- 2.39.2