From 35e8e06c030f2dc6dd63d26fc26462e305c8f808 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 8 Nov 2004 20:53:38 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 338 +++++++++++++++--------------- Documentation/user/notation.itely | 114 ++++------ VERSION | 2 +- 3 files changed, 211 insertions(+), 243 deletions(-) diff --git a/ChangeLog b/ChangeLog index 46457faf3f..f121587c85 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,177 +1,167 @@ - *************** -*** 1,7 **** - 2004-11-04 Han-Wen Nienhuys -i - * input/regression/new-slur.ly: mention forcing. - - 2004-11-04 Heikki Junes - - * Documentation/user/lilypond.tely: changes 2.3.x to 2.5.x. ---- 1,164 ---- -+ 2004-11-08 Han-Wen Nienhuys -+ -+ * lily/grace-engraver.cc (start_translation_timestep): split -+ scm_cadddr -+ -+ 2004-11-07 Han-Wen Nienhuys -+ -+ * lily/quote-iterator.cc (Module): remove old quote-iterator -+ -+ * scm/define-music-types.scm (music-descriptions): move -+ NewQuoteMusic over QuoteMusic -+ -+ * Documentation/user/notation.itely (Formatting cue notes): use -+ \cueDuring. -+ -+ * lily/new-quote-iterator.cc (quote_ok): new function. -+ -+ * input/regression/quote-cue-during.ly: new file. -+ -+ * input/regression/quote-grace.ly: new file. -+ -+ * scm/define-context-properties.scm (Module): change definition of -+ graceSettings -+ -+ * lily/context-property.cc (Module): rename from -+ translator-property.cc -+ -+ * lily/context.cc (context_name_symbol): new function -+ -+ * lily/grace-engraver.cc: new file. Set properties for grobs based -+ on the grace-ness of now_moment(). -+ -+ * scm/music-functions.scm (add-grace-property): use list -+ iso. vector for graceSettings -+ remove set-{start,stop}-grace-properties. -+ -+ * lily/new-quote-iterator.cc (construct_children): set -+ quote_outlet_ if no quoted-context-{id,type} specified. -+ -+ * scripts/convert-ly.py (conv): \quote -> \quoteDuring. -+ -+ * lily/parser.yy (command_element): remove \quote. -+ -+ * ly/music-functions-init.ly (location): add quoteDuring music -+ function. -+ -+ * lily/lexer.ll: allow \encoding in lyrics as well. Remove -+ optional semicolon. (backportme) -+ -+ 2004-11-06 Jan Nieuwenhuizen -+ -+ * python/GNUmakefile (STEPMAKE_TEMPLATES): Unset USER_LDFLAGS, no -+ need to link to GUILE et al. -+ -+ 2004-11-06 Han-Wen Nienhuys -+ -+ * scm/define-music-properties.scm (all-music-properties): add -+ quoted-context-type, quoted-context-id. -+ -+ * scm/lily.scm (type-check-list): new function. -+ -+ * scm/lily-library.scm: new file. Generic library routines. -+ -+ * lily/parser.yy (Generic_prefix_music): move typechecking out of -+ parser. -+ -+ * ly/music-functions-init.ly: add quoteDuring function. -+ -+ * lily/include/music-iterator.hh (class Music_iterator): rename -+ set_translator -> set_context -+ -+ * lily/parser.yy (Generic_prefix_music_scm): add -+ MUSIC_FUNCTION_SCM_SCM_MUSIC -+ -+ * scm/lily.scm (sanitize-command-option): new function. (backportme) -+ -+ * scm/framework-tex.scm (header): sanitize TeX paper size. -+ (backportme) -+ -+ 2004-11-06 Jan Nieuwenhuizen -+ -+ * elisp/lilypond-indent.el (LilyPond-indent-level): 2 is now standard. -+ -+ * tex/lilyponddefs.tex: If no inputencoding use latin1. (backportme) -+ -+ * scm/framework-tex.scm (font-load-command): Use T1 if no -+ font-encoding set. (backportme) -+ -+ * scm/lily.scm (postscript->pdf): Remove .pdf file if it -+ exists before converting. (backportme) -+ -+ * scm/framework-tex.scm (convert-to-dvi): Remove .dvi file if it -+ exists before converting. (backportme) -+ (convert-to-ps): Remove .ps file if it exists before -+ converting. (backportme) -+ -+ * lily/lexer.ll: Remove extra progress newline, use present tense. -+ -+ * scm/paper.scm (paper-alist): public. -+ * scm/framework-tex.scm (convert-to-ps): -+ * scm/lily.scm (postscript->pdf): Do not leak papersizename into -+ command line. -+ -+ 2004-11-06 Han-Wen Nienhuys -+ -+ * scm/lily.scm (ly:system): add > /dev/null 2>&1 . (backportme) -+ -+ * lily/recording-group-engraver.cc (derived_mark): mark -+ now_events_. (backportme) -+ -+ 2004-11-05 Han-Wen Nienhuys -+ -+ * mf/GNUmakefile: use Fedora-3 in download link. (backportme.) -+ -+ * scm/framework-tex.scm (convert-to-dvi): use ly:system for -+ invoking latex. (backportme.) -+ -+ * lily/stem.cc (off_callback): center stems for all rest stems. -+ -+ 2004-11-05 Werner Lemberg -+ -+ * Documentation/user/lilypond.tely: Add more guidelines for writing -+ lilypond texinfo documents. -+ -+ 2004-11-05 Heikki Junes -+ -+ * Documentation/index.html.in: remove
. -+ -+ * THANKS: change 2.3 to 2.4. -+ -+ 2004-11-05 Jan Nieuwenhuizen -+ -+ * scm/output-gnome.scm: More fontconfig comment. -+ -+ 2004-11-05 Pedro Kroger -+ -+ * GNUmakefile.in ($(builddir)/share/lilypond-force): create the -+ directory in $(builddir)/share according with -+ PACKAGE_NAME defined in the VERSION file. -+ - 2004-11-04 Han-Wen Nienhuys - -+ * lily/beam.cc (rest_collision_callback): use local beam -+ multiplicity. -+ -+ * input/regression/stem-stemlet.ly: new file. -+ -+ * lily/stem.cc (add_head): store rests as well. -+ -+ * scm/define-grob-properties.scm (all-user-grob-properties): add -+ stemlet-length -+ -+ * lily/stem.cc: store rests as well. -+ - * input/regression/new-slur.ly: mention forcing. - -+ 2004-11-04 Werner Lemberg -+ -+ * Documentation/user/*: A new round of layout fixes and document -+ structure cleanup. -+ - 2004-11-04 Heikki Junes +2004-11-08 Han-Wen Nienhuys + + * lily/grace-engraver.cc (start_translation_timestep): split + scm_cadddr + +2004-11-07 Han-Wen Nienhuys + + * lily/quote-iterator.cc (Module): remove old quote-iterator + + * scm/define-music-types.scm (music-descriptions): move + NewQuoteMusic over QuoteMusic + + * Documentation/user/notation.itely (Formatting cue notes): use + \cueDuring. + + * lily/new-quote-iterator.cc (quote_ok): new function. + + * input/regression/quote-cue-during.ly: new file. + + * input/regression/quote-grace.ly: new file. + + * scm/define-context-properties.scm (Module): change definition of + graceSettings + + * lily/context-property.cc (Module): rename from + translator-property.cc + + * lily/context.cc (context_name_symbol): new function + + * lily/grace-engraver.cc: new file. Set properties for grobs based + on the grace-ness of now_moment(). + + * scm/music-functions.scm (add-grace-property): use list + iso. vector for graceSettings + remove set-{start,stop}-grace-properties. + + * lily/new-quote-iterator.cc (construct_children): set + quote_outlet_ if no quoted-context-{id,type} specified. + + * scripts/convert-ly.py (conv): \quote -> \quoteDuring. + + * lily/parser.yy (command_element): remove \quote. + + * ly/music-functions-init.ly (location): add quoteDuring music + function. + + * lily/lexer.ll: allow \encoding in lyrics as well. Remove + optional semicolon. (backportme) + +2004-11-06 Jan Nieuwenhuizen + + * python/GNUmakefile (STEPMAKE_TEMPLATES): Unset USER_LDFLAGS, no + need to link to GUILE et al. + +2004-11-06 Han-Wen Nienhuys + + * scm/define-music-properties.scm (all-music-properties): add + quoted-context-type, quoted-context-id. + + * scm/lily.scm (type-check-list): new function. + + * scm/lily-library.scm: new file. Generic library routines. + + * lily/parser.yy (Generic_prefix_music): move typechecking out of + parser. + + * ly/music-functions-init.ly: add quoteDuring function. + + * lily/include/music-iterator.hh (class Music_iterator): rename + set_translator -> set_context + + * lily/parser.yy (Generic_prefix_music_scm): add + MUSIC_FUNCTION_SCM_SCM_MUSIC + + * scm/lily.scm (sanitize-command-option): new function. (backportme) + + * scm/framework-tex.scm (header): sanitize TeX paper size. + (backportme) + +2004-11-06 Jan Nieuwenhuizen + + * elisp/lilypond-indent.el (LilyPond-indent-level): 2 is now standard. + + * tex/lilyponddefs.tex: If no inputencoding use latin1. (backportme) + + * scm/framework-tex.scm (font-load-command): Use T1 if no + font-encoding set. (backportme) + + * scm/lily.scm (postscript->pdf): Remove .pdf file if it + exists before converting. (backportme) + + * scm/framework-tex.scm (convert-to-dvi): Remove .dvi file if it + exists before converting. (backportme) + (convert-to-ps): Remove .ps file if it exists before + converting. (backportme) + + * lily/lexer.ll: Remove extra progress newline, use present tense. + + * scm/paper.scm (paper-alist): public. + * scm/framework-tex.scm (convert-to-ps): + * scm/lily.scm (postscript->pdf): Do not leak papersizename into + command line. + +2004-11-06 Han-Wen Nienhuys + + * scm/lily.scm (ly:system): add > /dev/null 2>&1 . (backportme) + + * lily/recording-group-engraver.cc (derived_mark): mark + now_events_. (backportme) + +2004-11-05 Han-Wen Nienhuys + + * mf/GNUmakefile: use Fedora-3 in download link. (backportme.) + + * scm/framework-tex.scm (convert-to-dvi): use ly:system for + invoking latex. (backportme.) + + * lily/stem.cc (off_callback): center stems for all rest stems. + +2004-11-05 Werner Lemberg + + * Documentation/user/lilypond.tely: Add more guidelines for writing + lilypond texinfo documents. + +2004-11-05 Heikki Junes + + * Documentation/index.html.in: remove
. + + * THANKS: change 2.3 to 2.4. + +2004-11-05 Jan Nieuwenhuizen + + * scm/output-gnome.scm: More fontconfig comment. + +2004-11-05 Pedro Kroger + + * GNUmakefile.in ($(builddir)/share/lilypond-force): create the + directory in $(builddir)/share according with + PACKAGE_NAME defined in the VERSION file. + +2004-11-04 Han-Wen Nienhuys - * Documentation/user/lilypond.tely: changes 2.3.x to 2.5.x. + * lily/beam.cc (rest_collision_callback): use local beam + multiplicity. + + * input/regression/stem-stemlet.ly: new file. + + * lily/stem.cc (add_head): store rests as well. + + * scm/define-grob-properties.scm (all-user-grob-properties): add + stemlet-length + + * lily/stem.cc: store rests as well. + + * input/regression/new-slur.ly: mention forcing. + +2004-11-04 Werner Lemberg + + * Documentation/user/*: A new round of layout fixes and document + structure cleanup. + +2004-11-04 Heikki Junes + + * Documentation/user/lilypond.tely: changes 2.3.x to 2.5.x. 2004-11-08 Han-Wen Nienhuys @@ -186,7 +176,7 @@ i 2004-11-04 Heikki Junes - * Documentation/user/lilypond.tely: changes 2.3.x to 2.5.x. + * Documentation/user/lilypond.tely: changes 2.3.x to 2.5.x. 2004-11-04 Jan Nieuwenhuizen diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely index 8729c23b98..576cb33ebb 100644 --- a/Documentation/user/notation.itely +++ b/Documentation/user/notation.itely @@ -5575,6 +5575,7 @@ Examples: @inputfileref{input/@/regression,tag@/-filter@/.ly}. Multiple rests are not merged if you create the score with both tagged sections. + @node Quoting other voices @subsection Quoting other voices @@ -5601,22 +5602,21 @@ This command must be entered at toplevel, i.e. outside any music blocks. After calling @code{\addquote}, the quotation may then be done with -@code{\quoteDuring} or @code{\cueDuring}, +@code{\quote}, @example -\quoteDuring #@var{name} @var{music} +\quote @var{name} @var{duration} @end example -During a part, a piece of music can be quoted with the @code{\quoteDuring} +During a part, a piece of music can be quoted with the @code{\quote} command. @example -\quoteDuring #"clarinet" @{ s2. @} +\quote clarinet 2. @end example -This would cite three quarter notes (the duration of @code{s2.}) of -the previously added @code{clarinet} voice. - +This would cite three quarter notes (@code{2.} is a dotted half note) +of the previously added @code{clarinet} voice. More precisely, it takes the current time-step of the part being printed, and extracts the notes at the corresponding point of the @@ -5634,14 +5634,14 @@ instruments, if they are specified using the @code{\transposition} command. } { - e'8 f'8 \quoteDuring #"clarinet" { s2 } + e'8 f'8 \quote clarinet 2 } @end lilypond The type of events that are present in cue notes can be trimmed with -the @code{quotedEventTypes} property. The default value is +the @code{quotedEventTypes} property. The default value is @code{(note-event rest-event)}, which means that only notes of and -rests of the cued voice end up in the @code{\quoteDuring}. +rests of the cued voice end up in the @code{\quote}. Setting @example @@ -5673,85 +5673,63 @@ Program reference: @internalsref{QuoteMusic}. @node Formatting cue notes @subsection Formatting cue notes -The previous section deals with inserting notes from another voice. -There is a more advanced music function called @code{\cueDuring}, -which makes formatting cue notes easier. -The syntax is +The previous section deals with inserting notes from another +voice. When making a part, these notes need to be specially formatted. +Here is an example of formatted cue notes -@example - \cueDuring #@var{name} #@var{updown} @var{music} -@end example +@c TODO: This should be done with \quote stuff, not manually. -This will insert notes from the part @var{name} into a -@internalsref{Voice} called @code{cue}. This happens simultaneously -with @var{music}, which usually is a rest. When the cue notes start, -the staff in effect becomes polyphonic for a moment. The argument -@var{updown} determines whether the cue notes should be notated as a -first or second voice. - - -@lilypond[verbatim,raggedright] +@lilypond[raggedright,verbatim] smaller = { \set fontSize = #-2 - \override Stem #'length = #5.5 - \override Beam #'thickness = #0.384 - \override Beam #'space-function = + \override Stem #'length = #5.5 + \override Beam #'thickness = #0.384 + \override Beam #'space-function = #(lambda (beam mult) (* 0.8 (Beam::space_function beam mult))) } -\addquote clarinet \relative { - R1*20 - r2 r8 c f f -} - -\new Staff \relative << - - % setup a context for cue notes. - \context Voice = cue { \smaller \skip 1*21 } - +{ + \set Staff.instrument = #"Horn in F" \set Score.skipBars = ##t - + R1*21 + << { + \once \override Staff.MultiMeasureRest #'staff-position = #-6 + R1 + } \new Voice { - R1*20 - \cueDuring #"clarinet" #1 { - R1 - } - g4 g2. + s2 + \clef tenor + \smaller + r8^"Bsn." c'8 f'8[ f'8] + \clef treble } ->> -@end lilypond + >> + c'8^"Horn" cis' + eis'4 fis'4 +} +@end lilypond -Here are a couple of hints for successful cue notes +There are a couple of points to take care of: @itemize @bullet @item +The multi rest of the original part should be moved up or down during +the cue. +@item Cue notes have smaller font sizes. @item - the cued part is marked with the instrument playing the cue. +When cued notes have a clef change relative to the original part, the +clef should be restored after the cue section. This minimizes +confusion for the reader, @item - when the original part takes over again, this should be marked with - the name of the original instrument. - - @c really? Are you sure about that last point? I'll check after 3.0 -gp - -@c Yes, this is good practice. Otherwise, the start of the original -@c part can only be seen from the font size. This is not good enough -@c for sight-reading. It is possilbe to use other -@c markers (eg. a big close-bracket over the staff) to indicate the cue notes are -@c finished. -@c -hwn - - - any other changes introduced by the cued part should also be -undone. For example, if the cued instrument plays in a different clef, -the original clef should be stated once again. - +When the original part starts, this should be marked with the name of +the instrument, in this case ``Horn.'' Of course, the cue part is +marked with the instrument playing the cue. @end itemize - - +@c really? Are you sure about that last point? I'll check after 3.0 -gp @node Ancient notation diff --git a/VERSION b/VERSION index d9361ffac8..990a67f241 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=2 MINOR_VERSION=4 -PATCH_LEVEL=1 +PATCH_LEVEL=2 MY_PATCH_LEVEL= -- 2.39.5