CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Graham Percival <[EMAIL PROTECTED]> 05/06/07 05:29:30
Modified files:
. : ChangeLog
Documentation/user: putting.itely converters.itely lilypond.tely
invoking.itely
Log message:
New section on modifying templates and misc small changes.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3729&tr2=1.3730&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/putting.itely.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/converters.itely.diff?tr1=1.55&tr2=1.56&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/lilypond.tely.diff?tr1=1.131&tr2=1.132&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/invoking.itely.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3729 lilypond/ChangeLog:1.3730
--- lilypond/ChangeLog:1.3729 Mon Jun 6 23:31:20 2005
+++ lilypond/ChangeLog Tue Jun 7 05:29:30 2005
@@ -1,3 +1,10 @@
+2005-06-07 Graham Percival <[EMAIL PROTECTED]>
+
+ * Documentation/user/putting.itely: add info on modifying templates.
+
+ * Documentation/user/lilypond.itely, converters.itely, invoking.itely:
+ misc small changes.
+
2005-06-07 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* VERSION (PACKAGE_NAME): release 2.5.28
Index: lilypond/Documentation/user/converters.itely
diff -u lilypond/Documentation/user/converters.itely:1.55
lilypond/Documentation/user/converters.itely:1.56
--- lilypond/Documentation/user/converters.itely:1.55 Mon May 30 21:20:14 2005
+++ lilypond/Documentation/user/converters.itely Tue Jun 7 05:29:30 2005
@@ -262,10 +262,10 @@
@uref{http://nicolas@/.sceaux@/.free@/.fr/lilypond/lyqi@/.html,lyqi}, an Emacs
major mode.
@item
@uref{http://@/www@/.nongnu@/.org/@/xml2ly/, xml2ly}, which imports
[EMAIL PROTECTED]://@/www@/.musicxml@/.com/,MusicXML}
[EMAIL PROTECTED]://@/www@/.musicxml@/.com/xml@/.html,MusicXML}
@item
@uref{http://@/rnvs@/.informatik@/.tu@/-chemnitz@/.de/@/~jan/@/noteedit/@/noteedit@/.html,NoteEdit}
-which imports MusicXML
+which imports @uref{http://@/www@/.musicxml@/.com/xml@/.html,MusicXML}
@item
@uref{http://@/www@/.all@/-day@/-breakfast@/.com/@/rosegarden/,Rosegarden},
which imports MIDI
Index: lilypond/Documentation/user/invoking.itely
diff -u lilypond/Documentation/user/invoking.itely:1.33
lilypond/Documentation/user/invoking.itely:1.34
--- lilypond/Documentation/user/invoking.itely:1.33 Thu May 26 19:15:08 2005
+++ lilypond/Documentation/user/invoking.itely Tue Jun 7 05:29:30 2005
@@ -427,6 +427,10 @@
If there are no changes to myfile.ly and file called myfile.ly.NEW
is created, then myfile.ly is already updated.
[EMAIL PROTECTED] always converts up to the last syntax change handled by
+it. This means that the @code{\version} number left in the file is
+usually lower than the version of @command{convert-ly} itself.
+
To upgrade LilyPond fragments in texinfo files, use
@example
@@ -476,9 +480,6 @@
Print usage help.
@end table
[EMAIL PROTECTED] always converts up to the last syntax change handled by
-it. This means that the @code{\version} number left in the file is
-usually lower than the version of @command{convert-ly} itself.
@refbugs
Index: lilypond/Documentation/user/lilypond.tely
diff -u lilypond/Documentation/user/lilypond.tely:1.131
lilypond/Documentation/user/lilypond.tely:1.132
--- lilypond/Documentation/user/lilypond.tely:1.131 Thu May 26 19:15:08 2005
+++ lilypond/Documentation/user/lilypond.tely Tue Jun 7 05:29:30 2005
@@ -13,6 +13,8 @@
Current version of the manual: 2.5.18
Please update this whenever you run convert-ly on the docs.
+convert-ly --from=... --to=... --no-version *.itely
+
%%%%%
Distributions will want to install lilypond.info in postinstall, doing:
@@ -79,6 +81,10 @@
* Avoid fluff (``Notice that,'' ``as you can see,'' ``Currently,'').
+* The above three suggestions refer to the formal Notation Manual
+ (chapters 5 and up). In the Tutorial, Example templates, and
+ Putting it all together, you may write more colloquially
+
* The use of the word `illegal' is inappropriate in most cases. Say
`invalid' instead.
Index: lilypond/Documentation/user/putting.itely
diff -u lilypond/Documentation/user/putting.itely:1.2
lilypond/Documentation/user/putting.itely:1.3
--- lilypond/Documentation/user/putting.itely:1.2 Fri May 6 10:54:40 2005
+++ lilypond/Documentation/user/putting.itely Tue Jun 7 05:29:30 2005
@@ -2,15 +2,14 @@
@node Putting it all together
@chapter Putting it all together
-This section will demonstrate more complicated stuff in LilyPond, probably
-via annotated examples. It's currently incomplete and serves as a
-placeholder so that the chapter numbering doesn't change later.
+This section explains how to use the rest of the documentation and
+how to solve common problems.
@menu
* Suggestions for writing LilyPond files::
+* Extending the templates::
@end menu
[EMAIL PROTECTED] explain \score{} ? Add a note to the tutorial?
@node Suggestions for writing LilyPond files
@section Suggestions for writing LilyPond files
@@ -59,3 +58,189 @@
@end itemize
[EMAIL PROTECTED] Extending the templates
[EMAIL PROTECTED] Extending the templates
+
+You've read the tutorial, you know how to write music. But how can you
+get the staves that you want? The templates are ok, but what if you
+want something that isn't covered?
+
+Start off with the template that seems closest to what you want to end
+up with. Let's say that you want to write something for soprano and
+cello. In this case, we would start with ``Notes and lyrics'' (for the
+soprano part).
+
[EMAIL PROTECTED]
+\version "2.4.0"
+melody = \relative c' @{
+ \clef treble
+ \key c \major
+ \time 4/4
+
+ a4 b c d
[EMAIL PROTECTED]
+
+text = \lyricmode @{
+ Aaa Bee Cee Dee
[EMAIL PROTECTED]
+
[EMAIL PROTECTED]
+ <<
+ \context Voice = one @{
+ \autoBeamOff
+ \melody
+ @}
+ \lyricsto "one" \new Lyrics \text
+ >>
+ \layout @{ @}
+ \midi @{ \tempo 4=60 @}
[EMAIL PROTECTED]
[EMAIL PROTECTED] example
+
+Now we want to add a cello part. Let's look at the ``Notes only'' example:
+
[EMAIL PROTECTED]
+\version "2.4.0"
+melody = \relative c' @{
+ \clef treble
+ \key c \major
+ \time 4/4
+
+ a4 b c d
[EMAIL PROTECTED]
+
+\score @{
+\new Staff \melody
+\layout @{ @}
+\midi @{ \tempo 4=60 @}
[EMAIL PROTECTED]
[EMAIL PROTECTED] example
+
+We don't need two @code{\version} commands. We'll need the @code{melody}
+section. We don't want two @code{\score} sections -- if we had two
[EMAIL PROTECTED], we'd get the two parts separately. We want them together,
+as a duet. Within the @code{\score} section, we don't need two
[EMAIL PROTECTED] or @code{\midi}.
+
+If we simply cut and paste the @code{melody} section, we would end up with
+two @code{melody} sections. So let's rename them. We'll call the one
+for the soprano @code{sopranoMusic}, and the one for the cello can be
+called @code{celloMusic}. While we're doing this, let's rename @code{text}
+to be @code{sopranoLyrics}. Remember to rename both instances of all
+these names -- both the initial definition (the
[EMAIL PROTECTED] = relative c' @{ } part) and the name's use (in the
[EMAIL PROTECTED] section).
+
+While we're doing this, let's change the cello part's staff -- celli
+normally use bass clef. We'll also give the cello some different
+notes.
+
[EMAIL PROTECTED]
+\version "2.4.0"
+sopranoMusic = \relative c' @{
+ \clef treble
+ \key c \major
+ \time 4/4
+
+ a4 b c d
[EMAIL PROTECTED]
+
+sopranoLyrics = \lyricmode @{
+ Aaa Bee Cee Dee
[EMAIL PROTECTED]
+
+celloMusic = \relative c @{
+ \clef bass
+ \key c \major
+ \time 4/4
+
+ d4 g fis8 e d4
[EMAIL PROTECTED]
+
[EMAIL PROTECTED]
+ <<
+ \context Voice = one @{
+ \autoBeamOff
+ \sopranoMusic
+ @}
+ \lyricsto "one" \new Lyrics \sopranoLyrics
+ >>
+ \layout @{ @}
+ \midi @{ \tempo 4=60 @}
[EMAIL PROTECTED]
[EMAIL PROTECTED] example
+
+This is looking promising, but the cello part won't appear in the
+score -- we haven't used it in the @code{\score} section. If we
+want the cello part to appear under the soprano part, we need to add
+
[EMAIL PROTECTED]
+\new Staff \celloMusic
[EMAIL PROTECTED] example
+
[EMAIL PROTECTED]
+underneath the soprano stuff. We also need to add @code{<<} and
[EMAIL PROTECTED]>>} around the music -- that tells LilyPond that there's
+more than one thing (in this case staff) happening at once. The
[EMAIL PROTECTED] looks like this now
+
[EMAIL PROTECTED]
[EMAIL PROTECTED]
+<<
+ <<
+ \context Voice = one @{
+ \autoBeamOff
+ \sopranoMusic
+ @}
+ \lyricsto "one" \new Lyrics \sopranoLyrics
+ >>
+ \new Staff \celloMusic
+>>
+ \layout @{ @}
+ \midi @{ \tempo 4=60 @}
[EMAIL PROTECTED]
[EMAIL PROTECTED] example
+
[EMAIL PROTECTED]
+This looks a bit messy; the indentation is messed up now. That is
+easily fixed. Here's the complete soprano and cello template.
+
[EMAIL PROTECTED],verbatim,raggedright]
+\version "2.4.0"
+sopranoMusic = \relative c' {
+ \clef treble
+ \key c \major
+ \time 4/4
+
+ a4 b c d
+}
+
+sopranoLyrics = \lyricmode {
+ Aaa Bee Cee Dee
+}
+
+celloMusic = \relative c {
+ \clef bass
+ \key c \major
+ \time 4/4
+
+ d4 g fis8 e d4
+}
+
+\score{
+ <<
+ <<
+ \context Voice = one {
+ \autoBeamOff
+ \sopranoMusic
+ }
+ \lyricsto "one" \new Lyrics \sopranoLyrics
+ >>
+ \new Staff \celloMusic
+ >>
+ \layout { }
+ \midi { \tempo 4=60 }
+}
[EMAIL PROTECTED] lilypond
+
+
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
