From: Han-Wen Nienhuys Date: Mon, 9 Feb 2004 16:31:01 +0000 (+0000) Subject: * scripts/lilypond-book.py (do_file): fix latex output. X-Git-Tag: release/2.1.23~58 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ca503df05ee1e855083f54999f7e780c8a8a08e5;p=lilypond.git * scripts/lilypond-book.py (do_file): fix latex output. * scripts/lilypond-book.py (Lilypond_snippet.notice_include): write .dep file. (Lilypond_snippet.ly): add \renameinput. --- diff --git a/ChangeLog b/ChangeLog index e65ae56595..682f27ceb9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2004-02-09 Han-Wen Nienhuys + * scripts/lilypond-book.py (do_file): fix latex output. + + * VERSION: release 2.1.20 + * scm/part-combiner.scm (determine-split-list): robustness fix * lily/paper-score.cc (process): move gc stat stuff to init.ly diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi index 348a896a3b..f3ed17b79e 100644 --- a/Documentation/topdocs/NEWS.texi +++ b/Documentation/topdocs/NEWS.texi @@ -18,14 +18,20 @@ Version 2.1.13 @itemize @bullet -@item The lilypond-book script has been rewritten. It now supports +@item Melismata in lyrics are also properly handled in the MIDI output. + +@item The lilypond-book script has been rewritten. +It is shorter, cleaner and faster. The special construct +@code{mbinclude} has been removed, plain @code{@@include} or +@code{\\input} can be used now. + +@ignore +It now supports running convert-ly on the lilypond snippets like so: @example lilypond-book --filter='convert-ly --from=2.0.0' my-book.tely @end example -It is also twice as short and thrice as fast. The special construct -@code{mbinclude} has been removed, plain @code{@@include} or -@code{\\input} can be used now. +@end ignore @item The @code{Lyrics} context has been removed. Lyrics should only be constructed in @code{LyricsVoice}. @@ -40,8 +46,8 @@ are now constructed at @code{Voice} level. @end example @item Drum notation is now supported as a regular feature: -percussion may be entered in @code{\drums} mode, and printed in a -@code{DrumStaff} context: +percussion may be entered in @code{\drums} mode, and printed or +performed in a @code{DrumStaff} context: @example \score @{ @@ -49,7 +55,6 @@ percussion may be entered in @code{\drums} mode, and printed in a @} @end example - @item The automatic staff changer was internally rewritten. As a result, the syntax has been simplified as well: diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 5b5f4df1c5..bf0b9da757 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -2771,15 +2771,12 @@ Internals: @internalsref{RhythmicStaff}. Examples: @inputfileref{input/regression,rhythmic-staff.ly}. -@node Percussion staves -@subsection Percussion staves +@node Entering percussion +@subsection Entering percussion + @cindex percussion @cindex drums -A percussion part for more than one instrument typically uses a -multiline staff where each position in the staff refers to one piece -of percussion. - @syntax Percussion notes may be entered in @code{\drums} mode, which is @@ -2790,6 +2787,24 @@ an abbreviated name, and both be used in input files: \drums { hihat4 hh4 } @end lilypond +The complete list of drum names is in the init file +@file{ly/drumpitch-init.ly}. +@c TODO: properly document this. + +@seealso + +Internals: @internalsref{DrumNoteEvent} + +@node Percussion staves +@subsection Percussion staves +@cindex percussion +@cindex drums + +A percussion part for more than one instrument typically uses a +multiline staff where each position in the staff refers to one piece +of percussion. + + To typeset the music, the notes must be interpreted in a @internalsref{DrumStaff} and @internalsref{DrumVoice} contexts: diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index bd2cb300b1..4e099ea9a2 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -52,11 +52,13 @@ your first sheets of music. @menu * First steps:: * Running LilyPond:: -* More about pitches :: +* More about pitches:: * Octave entry:: * Combining music into compound expressions:: * Adding articulation marks to notes:: * Combining notes into chords:: +* Basic rhythmical commands:: +* Commenting input files:: * Printing lyrics:: * A lead sheet:: * Listening to output:: @@ -964,13 +966,9 @@ r4 8\>( 8\!) -@menu -* Basic rhythmical commands:: -* Commenting input files:: -@end menu @node Basic rhythmical commands -@subsection Basic rhythmical commands +@section Basic rhythmical commands @cindex pickup @cindex anacruse @@ -1024,7 +1022,7 @@ see @ref{Partial measures}. @node Commenting input files -@subsection Commenting input files +@section Commenting input files @cindex comments @cindex line comment diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index 66db3075b6..b4020ef1db 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -548,8 +548,7 @@ snippet_type_to_class = { } -def find_toplevel_snippets (infile, types): - s = infile.read () +def find_toplevel_snippets (s, types): res = {} for i in types: res[i] = ly.re.compile (snippet_res[format][i]) @@ -714,9 +713,9 @@ def do_file (input_filename): ly.progress (_ ("Reading %s...") % input_filename) if not input_filename or input_filename == '-': - ih = sys.stdin + in_handle = sys.stdin else: - ih = open (input_filename) + in_handle = open (input_filename) ly.progress ('\n') @@ -749,8 +748,9 @@ def do_file (input_filename): output_file = open (output_filename, 'w') os.chdir (output_name) - - chunks = find_toplevel_snippets (ih, snippet_types) + + source = in_handle.read () + chunks = find_toplevel_snippets (source, snippet_types) ly.progress ('\n') global default_ly_options