From: gpercival Date: Mon, 30 May 2005 21:20:14 +0000 (+0000) Subject: Misc small changes. X-Git-Tag: release/2.5.32^2~111 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f7e11293463b8e14017b5ceadff522f82a1abf11;p=lilypond.git Misc small changes. --- diff --git a/ChangeLog b/ChangeLog index 14bcecf09a..093beaefc7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-05-30 Graham Percival + + * Documentation/user/advanced.itely, converters.itely, + instrument-notation.itely, lilypond-book.itely: misc small + changes. + 2005-05-30 Jan Nieuwenhuizen * cygwin: Update from mingw patches. diff --git a/Documentation/user/advanced-notation.itely b/Documentation/user/advanced-notation.itely index ebff0ec7d4..1560bb3ba7 100644 --- a/Documentation/user/advanced-notation.itely +++ b/Documentation/user/advanced-notation.itely @@ -243,8 +243,6 @@ For clarity, you can also do this for single arguments, e.g., \markup @{ is \italic @{ anyone @} home @} @end example -@cindex 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 { \center-align { a bbbb c } } c1^\markup { \line { a b c } } @end lilypond +Lists with no previous command are not kept distinct. The expression + +@example +\center-align @{ @{ a b @} @{ c d @} @} +@end example + +@noindent + +is equivalent to + +@example +\center-align @{ a b c d @} +@end example + +@noindent + +To keep lists of words distinct, please use quotes @code{"} or +the @code{\line} command + +@lilypond[quote,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 } } } +@end lilypond + Markups can be stored in variables and these variables may be attached to notes, like @example diff --git a/Documentation/user/converters.itely b/Documentation/user/converters.itely index b771f10f8c..68bface71f 100644 --- a/Documentation/user/converters.itely +++ b/Documentation/user/converters.itely @@ -16,7 +16,7 @@ sequencers and XML converters. Refer to the * Invoking etf2ly:: Importing Finale. * Invoking abc2ly:: Importing ABC. * Invoking mup2ly:: Importing MUP. -* Other formats:: +* Generating LilyPond files:: @end menu @@ -243,19 +243,25 @@ Only plain notes (pitches, durations), voices, and staves are converted. -@node Other formats -@section Other formats +@node Generating LilyPond files +@section Generating LilyPond files -LilyPond itself does not come with support for other formats, but +@cindex 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 -@uref{http://@/denemo@/.sourceforge@/.net/,Denemo}. +@uref{http://@/denemo@/.sourceforge@/.net/,Denemo}, a graphical score editor. +@item +@uref{http://www@/.volny@/.cz/smilauer/rumor/rumor@/.html,Rumor}, a realtime monophonic MIDI to LilyPond converter. @item -@uref{http://@/www@/.nongnu@/.org/@/xml2ly/, xml2ly}, that imports +@uref{http://nicolas@/.sceaux@/.free@/.fr/lilypond/lyqi@/.html,lyqi}, an Emacs major mode. +@item +@uref{http://@/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 @@ which imports MusicXML @uref{http://@/www@/.all@/-day@/-breakfast@/.com/@/rosegarden/,Rosegarden}, which imports MIDI @end itemize + diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely index 0591e8a872..b500a36147 100644 --- a/Documentation/user/instrument-notation.itely +++ b/Documentation/user/instrument-notation.itely @@ -1784,9 +1784,9 @@ following example @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 @@ following example } } 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 @@ following table { \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 diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely index 09544f6c1f..5ec8f5a062 100644 --- a/Documentation/user/lilypond-book.itely +++ b/Documentation/user/lilypond-book.itely @@ -660,11 +660,6 @@ are ignored. Only the first @code{\score} of a LilyPond block is processed. -@c 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