CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Graham Percival <[EMAIL PROTECTED]> 05/05/18 16:03:32
Modified files:
. : ChangeLog
Documentation/user: macros.itexi basic-notation.itely
Log message:
Add @commonprop macro.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3635&tr2=1.3636&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/macros.itexi.diff?tr1=1.63&tr2=1.64&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/basic-notation.itely.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3635 lilypond/ChangeLog:1.3636
--- lilypond/ChangeLog:1.3635 Wed May 18 14:59:22 2005
+++ lilypond/ChangeLog Wed May 18 16:03:32 2005
@@ -1,3 +1,8 @@
+2005-05-18 Graham Percival <[EMAIL PROTECTED]>
+
+ * Documentation/user/macros.itexi, basic-notation.itely:
+ add @commonprop (commonly used properties) macro.
+
2005-05-18 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* ly/Welcome_to_LilyPond.ly: talk about icon, not program.
Index: lilypond/Documentation/user/basic-notation.itely
diff -u lilypond/Documentation/user/basic-notation.itely:1.16
lilypond/Documentation/user/basic-notation.itely:1.17
--- lilypond/Documentation/user/basic-notation.itely:1.16 Wed May 18
04:36:41 2005
+++ lilypond/Documentation/user/basic-notation.itely Wed May 18 16:03:32 2005
@@ -5,6 +5,7 @@
@c M-x texinfo-all-menus-update
@c to automatically fill in these menus before saving changes
+
@node Basic notation
@chapter Basic notation
@@ -21,7 +22,6 @@
@end menu
-
@node Note entry
@section Note entry
@cindex Note entry
@@ -47,6 +47,8 @@
@node Notes
@subsection Notes
[EMAIL PROTECTED] Note specification
[EMAIL PROTECTED] entering notes
A note is printed by specifying its pitch and then its duration,
@@ -54,14 +56,16 @@
cis'4 d'8 e'16 c'16
@end lilypond
[EMAIL PROTECTED]
+
[EMAIL PROTECTED], @ref{Durations}
+
@node Pitches
@subsection Pitches
@cindex Pitch names
[EMAIL PROTECTED] Note specification
@cindex pitches
[EMAIL PROTECTED] entering notes
The most common syntax for pitch entry is used for standard notes and
@code{\chordmode} modes. In these modes, pitches may be designated by
@@ -70,7 +74,7 @@
to @code{b}. The pitch @code{c} is an octave below middle C and the
letters span the octave above that C
[EMAIL PROTECTED],fragment,verbatim]
[EMAIL PROTECTED],fragment,verbatim,raggedright]
\clef bass
a,4 b, c d e f g a b c' d' e' \clef treble f' g' a' b' c''
@end lilypond
@@ -84,7 +88,7 @@
octave; each @code{,} lowers the pitch by an octave
@lilypond[quote,raggedright,fragment,verbatim]
-c' c'' es' g' as' gisis' ais'
+c' c'' e' g d'' d'
@end lilypond
@cindex note names, Dutch
@@ -104,17 +108,6 @@
cisis
@end lilypond
-In accordance with standard typsetting rules, a natural sign is printed
-before a sharp or flat if a previous accidental needs to be
-cancelled. To change this behaviour, use
[EMAIL PROTECTED] Staff.extraNatural = ##f}
-
[EMAIL PROTECTED],quote,raggedright,verbatim,relative=2]
-ceses4 ces cis c
-\set Staff.extraNatural = ##f
-ceses4 ces cis c
[EMAIL PROTECTED] lilypond
-
There are predefined sets of note names for various other languages.
To use them, include the language specific init file. For
example: @code{\include "english.ly"}. The available language files
@@ -142,19 +135,33 @@
@internalsref{LedgerLineSpanner}, and @internalsref{NoteHead}.
[EMAIL PROTECTED]
+
+In accordance with standard typsetting rules, a natural sign is printed
+before a sharp or flat if a previous accidental needs to be
+cancelled. To change this behaviour, use
[EMAIL PROTECTED] Staff.extraNatural = ##f}
+
[EMAIL PROTECTED],quote,raggedright,verbatim,relative=2]
+ceses4 ces cis c
+\set Staff.extraNatural = ##f
+ceses4 ces cis c
[EMAIL PROTECTED] lilypond
+
@node Cautionary accidentals
@subsection Cautionary accidentals
-Normally accidentals are printed automatically, but you may also
-print them manually. A reminder accidental
@cindex reminder accidental
@cindex @code{?}
-can be forced by adding an exclamation mark @code{!}
-after the pitch. A cautionary accidental
@cindex cautionary accidental
@cindex parenthesized accidental
@cindex @code{!}
+
+Normally accidentals are printed automatically, but you may also
+print them manually. A reminder accidental
+can be forced by adding an exclamation mark @code{!}
+after the pitch. A cautionary accidental
(i.e., an accidental within parentheses) can be obtained by adding the
question mark [EMAIL PROTECTED]' after the pitch.
@@ -173,17 +180,18 @@
@node Micro tones
@subsection Micro tones
-Half-flats and half-sharps are formed by adding @code{-eh} and
[EMAIL PROTECTED]; the following is a series of Cs with increasing pitches
-
@cindex quarter tones
@cindex semi-flats, semi-sharps
+Half-flats and half-sharps are formed by adding @code{-eh} and
[EMAIL PROTECTED]; the following is a series of Cs with increasing pitches
+
@lilypond[verbatim,raggedright,quote,relative=2,fragment]
-{ ceseh ceh cih cisih }
+\set Staff.extraNatural = ##f
+ceseh ceh cih cisih
@end lilypond
-Micro tones are also exported to the MIDI file
+Micro tones are also exported to the MIDI file.
@refbugs
@@ -191,8 +199,10 @@
There are no generally accepted standards for denoting three quarter
flats, so LilyPond's symbol does not conform to any standard.
+
@node Chords
@subsection Chords
+
@cindex Chords
A chord is formed by a enclosing a set of pitches in @code{<} and
@@ -214,7 +224,7 @@
@cindex @code{\rest}
@cindex @code{r}
-Rests are entered like notes, with the note name @code{r}
+Rests are entered like notes with the note name @code{r}
@lilypond[fragment,quote,raggedright,verbatim]
r1 r2 r4 r8
@@ -240,15 +250,15 @@
Program reference: @internalsref{RestEvent}, and @internalsref{Rest}.
[EMAIL PROTECTED] FIXME: naming.
@node Skips
@subsection Skips
+
@cindex Skip
@cindex Invisible rest
@cindex Space note
-
@cindex @code{\skip}
@cindex @code{s}
+
An invisible rest (also called a `skip') can be entered like a note
with note name [EMAIL PROTECTED]' or with @code{\skip @var{duration}}
@@ -262,8 +272,8 @@
@lilypond[quote,raggedright,verbatim]
<<
- \relative { a'2 a1 }
- \new Lyrics \lyricmode { \skip 2 bla1 }
+ \relative { a'2 a2 }
+ \new Lyrics \lyricmode { \skip 2 bla2 }
>>
@end lilypond
@@ -285,17 +295,14 @@
Program reference: @internalsref{SkipEvent}, @internalsref{SkipMusic}.
-
@node Durations
@subsection Durations
-
@cindex duration
@cindex @code{\longa}
@cindex @code{\breve}
@cindex @code{\maxima}
-
In Note, Chord, and Lyrics mode, durations are designated by numbers and
dots: durations are entered as their reciprocal values. For example, a
quarter note is entered using a @code{4} (since it is a 1/4 note), while
@@ -342,11 +349,11 @@
@end lilypond
-
@node Augmentation dots
@subsection Augmentation dots
@cindex @code{.}
+
To obtain dotted note lenghts, simply add a dot ([EMAIL PROTECTED]') to
the number. Double-dotted notes are produced in a similar way.
@@ -397,6 +404,33 @@
g'4 \times 2/3 {c'4 c' c'} d'4 d'4
@end lilypond
[EMAIL PROTECTED]
+
[EMAIL PROTECTED] @code{\tupletUp}
[EMAIL PROTECTED],
[EMAIL PROTECTED] @code{\tupletDown}
[EMAIL PROTECTED],
[EMAIL PROTECTED] @code{\tupletNeutral}
[EMAIL PROTECTED]
+
+
[EMAIL PROTECTED]
+
+Program reference: @internalsref{TupletBracket}, and
@internalsref{TimeScaledMusic}.
+
[EMAIL PROTECTED] FIXME: will be deleted or moved; not suitable for
basic-notation.
[EMAIL PROTECTED]
+Examples: @inputfileref{input/@/regression,tuplet@/-nest@/.ly}.
+User manual: @ref{Changing context properties on the fly} for the
[EMAIL PROTECTED] command.
[EMAIL PROTECTED] ignore
+
+
[EMAIL PROTECTED]
+
[EMAIL PROTECTED] @code{tupletNumberFormatFunction}
[EMAIL PROTECTED] tuplet formatting
+
The property @code{tupletSpannerDuration} specifies how long each
bracket should last. With this, you can make lots of tuplets while
typing @code{\times} only once, thus saving lots of typing. In the next
@@ -414,27 +448,6 @@
@code{fraction-tuplet-formatter}, @var{num}:@var{den} will be printed
instead.
[EMAIL PROTECTED] @code{tupletNumberFormatFunction}
[EMAIL PROTECTED] tuplet formatting
-
[EMAIL PROTECTED]
-
[EMAIL PROTECTED] @code{\tupletUp}
[EMAIL PROTECTED],
[EMAIL PROTECTED] @code{\tupletDown}
[EMAIL PROTECTED],
[EMAIL PROTECTED] @code{\tupletNeutral}
[EMAIL PROTECTED]
-
[EMAIL PROTECTED]
-
-User manual: @ref{Changing context properties on the fly} for the
[EMAIL PROTECTED] command.
-
-
-Program reference: @internalsref{TupletBracket}, and
@internalsref{TimeScaledMusic}.
-
-Examples: @inputfileref{input/@/regression,tuplet@/-nest@/.ly}.
@refbugs
Index: lilypond/Documentation/user/macros.itexi
diff -u lilypond/Documentation/user/macros.itexi:1.63
lilypond/Documentation/user/macros.itexi:1.64
--- lilypond/Documentation/user/macros.itexi:1.63 Tue Apr 5 15:10:55 2005
+++ lilypond/Documentation/user/macros.itexi Wed May 18 16:03:32 2005
@@ -187,3 +187,9 @@
@code{\WHAT\}
@end macro
[EMAIL PROTECTED] commonprop
[EMAIL PROTECTED]
[EMAIL PROTECTED] Commonly tweaked properties
+
[EMAIL PROTECTED] macro
+
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
