CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Graham Percival <[EMAIL PROTECTED]> 05/05/30 21:20:14
Modified files:
. : ChangeLog
Documentation/user: advanced-notation.itely converters.itely
instrument-notation.itely
lilypond-book.itely
Log message:
Misc small changes.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3682&tr2=1.3683&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/advanced-notation.itely.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/converters.itely.diff?tr1=1.54&tr2=1.55&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/instrument-notation.itely.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/lilypond-book.itely.diff?tr1=1.113&tr2=1.114&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3682 lilypond/ChangeLog:1.3683
--- lilypond/ChangeLog:1.3682 Mon May 30 19:58:24 2005
+++ lilypond/ChangeLog Mon May 30 21:20:14 2005
@@ -1,3 +1,9 @@
+2005-05-30 Graham Percival <[EMAIL PROTECTED]>
+
+ * Documentation/user/advanced.itely, converters.itely,
+ instrument-notation.itely, lilypond-book.itely: misc small
+ changes.
+
2005-05-30 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
* cygwin: Update from mingw patches.
Index: lilypond/Documentation/user/advanced-notation.itely
diff -u lilypond/Documentation/user/advanced-notation.itely:1.30
lilypond/Documentation/user/advanced-notation.itely:1.31
--- lilypond/Documentation/user/advanced-notation.itely:1.30 Thu May 26
19:15:08 2005
+++ lilypond/Documentation/user/advanced-notation.itely Mon May 30 21:20:14 2005
@@ -243,8 +243,6 @@
\markup @{ is \italic @{ anyone @} home @}
@end example
[EMAIL PROTECTED] font size, texts
-
In markup mode you can compose expressions, similar to mathematical
expressions, XML documents, and music expressions. You can stack
expressions grouped vertically with the command @code{\column}.
@@ -256,6 +254,33 @@
c1^\markup { \line { a b c } }
@end lilypond
+Lists with no previous command are not kept distinct. The expression
+
[EMAIL PROTECTED]
+\center-align @{ @{ a b @} @{ c d @} @}
[EMAIL PROTECTED] example
+
[EMAIL PROTECTED]
+
+is equivalent to
+
[EMAIL PROTECTED]
+\center-align @{ a b c d @}
[EMAIL PROTECTED] example
+
[EMAIL PROTECTED]
+
+To keep lists of words distinct, please use quotes @code{"} or
+the @code{\line} command
+
[EMAIL PROTECTED],verbatim,fragment,relative=1]
+\fatText
+c4^\markup{ \center-align { on three lines } }
+c4^\markup{ \center-align { "all one line" } }
+c4^\markup{ \center-align { { on three lines } } }
+c4^\markup{ \center-align { \line { on one line } } }
[EMAIL PROTECTED] lilypond
+
Markups can be stored in variables and these variables
may be attached to notes, like
@example
Index: lilypond/Documentation/user/converters.itely
diff -u lilypond/Documentation/user/converters.itely:1.54
lilypond/Documentation/user/converters.itely:1.55
--- lilypond/Documentation/user/converters.itely:1.54 Mon Feb 28 03:53:30 2005
+++ lilypond/Documentation/user/converters.itely Mon May 30 21:20:14 2005
@@ -16,7 +16,7 @@
* Invoking etf2ly:: Importing Finale.
* Invoking abc2ly:: Importing ABC.
* Invoking mup2ly:: Importing MUP.
-* Other formats::
+* Generating LilyPond files::
@end menu
@@ -243,19 +243,25 @@
converted.
[EMAIL PROTECTED] Other formats
[EMAIL PROTECTED] Other formats
[EMAIL PROTECTED] Generating LilyPond files
[EMAIL PROTECTED] Generating LilyPond files
-LilyPond itself does not come with support for other formats, but
[EMAIL PROTECTED] External programs, generating LilyPond files
+
+LilyPond itself does not come with support for any other formats, but
there are some external tools that also generate LilyPond files.
These tools include
@itemize @bullet
@item
[EMAIL PROTECTED]://@/denemo@/.sourceforge@/.net/,Denemo}.
[EMAIL PROTECTED]://@/denemo@/.sourceforge@/.net/,Denemo}, a graphical score
editor.
[EMAIL PROTECTED]
[EMAIL PROTECTED]://www@/.volny@/.cz/smilauer/rumor/rumor@/.html,Rumor}, a
realtime monophonic MIDI to LilyPond converter.
@item
[EMAIL PROTECTED]://@/www@/.nongnu@/.org/@/xml2ly/, xml2ly}, that imports
[EMAIL PROTECTED]://nicolas@/.sceaux@/.free@/.fr/lilypond/lyqi@/.html,lyqi}, an
Emacs major mode.
[EMAIL PROTECTED]
[EMAIL PROTECTED]://@/www@/.nongnu@/.org/@/xml2ly/, xml2ly}, which imports
@uref{http://@/www@/.musicxml@/.com/,MusicXML}
@item
@uref{http://@/rnvs@/.informatik@/.tu@/-chemnitz@/.de/@/~jan/@/noteedit/@/noteedit@/.html,NoteEdit}
@@ -264,3 +270,4 @@
@uref{http://@/www@/.all@/-day@/-breakfast@/.com/@/rosegarden/,Rosegarden},
which imports MIDI
@end itemize
+
Index: lilypond/Documentation/user/instrument-notation.itely
diff -u lilypond/Documentation/user/instrument-notation.itely:1.33
lilypond/Documentation/user/instrument-notation.itely:1.34
--- lilypond/Documentation/user/instrument-notation.itely:1.33 Thu May 26
19:15:08 2005
+++ lilypond/Documentation/user/instrument-notation.itely Mon May 30
21:20:14 2005
@@ -1784,9 +1784,9 @@
@lilypond[verbatim, raggedright, quote]
\context Voice {
- d' ^\markup \fret-diagram #"6-x;5-x;4-o;3-2;2-3;1-2;"
+ d'^\markup \fret-diagram #"6-x;5-x;4-o;3-2;2-3;1-2;"
d' d' d'
- fis' ^\markup \override #'(size . 0.75) {
+ fis'^\markup \override #'(size . 0.75) {
\override #'(finger-code . below-string) {
\fret-diagram-verbose #'((place-fret 6 2 1) (barre 6 1 2)
(place-fret 5 4 3) (place-fret 4 4 4)
@@ -1795,7 +1795,7 @@
}
}
fis' fis' fis'
- c' ^\markup \override #'(dot-radius . 0.35) {
+ c'^\markup \override #'(dot-radius . 0.35) {
\override #'(finger-code . in-dot) {
\override #'(dot-color . white) {
\fret-diagram-terse #"x;3-1-(;5-2;5-3;5-4;3-1-);"
@@ -2395,35 +2395,25 @@
{
\set Score.timing = ##f
\set Score.barAlways = ##t
- s_\markup { "\\time 4/4" }
- ^\markup { " " \musicglyph #"timesig.neomensural44" }
+ s_\markup { "\\time 4/4" }^\markup { " " \musicglyph
#"timesig.neomensural44" }
s
- s_\markup { "\\time 2/2" }
- ^\markup { " " \musicglyph #"timesig.neomensural22" }
+ s_\markup { "\\time 2/2" }^\markup { " " \musicglyph
#"timesig.neomensural22" }
s
- s_\markup { "\\time 6/4" }
- ^\markup { " " \musicglyph #"timesig.neomensural64" }
+ s_\markup { "\\time 6/4" }^\markup { " " \musicglyph
#"timesig.neomensural64" }
s
- s_\markup { "\\time 6/8" }
- ^\markup { " " \musicglyph #"timesig.neomensural68" }
+ s_\markup { "\\time 6/8" }^\markup { " " \musicglyph
#"timesig.neomensural68" }
\break
- s_\markup { "\\time 3/2" }
- ^\markup { " " \musicglyph #"timesig.neomensural32" }
+ s_\markup { "\\time 3/2" }^\markup { " " \musicglyph
#"timesig.neomensural32" }
s
- s_\markup { "\\time 3/4" }
- ^\markup { " " \musicglyph #"timesig.neomensural34" }
+ s_\markup { "\\time 3/4" }^\markup { " " \musicglyph
#"timesig.neomensural34" }
s
- s_\markup { "\\time 9/4" }
- ^\markup { " " \musicglyph #"timesig.neomensural94" }
+ s_\markup { "\\time 9/4" }^\markup { " " \musicglyph
#"timesig.neomensural94" }
s
- s_\markup { "\\time 9/8" }
- ^\markup { " " \musicglyph #"timesig.neomensural98" }
+ s_\markup { "\\time 9/8" }^\markup { " " \musicglyph
#"timesig.neomensural98" }
\break
- s_\markup { "\\time 4/8" }
- ^\markup { " " \musicglyph #"timesig.neomensural48" }
+ s_\markup { "\\time 4/8" }^\markup { " " \musicglyph
#"timesig.neomensural48" }
s
- s_\markup { "\\time 2/4" }
- ^\markup { " " \musicglyph #"timesig.neomensural24" }
+ s_\markup { "\\time 2/4" }^\markup { " " \musicglyph
#"timesig.neomensural24" }
}
@end lilypond
Index: lilypond/Documentation/user/lilypond-book.itely
diff -u lilypond/Documentation/user/lilypond-book.itely:1.113
lilypond/Documentation/user/lilypond-book.itely:1.114
--- lilypond/Documentation/user/lilypond-book.itely:1.113 Tue May 24
16:08:27 2005
+++ lilypond/Documentation/user/lilypond-book.itely Mon May 30 21:20:14 2005
@@ -660,11 +660,6 @@
Only the first @code{\score} of a LilyPond block is processed.
[EMAIL PROTECTED] CHECKME--FIXME
-The size of a music block is limited to 1.5 KB, due to technical
-problems with the Python regular expression engine. For longer files,
-use @code{\lilypondfile}.
-
@node Filename extensions
@section Filename extensions
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
